diff --git a/assets/Scene/HomeScene.fire b/assets/Scene/HomeScene.fire index 03c4451b..888a61a3 100644 --- a/assets/Scene/HomeScene.fire +++ b/assets/Scene/HomeScene.fire @@ -20,7 +20,7 @@ "__id__": 5 }, { - "__id__": 716 + "__id__": 718 } ], "_active": false, @@ -246,19 +246,19 @@ "__id__": 658 }, { - "__id__": 720 + "__id__": 713 } ], "_active": true, "_components": [ - { - "__id__": 713 - }, - { - "__id__": 714 - }, { "__id__": 715 + }, + { + "__id__": 716 + }, + { + "__id__": 717 } ], "_prefab": null, @@ -30339,6 +30339,78 @@ "fileId": "", "sync": false }, + { + "__type__": "cc.Node", + "_name": "sevenDayGift", + "_objFlags": 0, + "_parent": { + "__id__": 5 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 714 + } + ], + "_prefab": null, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "f6jRhIHhRJHbv8/OnSu2fQ" + }, + { + "__type__": "9cbb94nzQtN9rF7RQfETigx", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 713 + }, + "_enabled": true, + "_id": "27mZkVdCJGxYd6nUeS0QfP" + }, { "__type__": "cc.Canvas", "_name": "", @@ -30440,14 +30512,14 @@ "_children": [], "_active": true, "_components": [ - { - "__id__": 717 - }, - { - "__id__": 718 - }, { "__id__": 719 + }, + { + "__id__": 720 + }, + { + "__id__": 721 } ], "_prefab": null, @@ -30503,7 +30575,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 716 + "__id__": 718 }, "_enabled": true, "_materials": [ @@ -30536,7 +30608,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 716 + "__id__": 718 }, "_enabled": true, "alignMode": 1, @@ -30563,84 +30635,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 716 + "__id__": 718 }, "_enabled": true, "uid_Number": { - "__id__": 717 + "__id__": 719 }, "_id": "67zCbKKV9PvYlB9x+eob0L" - }, - { - "__type__": "cc.Node", - "_name": "sevenDayGift", - "_objFlags": 0, - "_parent": { - "__id__": 5 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 721 - } - ], - "_prefab": null, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 0 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "f6jRhIHhRJHbv8/OnSu2fQ" - }, - { - "__type__": "9cbb94nzQtN9rF7RQfETigx", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 720 - }, - "_enabled": true, - "_id": "27mZkVdCJGxYd6nUeS0QfP" } -] +] \ No newline at end of file diff --git a/assets/Script/module/Tool/GameTool.ts b/assets/Script/module/Tool/GameTool.ts index 4c2bd094..295faefc 100644 --- a/assets/Script/module/Tool/GameTool.ts +++ b/assets/Script/module/Tool/GameTool.ts @@ -388,9 +388,11 @@ var GameTool = { //增加关卡数 addLevel(time1, time2, callBack) { - if (cc.fx.GameTool.maxLevel()) { - - } else { + const isMaxLevel = cc.fx.GameTool.maxLevel(); + // 结算记录本局关卡,避免进度自增后变成下一关或误判为无尽模式。 + const endLevel = isMaxLevel && cc.fx.GameConfig.GM_INFO.GameplayType == 1; + const stageId = endLevel ? cc.fx.GameConfig.GM_INFO.randomLevel : cc.fx.GameConfig.GM_INFO.level + 1; + if (!isMaxLevel) { cc.fx.GameConfig.GM_INFO.level += 1; } @@ -411,11 +413,8 @@ var GameTool = { use_frenzy = MapConroler._instance.use_frenzy; } if (time1 != null && time2 != null) { - let endLevel = false; - if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { - endLevel = true; - } let data = { + stage_id: stageId, time: time1, add_Time: time2, is_frenzy: is_frenzy, @@ -1396,9 +1395,12 @@ var GameTool = { } break; case "finish_stage": - let userLevel2 = (cc.fx.GameConfig.GM_INFO.level + 1); - if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { - userLevel2 = cc.fx.GameConfig.GM_INFO.randomLevel; + let userLevel2 = data.stage_id; + if (userLevel2 == null) { + userLevel2 = cc.fx.GameConfig.GM_INFO.level + 1; + if (cc.fx.GameTool.maxLevel() && cc.fx.GameConfig.GM_INFO.GameplayType == 1) { + userLevel2 = cc.fx.GameConfig.GM_INFO.randomLevel; + } } eventData = { stage_id: userLevel2, diff --git a/assets/UI/Cat/cat.png b/assets/UI/Cat/cat.png index af9eaf16..bd12fad4 100644 Binary files a/assets/UI/Cat/cat.png and b/assets/UI/Cat/cat.png differ diff --git a/assets/UI/Cat/cat.png.meta b/assets/UI/Cat/cat.png.meta index 45fbcbf6..ae570849 100644 --- a/assets/UI/Cat/cat.png.meta +++ b/assets/UI/Cat/cat.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 186, - "height": 173, + "width": 417, + "height": 388, "platformSettings": {}, "subMetas": { "cat": { @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 186, - "height": 173, - "rawWidth": 186, - "rawHeight": 173, + "width": 417, + "height": 388, + "rawWidth": 417, + "rawHeight": 388, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/action_bundle/prefab/Avatar.prefab b/assets/action_bundle/prefab/Avatar.prefab index b6cf3b38..2fa35a35 100644 --- a/assets/action_bundle/prefab/Avatar.prefab +++ b/assets/action_bundle/prefab/Avatar.prefab @@ -69,26 +69,26 @@ "__id__": 680 }, { - "__id__": 922 + "__id__": 943 }, { - "__id__": 927 + "__id__": 948 }, { - "__id__": 1225 + "__id__": 1246 } ], "_active": true, "_components": [ { - "__id__": 1262 + "__id__": 1283 }, { - "__id__": 1263 + "__id__": 1284 } ], "_prefab": { - "__id__": 1264 + "__id__": 1285 }, "_opacity": 255, "_color": { @@ -26278,17 +26278,17 @@ "__id__": 681 }, { - "__id__": 917 + "__id__": 938 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 920 + "__id__": 941 } ], "_prefab": { - "__id__": 921 + "__id__": 942 }, "_opacity": 255, "_color": { @@ -26352,11 +26352,11 @@ "_active": true, "_components": [ { - "__id__": 915 + "__id__": 936 } ], "_prefab": { - "__id__": 916 + "__id__": 937 }, "_opacity": 255, "_color": { @@ -26447,13 +26447,13 @@ "__id__": 893 }, { - "__id__": 1265 + "__id__": 914 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 914 + "__id__": 935 }, "_opacity": 255, "_color": { @@ -35368,6 +35368,810 @@ "fileId": "08ysyKFc5Dvqj6ZYQU3Z6U", "sync": false }, + { + "__type__": "cc.Node", + "_name": "cat_12", + "_objFlags": 0, + "_parent": { + "__id__": 682 + }, + "_children": [ + { + "__id__": 915 + }, + { + "__id__": 918 + }, + { + "__id__": 921 + }, + { + "__id__": 927 + } + ], + "_active": true, + "_components": [ + { + "__id__": 932 + } + ], + "_prefab": { + "__id__": 934 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 200, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 300, + -490.497, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "kuang_6", + "_objFlags": 0, + "_parent": { + "__id__": 914 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 916 + } + ], + "_prefab": { + "__id__": 917 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 160 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 5.39, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 915 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "c2b141f2-de71-4481-b9ee-440c893c28b3" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9306dfbb-8c2b-4c19-a890-649041d0fac9", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "icon", + "_objFlags": 0, + "_parent": { + "__id__": 914 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 919 + } + ], + "_prefab": { + "__id__": 920 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 417, + "height": 388 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 0, + 0, + 0, + 0, + 0, + 1, + 0.35, + 0.35, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 918 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "7d090003-0209-4a00-8b00-000000000209" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ddfcf83a-5420-4550-a7ab-0a21c8809fd3", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "select", + "_objFlags": 0, + "_parent": { + "__id__": 914 + }, + "_children": [ + { + "__id__": 922 + } + ], + "_active": false, + "_components": [ + { + "__id__": 925 + } + ], + "_prefab": { + "__id__": 926 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 176, + "height": 176 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 5.6, + 0, + 0, + 0, + 0, + 1, + 0.9, + 0.9, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "New Sprite", + "_objFlags": 0, + "_parent": { + "__id__": 921 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 923 + } + ], + "_prefab": { + "__id__": 924 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 66, + "height": 66 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 60, + -60, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 922 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "7453479c-fcfb-4019-b1a9-c81ca044b911" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1a937bd3-c177-4e84-967c-cb109a00beb8", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 921 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "949ab4be-d9b5-4dda-a22c-26b8356d1324" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": { + "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" + }, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "738777dc-7255-4aef-9e5e-b052515739ce", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "lock", + "_objFlags": 0, + "_parent": { + "__id__": 914 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 928 + }, + { + "__id__": 929 + } + ], + "_prefab": { + "__id__": 931 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 160, + "height": 160 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 5.897, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 927 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "eea1ebab-83ca-474e-bdf5-bc03e7794897" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 927 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.1, + "clickEvents": [ + { + "__id__": 930 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 927 + }, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "7589aoelbpHs5EJQkTTKE6y", + "handler": "openGacha", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "846c69a5-b6f2-4557-aac0-cb8296acfcb7", + "sync": false + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 914 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.05, + "clickEvents": [ + { + "__id__": 933 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": { + "__id__": 914 + }, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "7589aoelbpHs5EJQkTTKE6y", + "handler": "changeCat", + "customEventData": "cat_12" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ccd7ddb0-74b3-4f3a-8661-1cfc8b0257bf", + "sync": false + }, { "__type__": "cc.PrefabInfo", "root": { @@ -35421,11 +36225,11 @@ "_active": true, "_components": [ { - "__id__": 918 + "__id__": 939 } ], "_prefab": { - "__id__": 919 + "__id__": 940 }, "_opacity": 255, "_color": { @@ -35479,7 +36283,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 917 + "__id__": 938 }, "_enabled": true, "_materials": [ @@ -35565,14 +36369,14 @@ "_active": true, "_components": [ { - "__id__": 923 + "__id__": 944 }, { - "__id__": 924 + "__id__": 945 } ], "_prefab": { - "__id__": 926 + "__id__": 947 }, "_opacity": 255, "_color": { @@ -35626,7 +36430,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 922 + "__id__": 943 }, "_enabled": true, "_materials": [ @@ -35658,7 +36462,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 922 + "__id__": 943 }, "_enabled": true, "_normalMaterial": null, @@ -35667,7 +36471,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 925 + "__id__": 946 } ], "_N$interactable": true, @@ -35723,7 +36527,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 922 + "__id__": 943 }, "_id": "" }, @@ -35757,26 +36561,26 @@ }, "_children": [ { - "__id__": 928 + "__id__": 949 }, { - "__id__": 932 + "__id__": 953 }, { - "__id__": 935 + "__id__": 956 }, { - "__id__": 1216 + "__id__": 1237 } ], "_active": false, "_components": [ { - "__id__": 1223 + "__id__": 1244 } ], "_prefab": { - "__id__": 1224 + "__id__": 1245 }, "_opacity": 255, "_color": { @@ -35830,20 +36634,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 927 + "__id__": 948 }, "_children": [], "_active": true, "_components": [ { - "__id__": 929 + "__id__": 950 }, { - "__id__": 930 + "__id__": 951 } ], "_prefab": { - "__id__": 931 + "__id__": 952 }, "_opacity": 220, "_color": { @@ -35897,7 +36701,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 928 + "__id__": 949 }, "_enabled": true, "_materials": [ @@ -35929,7 +36733,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 928 + "__id__": 949 }, "_enabled": true, "alignMode": 1, @@ -35967,17 +36771,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 927 + "__id__": 948 }, "_children": [], "_active": true, "_components": [ { - "__id__": 933 + "__id__": 954 } ], "_prefab": { - "__id__": 934 + "__id__": 955 }, "_opacity": 255, "_color": { @@ -36031,7 +36835,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 932 + "__id__": 953 }, "_enabled": true, "_materials": [ @@ -36074,21 +36878,21 @@ "_name": "ScrollView", "_objFlags": 0, "_parent": { - "__id__": 927 + "__id__": 948 }, "_children": [ { - "__id__": 936 + "__id__": 957 } ], "_active": true, "_components": [ { - "__id__": 1214 + "__id__": 1235 } ], "_prefab": { - "__id__": 1215 + "__id__": 1236 }, "_opacity": 255, "_color": { @@ -36142,21 +36946,21 @@ "_name": "view", "_objFlags": 0, "_parent": { - "__id__": 935 + "__id__": 956 }, "_children": [ { - "__id__": 937 + "__id__": 958 } ], "_active": true, "_components": [ { - "__id__": 1212 + "__id__": 1233 } ], "_prefab": { - "__id__": 1213 + "__id__": 1234 }, "_opacity": 255, "_color": { @@ -36210,116 +37014,116 @@ "_name": "content", "_objFlags": 0, "_parent": { - "__id__": 936 + "__id__": 957 }, "_children": [ { - "__id__": 938 + "__id__": 959 }, { - "__id__": 946 + "__id__": 967 }, { - "__id__": 954 + "__id__": 975 }, { - "__id__": 962 + "__id__": 983 }, { - "__id__": 970 + "__id__": 991 }, { - "__id__": 978 + "__id__": 999 }, { - "__id__": 986 + "__id__": 1007 }, { - "__id__": 994 + "__id__": 1015 }, { - "__id__": 1002 + "__id__": 1023 }, { - "__id__": 1010 + "__id__": 1031 }, { - "__id__": 1018 + "__id__": 1039 }, { - "__id__": 1026 + "__id__": 1047 }, { - "__id__": 1034 + "__id__": 1055 }, { - "__id__": 1042 + "__id__": 1063 }, { - "__id__": 1050 + "__id__": 1071 }, { - "__id__": 1058 + "__id__": 1079 }, { - "__id__": 1066 + "__id__": 1087 }, { - "__id__": 1074 + "__id__": 1095 }, { - "__id__": 1082 + "__id__": 1103 }, { - "__id__": 1090 + "__id__": 1111 }, { - "__id__": 1098 + "__id__": 1119 }, { - "__id__": 1106 + "__id__": 1127 }, { - "__id__": 1114 + "__id__": 1135 }, { - "__id__": 1122 + "__id__": 1143 }, { - "__id__": 1130 + "__id__": 1151 }, { - "__id__": 1138 + "__id__": 1159 }, { - "__id__": 1146 + "__id__": 1167 }, { - "__id__": 1154 + "__id__": 1175 }, { - "__id__": 1162 + "__id__": 1183 }, { - "__id__": 1170 + "__id__": 1191 }, { - "__id__": 1178 + "__id__": 1199 }, { - "__id__": 1186 + "__id__": 1207 }, { - "__id__": 1194 + "__id__": 1215 }, { - "__id__": 1202 + "__id__": 1223 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 1211 + "__id__": 1232 }, "_opacity": 255, "_color": { @@ -36373,24 +37177,24 @@ "_name": "北京", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 939 + "__id__": 960 } ], "_active": true, "_components": [ { - "__id__": 942 + "__id__": 963 }, { - "__id__": 943 + "__id__": 964 } ], "_prefab": { - "__id__": 945 + "__id__": 966 }, "_opacity": 255, "_color": { @@ -36444,17 +37248,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 938 + "__id__": 959 }, "_children": [], "_active": true, "_components": [ { - "__id__": 940 + "__id__": 961 } ], "_prefab": { - "__id__": 941 + "__id__": 962 }, "_opacity": 255, "_color": { @@ -36508,7 +37312,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 939 + "__id__": 960 }, "_enabled": true, "_materials": [ @@ -36552,7 +37356,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 938 + "__id__": 959 }, "_enabled": true, "_materials": [ @@ -36586,7 +37390,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 938 + "__id__": 959 }, "_enabled": true, "_normalMaterial": null, @@ -36595,7 +37399,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 944 + "__id__": 965 } ], "_N$interactable": true, @@ -36651,7 +37455,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 938 + "__id__": 959 }, "_id": "" }, @@ -36681,24 +37485,24 @@ "_name": "天津", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 947 + "__id__": 968 } ], "_active": true, "_components": [ { - "__id__": 950 + "__id__": 971 }, { - "__id__": 951 + "__id__": 972 } ], "_prefab": { - "__id__": 953 + "__id__": 974 }, "_opacity": 255, "_color": { @@ -36752,17 +37556,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 946 + "__id__": 967 }, "_children": [], "_active": true, "_components": [ { - "__id__": 948 + "__id__": 969 } ], "_prefab": { - "__id__": 949 + "__id__": 970 }, "_opacity": 255, "_color": { @@ -36816,7 +37620,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 947 + "__id__": 968 }, "_enabled": true, "_materials": [ @@ -36860,7 +37664,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 946 + "__id__": 967 }, "_enabled": true, "_materials": [ @@ -36894,7 +37698,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 946 + "__id__": 967 }, "_enabled": true, "_normalMaterial": null, @@ -36903,7 +37707,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 952 + "__id__": 973 } ], "_N$interactable": true, @@ -36959,7 +37763,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 946 + "__id__": 967 }, "_id": "" }, @@ -36989,24 +37793,24 @@ "_name": "上海", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 955 + "__id__": 976 } ], "_active": true, "_components": [ { - "__id__": 958 + "__id__": 979 }, { - "__id__": 959 + "__id__": 980 } ], "_prefab": { - "__id__": 961 + "__id__": 982 }, "_opacity": 255, "_color": { @@ -37060,17 +37864,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 954 + "__id__": 975 }, "_children": [], "_active": true, "_components": [ { - "__id__": 956 + "__id__": 977 } ], "_prefab": { - "__id__": 957 + "__id__": 978 }, "_opacity": 255, "_color": { @@ -37124,7 +37928,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 955 + "__id__": 976 }, "_enabled": true, "_materials": [ @@ -37168,7 +37972,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 954 + "__id__": 975 }, "_enabled": true, "_materials": [ @@ -37202,7 +38006,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 954 + "__id__": 975 }, "_enabled": true, "_normalMaterial": null, @@ -37211,7 +38015,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 960 + "__id__": 981 } ], "_N$interactable": true, @@ -37267,7 +38071,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 954 + "__id__": 975 }, "_id": "" }, @@ -37297,24 +38101,24 @@ "_name": "重庆", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 963 + "__id__": 984 } ], "_active": true, "_components": [ { - "__id__": 966 + "__id__": 987 }, { - "__id__": 967 + "__id__": 988 } ], "_prefab": { - "__id__": 969 + "__id__": 990 }, "_opacity": 255, "_color": { @@ -37368,17 +38172,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 962 + "__id__": 983 }, "_children": [], "_active": true, "_components": [ { - "__id__": 964 + "__id__": 985 } ], "_prefab": { - "__id__": 965 + "__id__": 986 }, "_opacity": 255, "_color": { @@ -37432,7 +38236,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 963 + "__id__": 984 }, "_enabled": true, "_materials": [ @@ -37476,7 +38280,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 962 + "__id__": 983 }, "_enabled": true, "_materials": [ @@ -37510,7 +38314,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 962 + "__id__": 983 }, "_enabled": true, "_normalMaterial": null, @@ -37519,7 +38323,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 968 + "__id__": 989 } ], "_N$interactable": true, @@ -37575,7 +38379,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 962 + "__id__": 983 }, "_id": "" }, @@ -37605,24 +38409,24 @@ "_name": "河北省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 971 + "__id__": 992 } ], "_active": true, "_components": [ { - "__id__": 974 + "__id__": 995 }, { - "__id__": 975 + "__id__": 996 } ], "_prefab": { - "__id__": 977 + "__id__": 998 }, "_opacity": 255, "_color": { @@ -37676,17 +38480,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 970 + "__id__": 991 }, "_children": [], "_active": true, "_components": [ { - "__id__": 972 + "__id__": 993 } ], "_prefab": { - "__id__": 973 + "__id__": 994 }, "_opacity": 255, "_color": { @@ -37740,7 +38544,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 971 + "__id__": 992 }, "_enabled": true, "_materials": [ @@ -37784,7 +38588,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 970 + "__id__": 991 }, "_enabled": true, "_materials": [ @@ -37818,7 +38622,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 970 + "__id__": 991 }, "_enabled": true, "_normalMaterial": null, @@ -37827,7 +38631,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 976 + "__id__": 997 } ], "_N$interactable": true, @@ -37883,7 +38687,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 970 + "__id__": 991 }, "_id": "" }, @@ -37913,24 +38717,24 @@ "_name": "河南省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 979 + "__id__": 1000 } ], "_active": true, "_components": [ { - "__id__": 982 + "__id__": 1003 }, { - "__id__": 983 + "__id__": 1004 } ], "_prefab": { - "__id__": 985 + "__id__": 1006 }, "_opacity": 255, "_color": { @@ -37984,17 +38788,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 978 + "__id__": 999 }, "_children": [], "_active": true, "_components": [ { - "__id__": 980 + "__id__": 1001 } ], "_prefab": { - "__id__": 981 + "__id__": 1002 }, "_opacity": 255, "_color": { @@ -38048,7 +38852,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 979 + "__id__": 1000 }, "_enabled": true, "_materials": [ @@ -38092,7 +38896,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 978 + "__id__": 999 }, "_enabled": true, "_materials": [ @@ -38126,7 +38930,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 978 + "__id__": 999 }, "_enabled": true, "_normalMaterial": null, @@ -38135,7 +38939,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 984 + "__id__": 1005 } ], "_N$interactable": true, @@ -38191,7 +38995,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 978 + "__id__": 999 }, "_id": "" }, @@ -38221,24 +39025,24 @@ "_name": "内蒙古", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 987 + "__id__": 1008 } ], "_active": true, "_components": [ { - "__id__": 990 + "__id__": 1011 }, { - "__id__": 991 + "__id__": 1012 } ], "_prefab": { - "__id__": 993 + "__id__": 1014 }, "_opacity": 255, "_color": { @@ -38292,17 +39096,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 986 + "__id__": 1007 }, "_children": [], "_active": true, "_components": [ { - "__id__": 988 + "__id__": 1009 } ], "_prefab": { - "__id__": 989 + "__id__": 1010 }, "_opacity": 255, "_color": { @@ -38356,7 +39160,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 987 + "__id__": 1008 }, "_enabled": true, "_materials": [ @@ -38400,7 +39204,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 986 + "__id__": 1007 }, "_enabled": true, "_materials": [ @@ -38434,7 +39238,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 986 + "__id__": 1007 }, "_enabled": true, "_normalMaterial": null, @@ -38443,7 +39247,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 992 + "__id__": 1013 } ], "_N$interactable": true, @@ -38499,7 +39303,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 986 + "__id__": 1007 }, "_id": "" }, @@ -38529,24 +39333,24 @@ "_name": "辽宁省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 995 + "__id__": 1016 } ], "_active": true, "_components": [ { - "__id__": 998 + "__id__": 1019 }, { - "__id__": 999 + "__id__": 1020 } ], "_prefab": { - "__id__": 1001 + "__id__": 1022 }, "_opacity": 255, "_color": { @@ -38600,17 +39404,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 994 + "__id__": 1015 }, "_children": [], "_active": true, "_components": [ { - "__id__": 996 + "__id__": 1017 } ], "_prefab": { - "__id__": 997 + "__id__": 1018 }, "_opacity": 255, "_color": { @@ -38664,7 +39468,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 995 + "__id__": 1016 }, "_enabled": true, "_materials": [ @@ -38708,7 +39512,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 994 + "__id__": 1015 }, "_enabled": true, "_materials": [ @@ -38742,7 +39546,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 994 + "__id__": 1015 }, "_enabled": true, "_normalMaterial": null, @@ -38751,7 +39555,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1000 + "__id__": 1021 } ], "_N$interactable": true, @@ -38807,7 +39611,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 994 + "__id__": 1015 }, "_id": "" }, @@ -38837,24 +39641,24 @@ "_name": "吉林省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1003 + "__id__": 1024 } ], "_active": true, "_components": [ { - "__id__": 1006 + "__id__": 1027 }, { - "__id__": 1007 + "__id__": 1028 } ], "_prefab": { - "__id__": 1009 + "__id__": 1030 }, "_opacity": 255, "_color": { @@ -38908,17 +39712,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1002 + "__id__": 1023 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1004 + "__id__": 1025 } ], "_prefab": { - "__id__": 1005 + "__id__": 1026 }, "_opacity": 255, "_color": { @@ -38972,7 +39776,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1003 + "__id__": 1024 }, "_enabled": true, "_materials": [ @@ -39016,7 +39820,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1002 + "__id__": 1023 }, "_enabled": true, "_materials": [ @@ -39050,7 +39854,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1002 + "__id__": 1023 }, "_enabled": true, "_normalMaterial": null, @@ -39059,7 +39863,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1008 + "__id__": 1029 } ], "_N$interactable": true, @@ -39115,7 +39919,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1002 + "__id__": 1023 }, "_id": "" }, @@ -39145,24 +39949,24 @@ "_name": "黑龙江省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1011 + "__id__": 1032 } ], "_active": true, "_components": [ { - "__id__": 1014 + "__id__": 1035 }, { - "__id__": 1015 + "__id__": 1036 } ], "_prefab": { - "__id__": 1017 + "__id__": 1038 }, "_opacity": 255, "_color": { @@ -39216,17 +40020,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1010 + "__id__": 1031 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1012 + "__id__": 1033 } ], "_prefab": { - "__id__": 1013 + "__id__": 1034 }, "_opacity": 255, "_color": { @@ -39280,7 +40084,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1011 + "__id__": 1032 }, "_enabled": true, "_materials": [ @@ -39324,7 +40128,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1010 + "__id__": 1031 }, "_enabled": true, "_materials": [ @@ -39358,7 +40162,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1010 + "__id__": 1031 }, "_enabled": true, "_normalMaterial": null, @@ -39367,7 +40171,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1016 + "__id__": 1037 } ], "_N$interactable": true, @@ -39423,7 +40227,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1010 + "__id__": 1031 }, "_id": "" }, @@ -39453,24 +40257,24 @@ "_name": "广东省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1019 + "__id__": 1040 } ], "_active": true, "_components": [ { - "__id__": 1022 + "__id__": 1043 }, { - "__id__": 1023 + "__id__": 1044 } ], "_prefab": { - "__id__": 1025 + "__id__": 1046 }, "_opacity": 255, "_color": { @@ -39524,17 +40328,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1018 + "__id__": 1039 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1020 + "__id__": 1041 } ], "_prefab": { - "__id__": 1021 + "__id__": 1042 }, "_opacity": 255, "_color": { @@ -39588,7 +40392,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1019 + "__id__": 1040 }, "_enabled": true, "_materials": [ @@ -39632,7 +40436,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1018 + "__id__": 1039 }, "_enabled": true, "_materials": [ @@ -39666,7 +40470,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1018 + "__id__": 1039 }, "_enabled": true, "_normalMaterial": null, @@ -39675,7 +40479,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1024 + "__id__": 1045 } ], "_N$interactable": true, @@ -39731,7 +40535,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1018 + "__id__": 1039 }, "_id": "" }, @@ -39761,24 +40565,24 @@ "_name": "广西", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1027 + "__id__": 1048 } ], "_active": true, "_components": [ { - "__id__": 1030 + "__id__": 1051 }, { - "__id__": 1031 + "__id__": 1052 } ], "_prefab": { - "__id__": 1033 + "__id__": 1054 }, "_opacity": 255, "_color": { @@ -39832,17 +40636,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1026 + "__id__": 1047 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1028 + "__id__": 1049 } ], "_prefab": { - "__id__": 1029 + "__id__": 1050 }, "_opacity": 255, "_color": { @@ -39896,7 +40700,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1027 + "__id__": 1048 }, "_enabled": true, "_materials": [ @@ -39940,7 +40744,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1026 + "__id__": 1047 }, "_enabled": true, "_materials": [ @@ -39974,7 +40778,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1026 + "__id__": 1047 }, "_enabled": true, "_normalMaterial": null, @@ -39983,7 +40787,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1032 + "__id__": 1053 } ], "_N$interactable": true, @@ -40039,7 +40843,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1026 + "__id__": 1047 }, "_id": "" }, @@ -40069,24 +40873,24 @@ "_name": "江苏省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1035 + "__id__": 1056 } ], "_active": true, "_components": [ { - "__id__": 1038 + "__id__": 1059 }, { - "__id__": 1039 + "__id__": 1060 } ], "_prefab": { - "__id__": 1041 + "__id__": 1062 }, "_opacity": 255, "_color": { @@ -40140,17 +40944,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1034 + "__id__": 1055 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1036 + "__id__": 1057 } ], "_prefab": { - "__id__": 1037 + "__id__": 1058 }, "_opacity": 255, "_color": { @@ -40204,7 +41008,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1035 + "__id__": 1056 }, "_enabled": true, "_materials": [ @@ -40248,7 +41052,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1034 + "__id__": 1055 }, "_enabled": true, "_materials": [ @@ -40282,7 +41086,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1034 + "__id__": 1055 }, "_enabled": true, "_normalMaterial": null, @@ -40291,7 +41095,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1040 + "__id__": 1061 } ], "_N$interactable": true, @@ -40347,7 +41151,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1034 + "__id__": 1055 }, "_id": "" }, @@ -40377,24 +41181,24 @@ "_name": "浙江省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1043 + "__id__": 1064 } ], "_active": true, "_components": [ { - "__id__": 1046 + "__id__": 1067 }, { - "__id__": 1047 + "__id__": 1068 } ], "_prefab": { - "__id__": 1049 + "__id__": 1070 }, "_opacity": 255, "_color": { @@ -40448,17 +41252,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1042 + "__id__": 1063 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1044 + "__id__": 1065 } ], "_prefab": { - "__id__": 1045 + "__id__": 1066 }, "_opacity": 255, "_color": { @@ -40512,7 +41316,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1043 + "__id__": 1064 }, "_enabled": true, "_materials": [ @@ -40556,7 +41360,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1042 + "__id__": 1063 }, "_enabled": true, "_materials": [ @@ -40590,7 +41394,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1042 + "__id__": 1063 }, "_enabled": true, "_normalMaterial": null, @@ -40599,7 +41403,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1048 + "__id__": 1069 } ], "_N$interactable": true, @@ -40655,7 +41459,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1042 + "__id__": 1063 }, "_id": "" }, @@ -40685,24 +41489,24 @@ "_name": "安徽省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1051 + "__id__": 1072 } ], "_active": true, "_components": [ { - "__id__": 1054 + "__id__": 1075 }, { - "__id__": 1055 + "__id__": 1076 } ], "_prefab": { - "__id__": 1057 + "__id__": 1078 }, "_opacity": 255, "_color": { @@ -40756,17 +41560,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1050 + "__id__": 1071 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1052 + "__id__": 1073 } ], "_prefab": { - "__id__": 1053 + "__id__": 1074 }, "_opacity": 255, "_color": { @@ -40820,7 +41624,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1051 + "__id__": 1072 }, "_enabled": true, "_materials": [ @@ -40864,7 +41668,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1050 + "__id__": 1071 }, "_enabled": true, "_materials": [ @@ -40898,7 +41702,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1050 + "__id__": 1071 }, "_enabled": true, "_normalMaterial": null, @@ -40907,7 +41711,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1056 + "__id__": 1077 } ], "_N$interactable": true, @@ -40963,7 +41767,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1050 + "__id__": 1071 }, "_id": "" }, @@ -40993,24 +41797,24 @@ "_name": "福建省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1059 + "__id__": 1080 } ], "_active": true, "_components": [ { - "__id__": 1062 + "__id__": 1083 }, { - "__id__": 1063 + "__id__": 1084 } ], "_prefab": { - "__id__": 1065 + "__id__": 1086 }, "_opacity": 255, "_color": { @@ -41064,17 +41868,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1058 + "__id__": 1079 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1060 + "__id__": 1081 } ], "_prefab": { - "__id__": 1061 + "__id__": 1082 }, "_opacity": 255, "_color": { @@ -41128,7 +41932,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1059 + "__id__": 1080 }, "_enabled": true, "_materials": [ @@ -41172,7 +41976,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1058 + "__id__": 1079 }, "_enabled": true, "_materials": [ @@ -41206,7 +42010,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1058 + "__id__": 1079 }, "_enabled": true, "_normalMaterial": null, @@ -41215,7 +42019,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1064 + "__id__": 1085 } ], "_N$interactable": true, @@ -41271,7 +42075,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1058 + "__id__": 1079 }, "_id": "" }, @@ -41301,24 +42105,24 @@ "_name": "江西省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1067 + "__id__": 1088 } ], "_active": true, "_components": [ { - "__id__": 1070 + "__id__": 1091 }, { - "__id__": 1071 + "__id__": 1092 } ], "_prefab": { - "__id__": 1073 + "__id__": 1094 }, "_opacity": 255, "_color": { @@ -41372,17 +42176,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1066 + "__id__": 1087 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1068 + "__id__": 1089 } ], "_prefab": { - "__id__": 1069 + "__id__": 1090 }, "_opacity": 255, "_color": { @@ -41436,7 +42240,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1067 + "__id__": 1088 }, "_enabled": true, "_materials": [ @@ -41480,7 +42284,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1066 + "__id__": 1087 }, "_enabled": true, "_materials": [ @@ -41514,7 +42318,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1066 + "__id__": 1087 }, "_enabled": true, "_normalMaterial": null, @@ -41523,7 +42327,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1072 + "__id__": 1093 } ], "_N$interactable": true, @@ -41579,7 +42383,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1066 + "__id__": 1087 }, "_id": "" }, @@ -41609,24 +42413,24 @@ "_name": "山东省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1075 + "__id__": 1096 } ], "_active": true, "_components": [ { - "__id__": 1078 + "__id__": 1099 }, { - "__id__": 1079 + "__id__": 1100 } ], "_prefab": { - "__id__": 1081 + "__id__": 1102 }, "_opacity": 255, "_color": { @@ -41680,17 +42484,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1074 + "__id__": 1095 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1076 + "__id__": 1097 } ], "_prefab": { - "__id__": 1077 + "__id__": 1098 }, "_opacity": 255, "_color": { @@ -41744,7 +42548,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1075 + "__id__": 1096 }, "_enabled": true, "_materials": [ @@ -41788,7 +42592,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1074 + "__id__": 1095 }, "_enabled": true, "_materials": [ @@ -41822,7 +42626,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1074 + "__id__": 1095 }, "_enabled": true, "_normalMaterial": null, @@ -41831,7 +42635,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1080 + "__id__": 1101 } ], "_N$interactable": true, @@ -41887,7 +42691,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1074 + "__id__": 1095 }, "_id": "" }, @@ -41917,24 +42721,24 @@ "_name": "山西省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1083 + "__id__": 1104 } ], "_active": true, "_components": [ { - "__id__": 1086 + "__id__": 1107 }, { - "__id__": 1087 + "__id__": 1108 } ], "_prefab": { - "__id__": 1089 + "__id__": 1110 }, "_opacity": 255, "_color": { @@ -41988,17 +42792,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1082 + "__id__": 1103 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1084 + "__id__": 1105 } ], "_prefab": { - "__id__": 1085 + "__id__": 1106 }, "_opacity": 255, "_color": { @@ -42052,7 +42856,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1083 + "__id__": 1104 }, "_enabled": true, "_materials": [ @@ -42096,7 +42900,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1082 + "__id__": 1103 }, "_enabled": true, "_materials": [ @@ -42130,7 +42934,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1082 + "__id__": 1103 }, "_enabled": true, "_normalMaterial": null, @@ -42139,7 +42943,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1088 + "__id__": 1109 } ], "_N$interactable": true, @@ -42195,7 +42999,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1082 + "__id__": 1103 }, "_id": "" }, @@ -42225,24 +43029,24 @@ "_name": "湖北省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1091 + "__id__": 1112 } ], "_active": true, "_components": [ { - "__id__": 1094 + "__id__": 1115 }, { - "__id__": 1095 + "__id__": 1116 } ], "_prefab": { - "__id__": 1097 + "__id__": 1118 }, "_opacity": 255, "_color": { @@ -42296,17 +43100,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1090 + "__id__": 1111 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1092 + "__id__": 1113 } ], "_prefab": { - "__id__": 1093 + "__id__": 1114 }, "_opacity": 255, "_color": { @@ -42360,7 +43164,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1091 + "__id__": 1112 }, "_enabled": true, "_materials": [ @@ -42404,7 +43208,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1090 + "__id__": 1111 }, "_enabled": true, "_materials": [ @@ -42438,7 +43242,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1090 + "__id__": 1111 }, "_enabled": true, "_normalMaterial": null, @@ -42447,7 +43251,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1096 + "__id__": 1117 } ], "_N$interactable": true, @@ -42503,7 +43307,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1090 + "__id__": 1111 }, "_id": "" }, @@ -42533,24 +43337,24 @@ "_name": "湖南省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1099 + "__id__": 1120 } ], "_active": true, "_components": [ { - "__id__": 1102 + "__id__": 1123 }, { - "__id__": 1103 + "__id__": 1124 } ], "_prefab": { - "__id__": 1105 + "__id__": 1126 }, "_opacity": 255, "_color": { @@ -42604,17 +43408,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1098 + "__id__": 1119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1100 + "__id__": 1121 } ], "_prefab": { - "__id__": 1101 + "__id__": 1122 }, "_opacity": 255, "_color": { @@ -42668,7 +43472,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1099 + "__id__": 1120 }, "_enabled": true, "_materials": [ @@ -42712,7 +43516,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1098 + "__id__": 1119 }, "_enabled": true, "_materials": [ @@ -42746,7 +43550,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1098 + "__id__": 1119 }, "_enabled": true, "_normalMaterial": null, @@ -42755,7 +43559,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1104 + "__id__": 1125 } ], "_N$interactable": true, @@ -42811,7 +43615,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1098 + "__id__": 1119 }, "_id": "" }, @@ -42841,24 +43645,24 @@ "_name": "四川省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1107 + "__id__": 1128 } ], "_active": true, "_components": [ { - "__id__": 1110 + "__id__": 1131 }, { - "__id__": 1111 + "__id__": 1132 } ], "_prefab": { - "__id__": 1113 + "__id__": 1134 }, "_opacity": 255, "_color": { @@ -42912,17 +43716,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1106 + "__id__": 1127 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1108 + "__id__": 1129 } ], "_prefab": { - "__id__": 1109 + "__id__": 1130 }, "_opacity": 255, "_color": { @@ -42976,7 +43780,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1107 + "__id__": 1128 }, "_enabled": true, "_materials": [ @@ -43020,7 +43824,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1106 + "__id__": 1127 }, "_enabled": true, "_materials": [ @@ -43054,7 +43858,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1106 + "__id__": 1127 }, "_enabled": true, "_normalMaterial": null, @@ -43063,7 +43867,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1112 + "__id__": 1133 } ], "_N$interactable": true, @@ -43119,7 +43923,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1106 + "__id__": 1127 }, "_id": "" }, @@ -43149,24 +43953,24 @@ "_name": "贵州省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1115 + "__id__": 1136 } ], "_active": true, "_components": [ { - "__id__": 1118 + "__id__": 1139 }, { - "__id__": 1119 + "__id__": 1140 } ], "_prefab": { - "__id__": 1121 + "__id__": 1142 }, "_opacity": 255, "_color": { @@ -43220,17 +44024,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1114 + "__id__": 1135 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1116 + "__id__": 1137 } ], "_prefab": { - "__id__": 1117 + "__id__": 1138 }, "_opacity": 255, "_color": { @@ -43284,7 +44088,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1115 + "__id__": 1136 }, "_enabled": true, "_materials": [ @@ -43328,7 +44132,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1114 + "__id__": 1135 }, "_enabled": true, "_materials": [ @@ -43362,7 +44166,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1114 + "__id__": 1135 }, "_enabled": true, "_normalMaterial": null, @@ -43371,7 +44175,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1120 + "__id__": 1141 } ], "_N$interactable": true, @@ -43427,7 +44231,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1114 + "__id__": 1135 }, "_id": "" }, @@ -43457,24 +44261,24 @@ "_name": "云南省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1123 + "__id__": 1144 } ], "_active": true, "_components": [ { - "__id__": 1126 + "__id__": 1147 }, { - "__id__": 1127 + "__id__": 1148 } ], "_prefab": { - "__id__": 1129 + "__id__": 1150 }, "_opacity": 255, "_color": { @@ -43528,17 +44332,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1122 + "__id__": 1143 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1124 + "__id__": 1145 } ], "_prefab": { - "__id__": 1125 + "__id__": 1146 }, "_opacity": 255, "_color": { @@ -43592,7 +44396,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1123 + "__id__": 1144 }, "_enabled": true, "_materials": [ @@ -43636,7 +44440,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1122 + "__id__": 1143 }, "_enabled": true, "_materials": [ @@ -43670,7 +44474,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1122 + "__id__": 1143 }, "_enabled": true, "_normalMaterial": null, @@ -43679,7 +44483,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1128 + "__id__": 1149 } ], "_N$interactable": true, @@ -43735,7 +44539,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1122 + "__id__": 1143 }, "_id": "" }, @@ -43765,24 +44569,24 @@ "_name": "西藏", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1131 + "__id__": 1152 } ], "_active": true, "_components": [ { - "__id__": 1134 + "__id__": 1155 }, { - "__id__": 1135 + "__id__": 1156 } ], "_prefab": { - "__id__": 1137 + "__id__": 1158 }, "_opacity": 255, "_color": { @@ -43836,17 +44640,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1130 + "__id__": 1151 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1132 + "__id__": 1153 } ], "_prefab": { - "__id__": 1133 + "__id__": 1154 }, "_opacity": 255, "_color": { @@ -43900,7 +44704,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1131 + "__id__": 1152 }, "_enabled": true, "_materials": [ @@ -43944,7 +44748,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1130 + "__id__": 1151 }, "_enabled": true, "_materials": [ @@ -43978,7 +44782,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1130 + "__id__": 1151 }, "_enabled": true, "_normalMaterial": null, @@ -43987,7 +44791,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1136 + "__id__": 1157 } ], "_N$interactable": true, @@ -44043,7 +44847,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1130 + "__id__": 1151 }, "_id": "" }, @@ -44073,24 +44877,24 @@ "_name": "陕西省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1139 + "__id__": 1160 } ], "_active": true, "_components": [ { - "__id__": 1142 + "__id__": 1163 }, { - "__id__": 1143 + "__id__": 1164 } ], "_prefab": { - "__id__": 1145 + "__id__": 1166 }, "_opacity": 255, "_color": { @@ -44144,17 +44948,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1138 + "__id__": 1159 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1140 + "__id__": 1161 } ], "_prefab": { - "__id__": 1141 + "__id__": 1162 }, "_opacity": 255, "_color": { @@ -44208,7 +45012,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1139 + "__id__": 1160 }, "_enabled": true, "_materials": [ @@ -44252,7 +45056,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1138 + "__id__": 1159 }, "_enabled": true, "_materials": [ @@ -44286,7 +45090,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1138 + "__id__": 1159 }, "_enabled": true, "_normalMaterial": null, @@ -44295,7 +45099,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1144 + "__id__": 1165 } ], "_N$interactable": true, @@ -44351,7 +45155,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1138 + "__id__": 1159 }, "_id": "" }, @@ -44381,24 +45185,24 @@ "_name": "甘肃省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1147 + "__id__": 1168 } ], "_active": true, "_components": [ { - "__id__": 1150 + "__id__": 1171 }, { - "__id__": 1151 + "__id__": 1172 } ], "_prefab": { - "__id__": 1153 + "__id__": 1174 }, "_opacity": 255, "_color": { @@ -44452,17 +45256,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1146 + "__id__": 1167 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1148 + "__id__": 1169 } ], "_prefab": { - "__id__": 1149 + "__id__": 1170 }, "_opacity": 255, "_color": { @@ -44516,7 +45320,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1147 + "__id__": 1168 }, "_enabled": true, "_materials": [ @@ -44560,7 +45364,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1146 + "__id__": 1167 }, "_enabled": true, "_materials": [ @@ -44594,7 +45398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1146 + "__id__": 1167 }, "_enabled": true, "_normalMaterial": null, @@ -44603,7 +45407,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1152 + "__id__": 1173 } ], "_N$interactable": true, @@ -44659,7 +45463,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1146 + "__id__": 1167 }, "_id": "" }, @@ -44689,24 +45493,24 @@ "_name": "青海省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1155 + "__id__": 1176 } ], "_active": true, "_components": [ { - "__id__": 1158 + "__id__": 1179 }, { - "__id__": 1159 + "__id__": 1180 } ], "_prefab": { - "__id__": 1161 + "__id__": 1182 }, "_opacity": 255, "_color": { @@ -44760,17 +45564,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1154 + "__id__": 1175 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1156 + "__id__": 1177 } ], "_prefab": { - "__id__": 1157 + "__id__": 1178 }, "_opacity": 255, "_color": { @@ -44824,7 +45628,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1155 + "__id__": 1176 }, "_enabled": true, "_materials": [ @@ -44868,7 +45672,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1154 + "__id__": 1175 }, "_enabled": true, "_materials": [ @@ -44902,7 +45706,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1154 + "__id__": 1175 }, "_enabled": true, "_normalMaterial": null, @@ -44911,7 +45715,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1160 + "__id__": 1181 } ], "_N$interactable": true, @@ -44967,7 +45771,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1154 + "__id__": 1175 }, "_id": "" }, @@ -44997,24 +45801,24 @@ "_name": "宁夏", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1163 + "__id__": 1184 } ], "_active": true, "_components": [ { - "__id__": 1166 + "__id__": 1187 }, { - "__id__": 1167 + "__id__": 1188 } ], "_prefab": { - "__id__": 1169 + "__id__": 1190 }, "_opacity": 255, "_color": { @@ -45068,17 +45872,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1162 + "__id__": 1183 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1164 + "__id__": 1185 } ], "_prefab": { - "__id__": 1165 + "__id__": 1186 }, "_opacity": 255, "_color": { @@ -45132,7 +45936,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1163 + "__id__": 1184 }, "_enabled": true, "_materials": [ @@ -45176,7 +45980,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1162 + "__id__": 1183 }, "_enabled": true, "_materials": [ @@ -45210,7 +46014,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1162 + "__id__": 1183 }, "_enabled": true, "_normalMaterial": null, @@ -45219,7 +46023,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1168 + "__id__": 1189 } ], "_N$interactable": true, @@ -45275,7 +46079,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1162 + "__id__": 1183 }, "_id": "" }, @@ -45305,24 +46109,24 @@ "_name": "新疆", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1171 + "__id__": 1192 } ], "_active": true, "_components": [ { - "__id__": 1174 + "__id__": 1195 }, { - "__id__": 1175 + "__id__": 1196 } ], "_prefab": { - "__id__": 1177 + "__id__": 1198 }, "_opacity": 255, "_color": { @@ -45376,17 +46180,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1170 + "__id__": 1191 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1172 + "__id__": 1193 } ], "_prefab": { - "__id__": 1173 + "__id__": 1194 }, "_opacity": 255, "_color": { @@ -45440,7 +46244,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1171 + "__id__": 1192 }, "_enabled": true, "_materials": [ @@ -45484,7 +46288,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1170 + "__id__": 1191 }, "_enabled": true, "_materials": [ @@ -45518,7 +46322,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1170 + "__id__": 1191 }, "_enabled": true, "_normalMaterial": null, @@ -45527,7 +46331,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1176 + "__id__": 1197 } ], "_N$interactable": true, @@ -45583,7 +46387,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1170 + "__id__": 1191 }, "_id": "" }, @@ -45613,24 +46417,24 @@ "_name": "海南省", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1179 + "__id__": 1200 } ], "_active": true, "_components": [ { - "__id__": 1182 + "__id__": 1203 }, { - "__id__": 1183 + "__id__": 1204 } ], "_prefab": { - "__id__": 1185 + "__id__": 1206 }, "_opacity": 255, "_color": { @@ -45684,17 +46488,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1178 + "__id__": 1199 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1180 + "__id__": 1201 } ], "_prefab": { - "__id__": 1181 + "__id__": 1202 }, "_opacity": 255, "_color": { @@ -45748,7 +46552,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1179 + "__id__": 1200 }, "_enabled": true, "_materials": [ @@ -45792,7 +46596,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1178 + "__id__": 1199 }, "_enabled": true, "_materials": [ @@ -45826,7 +46630,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1178 + "__id__": 1199 }, "_enabled": true, "_normalMaterial": null, @@ -45835,7 +46639,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1184 + "__id__": 1205 } ], "_N$interactable": true, @@ -45891,7 +46695,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1178 + "__id__": 1199 }, "_id": "" }, @@ -45921,24 +46725,24 @@ "_name": "港澳台", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1187 + "__id__": 1208 } ], "_active": true, "_components": [ { - "__id__": 1190 + "__id__": 1211 }, { - "__id__": 1191 + "__id__": 1212 } ], "_prefab": { - "__id__": 1193 + "__id__": 1214 }, "_opacity": 255, "_color": { @@ -45992,17 +46796,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1186 + "__id__": 1207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1188 + "__id__": 1209 } ], "_prefab": { - "__id__": 1189 + "__id__": 1210 }, "_opacity": 255, "_color": { @@ -46056,7 +46860,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1187 + "__id__": 1208 }, "_enabled": true, "_materials": [ @@ -46100,7 +46904,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1186 + "__id__": 1207 }, "_enabled": true, "_materials": [ @@ -46134,7 +46938,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1186 + "__id__": 1207 }, "_enabled": true, "_normalMaterial": null, @@ -46143,7 +46947,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1192 + "__id__": 1213 } ], "_N$interactable": true, @@ -46199,7 +47003,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1186 + "__id__": 1207 }, "_id": "" }, @@ -46229,24 +47033,24 @@ "_name": "其他", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1195 + "__id__": 1216 } ], "_active": true, "_components": [ { - "__id__": 1198 + "__id__": 1219 }, { - "__id__": 1199 + "__id__": 1220 } ], "_prefab": { - "__id__": 1201 + "__id__": 1222 }, "_opacity": 255, "_color": { @@ -46300,17 +47104,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1194 + "__id__": 1215 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1196 + "__id__": 1217 } ], "_prefab": { - "__id__": 1197 + "__id__": 1218 }, "_opacity": 255, "_color": { @@ -46364,7 +47168,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1195 + "__id__": 1216 }, "_enabled": true, "_materials": [ @@ -46408,7 +47212,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1194 + "__id__": 1215 }, "_enabled": true, "_materials": [ @@ -46442,7 +47246,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1194 + "__id__": 1215 }, "_enabled": true, "_normalMaterial": null, @@ -46451,7 +47255,7 @@ "zoomScale": 1.05, "clickEvents": [ { - "__id__": 1200 + "__id__": 1221 } ], "_N$interactable": true, @@ -46507,7 +47311,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1194 + "__id__": 1215 }, "_id": "" }, @@ -46537,24 +47341,24 @@ "_name": "choice", "_objFlags": 0, "_parent": { - "__id__": 937 + "__id__": 958 }, "_children": [ { - "__id__": 1203 + "__id__": 1224 }, { - "__id__": 1206 + "__id__": 1227 } ], "_active": false, "_components": [ { - "__id__": 1209 + "__id__": 1230 } ], "_prefab": { - "__id__": 1210 + "__id__": 1231 }, "_opacity": 255, "_color": { @@ -46608,17 +47412,17 @@ "_name": "New Sprite", "_objFlags": 0, "_parent": { - "__id__": 1202 + "__id__": 1223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1204 + "__id__": 1225 } ], "_prefab": { - "__id__": 1205 + "__id__": 1226 }, "_opacity": 255, "_color": { @@ -46672,7 +47476,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1203 + "__id__": 1224 }, "_enabled": true, "_materials": [ @@ -46717,17 +47521,17 @@ "_name": "cityName", "_objFlags": 0, "_parent": { - "__id__": 1202 + "__id__": 1223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1207 + "__id__": 1228 } ], "_prefab": { - "__id__": 1208 + "__id__": 1229 }, "_opacity": 255, "_color": { @@ -46781,7 +47585,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1206 + "__id__": 1227 }, "_enabled": true, "_materials": [ @@ -46825,7 +47629,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1202 + "__id__": 1223 }, "_enabled": true, "_materials": [ @@ -46881,7 +47685,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 936 + "__id__": 957 }, "_enabled": true, "_materials": [ @@ -46912,7 +47716,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 935 + "__id__": 956 }, "_enabled": false, "horizontal": false, @@ -46924,10 +47728,10 @@ "scrollEvents": [], "cancelInnerEvents": true, "_N$content": { - "__id__": 937 + "__id__": 958 }, "content": { - "__id__": 937 + "__id__": 958 }, "_N$horizontalScrollBar": null, "_N$verticalScrollBar": null, @@ -46949,24 +47753,24 @@ "_name": "close", "_objFlags": 0, "_parent": { - "__id__": 927 + "__id__": 948 }, "_children": [ { - "__id__": 1217 + "__id__": 1238 } ], "_active": true, "_components": [ { - "__id__": 1219 + "__id__": 1240 }, { - "__id__": 1220 + "__id__": 1241 } ], "_prefab": { - "__id__": 1222 + "__id__": 1243 }, "_opacity": 255, "_color": { @@ -47020,13 +47824,13 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 1216 + "__id__": 1237 }, "_children": [], "_active": true, "_components": [], "_prefab": { - "__id__": 1218 + "__id__": 1239 }, "_opacity": 255, "_color": { @@ -47091,7 +47895,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1216 + "__id__": 1237 }, "_enabled": true, "_materials": [ @@ -47125,7 +47929,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1216 + "__id__": 1237 }, "_enabled": true, "_normalMaterial": null, @@ -47134,7 +47938,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 1221 + "__id__": 1242 } ], "_N$interactable": true, @@ -47190,7 +47994,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 1217 + "__id__": 1238 }, "_id": "" }, @@ -47220,7 +48024,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 927 + "__id__": 948 }, "_enabled": true, "alignMode": 1, @@ -47262,35 +48066,35 @@ }, "_children": [ { - "__id__": 1226 - }, - { - "__id__": 1230 - }, - { - "__id__": 1233 - }, - { - "__id__": 1239 - }, - { - "__id__": 1245 + "__id__": 1247 }, { "__id__": 1251 }, { - "__id__": 1257 + "__id__": 1254 + }, + { + "__id__": 1260 + }, + { + "__id__": 1266 + }, + { + "__id__": 1272 + }, + { + "__id__": 1278 } ], "_active": false, "_components": [ { - "__id__": 1260 + "__id__": 1281 } ], "_prefab": { - "__id__": 1261 + "__id__": 1282 }, "_opacity": 255, "_color": { @@ -47344,20 +48148,20 @@ "_name": "New Sprite(Splash)", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1227 + "__id__": 1248 }, { - "__id__": 1228 + "__id__": 1249 } ], "_prefab": { - "__id__": 1229 + "__id__": 1250 }, "_opacity": 200, "_color": { @@ -47411,7 +48215,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1226 + "__id__": 1247 }, "_enabled": true, "_materials": [ @@ -47443,7 +48247,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1226 + "__id__": 1247 }, "_enabled": true, "_id": "" @@ -47464,17 +48268,17 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1231 + "__id__": 1252 } ], "_prefab": { - "__id__": 1232 + "__id__": 1253 }, "_opacity": 255, "_color": { @@ -47528,7 +48332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1230 + "__id__": 1251 }, "_enabled": true, "_materials": [ @@ -47572,21 +48376,21 @@ "_name": "block1", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [ { - "__id__": 1234 + "__id__": 1255 } ], "_active": true, "_components": [ { - "__id__": 1237 + "__id__": 1258 } ], "_prefab": { - "__id__": 1238 + "__id__": 1259 }, "_opacity": 255, "_color": { @@ -47640,17 +48444,17 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 1233 + "__id__": 1254 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1235 + "__id__": 1256 } ], "_prefab": { - "__id__": 1236 + "__id__": 1257 }, "_opacity": 0, "_color": { @@ -47704,7 +48508,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1234 + "__id__": 1255 }, "_enabled": true, "_materials": [ @@ -47747,7 +48551,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1233 + "__id__": 1254 }, "_enabled": true, "_materials": [ @@ -47790,21 +48594,21 @@ "_name": "block2", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [ { - "__id__": 1240 + "__id__": 1261 } ], "_active": true, "_components": [ { - "__id__": 1243 + "__id__": 1264 } ], "_prefab": { - "__id__": 1244 + "__id__": 1265 }, "_opacity": 255, "_color": { @@ -47858,17 +48662,17 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 1239 + "__id__": 1260 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1241 + "__id__": 1262 } ], "_prefab": { - "__id__": 1242 + "__id__": 1263 }, "_opacity": 0, "_color": { @@ -47922,7 +48726,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1240 + "__id__": 1261 }, "_enabled": true, "_materials": [ @@ -47965,7 +48769,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1239 + "__id__": 1260 }, "_enabled": true, "_materials": [ @@ -48008,21 +48812,21 @@ "_name": "block3", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [ { - "__id__": 1246 + "__id__": 1267 } ], "_active": true, "_components": [ { - "__id__": 1249 + "__id__": 1270 } ], "_prefab": { - "__id__": 1250 + "__id__": 1271 }, "_opacity": 255, "_color": { @@ -48076,17 +48880,17 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 1245 + "__id__": 1266 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1247 + "__id__": 1268 } ], "_prefab": { - "__id__": 1248 + "__id__": 1269 }, "_opacity": 0, "_color": { @@ -48140,7 +48944,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1246 + "__id__": 1267 }, "_enabled": true, "_materials": [ @@ -48183,7 +48987,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1245 + "__id__": 1266 }, "_enabled": true, "_materials": [ @@ -48226,21 +49030,21 @@ "_name": "block4", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [ { - "__id__": 1252 + "__id__": 1273 } ], "_active": true, "_components": [ { - "__id__": 1255 + "__id__": 1276 } ], "_prefab": { - "__id__": 1256 + "__id__": 1277 }, "_opacity": 0, "_color": { @@ -48294,17 +49098,17 @@ "_name": "light", "_objFlags": 0, "_parent": { - "__id__": 1251 + "__id__": 1272 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1253 + "__id__": 1274 } ], "_prefab": { - "__id__": 1254 + "__id__": 1275 }, "_opacity": 0, "_color": { @@ -48358,7 +49162,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1252 + "__id__": 1273 }, "_enabled": true, "_materials": [ @@ -48401,7 +49205,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1251 + "__id__": 1272 }, "_enabled": true, "_materials": [ @@ -48444,17 +49248,17 @@ "_name": "cat", "_objFlags": 0, "_parent": { - "__id__": 1225 + "__id__": 1246 }, "_children": [], "_active": true, "_components": [ { - "__id__": 1258 + "__id__": 1279 } ], "_prefab": { - "__id__": 1259 + "__id__": 1280 }, "_opacity": 255, "_color": { @@ -48508,7 +49312,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1257 + "__id__": 1278 }, "_enabled": true, "_materials": [ @@ -48551,7 +49355,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 1225 + "__id__": 1246 }, "_enabled": true, "alignMode": 1, @@ -48623,7 +49427,7 @@ "__id__": 78 }, "content2": { - "__id__": 937 + "__id__": 958 }, "content3": { "__id__": 593 @@ -48646,809 +49450,5 @@ }, "fileId": "", "sync": false - }, - { - "__type__": "cc.Node", - "_name": "cat_12", - "_objFlags": 0, - "_parent": { - "__id__": 682 - }, - "_children": [ - { - "__id__": 1266 - }, - { - "__id__": 1269 - }, - { - "__id__": 1272 - }, - { - "__id__": 1278 - } - ], - "_active": true, - "_components": [ - { - "__id__": 1283 - } - ], - "_prefab": { - "__id__": 1285 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 200, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 300, - -490.497, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "kuang_6", - "_objFlags": 0, - "_parent": { - "__id__": 1265 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1267 - } - ], - "_prefab": { - "__id__": 1268 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 160, - "height": 160 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 5.39, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1266 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "c2b141f2-de71-4481-b9ee-440c893c28b3" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" - }, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "9306dfbb-8c2b-4c19-a890-649041d0fac9", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "icon", - "_objFlags": 0, - "_parent": { - "__id__": 1265 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1270 - } - ], - "_prefab": { - "__id__": 1271 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 186, - "height": 173 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 0.7526881720430108, - 0.7526881720430108, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1269 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "7d090003-0209-4a00-8b00-000000000209" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ddfcf83a-5420-4550-a7ab-0a21c8809fd3", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "select", - "_objFlags": 0, - "_parent": { - "__id__": 1265 - }, - "_children": [ - { - "__id__": 1273 - } - ], - "_active": false, - "_components": [ - { - "__id__": 1276 - } - ], - "_prefab": { - "__id__": 1277 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 176, - "height": 176 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 5.6, - 0, - 0, - 0, - 0, - 1, - 0.9, - 0.9, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "New Sprite", - "_objFlags": 0, - "_parent": { - "__id__": 1272 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1274 - } - ], - "_prefab": { - "__id__": 1275 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 66, - "height": 66 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 60, - -60, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1273 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "7453479c-fcfb-4019-b1a9-c81ca044b911" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" - }, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "1a937bd3-c177-4e84-967c-cb109a00beb8", - "sync": false - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1272 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "949ab4be-d9b5-4dda-a22c-26b8356d1324" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": { - "__uuid__": "fd85df88-648f-4407-bab2-da4f15478fb9" - }, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "738777dc-7255-4aef-9e5e-b052515739ce", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "lock", - "_objFlags": 0, - "_parent": { - "__id__": 1265 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 1279 - }, - { - "__id__": 1280 - } - ], - "_prefab": { - "__id__": 1282 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 160, - "height": 160 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 5.897, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 0 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1278 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "eea1ebab-83ca-474e-bdf5-bc03e7794897" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1278 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.1, - "clickEvents": [ - { - "__id__": 1281 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1278 - }, - "_id": "" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "7589aoelbpHs5EJQkTTKE6y", - "handler": "openGacha", - "customEventData": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "846c69a5-b6f2-4557-aac0-cb8296acfcb7", - "sync": false - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 1265 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.05, - "clickEvents": [ - { - "__id__": 1284 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": { - "__id__": 1265 - }, - "_id": "" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "7589aoelbpHs5EJQkTTKE6y", - "handler": "changeCat", - "customEventData": "cat_12" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ccd7ddb0-74b3-4f3a-8661-1cfc8b0257bf", - "sync": false } -] +] \ No newline at end of file diff --git a/assets/win/prefab/Win.prefab b/assets/win/prefab/Win.prefab index ff1b5f4b..aa660c4b 100644 --- a/assets/win/prefab/Win.prefab +++ b/assets/win/prefab/Win.prefab @@ -2637,7 +2637,7 @@ "ctor": "Float64Array", "array": [ 49.628, - 50.547, + 91.915, 0, 0, 0, @@ -2946,8 +2946,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 395, - "height": 402 + "width": 392, + "height": 399 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2959,7 +2959,7 @@ "ctor": "Float64Array", "array": [ 11.564, - -200, + -196.188, 0, 0, 0, @@ -2999,7 +2999,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "43a66e64-aeca-44fb-8322-ec56eabd543c" + "__uuid__": "a18073a3-11b7-4fd1-a043-814b30a83b82" }, "_type": 0, "_sizeMode": 1, @@ -10976,10 +10976,10 @@ "catUI": { "__uuid__": "ff580ec5-b05e-404f-b9f2-3e6a0fd2863c" }, - "_id": "", "cat12": { - "__uuid__": "7d090003-0209-4a00-8b00-000000000209" - } + "__uuid__": "cbd01a77-0102-4324-a1aa-bcbc6f816850" + }, + "_id": "" }, { "__type__": "cc.PrefabInfo", @@ -14488,4 +14488,4 @@ "fileId": "", "sync": false } -] +] \ No newline at end of file diff --git a/assets/win/texture/cat.png b/assets/win/texture/cat.png new file mode 100644 index 00000000..bd12fad4 Binary files /dev/null and b/assets/win/texture/cat.png differ diff --git a/assets/win/texture/cat.png.meta b/assets/win/texture/cat.png.meta new file mode 100644 index 00000000..ea306eae --- /dev/null +++ b/assets/win/texture/cat.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "ab6fdc88-7163-4370-bd1d-23792f25c591", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 417, + "height": 388, + "platformSettings": {}, + "subMetas": { + "cat": { + "ver": "1.0.6", + "uuid": "cbd01a77-0102-4324-a1aa-bcbc6f816850", + "importer": "sprite-frame", + "rawTextureUuid": "ab6fdc88-7163-4370-bd1d-23792f25c591", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 417, + "height": 388, + "rawWidth": 417, + "rawHeight": 388, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/tools/test-finish-stage.cjs b/tools/test-finish-stage.cjs new file mode 100644 index 00000000..d82692b7 --- /dev/null +++ b/tools/test-finish-stage.cjs @@ -0,0 +1,99 @@ +// Run: node --test tools/test-finish-stage.cjs +const test = require('node:test'); +const assert = require('node:assert/strict'); +const fs = require('node:fs'); +const path = require('node:path'); +const vm = require('node:vm'); +const ts = require('typescript'); + +const file = path.join(__dirname, '../assets/Script/module/Tool/GameTool.ts'); +const source = ts.createSourceFile(file, fs.readFileSync(file, 'utf8'), ts.ScriptTarget.Latest, true); +const declaration = source.statements.filter(ts.isVariableStatement) + .flatMap(statement => [...statement.declarationList.declarations]) + .find(node => node.name.getText(source) === 'GameTool'); +const members = declaration.initializer.properties.filter(node => + ['MAX_NORMAL_LEVEL', 'addLevel', 'maxLevel', 'shushu_Track'].includes(node.name?.getText(source))); +const code = ts.transpileModule('({' + members.map(node => node.getText(source)).join(',\n') + '})', { + compilerOptions: { target: ts.ScriptTarget.ES2017 }, +}).outputText; + +function fixture(overrides = {}) { + const info = { level: 0, GameplayType: 1, randomLevel: 321, otherLevel: 0, addLevel: 0, + winStreak: 2, address: 'test', ...overrides }; + const events = [], progress = [], gravity = [], storage = new Map(); + const cc = { fx: { GameConfig: { GM_INFO: info }, StorageMessage: { + setStorage: (key, value) => storage.set(key, value), + } } }; + const api = { + setNewCloudlevel: () => progress.push({ target: 'cloud', level: info.level }), + shushu_SetSuperProperties() {}, + shushu_Track: (name, data) => events.push({ name, data }), + yinli_FinishiStage: () => gravity.push(info.level), + }; + const tool = vm.runInNewContext(code, { cc, MiniGameSdk: { API: api }, + MapConroler: { _instance: { is_frenzy: true, use_frenzy: true, total_steps_count: 7 } }, + Utils: { setUserLevel(done, infinity) { + progress.push({ target: 'server', level: info.level, infinity }); + done({ code: 1, data: {} }); + } }, + }); + cc.fx.GameTool = tool; + return { info, tool, events, progress, gravity, storage }; +} + +const maxLevel = fixture().tool.MAX_NORMAL_LEVEL; +for (const scenario of [ + { name: 'first stage', level: 0, stage: 1 }, + { name: 'ordinary stage', level: 41, stage: 42 }, + { name: 'last normal stage', level: maxLevel - 1, stage: maxLevel }, + { name: 'endless stage', level: maxLevel, stage: 321, infinity: true }, +]) { + test(`${scenario.name}: success reports the entered stage and saves advanced progress`, () => { + const f = fixture({ level: scenario.level }); + f.tool.shushu_Track('enter_stage', { infinity: !!scenario.infinity }); + let completed = false; + f.tool.addLevel(1200, 0, () => { completed = true; }); + const entered = f.events.find(event => event.name === 'enter_stage').data; + const finished = f.events.find(event => event.name === 'finish_stage').data; + assert.equal(finished.stage_id, scenario.stage); + assert.equal(finished.stage_id, entered.stage_id); + assert.equal(finished.infinity, !!scenario.infinity); + assert.equal(finished.result, 'success'); + assert.equal(finished.stage_duration, 1200); + assert.equal(finished.added_time, 0); + assert.equal(finished.use_frenzy, true); + assert.equal(finished.total_steps_count, 7); + const nextLevel = Math.min(scenario.level + 1, maxLevel); + assert.equal(f.info.level, nextLevel); + assert.equal(f.storage.get('level').level, nextLevel); + assert.deepEqual(f.progress, [ + { target: 'cloud', level: nextLevel }, + { target: 'server', level: nextLevel, infinity: nextLevel === maxLevel }, + ]); + assert.deepEqual(f.gravity, [nextLevel]); + assert.equal(completed, true); + }); +} + +for (const result of ['failreason: time', 'give_up']) { + for (const scenario of [ + { name: 'normal', level: 41, stage: 42 }, + { name: 'endless', level: maxLevel, stage: 321 }, + { name: 'shared', level: 41, otherLevel: 88, stage: 88 }, + ]) { + test(`${scenario.name}: ${result} keeps its current stage without advancing progress`, () => { + const f = fixture(scenario); + f.tool.shushu_Track('finish_stage', { result, time: 1200, add_Time: 0 }); + assert.equal(f.events[0].data.stage_id, scenario.stage); + assert.equal(f.events[0].data.result, result); + assert.equal(f.info.level, scenario.level); + }); + } +} + +test('skipping a missing level advances progress without a success event', () => { + const f = fixture(); + f.tool.addLevel(null, null, null); + assert.equal(f.info.level, 1); + assert.equal(f.events.length, 0); +});