diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 1ead7717..b7ade450 100644 Binary files a/DataTables/Datas/__tables__.xlsx and b/DataTables/Datas/__tables__.xlsx differ diff --git a/DataTables/Datas/常用/资源表.xlsx b/DataTables/Datas/常用/资源表.xlsx index ee89383a..32b6ed90 100644 Binary files a/DataTables/Datas/常用/资源表.xlsx and b/DataTables/Datas/常用/资源表.xlsx differ diff --git a/DataTables/Datas/礼包/商店/商店礼包布局.xlsx b/DataTables/Datas/礼包/商店/商店礼包布局.xlsx index 28528986..67dbbbf8 100644 Binary files a/DataTables/Datas/礼包/商店/商店礼包布局.xlsx and b/DataTables/Datas/礼包/商店/商店礼包布局.xlsx differ diff --git a/DataTables/Datas/礼包/礼包.xlsx b/DataTables/Datas/礼包/礼包.xlsx index 354e2778..82473f4b 100644 Binary files a/DataTables/Datas/礼包/礼包.xlsx and b/DataTables/Datas/礼包/礼包.xlsx differ diff --git a/JisolGameCocos/assets/resources/WorldCanvas.prefab b/JisolGameCocos/assets/resources/WorldCanvas.prefab index 73f8cac8..10091ac5 100644 --- a/JisolGameCocos/assets/resources/WorldCanvas.prefab +++ b/JisolGameCocos/assets/resources/WorldCanvas.prefab @@ -132,7 +132,7 @@ "_priority": 0, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 1000, + "_orthoHeight": 700, "_near": 0, "_far": 1000, "_color": { diff --git a/JisolGameCocos/assets/resources/config/json/tbggift.json b/JisolGameCocos/assets/resources/config/json/tbggift.json index 0eb93bef..7012e553 100644 --- a/JisolGameCocos/assets/resources/config/json/tbggift.json +++ b/JisolGameCocos/assets/resources/config/json/tbggift.json @@ -93,5 +93,25 @@ "value": 20 } ] + }, + { + "id": 210001, + "name": "锻造礼包", + "tig": "锻造礼包", + "limit": 1, + "limitValue": 0, + "exchanges": [ + { + "id": 90001, + "value": 2000 + } + ], + "rewards": [ + { + "type": 1, + "id": 90002, + "value": 20 + } + ] } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgresource.json b/JisolGameCocos/assets/resources/config/json/tbgresource.json index d445d0ca..bdc29411 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgresource.json +++ b/JisolGameCocos/assets/resources/config/json/tbgresource.json @@ -50,7 +50,7 @@ { "id": 90007, "icon": "90007", - "name": "兑换券", + "name": "点卷", "tig": "用于购买礼包", "args": "", "quality": 1 diff --git a/JisolGameCocos/assets/resources/config/json/tbgshop.json b/JisolGameCocos/assets/resources/config/json/tbgshop.json index 2e667d2a..224d286e 100644 --- a/JisolGameCocos/assets/resources/config/json/tbgshop.json +++ b/JisolGameCocos/assets/resources/config/json/tbgshop.json @@ -1,22 +1,27 @@ [ { - "id": 1, "tig": "金币礼包", - "giftId": 180001 + "giftId": 180001, + "type": 0 }, { - "id": 2, "tig": "好多金币礼包", - "giftId": 180002 + "giftId": 180002, + "type": 0 }, { - "id": 3, "tig": "限购矿石礼包", - "giftId": 190001 + "giftId": 190001, + "type": 0 }, { - "id": 4, "tig": "每日矿石礼包", - "giftId": 200001 + "giftId": 200001, + "type": 0 + }, + { + "tig": "锻造礼包", + "giftId": 210001, + "type": 1 } ] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab index 3d24f773..34e92fa0 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/主页/MainView.prefab @@ -25,26 +25,26 @@ "__id__": 10 }, { - "__id__": 433 + "__id__": 484 }, { - "__id__": 576 + "__id__": 627 } ], "_active": true, "_components": [ { - "__id__": 593 + "__id__": 644 }, { - "__id__": 595 + "__id__": 646 }, { - "__id__": 597 + "__id__": 648 } ], "_prefab": { - "__id__": 599 + "__id__": 650 }, "_lpos": { "__type__": "cc.Vec3", @@ -263,32 +263,26 @@ "__id__": 11 }, { - "__id__": 28 + "__id__": 19 }, { - "__id__": 60 - }, - { - "__id__": 90 - }, - { - "__id__": 262 + "__id__": 35 } ], "_active": true, "_components": [ { - "__id__": 426 + "__id__": 477 }, { - "__id__": 428 + "__id__": 479 }, { - "__id__": 430 + "__id__": 481 } ], "_prefab": { - "__id__": 432 + "__id__": 483 }, "_lpos": { "__type__": "cc.Vec3", @@ -321,19 +315,607 @@ }, { "__type__": "cc.Node", + "_name": "bg", "_objFlags": 0, + "__editorExtras__": {}, "_parent": { "__id__": 10 }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 12 + }, + { + "__id__": 14 + }, + { + "__id__": 16 + } + ], "_prefab": { - "__id__": 12 + "__id__": 18 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 13 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 680, + "height": 720 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9cK28cM8hBN7pr6xQ818/7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 15 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9dZQ/uWkpBnKzBRmCLXlG4" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 11 + }, + "_enabled": true, + "__prefab": { + "__id__": 17 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "76JZwFIMJIfoaokebDYrYH" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "35pZTDcAtFPqTM2P2q8bHR", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "header", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [ + { + "__id__": 20 + } + ], + "_active": true, + "_components": [ + { + "__id__": 28 + }, + { + "__id__": 30 + }, + { + "__id__": 32 + } + ], + "_prefab": { + "__id__": 34 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 340, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "标题", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 19 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 21 + }, + { + "__id__": 23 + }, + { + "__id__": 25 + } + ], + "_prefab": { + "__id__": 27 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 22 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 68.43359375, + "height": 54.4 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "bcMtpVtIVP7JcMXqdC7fqY" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 24 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_string": "- 信息 -", + "_horizontalAlign": 1, + "_verticalAlign": 1, + "_actualFontSize": 20, + "_fontSize": 20, + "_fontFamily": "Arial", + "_lineHeight": 40, + "_overflow": 0, + "_enableWrapText": true, + "_font": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_isItalic": false, + "_isBold": true, + "_isUnderline": false, + "_underlineHeight": 2, + "_cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6cDGlvx1FCkYIr7CRHUjlA" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 20 + }, + "_enabled": true, + "__prefab": { + "__id__": 26 + }, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 2, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "07tNXtqmlKBLgvspsEbikZ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3eF25/2JBIIrX0B8Jm8qkZ", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 29 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 680, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "90IJV53wJOnpzJ67Yx6LH7" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 31 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 61, + "g": 61, + "b": 61, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "48bMYb1rxOcpJ2Zt+b/cvr" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 19 + }, + "_enabled": true, + "__prefab": { + "__id__": 33 + }, + "_alignFlags": 41, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "6fCQM4e85MtqJWal8n3koz" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "625qkpPm9AWr/IqWI+9AqW", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, + { + "__type__": "cc.Node", + "_name": "内容", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 10 + }, + "_children": [ + { + "__id__": 36 + }, + { + "__id__": 53 + }, + { + "__id__": 125 + }, + { + "__id__": 304 + } + ], + "_active": true, + "_components": [ + { + "__id__": 468 + }, + { + "__id__": 470 + }, + { + "__id__": 472 + }, + { + "__id__": 474 + } + ], + "_prefab": { + "__id__": 476 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": -22.5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_objFlags": 0, + "_parent": { + "__id__": 35 + }, + "_prefab": { + "__id__": 37 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 11 + "__id__": 36 }, "asset": { "__uuid__": "bd8941db-e6c7-422a-989a-a51d4f778362", @@ -341,7 +923,7 @@ }, "fileId": "fdayH6FM5D7KxxkfPBzFJ/", "instance": { - "__id__": 13 + "__id__": 38 }, "targetOverrides": null }, @@ -354,21 +936,21 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 14 + "__id__": 39 } ], "propertyOverrides": [ { - "__id__": 20 + "__id__": 45 }, { - "__id__": 22 + "__id__": 47 }, { - "__id__": 24 + "__id__": 49 }, { - "__id__": 26 + "__id__": 51 } ], "removedComponents": [] @@ -376,14 +958,14 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 15 + "__id__": 40 }, "components": [ { - "__id__": 16 + "__id__": 41 }, { - "__id__": 18 + "__id__": 43 } ] }, @@ -399,21 +981,21 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 11 + "__id__": 36 } }, "node": { - "__id__": 11 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 17 + "__id__": 42 }, "_alignFlags": 9, "_target": null, "_left": 0, "_right": 0, - "_top": 40, + "_top": 0, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -439,15 +1021,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 11 + "__id__": 36 } }, "node": { - "__id__": 11 + "__id__": 36 }, "_enabled": true, "__prefab": { - "__id__": 19 + "__id__": 44 }, "_alignFlags": 1, "_target": null, @@ -476,7 +1058,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 21 + "__id__": 46 }, "propertyPath": [ "_name" @@ -492,7 +1074,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 23 + "__id__": 48 }, "propertyPath": [ "_lpos" @@ -500,7 +1082,7 @@ "value": { "__type__": "cc.Vec3", "x": -190, - "y": 260, + "y": 277.5, "z": 0 } }, @@ -513,7 +1095,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 25 + "__id__": 50 }, "propertyPath": [ "_lrot" @@ -535,7 +1117,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 27 + "__id__": 52 }, "propertyPath": [ "_euler" @@ -555,36 +1137,96 @@ }, { "__type__": "cc.Node", - "_name": "金币", + "_name": "资源列表", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 35 }, "_children": [ { - "__id__": 29 + "__id__": 54 + }, + { + "__id__": 86 } ], "_active": true, "_components": [ { - "__id__": 53 + "__id__": 118 }, { - "__id__": 55 + "__id__": 120 }, { - "__id__": 57 + "__id__": 122 } ], "_prefab": { - "__id__": 59 + "__id__": 124 }, "_lpos": { "__type__": "cc.Vec3", - "x": 68.46, - "y": 295, + "x": 150, + "y": 277.5, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 33554432, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "金币", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 53 + }, + "_children": [ + { + "__id__": 55 + } + ], + "_active": true, + "_components": [ + { + "__id__": 79 + }, + { + "__id__": 81 + }, + { + "__id__": 83 + } + ], + "_prefab": { + "__id__": 85 + }, + "_lpos": { + "__type__": "cc.Vec3", + "x": -81.54, + "y": 34.49, "z": 0 }, "_lrot": { @@ -616,30 +1258,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 28 + "__id__": 54 }, "_children": [ { - "__id__": 30 + "__id__": 56 }, { - "__id__": 38 + "__id__": 64 } ], "_active": true, "_components": [ { - "__id__": 46 + "__id__": 72 }, { - "__id__": 48 + "__id__": 74 }, { - "__id__": 50 + "__id__": 76 } ], "_prefab": { - "__id__": 52 + "__id__": 78 }, "_lpos": { "__type__": "cc.Vec3", @@ -676,23 +1318,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 29 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 31 + "__id__": 57 }, { - "__id__": 33 + "__id__": 59 }, { - "__id__": 35 + "__id__": 61 } ], "_prefab": { - "__id__": 37 + "__id__": 63 }, "_lpos": { "__type__": "cc.Vec3", @@ -729,11 +1371,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 32 + "__id__": 58 }, "_contentSize": { "__type__": "cc.Size", @@ -757,11 +1399,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 34 + "__id__": 60 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -802,11 +1444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 30 + "__id__": 56 }, "_enabled": true, "__prefab": { - "__id__": 36 + "__id__": 62 }, "_color": { "__type__": "cc.Color", @@ -841,23 +1483,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 29 + "__id__": 55 }, "_children": [], "_active": true, "_components": [ { - "__id__": 39 + "__id__": 65 }, { - "__id__": 41 + "__id__": 67 }, { - "__id__": 43 + "__id__": 69 } ], "_prefab": { - "__id__": 45 + "__id__": 71 }, "_lpos": { "__type__": "cc.Vec3", @@ -894,11 +1536,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 40 + "__id__": 66 }, "_contentSize": { "__type__": "cc.Size", @@ -922,11 +1564,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 42 + "__id__": 68 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -967,11 +1609,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 38 + "__id__": 64 }, "_enabled": true, "__prefab": { - "__id__": 44 + "__id__": 70 }, "_color": { "__type__": "cc.Color", @@ -1006,11 +1648,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 47 + "__id__": 73 }, "_contentSize": { "__type__": "cc.Size", @@ -1034,11 +1676,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 49 + "__id__": 75 }, "_resizeMode": 1, "_layoutType": 1, @@ -1072,15 +1714,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 29 + "__id__": 55 }, "_enabled": true, "__prefab": { - "__id__": 51 + "__id__": 77 }, "type": 90001, "show": { - "__id__": 41 + "__id__": 67 }, "_id": "" }, @@ -1107,11 +1749,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 54 + "__id__": 80 }, "_contentSize": { "__type__": "cc.Size", @@ -1135,11 +1777,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 56 + "__id__": 82 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1180,17 +1822,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 28 + "__id__": 54 }, "_enabled": true, "__prefab": { - "__id__": 58 + "__id__": 84 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 45, + "_top": 5.509999999999998, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -1225,36 +1867,36 @@ }, { "__type__": "cc.Node", - "_name": "宝石", + "_name": "点卷", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 53 }, "_children": [ { - "__id__": 61 + "__id__": 87 } ], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 111 }, { - "__id__": 85 + "__id__": 113 }, { - "__id__": 87 + "__id__": 115 } ], "_prefab": { - "__id__": 89 + "__id__": 117 }, "_lpos": { "__type__": "cc.Vec3", - "x": 242.803, - "y": 295, + "x": 92.803, + "y": 34.49, "z": 0 }, "_lrot": { @@ -1286,27 +1928,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 60 + "__id__": 86 }, "_children": [ { - "__id__": 62 + "__id__": 88 }, { - "__id__": 70 + "__id__": 96 } ], "_active": true, "_components": [ { - "__id__": 78 + "__id__": 104 }, { - "__id__": 80 + "__id__": 106 + }, + { + "__id__": 108 } ], "_prefab": { - "__id__": 82 + "__id__": 110 }, "_lpos": { "__type__": "cc.Vec3", @@ -1343,23 +1988,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 61 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 89 }, { - "__id__": 65 + "__id__": 91 }, { - "__id__": 67 + "__id__": 93 } ], "_prefab": { - "__id__": 69 + "__id__": 95 }, "_lpos": { "__type__": "cc.Vec3", @@ -1396,11 +2041,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 64 + "__id__": 90 }, "_contentSize": { "__type__": "cc.Size", @@ -1424,11 +2069,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 66 + "__id__": 92 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1440,7 +2085,7 @@ "b": 255, "a": 255 }, - "_string": "宝石:", + "_string": "点卷:", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 20, @@ -1469,11 +2114,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 62 + "__id__": 88 }, "_enabled": true, "__prefab": { - "__id__": 68 + "__id__": 94 }, "_color": { "__type__": "cc.Color", @@ -1508,23 +2153,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 61 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 71 + "__id__": 97 }, { - "__id__": 73 + "__id__": 99 }, { - "__id__": 75 + "__id__": 101 } ], "_prefab": { - "__id__": 77 + "__id__": 103 }, "_lpos": { "__type__": "cc.Vec3", @@ -1561,11 +2206,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 72 + "__id__": 98 }, "_contentSize": { "__type__": "cc.Size", @@ -1589,11 +2234,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 74 + "__id__": 100 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1634,11 +2279,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 70 + "__id__": 96 }, "_enabled": true, "__prefab": { - "__id__": 76 + "__id__": 102 }, "_color": { "__type__": "cc.Color", @@ -1673,11 +2318,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 79 + "__id__": 105 }, "_contentSize": { "__type__": "cc.Size", @@ -1701,11 +2346,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 61 + "__id__": 87 }, "_enabled": true, "__prefab": { - "__id__": 81 + "__id__": 107 }, "_resizeMode": 1, "_layoutType": 1, @@ -1733,6 +2378,31 @@ "__type__": "cc.CompPrefabInfo", "fileId": "2fUs/AEBVP47oojcoUKF+w" }, + { + "__type__": "dd6ff3gNGFAzKeTlGPK1jnx", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 87 + }, + "_enabled": true, + "__prefab": { + "__id__": 109 + }, + "type": 90007, + "tig": { + "__id__": 91 + }, + "show": { + "__id__": 99 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "9eWilUsb9D5LX9HCFfwvn7" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -1752,11 +2422,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 84 + "__id__": 112 }, "_contentSize": { "__type__": "cc.Size", @@ -1780,11 +2450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 86 + "__id__": 114 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -1825,17 +2495,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 60 + "__id__": 86 }, "_enabled": true, "__prefab": { - "__id__": 88 + "__id__": 116 }, "_alignFlags": 1, "_target": null, "_left": 0, "_right": 0, - "_top": 45, + "_top": 5.509999999999998, "_bottom": 0, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -1868,41 +2538,163 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 119 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 380, + "height": 120 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "7cQ4l612FPErgqdUSZnUwU" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 121 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_spriteFrame": { + "__uuid__": "7d8f9b89-4fd1-4c9f-a3ab-38ec7cded7ca@f9941", + "__expectedType__": "cc.SpriteFrame" + }, + "_type": 0, + "_fillType": 0, + "_sizeMode": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_useGrayscale": false, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "b5wWjX2epP1ZfjKKgvopOo" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 53 + }, + "_enabled": true, + "__prefab": { + "__id__": 123 + }, + "_alignFlags": 33, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "dcXpSHpnJCM7z2sWEM3brQ" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "959i7lQFFLXYTRpYsEj5Ka", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.Node", "_name": "控制区域", "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 35 }, "_children": [ { - "__id__": 91 + "__id__": 126 }, { - "__id__": 239 + "__id__": 274 } ], "_active": true, "_components": [ { - "__id__": 255 + "__id__": 297 }, { - "__id__": 257 + "__id__": 299 }, { - "__id__": 259 + "__id__": 301 } ], "_prefab": { - "__id__": 261 + "__id__": 303 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -90, + "y": -57.5, "z": 0 }, "_lrot": { @@ -1934,39 +2726,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 90 + "__id__": 125 }, "_children": [ { - "__id__": 92 + "__id__": 127 }, { - "__id__": 220 + "__id__": 255 } ], "_active": true, "_components": [ { - "__id__": 226 + "__id__": 261 }, { - "__id__": 228 + "__id__": 263 }, { - "__id__": 230 + "__id__": 265 }, { - "__id__": 232 + "__id__": 267 }, { - "__id__": 234 + "__id__": 269 }, { - "__id__": 236 + "__id__": 271 } ], "_prefab": { - "__id__": 238 + "__id__": 273 }, "_lpos": { "__type__": "cc.Vec3", @@ -2003,36 +2795,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 91 + "__id__": 126 }, "_children": [ { - "__id__": 93 + "__id__": 128 }, { - "__id__": 173 + "__id__": 208 }, { - "__id__": 192 + "__id__": 227 } ], "_active": true, "_components": [ { - "__id__": 211 + "__id__": 246 }, { - "__id__": 213 + "__id__": 248 }, { - "__id__": 215 + "__id__": 250 }, { - "__id__": 217 + "__id__": 252 } ], "_prefab": { - "__id__": 219 + "__id__": 254 }, "_lpos": { "__type__": "cc.Vec3", @@ -2069,27 +2861,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 127 }, "_children": [ { - "__id__": 94 + "__id__": 129 }, { - "__id__": 155 + "__id__": 190 } ], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 203 }, { - "__id__": 170 + "__id__": 205 } ], "_prefab": { - "__id__": 172 + "__id__": 207 }, "_lpos": { "__type__": "cc.Vec3", @@ -2126,27 +2918,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 93 + "__id__": 128 }, "_children": [ { - "__id__": 95 + "__id__": 130 }, { - "__id__": 108 + "__id__": 143 } ], "_active": true, "_components": [ { - "__id__": 150 + "__id__": 185 }, { - "__id__": 152 + "__id__": 187 } ], "_prefab": { - "__id__": 154 + "__id__": 189 }, "_lpos": { "__type__": "cc.Vec3", @@ -2181,17 +2973,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 94 + "__id__": 129 }, "_prefab": { - "__id__": 96 + "__id__": 131 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 95 + "__id__": 130 }, "asset": { "__uuid__": "9d7eeadb-58f6-4c42-aaed-bc402f272c84", @@ -2199,7 +2991,7 @@ }, "fileId": "a8T0NC/KpNY7MMbRkPRuwY", "instance": { - "__id__": 97 + "__id__": 132 }, "targetOverrides": null }, @@ -2213,19 +3005,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 98 + "__id__": 133 }, { - "__id__": 100 + "__id__": 135 }, { - "__id__": 102 + "__id__": 137 }, { - "__id__": 104 + "__id__": 139 }, { - "__id__": 106 + "__id__": 141 } ], "removedComponents": [] @@ -2233,7 +3025,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 99 + "__id__": 134 }, "propertyPath": [ "_name" @@ -2249,7 +3041,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 101 + "__id__": 136 }, "propertyPath": [ "_lpos" @@ -2270,7 +3062,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 103 + "__id__": 138 }, "propertyPath": [ "_lrot" @@ -2292,7 +3084,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 105 + "__id__": 140 }, "propertyPath": [ "_euler" @@ -2313,7 +3105,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 107 + "__id__": 142 }, "propertyPath": [ "_active" @@ -2332,30 +3124,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 94 + "__id__": 129 }, "_children": [ { - "__id__": 109 + "__id__": 144 }, { - "__id__": 126 + "__id__": 161 } ], "_active": true, "_components": [ { - "__id__": 143 + "__id__": 178 }, { - "__id__": 145 + "__id__": 180 }, { - "__id__": 147 + "__id__": 182 } ], "_prefab": { - "__id__": 149 + "__id__": 184 }, "_lpos": { "__type__": "cc.Vec3", @@ -2392,27 +3184,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 108 + "__id__": 143 }, "_children": [ { - "__id__": 110 + "__id__": 145 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 153 }, { - "__id__": 120 + "__id__": 155 }, { - "__id__": 122 + "__id__": 157 } ], "_prefab": { - "__id__": 125 + "__id__": 160 }, "_lpos": { "__type__": "cc.Vec3", @@ -2449,23 +3241,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 109 + "__id__": 144 }, "_children": [], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 146 }, { - "__id__": 113 + "__id__": 148 }, { - "__id__": 115 + "__id__": 150 } ], "_prefab": { - "__id__": 117 + "__id__": 152 }, "_lpos": { "__type__": "cc.Vec3", @@ -2502,11 +3294,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 112 + "__id__": 147 }, "_contentSize": { "__type__": "cc.Size", @@ -2530,11 +3322,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 114 + "__id__": 149 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2575,11 +3367,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 110 + "__id__": 145 }, "_enabled": true, "__prefab": { - "__id__": 116 + "__id__": 151 }, "_color": { "__type__": "cc.Color", @@ -2614,11 +3406,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 119 + "__id__": 154 }, "_contentSize": { "__type__": "cc.Size", @@ -2642,11 +3434,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 121 + "__id__": 156 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2687,15 +3479,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 109 + "__id__": 144 }, "_enabled": true, "__prefab": { - "__id__": 123 + "__id__": 158 }, "clickEvents": [ { - "__id__": 124 + "__id__": 159 } ], "_interactable": true, @@ -2747,7 +3539,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 109 + "__id__": 144 }, "_id": "" }, @@ -2784,27 +3576,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 108 + "__id__": 143 }, "_children": [ { - "__id__": 127 + "__id__": 162 } ], "_active": true, "_components": [ { - "__id__": 135 + "__id__": 170 }, { - "__id__": 137 + "__id__": 172 }, { - "__id__": 139 + "__id__": 174 } ], "_prefab": { - "__id__": 142 + "__id__": 177 }, "_lpos": { "__type__": "cc.Vec3", @@ -2841,23 +3633,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 126 + "__id__": 161 }, "_children": [], "_active": true, "_components": [ { - "__id__": 128 + "__id__": 163 }, { - "__id__": 130 + "__id__": 165 }, { - "__id__": 132 + "__id__": 167 } ], "_prefab": { - "__id__": 134 + "__id__": 169 }, "_lpos": { "__type__": "cc.Vec3", @@ -2894,11 +3686,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 129 + "__id__": 164 }, "_contentSize": { "__type__": "cc.Size", @@ -2922,11 +3714,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 131 + "__id__": 166 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -2967,11 +3759,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 127 + "__id__": 162 }, "_enabled": true, "__prefab": { - "__id__": 133 + "__id__": 168 }, "_color": { "__type__": "cc.Color", @@ -3006,11 +3798,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 136 + "__id__": 171 }, "_contentSize": { "__type__": "cc.Size", @@ -3034,11 +3826,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 138 + "__id__": 173 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3079,15 +3871,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 126 + "__id__": 161 }, "_enabled": true, "__prefab": { - "__id__": 140 + "__id__": 175 }, "clickEvents": [ { - "__id__": 141 + "__id__": 176 } ], "_interactable": true, @@ -3139,7 +3931,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 126 + "__id__": 161 }, "_id": "" }, @@ -3176,11 +3968,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 144 + "__id__": 179 }, "_contentSize": { "__type__": "cc.Size", @@ -3204,11 +3996,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 146 + "__id__": 181 }, "_resizeMode": 1, "_layoutType": 2, @@ -3242,11 +4034,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 108 + "__id__": 143 }, "_enabled": true, "__prefab": { - "__id__": 148 + "__id__": 183 }, "_alignFlags": 4, "_target": null, @@ -3291,11 +4083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 151 + "__id__": 186 }, "_contentSize": { "__type__": "cc.Size", @@ -3319,11 +4111,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 94 + "__id__": 129 }, "_enabled": true, "__prefab": { - "__id__": 153 + "__id__": 188 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3375,17 +4167,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 93 + "__id__": 128 }, "_prefab": { - "__id__": 156 + "__id__": 191 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 155 + "__id__": 190 }, "asset": { "__uuid__": "060c67fc-087c-45b5-8a09-ee63c3ebdd25", @@ -3393,11 +4185,11 @@ }, "fileId": "bdtesuqqNGPpKG+sSNpvIP", "instance": { - "__id__": 157 + "__id__": 192 }, "targetOverrides": [ { - "__id__": 165 + "__id__": 200 } ] }, @@ -3411,19 +4203,19 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 158 + "__id__": 193 }, { - "__id__": 160 + "__id__": 195 }, { - "__id__": 161 + "__id__": 196 }, { - "__id__": 162 + "__id__": 197 }, { - "__id__": 163 + "__id__": 198 } ], "removedComponents": [] @@ -3431,7 +4223,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 159 + "__id__": 194 }, "propertyPath": [ "_name" @@ -3447,7 +4239,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 159 + "__id__": 194 }, "propertyPath": [ "_lpos" @@ -3462,7 +4254,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 159 + "__id__": 194 }, "propertyPath": [ "_lrot" @@ -3478,7 +4270,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 159 + "__id__": 194 }, "propertyPath": [ "_euler" @@ -3493,7 +4285,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 164 + "__id__": 199 }, "propertyPath": [ "_contentSize" @@ -3518,10 +4310,10 @@ "petView" ], "target": { - "__id__": 166 + "__id__": 201 }, "targetInfo": { - "__id__": 167 + "__id__": 202 } }, { @@ -3540,11 +4332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 169 + "__id__": 204 }, "_contentSize": { "__type__": "cc.Size", @@ -3568,11 +4360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 93 + "__id__": 128 }, "_enabled": true, "__prefab": { - "__id__": 171 + "__id__": 206 }, "_resizeMode": 1, "_layoutType": 1, @@ -3619,30 +4411,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 127 }, "_children": [ { - "__id__": 174 + "__id__": 209 } ], "_active": true, "_components": [ { - "__id__": 182 + "__id__": 217 }, { - "__id__": 184 + "__id__": 219 }, { - "__id__": 186 + "__id__": 221 }, { - "__id__": 189 + "__id__": 224 } ], "_prefab": { - "__id__": 191 + "__id__": 226 }, "_lpos": { "__type__": "cc.Vec3", @@ -3679,23 +4471,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 173 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 210 }, { - "__id__": 177 + "__id__": 212 }, { - "__id__": 179 + "__id__": 214 } ], "_prefab": { - "__id__": 181 + "__id__": 216 }, "_lpos": { "__type__": "cc.Vec3", @@ -3732,11 +4524,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 176 + "__id__": 211 }, "_contentSize": { "__type__": "cc.Size", @@ -3760,11 +4552,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 178 + "__id__": 213 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3805,11 +4597,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 174 + "__id__": 209 }, "_enabled": true, "__prefab": { - "__id__": 180 + "__id__": 215 }, "_color": { "__type__": "cc.Color", @@ -3844,11 +4636,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 183 + "__id__": 218 }, "_contentSize": { "__type__": "cc.Size", @@ -3872,11 +4664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 185 + "__id__": 220 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -3917,15 +4709,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 187 + "__id__": 222 }, "clickEvents": [ { - "__id__": 188 + "__id__": 223 } ], "_interactable": true, @@ -3965,7 +4757,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 173 + "__id__": 208 }, "_id": "" }, @@ -3976,7 +4768,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 91 + "__id__": 126 }, "component": "", "_componentId": "00caayqUBZPVo/wpuvrmR6W", @@ -3989,11 +4781,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 173 + "__id__": 208 }, "_enabled": true, "__prefab": { - "__id__": 190 + "__id__": 225 }, "_alignFlags": 13, "_target": null, @@ -4038,30 +4830,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 92 + "__id__": 127 }, "_children": [ { - "__id__": 193 + "__id__": 228 } ], "_active": true, "_components": [ { - "__id__": 201 + "__id__": 236 }, { - "__id__": 203 + "__id__": 238 }, { - "__id__": 205 + "__id__": 240 }, { - "__id__": 208 + "__id__": 243 } ], "_prefab": { - "__id__": 210 + "__id__": 245 }, "_lpos": { "__type__": "cc.Vec3", @@ -4098,23 +4890,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 192 + "__id__": 227 }, "_children": [], "_active": true, "_components": [ { - "__id__": 194 + "__id__": 229 }, { - "__id__": 196 + "__id__": 231 }, { - "__id__": 198 + "__id__": 233 } ], "_prefab": { - "__id__": 200 + "__id__": 235 }, "_lpos": { "__type__": "cc.Vec3", @@ -4151,11 +4943,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 195 + "__id__": 230 }, "_contentSize": { "__type__": "cc.Size", @@ -4179,11 +4971,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 197 + "__id__": 232 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4224,11 +5016,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 193 + "__id__": 228 }, "_enabled": true, "__prefab": { - "__id__": 199 + "__id__": 234 }, "_color": { "__type__": "cc.Color", @@ -4263,11 +5055,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 202 + "__id__": 237 }, "_contentSize": { "__type__": "cc.Size", @@ -4291,11 +5083,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 204 + "__id__": 239 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4336,15 +5128,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 206 + "__id__": 241 }, "clickEvents": [ { - "__id__": 207 + "__id__": 242 } ], "_interactable": true, @@ -4384,7 +5176,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 192 + "__id__": 227 }, "_id": "" }, @@ -4395,7 +5187,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 91 + "__id__": 126 }, "component": "", "_componentId": "00caayqUBZPVo/wpuvrmR6W", @@ -4408,11 +5200,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 192 + "__id__": 227 }, "_enabled": true, "__prefab": { - "__id__": 209 + "__id__": 244 }, "_alignFlags": 37, "_target": null, @@ -4457,11 +5249,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 212 + "__id__": 247 }, "_contentSize": { "__type__": "cc.Size", @@ -4485,11 +5277,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 214 + "__id__": 249 }, "_type": 0, "_inverted": false, @@ -4507,11 +5299,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 216 + "__id__": 251 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4553,11 +5345,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 92 + "__id__": 127 }, "_enabled": true, "__prefab": { - "__id__": 218 + "__id__": 253 }, "_alignFlags": 45, "_target": null, @@ -4602,20 +5394,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 91 + "__id__": 126 }, "_children": [], "_active": false, "_components": [ { - "__id__": 221 + "__id__": 256 }, { - "__id__": 223 + "__id__": 258 } ], "_prefab": { - "__id__": 225 + "__id__": 260 }, "_lpos": { "__type__": "cc.Vec3", @@ -4652,11 +5444,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 222 + "__id__": 257 }, "_contentSize": { "__type__": "cc.Size", @@ -4680,11 +5472,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 220 + "__id__": 255 }, "_enabled": true, "__prefab": { - "__id__": 224 + "__id__": 259 }, "spacing": 10, "_spriteFrame": { @@ -4722,11 +5514,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 227 + "__id__": 262 }, "_contentSize": { "__type__": "cc.Size", @@ -4750,11 +5542,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 229 + "__id__": 264 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -4795,17 +5587,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 231 + "__id__": 266 }, "_alignFlags": 41, "_target": null, "_left": 0, "_right": 0, - "_top": 0, + "_top": 10, "_bottom": 35, "_horizontalCenter": 0, "_verticalCenter": 0, @@ -4831,11 +5623,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 233 + "__id__": 268 }, "bounceDuration": 1, "brake": 0.5, @@ -4846,7 +5638,7 @@ "cancelInnerEvents": true, "scrollEvents": [], "_content": { - "__id__": 93 + "__id__": 128 }, "_horizontalScrollBar": null, "_verticalScrollBar": null, @@ -4858,7 +5650,7 @@ "_scrollThreshold": 0.5, "_pageTurningEventTiming": 0.1, "_indicator": { - "__id__": 223 + "__id__": 258 }, "isStopMove": true, "_id": "" @@ -4873,17 +5665,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 235 + "__id__": 270 }, "leftButton": { - "__id__": 186 + "__id__": 221 }, "rightButton": { - "__id__": 205 + "__id__": 240 }, "_id": "" }, @@ -4897,17 +5689,17 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 91 + "__id__": 126 }, "_enabled": true, "__prefab": { - "__id__": 237 + "__id__": 272 }, "view": { - "__id__": 211 + "__id__": 246 }, "content": { - "__id__": 93 + "__id__": 128 }, "_id": "" }, @@ -4932,17 +5724,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 90 + "__id__": 125 }, "_prefab": { - "__id__": 240 + "__id__": 275 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 239 + "__id__": 274 }, "asset": { "__uuid__": "1368ab11-4f76-480d-852f-639c290c2446", @@ -4950,7 +5742,7 @@ }, "fileId": "0dwM6BvXxAIb2ADj9Thh37", "instance": { - "__id__": 241 + "__id__": 276 }, "targetOverrides": null }, @@ -4963,30 +5755,33 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 242 + "__id__": 277 } ], "propertyOverrides": [ { - "__id__": 246 + "__id__": 281 }, { - "__id__": 248 + "__id__": 283 }, { - "__id__": 249 + "__id__": 285 }, { - "__id__": 250 + "__id__": 287 }, { - "__id__": 251 + "__id__": 289 }, { - "__id__": 253 + "__id__": 291 }, { - "__id__": 254 + "__id__": 293 + }, + { + "__id__": 295 } ], "removedComponents": [] @@ -4994,11 +5789,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 243 + "__id__": 278 }, "components": [ { - "__id__": 244 + "__id__": 279 } ] }, @@ -5014,22 +5809,22 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 239 + "__id__": 274 } }, "node": { - "__id__": 239 + "__id__": 274 }, "_enabled": true, "__prefab": { - "__id__": 245 + "__id__": 280 }, - "_alignFlags": 1, + "_alignFlags": 4, "_target": null, "_left": 0, "_right": 0, "_top": 370, - "_bottom": 370, + "_bottom": 120, "_horizontalCenter": 0, "_verticalCenter": 0, "_isAbsLeft": true, @@ -5051,7 +5846,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 247 + "__id__": 282 }, "propertyPath": [ "_name" @@ -5067,7 +5862,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 247 + "__id__": 284 }, "propertyPath": [ "_lpos" @@ -5075,14 +5870,20 @@ "value": { "__type__": "cc.Vec3", "x": 0, - "y": -125, + "y": -135, "z": 0 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0dwM6BvXxAIb2ADj9Thh37" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 247 + "__id__": 286 }, "propertyPath": [ "_lrot" @@ -5095,10 +5896,16 @@ "w": 1 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0dwM6BvXxAIb2ADj9Thh37" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 247 + "__id__": 288 }, "propertyPath": [ "_euler" @@ -5110,10 +5917,16 @@ "z": 0 } }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "0dwM6BvXxAIb2ADj9Thh37" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 252 + "__id__": 290 }, "propertyPath": [ "clickEvents", @@ -5133,7 +5946,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 252 + "__id__": 292 }, "propertyPath": [ "clickEvents", @@ -5142,10 +5955,16 @@ ], "value": "b51bfKvsidNPKBbFirAFgQI" }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8aKEoy6fBFXIDxKkk6Hws8" + ] + }, { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 252 + "__id__": 294 }, "propertyPath": [ "clickEvents", @@ -5154,22 +5973,48 @@ ], "value": "onOpenChat" }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "8aKEoy6fBFXIDxKkk6Hws8" + ] + }, + { + "__type__": "CCPropertyOverrideInfo", + "targetInfo": { + "__id__": 296 + }, + "propertyPath": [ + "_contentSize" + ], + "value": { + "__type__": "cc.Size", + "width": 680, + "height": 50 + } + }, + { + "__type__": "cc.TargetInfo", + "localID": [ + "de48INVM5Dn703wxCA7KF8" + ] + }, { "__type__": "cc.UITransform", "_name": "", "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 256 + "__id__": 298 }, "_contentSize": { "__type__": "cc.Size", "width": 680, - "height": 540 + "height": 560 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5188,11 +6033,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 258 + "__id__": 300 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5233,11 +6078,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 90 + "__id__": 125 }, "_enabled": true, "__prefab": { - "__id__": 260 + "__id__": 302 }, "_alignFlags": 44, "_target": null, @@ -5282,32 +6127,32 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 10 + "__id__": 35 }, "_children": [ { - "__id__": 263 + "__id__": 305 } ], "_active": true, "_components": [ { - "__id__": 419 + "__id__": 461 }, { - "__id__": 421 + "__id__": 463 }, { - "__id__": 423 + "__id__": 465 } ], "_prefab": { - "__id__": 425 + "__id__": 467 }, "_lpos": { "__type__": "cc.Vec3", "x": 0, - "y": -300, + "y": -277.5, "z": 0 }, "_lrot": { @@ -5339,39 +6184,39 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 262 + "__id__": 304 }, "_children": [ { - "__id__": 264 + "__id__": 306 }, { - "__id__": 289 + "__id__": 331 }, { - "__id__": 314 + "__id__": 356 }, { - "__id__": 339 + "__id__": 381 }, { - "__id__": 364 + "__id__": 406 }, { - "__id__": 389 + "__id__": 431 } ], "_active": true, "_components": [ { - "__id__": 414 + "__id__": 456 }, { - "__id__": 416 + "__id__": 458 } ], "_prefab": { - "__id__": 418 + "__id__": 460 }, "_lpos": { "__type__": "cc.Vec3", @@ -5408,33 +6253,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 265 + "__id__": 307 }, { - "__id__": 271 + "__id__": 313 } ], "_active": true, "_components": [ { - "__id__": 279 + "__id__": 321 }, { - "__id__": 281 + "__id__": 323 }, { - "__id__": 283 + "__id__": 325 }, { - "__id__": 285 + "__id__": 327 } ], "_prefab": { - "__id__": 288 + "__id__": 330 }, "_lpos": { "__type__": "cc.Vec3", @@ -5471,20 +6316,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 264 + "__id__": 306 }, "_children": [], "_active": true, "_components": [ { - "__id__": 266 + "__id__": 308 }, { - "__id__": 268 + "__id__": 310 } ], "_prefab": { - "__id__": 270 + "__id__": 312 }, "_lpos": { "__type__": "cc.Vec3", @@ -5521,11 +6366,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 267 + "__id__": 309 }, "_contentSize": { "__type__": "cc.Size", @@ -5549,11 +6394,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 265 + "__id__": 307 }, "_enabled": true, "__prefab": { - "__id__": 269 + "__id__": 311 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5607,23 +6452,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 264 + "__id__": 306 }, "_children": [], "_active": true, "_components": [ { - "__id__": 272 + "__id__": 314 }, { - "__id__": 274 + "__id__": 316 }, { - "__id__": 276 + "__id__": 318 } ], "_prefab": { - "__id__": 278 + "__id__": 320 }, "_lpos": { "__type__": "cc.Vec3", @@ -5660,11 +6505,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 273 + "__id__": 315 }, "_contentSize": { "__type__": "cc.Size", @@ -5688,11 +6533,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 275 + "__id__": 317 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5733,11 +6578,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 271 + "__id__": 313 }, "_enabled": true, "__prefab": { - "__id__": 277 + "__id__": 319 }, "_color": { "__type__": "cc.Color", @@ -5772,11 +6617,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 280 + "__id__": 322 }, "_contentSize": { "__type__": "cc.Size", @@ -5800,11 +6645,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 282 + "__id__": 324 }, "_type": 1, "_inverted": false, @@ -5822,11 +6667,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 284 + "__id__": 326 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -5868,15 +6713,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 264 + "__id__": 306 }, "_enabled": true, "__prefab": { - "__id__": 286 + "__id__": 328 }, "clickEvents": [ { - "__id__": 287 + "__id__": 329 } ], "_interactable": true, @@ -5951,33 +6796,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 290 + "__id__": 332 }, { - "__id__": 296 + "__id__": 338 } ], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 346 }, { - "__id__": 306 + "__id__": 348 }, { - "__id__": 308 + "__id__": 350 }, { - "__id__": 310 + "__id__": 352 } ], "_prefab": { - "__id__": 313 + "__id__": 355 }, "_lpos": { "__type__": "cc.Vec3", @@ -6014,20 +6859,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 331 }, "_children": [], "_active": true, "_components": [ { - "__id__": 291 + "__id__": 333 }, { - "__id__": 293 + "__id__": 335 } ], "_prefab": { - "__id__": 295 + "__id__": 337 }, "_lpos": { "__type__": "cc.Vec3", @@ -6064,11 +6909,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 292 + "__id__": 334 }, "_contentSize": { "__type__": "cc.Size", @@ -6092,11 +6937,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 290 + "__id__": 332 }, "_enabled": true, "__prefab": { - "__id__": 294 + "__id__": 336 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6150,23 +6995,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 289 + "__id__": 331 }, "_children": [], "_active": true, "_components": [ { - "__id__": 297 + "__id__": 339 }, { - "__id__": 299 + "__id__": 341 }, { - "__id__": 301 + "__id__": 343 } ], "_prefab": { - "__id__": 303 + "__id__": 345 }, "_lpos": { "__type__": "cc.Vec3", @@ -6203,11 +7048,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 338 }, "_enabled": true, "__prefab": { - "__id__": 298 + "__id__": 340 }, "_contentSize": { "__type__": "cc.Size", @@ -6231,11 +7076,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 338 }, "_enabled": true, "__prefab": { - "__id__": 300 + "__id__": 342 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6276,11 +7121,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 296 + "__id__": 338 }, "_enabled": true, "__prefab": { - "__id__": 302 + "__id__": 344 }, "_color": { "__type__": "cc.Color", @@ -6315,11 +7160,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 305 + "__id__": 347 }, "_contentSize": { "__type__": "cc.Size", @@ -6343,11 +7188,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 307 + "__id__": 349 }, "_type": 1, "_inverted": false, @@ -6365,11 +7210,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 309 + "__id__": 351 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6411,15 +7256,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 289 + "__id__": 331 }, "_enabled": true, "__prefab": { - "__id__": 311 + "__id__": 353 }, "clickEvents": [ { - "__id__": 312 + "__id__": 354 } ], "_interactable": true, @@ -6494,33 +7339,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 315 + "__id__": 357 }, { - "__id__": 321 + "__id__": 363 } ], "_active": true, "_components": [ { - "__id__": 329 + "__id__": 371 }, { - "__id__": 331 + "__id__": 373 }, { - "__id__": 333 + "__id__": 375 }, { - "__id__": 335 + "__id__": 377 } ], "_prefab": { - "__id__": 338 + "__id__": 380 }, "_lpos": { "__type__": "cc.Vec3", @@ -6557,20 +7402,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 356 }, "_children": [], "_active": true, "_components": [ { - "__id__": 316 + "__id__": 358 }, { - "__id__": 318 + "__id__": 360 } ], "_prefab": { - "__id__": 320 + "__id__": 362 }, "_lpos": { "__type__": "cc.Vec3", @@ -6607,11 +7452,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 317 + "__id__": 359 }, "_contentSize": { "__type__": "cc.Size", @@ -6635,11 +7480,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 315 + "__id__": 357 }, "_enabled": true, "__prefab": { - "__id__": 319 + "__id__": 361 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6693,23 +7538,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 314 + "__id__": 356 }, "_children": [], "_active": true, "_components": [ { - "__id__": 322 + "__id__": 364 }, { - "__id__": 324 + "__id__": 366 }, { - "__id__": 326 + "__id__": 368 } ], "_prefab": { - "__id__": 328 + "__id__": 370 }, "_lpos": { "__type__": "cc.Vec3", @@ -6746,11 +7591,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 323 + "__id__": 365 }, "_contentSize": { "__type__": "cc.Size", @@ -6774,11 +7619,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 325 + "__id__": 367 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6819,11 +7664,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 321 + "__id__": 363 }, "_enabled": true, "__prefab": { - "__id__": 327 + "__id__": 369 }, "_color": { "__type__": "cc.Color", @@ -6858,11 +7703,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 330 + "__id__": 372 }, "_contentSize": { "__type__": "cc.Size", @@ -6886,11 +7731,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 332 + "__id__": 374 }, "_type": 1, "_inverted": false, @@ -6908,11 +7753,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 334 + "__id__": 376 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -6954,15 +7799,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 314 + "__id__": 356 }, "_enabled": true, "__prefab": { - "__id__": 336 + "__id__": 378 }, "clickEvents": [ { - "__id__": 337 + "__id__": 379 } ], "_interactable": true, @@ -7037,33 +7882,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 340 + "__id__": 382 }, { - "__id__": 346 + "__id__": 388 } ], "_active": true, "_components": [ { - "__id__": 354 + "__id__": 396 }, { - "__id__": 356 + "__id__": 398 }, { - "__id__": 358 + "__id__": 400 }, { - "__id__": 360 + "__id__": 402 } ], "_prefab": { - "__id__": 363 + "__id__": 405 }, "_lpos": { "__type__": "cc.Vec3", @@ -7100,20 +7945,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 381 }, "_children": [], "_active": true, "_components": [ { - "__id__": 341 + "__id__": 383 }, { - "__id__": 343 + "__id__": 385 } ], "_prefab": { - "__id__": 345 + "__id__": 387 }, "_lpos": { "__type__": "cc.Vec3", @@ -7150,11 +7995,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 342 + "__id__": 384 }, "_contentSize": { "__type__": "cc.Size", @@ -7178,11 +8023,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 340 + "__id__": 382 }, "_enabled": true, "__prefab": { - "__id__": 344 + "__id__": 386 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7236,23 +8081,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 339 + "__id__": 381 }, "_children": [], "_active": true, "_components": [ { - "__id__": 347 + "__id__": 389 }, { - "__id__": 349 + "__id__": 391 }, { - "__id__": 351 + "__id__": 393 } ], "_prefab": { - "__id__": 353 + "__id__": 395 }, "_lpos": { "__type__": "cc.Vec3", @@ -7289,11 +8134,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 348 + "__id__": 390 }, "_contentSize": { "__type__": "cc.Size", @@ -7317,11 +8162,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 350 + "__id__": 392 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7362,11 +8207,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 346 + "__id__": 388 }, "_enabled": true, "__prefab": { - "__id__": 352 + "__id__": 394 }, "_color": { "__type__": "cc.Color", @@ -7401,11 +8246,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 355 + "__id__": 397 }, "_contentSize": { "__type__": "cc.Size", @@ -7429,11 +8274,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 357 + "__id__": 399 }, "_type": 1, "_inverted": false, @@ -7451,11 +8296,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 359 + "__id__": 401 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7497,15 +8342,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 339 + "__id__": 381 }, "_enabled": true, "__prefab": { - "__id__": 361 + "__id__": 403 }, "clickEvents": [ { - "__id__": 362 + "__id__": 404 } ], "_interactable": true, @@ -7580,33 +8425,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 365 + "__id__": 407 }, { - "__id__": 371 + "__id__": 413 } ], "_active": true, "_components": [ { - "__id__": 379 + "__id__": 421 }, { - "__id__": 381 + "__id__": 423 }, { - "__id__": 383 + "__id__": 425 }, { - "__id__": 385 + "__id__": 427 } ], "_prefab": { - "__id__": 388 + "__id__": 430 }, "_lpos": { "__type__": "cc.Vec3", @@ -7643,20 +8488,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 364 + "__id__": 406 }, "_children": [], "_active": true, "_components": [ { - "__id__": 366 + "__id__": 408 }, { - "__id__": 368 + "__id__": 410 } ], "_prefab": { - "__id__": 370 + "__id__": 412 }, "_lpos": { "__type__": "cc.Vec3", @@ -7693,11 +8538,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 365 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 367 + "__id__": 409 }, "_contentSize": { "__type__": "cc.Size", @@ -7721,11 +8566,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 365 + "__id__": 407 }, "_enabled": true, "__prefab": { - "__id__": 369 + "__id__": 411 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7779,23 +8624,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 364 + "__id__": 406 }, "_children": [], "_active": true, "_components": [ { - "__id__": 372 + "__id__": 414 }, { - "__id__": 374 + "__id__": 416 }, { - "__id__": 376 + "__id__": 418 } ], "_prefab": { - "__id__": 378 + "__id__": 420 }, "_lpos": { "__type__": "cc.Vec3", @@ -7832,11 +8677,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 373 + "__id__": 415 }, "_contentSize": { "__type__": "cc.Size", @@ -7860,11 +8705,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 375 + "__id__": 417 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -7905,11 +8750,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 371 + "__id__": 413 }, "_enabled": true, "__prefab": { - "__id__": 377 + "__id__": 419 }, "_color": { "__type__": "cc.Color", @@ -7944,11 +8789,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 380 + "__id__": 422 }, "_contentSize": { "__type__": "cc.Size", @@ -7972,11 +8817,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 382 + "__id__": 424 }, "_type": 1, "_inverted": false, @@ -7994,11 +8839,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 384 + "__id__": 426 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8040,15 +8885,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 364 + "__id__": 406 }, "_enabled": true, "__prefab": { - "__id__": 386 + "__id__": 428 }, "clickEvents": [ { - "__id__": 387 + "__id__": 429 } ], "_interactable": true, @@ -8123,33 +8968,33 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 263 + "__id__": 305 }, "_children": [ { - "__id__": 390 + "__id__": 432 }, { - "__id__": 396 + "__id__": 438 } ], "_active": true, "_components": [ { - "__id__": 404 + "__id__": 446 }, { - "__id__": 406 + "__id__": 448 }, { - "__id__": 408 + "__id__": 450 }, { - "__id__": 410 + "__id__": 452 } ], "_prefab": { - "__id__": 413 + "__id__": 455 }, "_lpos": { "__type__": "cc.Vec3", @@ -8186,20 +9031,20 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 431 }, "_children": [], "_active": true, "_components": [ { - "__id__": 391 + "__id__": 433 }, { - "__id__": 393 + "__id__": 435 } ], "_prefab": { - "__id__": 395 + "__id__": 437 }, "_lpos": { "__type__": "cc.Vec3", @@ -8236,11 +9081,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 392 + "__id__": 434 }, "_contentSize": { "__type__": "cc.Size", @@ -8264,11 +9109,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 390 + "__id__": 432 }, "_enabled": true, "__prefab": { - "__id__": 394 + "__id__": 436 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8322,23 +9167,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 389 + "__id__": 431 }, "_children": [], "_active": true, "_components": [ { - "__id__": 397 + "__id__": 439 }, { - "__id__": 399 + "__id__": 441 }, { - "__id__": 401 + "__id__": 443 } ], "_prefab": { - "__id__": 403 + "__id__": 445 }, "_lpos": { "__type__": "cc.Vec3", @@ -8375,11 +9220,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 398 + "__id__": 440 }, "_contentSize": { "__type__": "cc.Size", @@ -8403,11 +9248,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 400 + "__id__": 442 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8448,11 +9293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 396 + "__id__": 438 }, "_enabled": true, "__prefab": { - "__id__": 402 + "__id__": 444 }, "_color": { "__type__": "cc.Color", @@ -8487,11 +9332,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 405 + "__id__": 447 }, "_contentSize": { "__type__": "cc.Size", @@ -8515,11 +9360,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 407 + "__id__": 449 }, "_type": 1, "_inverted": false, @@ -8537,11 +9382,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 409 + "__id__": 451 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8583,15 +9428,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 389 + "__id__": 431 }, "_enabled": true, "__prefab": { - "__id__": 411 + "__id__": 453 }, "clickEvents": [ { - "__id__": 412 + "__id__": 454 } ], "_interactable": true, @@ -8666,11 +9511,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 415 + "__id__": 457 }, "_contentSize": { "__type__": "cc.Size", @@ -8694,11 +9539,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 263 + "__id__": 305 }, "_enabled": true, "__prefab": { - "__id__": 417 + "__id__": 459 }, "_resizeMode": 1, "_layoutType": 1, @@ -8745,11 +9590,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 420 + "__id__": 462 }, "_contentSize": { "__type__": "cc.Size", @@ -8773,11 +9618,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 422 + "__id__": 464 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8818,11 +9663,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 262 + "__id__": 304 }, "_enabled": true, "__prefab": { - "__id__": 424 + "__id__": 466 }, "_alignFlags": 44, "_target": null, @@ -8861,6 +9706,151 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": null }, + { + "__type__": "cc.UITransform", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 469 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 680, + "height": 675 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "adzJlbkk1EjKqhT17SEPG1" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 471 + }, + "_alignFlags": 45, + "_target": null, + "_left": 0, + "_right": 0, + "_top": 45, + "_bottom": 0, + "_horizontalCenter": 0, + "_verticalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_alignMode": 2, + "_lockFlags": 0, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "060HuYhgRCVqdchX5dKJMK" + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 473 + }, + "_type": 0, + "_inverted": false, + "_segments": 64, + "_alphaThreshold": 0.1, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "54/Tru9ZZAK749jiQY5q1y" + }, + { + "__type__": "cc.Graphics", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 35 + }, + "_enabled": true, + "__prefab": { + "__id__": 475 + }, + "_customMaterial": null, + "_srcBlendFactor": 2, + "_dstBlendFactor": 4, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_lineWidth": 1, + "_strokeColor": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_lineJoin": 2, + "_lineCap": 0, + "_fillColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 0 + }, + "_miterLimit": 10, + "_id": "" + }, + { + "__type__": "cc.CompPrefabInfo", + "fileId": "29y3sEONVBpLT/kC6IfQeC" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4f5LGfbn9KLbI1qIu7ku5d", + "instance": null, + "targetOverrides": null, + "nestedPrefabInstanceRoots": null + }, { "__type__": "cc.UITransform", "_name": "", @@ -8871,7 +9861,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 427 + "__id__": 478 }, "_contentSize": { "__type__": "cc.Size", @@ -8899,7 +9889,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 429 + "__id__": 480 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -8944,7 +9934,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 431 + "__id__": 482 }, "_alignFlags": 32, "_target": null, @@ -8993,26 +9983,26 @@ }, "_children": [ { - "__id__": 434 + "__id__": 485 }, { - "__id__": 442 + "__id__": 493 }, { - "__id__": 458 + "__id__": 509 } ], "_active": true, "_components": [ { - "__id__": 571 + "__id__": 622 }, { - "__id__": 573 + "__id__": 624 } ], "_prefab": { - "__id__": 575 + "__id__": 626 }, "_lpos": { "__type__": "cc.Vec3", @@ -9049,23 +10039,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 433 + "__id__": 484 }, "_children": [], "_active": true, "_components": [ { - "__id__": 435 + "__id__": 486 }, { - "__id__": 437 + "__id__": 488 }, { - "__id__": 439 + "__id__": 490 } ], "_prefab": { - "__id__": 441 + "__id__": 492 }, "_lpos": { "__type__": "cc.Vec3", @@ -9102,11 +10092,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 436 + "__id__": 487 }, "_contentSize": { "__type__": "cc.Size", @@ -9130,11 +10120,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 438 + "__id__": 489 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9175,11 +10165,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 434 + "__id__": 485 }, "_enabled": true, "__prefab": { - "__id__": 440 + "__id__": 491 }, "_alignFlags": 45, "_target": null, @@ -9224,27 +10214,27 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 433 + "__id__": 484 }, "_children": [ { - "__id__": 443 + "__id__": 494 } ], "_active": true, "_components": [ { - "__id__": 451 + "__id__": 502 }, { - "__id__": 453 + "__id__": 504 }, { - "__id__": 455 + "__id__": 506 } ], "_prefab": { - "__id__": 457 + "__id__": 508 }, "_lpos": { "__type__": "cc.Vec3", @@ -9281,23 +10271,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 442 + "__id__": 493 }, "_children": [], "_active": true, "_components": [ { - "__id__": 444 + "__id__": 495 }, { - "__id__": 446 + "__id__": 497 }, { - "__id__": 448 + "__id__": 499 } ], "_prefab": { - "__id__": 450 + "__id__": 501 }, "_lpos": { "__type__": "cc.Vec3", @@ -9334,11 +10324,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 445 + "__id__": 496 }, "_contentSize": { "__type__": "cc.Size", @@ -9362,11 +10352,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 447 + "__id__": 498 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9407,11 +10397,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 443 + "__id__": 494 }, "_enabled": true, "__prefab": { - "__id__": 449 + "__id__": 500 }, "_color": { "__type__": "cc.Color", @@ -9446,11 +10436,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 452 + "__id__": 503 }, "_contentSize": { "__type__": "cc.Size", @@ -9474,11 +10464,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 454 + "__id__": 505 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -9519,11 +10509,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 442 + "__id__": 493 }, "_enabled": true, "__prefab": { - "__id__": 456 + "__id__": 507 }, "_alignFlags": 41, "_target": null, @@ -9568,37 +10558,37 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 433 + "__id__": 484 }, "_children": [ { - "__id__": 459 + "__id__": 510 }, { - "__id__": 478 + "__id__": 529 } ], "_active": true, "_components": [ { - "__id__": 562 + "__id__": 613 }, { - "__id__": 564 + "__id__": 615 }, { - "__id__": 566 + "__id__": 617 }, { - "__id__": 568 + "__id__": 619 } ], "_prefab": { - "__id__": 570 + "__id__": 621 }, "_lpos": { "__type__": "cc.Vec3", - "x": 0, + "x": -2.5, "y": -22.5, "z": 0 }, @@ -9631,21 +10621,21 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 458 + "__id__": 509 }, "_children": [ { - "__id__": 460 + "__id__": 511 } ], "_active": true, "_components": [ { - "__id__": 475 + "__id__": 526 } ], "_prefab": { - "__id__": 477 + "__id__": 528 }, "_lpos": { "__type__": "cc.Vec3", @@ -9662,8 +10652,8 @@ }, "_lscale": { "__type__": "cc.Vec3", - "x": 1.4, - "y": 1.4, + "x": 1, + "y": 1, "z": 1 }, "_mobility": 0, @@ -9680,17 +10670,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 459 + "__id__": 510 }, "_prefab": { - "__id__": 461 + "__id__": 512 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 460 + "__id__": 511 }, "asset": { "__uuid__": "1ee4a519-c5ef-453c-98d6-9940781b6fcc", @@ -9698,7 +10688,7 @@ }, "fileId": "64PJYFWgBDZrEsaiYwZxmh", "instance": { - "__id__": 462 + "__id__": 513 }, "targetOverrides": null }, @@ -9712,22 +10702,22 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 463 + "__id__": 514 }, { - "__id__": 465 + "__id__": 516 }, { - "__id__": 467 + "__id__": 518 }, { - "__id__": 469 + "__id__": 520 }, { - "__id__": 471 + "__id__": 522 }, { - "__id__": 473 + "__id__": 524 } ], "removedComponents": [] @@ -9735,7 +10725,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 464 + "__id__": 515 }, "propertyPath": [ "_name" @@ -9751,7 +10741,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 466 + "__id__": 517 }, "propertyPath": [ "_lpos" @@ -9772,7 +10762,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 468 + "__id__": 519 }, "propertyPath": [ "_lrot" @@ -9794,7 +10784,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 470 + "__id__": 521 }, "propertyPath": [ "_euler" @@ -9815,7 +10805,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 472 + "__id__": 523 }, "propertyPath": [ "_lscale" @@ -9836,7 +10826,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 474 + "__id__": 525 }, "propertyPath": [ "_contentSize" @@ -9859,11 +10849,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 459 + "__id__": 510 }, "_enabled": true, "__prefab": { - "__id__": 476 + "__id__": 527 }, "_contentSize": { "__type__": "cc.Size", @@ -9890,6 +10880,8 @@ "__id__": 0 }, "fileId": "aag23Igl9O4bW13vJTR2V6", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -9898,36 +10890,36 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 458 + "__id__": 509 }, "_children": [ { - "__id__": 479 + "__id__": 530 }, { - "__id__": 487 + "__id__": 538 }, { - "__id__": 506 + "__id__": 557 }, { - "__id__": 525 + "__id__": 576 }, { - "__id__": 533 + "__id__": 584 } ], "_active": true, "_components": [ { - "__id__": 557 + "__id__": 608 }, { - "__id__": 559 + "__id__": 610 } ], "_prefab": { - "__id__": 561 + "__id__": 612 }, "_lpos": { "__type__": "cc.Vec3", @@ -9962,17 +10954,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 478 + "__id__": 529 }, "_prefab": { - "__id__": 480 + "__id__": 531 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 479 + "__id__": 530 }, "asset": { "__uuid__": "c9df301b-3532-4bbd-8d7e-d0620db322a0", @@ -9980,7 +10972,7 @@ }, "fileId": "9eultbNU5HCLypkPXqoRGA", "instance": { - "__id__": 481 + "__id__": 532 }, "targetOverrides": null }, @@ -9994,16 +10986,16 @@ "mountedComponents": [], "propertyOverrides": [ { - "__id__": 482 + "__id__": 533 }, { - "__id__": 484 + "__id__": 535 }, { - "__id__": 485 + "__id__": 536 }, { - "__id__": 486 + "__id__": 537 } ], "removedComponents": [] @@ -10011,7 +11003,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 534 }, "propertyPath": [ "_name" @@ -10027,7 +11019,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 534 }, "propertyPath": [ "_lpos" @@ -10042,7 +11034,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 534 }, "propertyPath": [ "_lrot" @@ -10058,7 +11050,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 483 + "__id__": 534 }, "propertyPath": [ "_euler" @@ -10076,30 +11068,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 478 + "__id__": 529 }, "_children": [ { - "__id__": 488 + "__id__": 539 } ], "_active": true, "_components": [ { - "__id__": 496 + "__id__": 547 }, { - "__id__": 498 + "__id__": 549 }, { - "__id__": 500 + "__id__": 551 }, { - "__id__": 503 + "__id__": 554 } ], "_prefab": { - "__id__": 505 + "__id__": 556 }, "_lpos": { "__type__": "cc.Vec3", @@ -10136,23 +11128,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 487 + "__id__": 538 }, "_children": [], "_active": true, "_components": [ { - "__id__": 489 + "__id__": 540 }, { - "__id__": 491 + "__id__": 542 }, { - "__id__": 493 + "__id__": 544 } ], "_prefab": { - "__id__": 495 + "__id__": 546 }, "_lpos": { "__type__": "cc.Vec3", @@ -10189,11 +11181,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 539 }, "_enabled": true, "__prefab": { - "__id__": 490 + "__id__": 541 }, "_contentSize": { "__type__": "cc.Size", @@ -10217,11 +11209,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 539 }, "_enabled": true, "__prefab": { - "__id__": 492 + "__id__": 543 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10262,11 +11254,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 488 + "__id__": 539 }, "_enabled": true, "__prefab": { - "__id__": 494 + "__id__": 545 }, "_color": { "__type__": "cc.Color", @@ -10301,11 +11293,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 497 + "__id__": 548 }, "_contentSize": { "__type__": "cc.Size", @@ -10329,11 +11321,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 499 + "__id__": 550 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10374,15 +11366,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 501 + "__id__": 552 }, "clickEvents": [ { - "__id__": 502 + "__id__": 553 } ], "_interactable": true, @@ -10434,7 +11426,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 487 + "__id__": 538 }, "_id": "" }, @@ -10458,11 +11450,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 487 + "__id__": 538 }, "_enabled": true, "__prefab": { - "__id__": 504 + "__id__": 555 }, "_alignFlags": 1, "_target": null, @@ -10507,30 +11499,30 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 478 + "__id__": 529 }, "_children": [ { - "__id__": 507 + "__id__": 558 } ], "_active": true, "_components": [ { - "__id__": 515 + "__id__": 566 }, { - "__id__": 517 + "__id__": 568 }, { - "__id__": 519 + "__id__": 570 }, { - "__id__": 522 + "__id__": 573 } ], "_prefab": { - "__id__": 524 + "__id__": 575 }, "_lpos": { "__type__": "cc.Vec3", @@ -10567,23 +11559,23 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 506 + "__id__": 557 }, "_children": [], "_active": true, "_components": [ { - "__id__": 508 + "__id__": 559 }, { - "__id__": 510 + "__id__": 561 }, { - "__id__": 512 + "__id__": 563 } ], "_prefab": { - "__id__": 514 + "__id__": 565 }, "_lpos": { "__type__": "cc.Vec3", @@ -10620,11 +11612,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 509 + "__id__": 560 }, "_contentSize": { "__type__": "cc.Size", @@ -10648,11 +11640,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 511 + "__id__": 562 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10693,11 +11685,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 507 + "__id__": 558 }, "_enabled": true, "__prefab": { - "__id__": 513 + "__id__": 564 }, "_color": { "__type__": "cc.Color", @@ -10732,11 +11724,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 516 + "__id__": 567 }, "_contentSize": { "__type__": "cc.Size", @@ -10760,11 +11752,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 518 + "__id__": 569 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -10805,15 +11797,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 520 + "__id__": 571 }, "clickEvents": [ { - "__id__": 521 + "__id__": 572 } ], "_interactable": true, @@ -10865,7 +11857,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 506 + "__id__": 557 }, "_id": "" }, @@ -10889,11 +11881,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 506 + "__id__": 557 }, "_enabled": true, "__prefab": { - "__id__": 523 + "__id__": 574 }, "_alignFlags": 1, "_target": null, @@ -10938,23 +11930,23 @@ "_objFlags": 0, "__editorExtras__": {}, "_parent": { - "__id__": 478 + "__id__": 529 }, "_children": [], "_active": true, "_components": [ { - "__id__": 526 + "__id__": 577 }, { - "__id__": 528 + "__id__": 579 }, { - "__id__": 530 + "__id__": 581 } ], "_prefab": { - "__id__": 532 + "__id__": 583 }, "_lpos": { "__type__": "cc.Vec3", @@ -10991,11 +11983,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 527 + "__id__": 578 }, "_contentSize": { "__type__": "cc.Size", @@ -11019,11 +12011,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 529 + "__id__": 580 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11064,11 +12056,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 525 + "__id__": 576 }, "_enabled": true, "__prefab": { - "__id__": 531 + "__id__": 582 }, "_color": { "__type__": "cc.Color", @@ -11101,17 +12093,17 @@ "__type__": "cc.Node", "_objFlags": 0, "_parent": { - "__id__": 478 + "__id__": 529 }, "_prefab": { - "__id__": 534 + "__id__": 585 }, "__editorExtras__": {} }, { "__type__": "cc.PrefabInfo", "root": { - "__id__": 533 + "__id__": 584 }, "asset": { "__uuid__": "a9053170-1055-4272-b3fd-ad6fa75b5f25", @@ -11119,7 +12111,7 @@ }, "fileId": "cfqtEvOKpHO7NzoHh8DAIM", "instance": { - "__id__": 535 + "__id__": 586 }, "targetOverrides": null }, @@ -11132,39 +12124,39 @@ "mountedChildren": [], "mountedComponents": [ { - "__id__": 536 + "__id__": 587 } ], "propertyOverrides": [ { - "__id__": 540 + "__id__": 591 }, { - "__id__": 542 + "__id__": 593 }, { - "__id__": 543 + "__id__": 594 }, { - "__id__": 544 + "__id__": 595 }, { - "__id__": 545 + "__id__": 596 }, { - "__id__": 547 + "__id__": 598 }, { - "__id__": 549 + "__id__": 600 }, { - "__id__": 551 + "__id__": 602 }, { - "__id__": 553 + "__id__": 604 }, { - "__id__": 555 + "__id__": 606 } ], "removedComponents": [] @@ -11172,11 +12164,11 @@ { "__type__": "cc.MountedComponentsInfo", "targetInfo": { - "__id__": 537 + "__id__": 588 }, "components": [ { - "__id__": 538 + "__id__": 589 } ] }, @@ -11192,15 +12184,15 @@ "_objFlags": 0, "__editorExtras__": { "mountedRoot": { - "__id__": 533 + "__id__": 584 } }, "node": { - "__id__": 533 + "__id__": 584 }, "_enabled": true, "__prefab": { - "__id__": 539 + "__id__": 590 }, "_alignFlags": 44, "_target": null, @@ -11229,7 +12221,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 592 }, "propertyPath": [ "_name" @@ -11245,7 +12237,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 592 }, "propertyPath": [ "_lpos" @@ -11260,7 +12252,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 592 }, "propertyPath": [ "_lrot" @@ -11276,7 +12268,7 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 541 + "__id__": 592 }, "propertyPath": [ "_euler" @@ -11291,14 +12283,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 546 + "__id__": 597 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 600, + "width": 595, "height": 120 } }, @@ -11311,14 +12303,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 548 + "__id__": 599 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -240, + "x": -237.5, "y": 0, "z": 0 } @@ -11332,14 +12324,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 550 + "__id__": 601 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 360, + "width": 355, "height": 120 } }, @@ -11352,14 +12344,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 552 + "__id__": 603 }, "propertyPath": [ "_contentSize" ], "value": { "__type__": "cc.Size", - "width": 360, + "width": 355, "height": 120 } }, @@ -11372,14 +12364,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 554 + "__id__": 605 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": -180, + "x": -177.5, "y": 0, "z": 0 } @@ -11393,14 +12385,14 @@ { "__type__": "CCPropertyOverrideInfo", "targetInfo": { - "__id__": 556 + "__id__": 607 }, "propertyPath": [ "_lpos" ], "value": { "__type__": "cc.Vec3", - "x": 240, + "x": 237.5, "y": 0, "z": 0 } @@ -11417,15 +12409,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 558 + "__id__": 609 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, + "width": 595, "height": 675 }, "_anchorPoint": { @@ -11445,11 +12437,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 478 + "__id__": 529 }, "_enabled": true, "__prefab": { - "__id__": 560 + "__id__": 611 }, "_alignFlags": 45, "_target": null, @@ -11494,15 +12486,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 563 + "__id__": 614 }, "_contentSize": { "__type__": "cc.Size", - "width": 600, + "width": 595, "height": 675 }, "_anchorPoint": { @@ -11522,16 +12514,16 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 565 + "__id__": 616 }, "_alignFlags": 45, "_target": null, "_left": 0, - "_right": 0, + "_right": 5, "_top": 45, "_bottom": 0, "_horizontalCenter": 0, @@ -11558,11 +12550,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 567 + "__id__": 618 }, "_type": 0, "_inverted": false, @@ -11580,11 +12572,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 458 + "__id__": 509 }, "_enabled": true, "__prefab": { - "__id__": 569 + "__id__": 620 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11639,11 +12631,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 572 + "__id__": 623 }, "_contentSize": { "__type__": "cc.Size", @@ -11667,11 +12659,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 433 + "__id__": 484 }, "_enabled": true, "__prefab": { - "__id__": 574 + "__id__": 625 }, "_alignFlags": 45, "_target": null, @@ -11720,26 +12712,26 @@ }, "_children": [ { - "__id__": 577 + "__id__": 628 } ], "_active": true, "_components": [ { - "__id__": 583 + "__id__": 634 }, { - "__id__": 585 + "__id__": 636 }, { - "__id__": 587 + "__id__": 638 }, { - "__id__": 590 + "__id__": 641 } ], "_prefab": { - "__id__": 592 + "__id__": 643 }, "_lpos": { "__type__": "cc.Vec3", @@ -11776,20 +12768,20 @@ "_objFlags": 512, "__editorExtras__": {}, "_parent": { - "__id__": 576 + "__id__": 627 }, "_children": [], "_active": true, "_components": [ { - "__id__": 578 + "__id__": 629 }, { - "__id__": 580 + "__id__": 631 } ], "_prefab": { - "__id__": 582 + "__id__": 633 }, "_lpos": { "__type__": "cc.Vec3", @@ -11826,11 +12818,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 579 + "__id__": 630 }, "_contentSize": { "__type__": "cc.Size", @@ -11854,11 +12846,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 577 + "__id__": 628 }, "_enabled": true, "__prefab": { - "__id__": 581 + "__id__": 632 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11912,11 +12904,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 584 + "__id__": 635 }, "_contentSize": { "__type__": "cc.Size", @@ -11940,11 +12932,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 586 + "__id__": 637 }, "_customMaterial": null, "_srcBlendFactor": 2, @@ -11985,15 +12977,15 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 588 + "__id__": 639 }, "clickEvents": [ { - "__id__": 589 + "__id__": 640 } ], "_interactable": true, @@ -12045,7 +13037,7 @@ "_duration": 0.1, "_zoomScale": 1.2, "_target": { - "__id__": 576 + "__id__": 627 }, "_id": "" }, @@ -12069,11 +13061,11 @@ "_objFlags": 0, "__editorExtras__": {}, "node": { - "__id__": 576 + "__id__": 627 }, "_enabled": true, "__prefab": { - "__id__": 591 + "__id__": 642 }, "_alignFlags": 8, "_target": null, @@ -12122,7 +13114,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 594 + "__id__": 645 }, "_contentSize": { "__type__": "cc.Size", @@ -12150,7 +13142,7 @@ }, "_enabled": true, "__prefab": { - "__id__": 596 + "__id__": 647 }, "_alignFlags": 45, "_target": null, @@ -12186,16 +13178,16 @@ }, "_enabled": true, "__prefab": { - "__id__": 598 + "__id__": 649 }, "mask": false, "maskOpcity": 80, "isClickMaskeClose": false, "onHookLabel": { - "__id__": 113 + "__id__": 148 }, "nextLevelBtn": { - "__id__": 500 + "__id__": 551 }, "_id": "" }, @@ -12216,25 +13208,25 @@ "targetOverrides": null, "nestedPrefabInstanceRoots": [ { - "__id__": 533 + "__id__": 584 }, { - "__id__": 479 + "__id__": 530 }, { - "__id__": 460 + "__id__": 511 }, { - "__id__": 239 + "__id__": 274 }, { - "__id__": 155 + "__id__": 190 }, { - "__id__": 95 + "__id__": 130 }, { - "__id__": 11 + "__id__": 36 } ] } diff --git a/JisolGameCocos/assets/resources/prefab/ui/商店/商店礼包.prefab b/JisolGameCocos/assets/resources/prefab/ui/商店/商店礼包.prefab index d0f87e16..981d252a 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/商店/商店礼包.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/商店/商店礼包.prefab @@ -1119,8 +1119,8 @@ "_string": "购买", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 26, - "_fontSize": 26, + "_actualFontSize": 22, + "_fontSize": 22, "_fontFamily": "Arial", "_lineHeight": 40, "_overflow": 1, @@ -1439,6 +1439,9 @@ "giftLimit": { "__id__": 39 }, + "giftPrice": { + "__id__": 48 + }, "views": { "__id__": 33 }, diff --git a/JisolGameCocos/assets/resources/prefab/ui/商店/商店页面.prefab b/JisolGameCocos/assets/resources/prefab/ui/商店/商店页面.prefab index 59df7541..6e6ee4aa 100644 --- a/JisolGameCocos/assets/resources/prefab/ui/商店/商店页面.prefab +++ b/JisolGameCocos/assets/resources/prefab/ui/商店/商店页面.prefab @@ -1482,7 +1482,7 @@ "b": 255, "a": 255 }, - "_string": "兑换\n商城", + "_string": "点卷\n商城", "_horizontalAlign": 1, "_verticalAlign": 1, "_actualFontSize": 24, @@ -1702,10 +1702,12 @@ }, { "__type__": "cc.ClickEvent", - "target": null, + "target": { + "__id__": 1 + }, "component": "", - "_componentId": "b51bfKvsidNPKBbFirAFgQI", - "handler": "onClickShop", + "_componentId": "eb3d97OVbpKJIEDdbauLD9N", + "handler": "onClickTigs", "customEventData": "" }, { @@ -2243,10 +2245,12 @@ }, { "__type__": "cc.ClickEvent", - "target": null, + "target": { + "__id__": 1 + }, "component": "", - "_componentId": "b51bfKvsidNPKBbFirAFgQI", - "handler": "onClickShop", + "_componentId": "eb3d97OVbpKJIEDdbauLD9N", + "handler": "onClickTigs", "customEventData": "" }, { @@ -2337,6 +2341,8 @@ "__id__": 0 }, "fileId": "65LU7XwHdBEp0gEjbdLCNL", + "instance": null, + "targetOverrides": null, "nestedPrefabInstanceRoots": null }, { @@ -2665,6 +2671,9 @@ "views": { "__id__": 37 }, + "tigs": { + "__id__": 48 + }, "_id": "" }, { diff --git a/JisolGameCocos/assets/script/App.ts b/JisolGameCocos/assets/script/App.ts index 5b024b25..7920a778 100644 --- a/JisolGameCocos/assets/script/App.ts +++ b/JisolGameCocos/assets/script/App.ts @@ -32,10 +32,10 @@ import { Component } from "cc"; // let WsPath = `ws://localhost:8080/websocket` // let APIPath = `http://192.168.1.23:8080` // let WsPath = `ws://192.168.1.23:8080/websocket` -let APIPath = `http://192.168.0.118:8080` -let WsPath = `ws://192.168.0.118:8080/websocket` -// let APIPath = `https://api.pet.jisol.cn` -// let WsPath = `wss://api.pet.jisol.cn/websocket` +// let APIPath = `http://192.168.0.118:8080` +// let WsPath = `ws://192.168.0.118:8080/websocket` +let APIPath = `https://api.pet.jisol.cn` +let WsPath = `wss://api.pet.jisol.cn/websocket` //重写UI class JNGLayer extends JNLayer{ diff --git a/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts index c66db3e8..48637c39 100644 --- a/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts +++ b/JisolGameCocos/assets/script/battle/modes/default/GNormalModeBase.ts @@ -66,7 +66,7 @@ export default class GNormalModeBase extends GDefaultMode{ //调整相机 this.camera.enabled = true; let camreaPos = this.camera.node.worldPosition; - this.camera.node.worldPosition = v3(0,450,camreaPos.z) + this.camera.node.worldPosition = v3(0,400,camreaPos.z) } //获取配置 diff --git a/JisolGameCocos/assets/script/config/data/schema.ts b/JisolGameCocos/assets/script/config/data/schema.ts index 2d8d1081..1562dbb3 100644 --- a/JisolGameCocos/assets/script/config/data/schema.ts +++ b/JisolGameCocos/assets/script/config/data/schema.ts @@ -1212,18 +1212,14 @@ export namespace TB { export class TbGShop { constructor(_json_: any) { - if (_json_.id === undefined) { throw new Error() } - this.id = _json_.id if (_json_.tig === undefined) { throw new Error() } this.tig = _json_.tig if (_json_.giftId === undefined) { throw new Error() } this.giftId = _json_.giftId + if (_json_.type === undefined) { throw new Error() } + this.type = _json_.type } - /** - * id - */ - readonly id: number /** * 备注 */ @@ -1232,6 +1228,10 @@ export class TbGShop { * 礼包Id */ readonly giftId: number + /** + * 0.点卷商店 1.金币商店 + */ + readonly type: number resolve(tables:Tables) { @@ -2012,23 +2012,23 @@ export class TbGGift{ export class TbGShop{ - private _dataMap: Map + private _dataMap: Map private _dataList: TB.TbGShop[] constructor(_json_: any) { - this._dataMap = new Map() + this._dataMap = new Map() this._dataList = [] for(var _json2_ of _json_) { let _v: TB.TbGShop _v = new TB.TbGShop(_json2_) this._dataList.push(_v) - this._dataMap.set(_v.id, _v) + this._dataMap.set(_v.tig, _v) } } - getDataMap(): Map { return this._dataMap; } + getDataMap(): Map { return this._dataMap; } getDataList(): TB.TbGShop[] { return this._dataList; } - get(key: number): TB.TbGShop | undefined { return this._dataMap.get(key); } + get(key: string): TB.TbGShop | undefined { return this._dataMap.get(key); } resolve(tables:Tables) { diff --git a/JisolGameCocos/assets/script/data/GiftData.ts b/JisolGameCocos/assets/script/data/GiftData.ts index dae06b7b..25cbdad7 100644 --- a/JisolGameCocos/assets/script/data/GiftData.ts +++ b/JisolGameCocos/assets/script/data/GiftData.ts @@ -12,8 +12,9 @@ export default class GiftData extends BaseData{ records:GiftRecord[] = []; dayRecords:GiftDayRecord[] = []; - onInit() { - + async onInit() { + await this.UpdateGiftRecord(); + await this.UpdateGiftDayRecord(); } //查询充值记录 @@ -38,6 +39,8 @@ export default class GiftData extends BaseData{ //购买礼包 async buy(giftId:number){ await API.BuyGift(giftId); + await this.UpdateGiftRecord(); + await this.UpdateGiftDayRecord(); app.event.emit(GiftDataEnum.BUY); } diff --git a/JisolGameCocos/assets/script/data/PetEquipData.ts b/JisolGameCocos/assets/script/data/PetEquipData.ts index e208db64..0903ce5c 100644 --- a/JisolGameCocos/assets/script/data/PetEquipData.ts +++ b/JisolGameCocos/assets/script/data/PetEquipData.ts @@ -119,7 +119,7 @@ export default class PetEquipData extends BaseData{ //获取指定宠物等级 getForgingBenchPetLevel(petId:number = this.info.forgingPetId){ let exp = this.info.forgingPetLevels[`${petId}`] || 0; - let list = TD.TbGRoleEquipLevel.getDataList().filter(info => info.exp <= exp); + let list = TD.TbGRoleEquipLevel.getDataList().filter(info => (exp-=info.exp) >= 0); return list[list.length - 1].id; } diff --git a/JisolGameCocos/assets/script/data/ResourceData.ts b/JisolGameCocos/assets/script/data/ResourceData.ts index 91b38b3e..feda99ba 100644 --- a/JisolGameCocos/assets/script/data/ResourceData.ts +++ b/JisolGameCocos/assets/script/data/ResourceData.ts @@ -14,6 +14,7 @@ export enum ResourceType{ DungeonGold = 90004, //钥匙:金币副本 DungeonForgedStones = 90005, //钥匙:锻造石副本 Q1S = 90006, //魂:一品宠物魂 + GiftCoupons = 90007, //兑换券 } //资源刷新类型 diff --git a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts index 7ab6d552..da9f8065 100644 --- a/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts +++ b/JisolGameCocos/assets/script/ui/Consts/Pet/PetIcon.ts @@ -25,8 +25,6 @@ export class PetIcon extends Component { info:PlayerPetOV; onLoad(){ - this.reset(); - //监听 app.event.on(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this) } @@ -35,13 +33,6 @@ export class PetIcon extends Component { app.event.off(PlayerPetEvent.UPDATE_INFO,this.onUpdateInfo,this) } - //初始化 - reset(){ - - this.starNode.active = false; - - } - //信息更新 onUpdateInfo(info:PlayerPetOV){ if(this.info && info.petId == this.info.petId){ @@ -51,6 +42,9 @@ export class PetIcon extends Component { //刷新页面 onUpdateView(){ + + this.starNode.active = false; + this.spine.skeletonData = app.battleRes.getRoleSpine(this.info.petTbId); this.spine.setAnimation(0,UIPetAnim.std,true); @@ -67,7 +61,6 @@ export class PetIcon extends Component { //设置icon set(info:PlayerPetOV){ - this.reset(); this.info = info; this.onUpdateView(); } diff --git a/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts b/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts index 6099ea99..73ea2472 100644 --- a/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts +++ b/JisolGameCocos/assets/script/ui/Shop/ShopGiftItem.ts @@ -5,6 +5,7 @@ import { TD } from '../../App'; import { Label } from 'cc'; import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; import GiftData from '../../data/GiftData'; +import NumberTools from '../../tools/NumberTools'; const { ccclass, property } = _decorator; @ccclass('ShopGiftItem') @@ -16,6 +17,9 @@ export class ShopGiftItem extends JNScrollViewItem { @property(Label) giftLimit:Label; //限购 + @property(Label) + giftPrice:Label; //价格 + @property(JNScrollView) views:JNScrollView; //礼包列表 @@ -25,10 +29,6 @@ export class ShopGiftItem extends JNScrollViewItem { this.gift = TD.TbGGift.get(data.giftId); - } - - protected start(): void { - this.giftName.string = this.data.tig; if(this.gift.limit == TbGEnum.TGiftLimit.Unlimited) @@ -38,10 +38,11 @@ export class ShopGiftItem extends JNScrollViewItem { if(this.gift.limit == TbGEnum.TGiftLimit.Limit) this.giftLimit.string = `限制( ${GiftData.getIns().getGiftRecordCount(this.gift.id)}/${this.gift.limitValue} )`; + this.giftPrice.string = `${NumberTools.NumberStr(this.gift.exchanges[0].value)} ${TD.TbGResource.get(this.gift.exchanges[0].id).name}`; this.views.refreshData(this.gift.rewards); - } + } //点击购买礼包 async onClickBuy(){ diff --git a/JisolGameCocos/assets/script/ui/Shop/ShopView.ts b/JisolGameCocos/assets/script/ui/Shop/ShopView.ts index 8c45a7e7..0e1bb32d 100644 --- a/JisolGameCocos/assets/script/ui/Shop/ShopView.ts +++ b/JisolGameCocos/assets/script/ui/Shop/ShopView.ts @@ -3,6 +3,9 @@ import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLay import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView'; import { app, TD } from '../../App'; import GiftData, { GiftDataEnum } from '../../data/GiftData'; +import { Sprite } from 'cc'; +import { color } from 'cc'; +import { EventTouch } from 'cc'; const { ccclass, property } = _decorator; //商店页面 @@ -13,6 +16,13 @@ export class ShopView extends JNLayerBase { @property(JNScrollView) views:JNScrollView + //商店标签 + @property(Node) + tigs:Node; + + //页面下标 + index:number = 0; + async onJNLoad(data?: any) { super.onJNLoad(data); @@ -31,13 +41,24 @@ export class ShopView extends JNLayerBase { async onUpdateView() { - await GiftData.getIns().UpdateGiftRecord(); - await GiftData.getIns().UpdateGiftDayRecord(); + this.tigs.children.forEach((item,index) => { + if(this.index == index){ + item.getComponentInChildren(Sprite).color = color(0,0,0); + }else{ + item.getComponentInChildren(Sprite).color = color(255,255,255); + } + }) - this.views.refreshData(TD.TbGShop.getDataList()); + this.views.refreshData(TD.TbGShop.getDataList().filter(item => item.type == this.index)); } + //切换下标 + onClickTigs(touch:EventTouch){ + this.index = touch.target.getSiblingIndex(); + this.onUpdateView(); + } + } diff --git a/JisolGameCocos/extensions/ngame b/JisolGameCocos/extensions/ngame index a98403e0..7d40b6c6 160000 --- a/JisolGameCocos/extensions/ngame +++ b/JisolGameCocos/extensions/ngame @@ -1 +1 @@ -Subproject commit a98403e0e131001f21f870c9d511c3c63fbbc486 +Subproject commit 7d40b6c6e3089fe4feb559e85fd051aa74885cab diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java index 214b6934..0bbbbf9f 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGShop.java @@ -16,19 +16,15 @@ import com.google.gson.JsonObject; public final class TbGShop extends AbstractBean { public TbGShop(JsonObject _buf) { - id = _buf.get("id").getAsInt(); tig = _buf.get("tig").getAsString(); giftId = _buf.get("giftId").getAsInt(); + type = _buf.get("type").getAsInt(); } public static TbGShop deserialize(JsonObject _buf) { return new cfg.TB.TbGShop(_buf); } - /** - * id - */ - public final int id; /** * 备注 */ @@ -37,6 +33,10 @@ public final class TbGShop extends AbstractBean { * 礼包Id */ public final int giftId; + /** + * 0.点卷商店 1.金币商店 + */ + public final int type; public static final int __ID__ = 319422095; @@ -46,9 +46,9 @@ public final class TbGShop extends AbstractBean { @Override public String toString() { return "{ " - + "(format_field_name __code_style field.name):" + id + "," + "(format_field_name __code_style field.name):" + tig + "," + "(format_field_name __code_style field.name):" + giftId + "," + + "(format_field_name __code_style field.name):" + type + "," + "}"; } } diff --git a/JisolGameServer/Main/src/main/java/cfg/TbGShop.java b/JisolGameServer/Main/src/main/java/cfg/TbGShop.java index 1af8b239..1ae6ab9b 100644 --- a/JisolGameServer/Main/src/main/java/cfg/TbGShop.java +++ b/JisolGameServer/Main/src/main/java/cfg/TbGShop.java @@ -14,24 +14,24 @@ import com.google.gson.JsonElement; public final class TbGShop { - private final java.util.HashMap _dataMap; + private final java.util.HashMap _dataMap; private final java.util.ArrayList _dataList; public TbGShop(JsonElement _buf) { - _dataMap = new java.util.HashMap(); + _dataMap = new java.util.HashMap(); _dataList = new java.util.ArrayList(); for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) { cfg.TB.TbGShop _v; _v = cfg.TB.TbGShop.deserialize(_e_.getAsJsonObject()); _dataList.add(_v); - _dataMap.put(_v.id, _v); + _dataMap.put(_v.tig, _v); } } - public java.util.HashMap getDataMap() { return _dataMap; } + public java.util.HashMap getDataMap() { return _dataMap; } public java.util.ArrayList getDataList() { return _dataList; } - public cfg.TB.TbGShop get(int key) { return _dataMap.get(key); } + public cfg.TB.TbGShop get(String key) { return _dataMap.get(key); } } diff --git a/JisolGameServer/Main/src/main/resources/application.yml b/JisolGameServer/Main/src/main/resources/application.yml index 26fc9772..0b5e7c94 100644 --- a/JisolGameServer/Main/src/main/resources/application.yml +++ b/JisolGameServer/Main/src/main/resources/application.yml @@ -11,6 +11,6 @@ spring: serialization: write-dates-as-timestamps: true -mybatis-plus: - configuration: - log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file +#mybatis-plus: +# configuration: +# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbggift.json b/JisolGameServer/Main/src/main/resources/json/tbggift.json index 0eb93bef..7012e553 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbggift.json +++ b/JisolGameServer/Main/src/main/resources/json/tbggift.json @@ -93,5 +93,25 @@ "value": 20 } ] + }, + { + "id": 210001, + "name": "锻造礼包", + "tig": "锻造礼包", + "limit": 1, + "limitValue": 0, + "exchanges": [ + { + "id": 90001, + "value": 2000 + } + ], + "rewards": [ + { + "type": 1, + "id": 90002, + "value": 20 + } + ] } ] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgresource.json b/JisolGameServer/Main/src/main/resources/json/tbgresource.json index d445d0ca..bdc29411 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgresource.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgresource.json @@ -50,7 +50,7 @@ { "id": 90007, "icon": "90007", - "name": "兑换券", + "name": "点卷", "tig": "用于购买礼包", "args": "", "quality": 1 diff --git a/JisolGameServer/Main/src/main/resources/json/tbgshop.json b/JisolGameServer/Main/src/main/resources/json/tbgshop.json index 2e667d2a..224d286e 100644 --- a/JisolGameServer/Main/src/main/resources/json/tbgshop.json +++ b/JisolGameServer/Main/src/main/resources/json/tbgshop.json @@ -1,22 +1,27 @@ [ { - "id": 1, "tig": "金币礼包", - "giftId": 180001 + "giftId": 180001, + "type": 0 }, { - "id": 2, "tig": "好多金币礼包", - "giftId": 180002 + "giftId": 180002, + "type": 0 }, { - "id": 3, "tig": "限购矿石礼包", - "giftId": 190001 + "giftId": 190001, + "type": 0 }, { - "id": 4, "tig": "每日矿石礼包", - "giftId": 200001 + "giftId": 200001, + "type": 0 + }, + { + "tig": "锻造礼包", + "giftId": 210001, + "type": 1 } ] \ No newline at end of file