diff --git a/assets/CommonRes/texture/跳过.png b/assets/CommonRes/texture/跳过.png new file mode 100644 index 00000000..f7024805 Binary files /dev/null and b/assets/CommonRes/texture/跳过.png differ diff --git a/assets/CommonRes/texture/跳过.png.meta b/assets/CommonRes/texture/跳过.png.meta new file mode 100644 index 00000000..f75536fe --- /dev/null +++ b/assets/CommonRes/texture/跳过.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "e37519d8-48f0-476c-85d2-e897c211e58d", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 73, + "height": 76, + "platformSettings": {}, + "subMetas": { + "跳过": { + "ver": "1.0.6", + "uuid": "0f6a3cae-8ecd-451f-be25-e0143467f45d", + "importer": "sprite-frame", + "rawTextureUuid": "e37519d8-48f0-476c-85d2-e897c211e58d", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 73, + "height": 76, + "rawWidth": 73, + "rawHeight": 76, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/DH/DH_3/DH_3.prefab b/assets/DH/DH_3/DH_3.prefab index 6392f0ed..bec48af0 100644 --- a/assets/DH/DH_3/DH_3.prefab +++ b/assets/DH/DH_3/DH_3.prefab @@ -31,22 +31,25 @@ }, { "__id__": 89 + }, + { + "__id__": 103 } ], "_active": true, "_components": [ { - "__id__": 103 + "__id__": 112 }, { - "__id__": 104 + "__id__": 113 }, { - "__id__": 105 + "__id__": 114 } ], "_prefab": { - "__id__": 106 + "__id__": 115 }, "_opacity": 255, "_color": { @@ -3762,6 +3765,331 @@ "fileId": "afKndR+gFKC7n568QEwI37", "sync": false }, + { + "__type__": "cc.Node", + "_name": "推开", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 104 + } + ], + "_active": false, + "_components": [ + { + "__id__": 108 + }, + { + "__id__": 109 + } + ], + "_prefab": { + "__id__": 111 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 157, + "height": 66 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -51.644, + 0, + 0, + 0, + 0, + 1, + 1.5, + 1.5, + 0 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 103 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 105 + }, + { + "__id__": 106 + } + ], + "_prefab": { + "__id__": 107 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 158, + "g": 78, + "b": 0, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 52, + "height": 33.5 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 3, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 104 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "推开", + "_N$string": "推开", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 104 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_width": 1, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "begMCzdvtC+pjlu8th/64U", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 103 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d56f80fb-deaf-4a01-9703-798221ae258c" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 103 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [ + { + "__id__": 110 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 3, + "transition": 3, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": null, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "4d0b0/Zi1RLDb+UH/6mf4+1", + "handler": "onTouchTuiKai", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b6dDlUH0FDxZonIA5ro3SA", + "sync": false + }, { "__type__": "cc.Widget", "_name": "", diff --git a/assets/FrameWork/Config/AppConfig.ts b/assets/FrameWork/Config/AppConfig.ts index 7db8874a..13614f6c 100644 --- a/assets/FrameWork/Config/AppConfig.ts +++ b/assets/FrameWork/Config/AppConfig.ts @@ -38,11 +38,11 @@ export default class AppConfig { //--设置各自游戏的 资源服务器地址 - public static TT_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.1/"; - public static WX_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.1/";//资源服务器地址 - public static QQ_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.1/";//资源服务器地址 - public static VIVO_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.1/";//资源服务器地址 - public static OPPO_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.1/";//资源服务器地址 + public static TT_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.3/"; + public static WX_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.3/";//资源服务器地址 + public static QQ_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.3/";//资源服务器地址 + public static VIVO_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.3/";//资源服务器地址 + public static OPPO_ResServer_custom: string = "https://dycdn.ioe-times.com/xianyudefanji/remoteRes_1.0.3/";//资源服务器地址 public static APK_ResServer_custom: string = "";//资源服务器地址 //--各自游戏的版本 diff --git a/assets/FrameWork/User/User.ts b/assets/FrameWork/User/User.ts index 498f2392..be8d28a7 100644 --- a/assets/FrameWork/User/User.ts +++ b/assets/FrameWork/User/User.ts @@ -3027,7 +3027,7 @@ export default class User { Common5.lixianTime = 0 User._gameData_custom.headImg = "headImg1"; User._gameData_custom.headImgUnlock = ["headImg1"]; - User._gameData_custom.money = 20000 + User._gameData_custom.money = 500 User._gameData_custom.userIQ = 0 User._gameData_custom.yuanBao = 0 User._gameData_custom.day = 1 diff --git a/assets/GameRes/JuQingChat/prefab/chatList.prefab b/assets/GameRes/JuQingChat/prefab/chatList.prefab index d251faab..d8697fd0 100644 --- a/assets/GameRes/JuQingChat/prefab/chatList.prefab +++ b/assets/GameRes/JuQingChat/prefab/chatList.prefab @@ -34,6 +34,9 @@ }, { "__id__": 87 + }, + { + "__id__": 96 } ], "_active": true, @@ -3047,17 +3050,17 @@ "_active": true, "_components": [ { - "__id__": 94 + "__id__": 91 }, { - "__id__": 96 + "__id__": 93 }, { - "__id__": 97 + "__id__": 94 } ], "_prefab": { - "__id__": 98 + "__id__": 95 }, "_opacity": 255, "_color": { @@ -3113,83 +3116,15 @@ "_parent": { "__id__": 87 }, - "_children": [ - { - "__id__": 89 - } - ], - "_active": true, - "_components": [ - { - "__id__": 92 - } - ], - "_prefab": { - "__id__": 93 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 156, - "height": 66 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 0, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "New Label", - "_objFlags": 0, - "_parent": { - "__id__": 88 - }, "_children": [], "_active": true, "_components": [ { - "__id__": 90 + "__id__": 89 } ], "_prefab": { - "__id__": 91 + "__id__": 90 }, "_opacity": 255, "_color": { @@ -3201,8 +3136,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 100, - "height": 31.5 + "width": 228, + "height": 91 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3214,7 +3149,7 @@ "ctor": "Float64Array", "array": [ 0, - 2.956, + 0, 0, 0, 0, @@ -3238,50 +3173,6 @@ "groupIndex": 0, "_id": "" }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 89 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_string": "放下手机", - "_N$string": "放下手机", - "_fontSize": 25, - "_lineHeight": 25, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_batchAsBitmap": false, - "_styleFlags": 1, - "_underlineHeight": 0, - "_N$horizontalAlign": 1, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 0, - "_N$cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 87 - }, - "asset": { - "__uuid__": "ac036a02-5ea3-4d6c-abf4-a95fc1b501be" - }, - "fileId": "afzf/V4ulEt7opd8Wda5Nj", - "sync": false - }, { "__type__": "cc.Sprite", "_name": "", @@ -3298,7 +3189,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "0ee98f53-8de6-409c-b645-bd2236613969" + "__uuid__": "10adf897-fec3-4d50-8ecc-6acedcc096a3" }, "_type": 0, "_sizeMode": 1, @@ -3339,7 +3230,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 95 + "__id__": 92 } ], "_N$interactable": true, @@ -3455,6 +3346,108 @@ "fileId": "b9jv0EOeFF9KaL6fHxfIxR", "sync": false }, + { + "__type__": "cc.Node", + "_name": "guide", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 97 + } + ], + "_prefab": { + "__id__": 98 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 500, + "height": 100 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 386.705, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 96 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 1, + "_left": 0, + "_right": 0, + "_top": 230.29500000000002, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "1eGsDalsdLdq2cz0vo6yQT", + "sync": false + }, { "__type__": "9ca71RSiS5PiruNFQKOQzjW", "_name": "", diff --git a/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png b/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png new file mode 100644 index 00000000..c2dcd142 Binary files /dev/null and b/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png differ diff --git a/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png.meta b/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png.meta new file mode 100644 index 00000000..2669249b --- /dev/null +++ b/assets/GameRes/JuQingChat/texture/微信聊天/按钮.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "fc423f1f-1224-41c3-b588-65679393b6bc", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 228, + "height": 91, + "platformSettings": {}, + "subMetas": { + "按钮": { + "ver": "1.0.6", + "uuid": "10adf897-fec3-4d50-8ecc-6acedcc096a3", + "importer": "sprite-frame", + "rawTextureUuid": "fc423f1f-1224-41c3-b588-65679393b6bc", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 228, + "height": 91, + "rawWidth": 228, + "rawHeight": 91, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/GameRoomRes/Room2/prefab/Room2.prefab b/assets/GameRoomRes/Room2/prefab/Room2.prefab index 8ac1c777..6f107e9e 100644 --- a/assets/GameRoomRes/Room2/prefab/Room2.prefab +++ b/assets/GameRoomRes/Room2/prefab/Room2.prefab @@ -26,48 +26,48 @@ { "__id__": 137 }, - { - "__id__": 152 - }, { "__id__": 155 }, { - "__id__": 162 + "__id__": 158 }, { - "__id__": 169 + "__id__": 165 }, { - "__id__": 176 + "__id__": 172 }, { - "__id__": 190 + "__id__": 179 }, { - "__id__": 216 + "__id__": 193 }, { - "__id__": 234 + "__id__": 219 }, { "__id__": 237 + }, + { + "__id__": 240 } ], "_active": true, "_components": [ { - "__id__": 245 + "__id__": 248 }, { - "__id__": 246 + "__id__": 249 }, { - "__id__": 247 + "__id__": 250 } ], "_prefab": { - "__id__": 248 + "__id__": 251 }, "_opacity": 255, "_color": { @@ -5166,19 +5166,22 @@ }, { "__id__": 144 + }, + { + "__id__": 148 } ], "_active": false, "_components": [ { - "__id__": 148 + "__id__": 151 }, { - "__id__": 149 + "__id__": 152 } ], "_prefab": { - "__id__": 151 + "__id__": 154 }, "_opacity": 255, "_color": { @@ -5570,6 +5573,123 @@ "fileId": "d4oc2KiY1CKJRI5dJrdZf0", "sync": false }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 137 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 149 + } + ], + "_prefab": { + "__id__": 150 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 51.668, + -62.149, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 148 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "998rYekJ1EUZqNh5e3c0hO", + "sync": false + }, { "__type__": "67b86Vr/PZKGZqkUcKGp7BO", "_name": "", @@ -5597,7 +5717,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 150 + "__id__": 153 } ], "_N$interactable": true, @@ -5687,11 +5807,11 @@ "_active": false, "_components": [ { - "__id__": 153 + "__id__": 156 } ], "_prefab": { - "__id__": 154 + "__id__": 157 }, "_opacity": 255, "_color": { @@ -5745,7 +5865,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 152 + "__id__": 155 }, "_enabled": true, "_materials": [ @@ -5802,17 +5922,17 @@ }, "_children": [ { - "__id__": 156 + "__id__": 159 } ], "_active": false, "_components": [ { - "__id__": 159 + "__id__": 162 } ], "_prefab": { - "__id__": 161 + "__id__": 164 }, "_opacity": 255, "_color": { @@ -5866,17 +5986,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 155 + "__id__": 158 }, "_children": [], "_active": true, "_components": [ { - "__id__": 157 + "__id__": 160 } ], "_prefab": { - "__id__": 158 + "__id__": 161 }, "_opacity": 255, "_color": { @@ -5930,7 +6050,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 156 + "__id__": 159 }, "_enabled": true, "_materials": [ @@ -5983,7 +6103,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 158 }, "_enabled": true, "_normalMaterial": null, @@ -5992,7 +6112,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 160 + "__id__": 163 } ], "_N$interactable": true, @@ -6080,17 +6200,17 @@ }, "_children": [ { - "__id__": 163 + "__id__": 166 } ], "_active": false, "_components": [ { - "__id__": 166 + "__id__": 169 } ], "_prefab": { - "__id__": 168 + "__id__": 171 }, "_opacity": 255, "_color": { @@ -6144,17 +6264,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 162 + "__id__": 165 }, "_children": [], "_active": true, "_components": [ { - "__id__": 164 + "__id__": 167 } ], "_prefab": { - "__id__": 165 + "__id__": 168 }, "_opacity": 255, "_color": { @@ -6208,7 +6328,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 163 + "__id__": 166 }, "_enabled": true, "_materials": [ @@ -6261,7 +6381,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 162 + "__id__": 165 }, "_enabled": true, "_normalMaterial": null, @@ -6270,7 +6390,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 167 + "__id__": 170 } ], "_N$interactable": true, @@ -6358,17 +6478,17 @@ }, "_children": [ { - "__id__": 170 + "__id__": 173 } ], "_active": false, "_components": [ { - "__id__": 173 + "__id__": 176 } ], "_prefab": { - "__id__": 175 + "__id__": 178 }, "_opacity": 255, "_color": { @@ -6422,17 +6542,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 169 + "__id__": 172 }, "_children": [], "_active": true, "_components": [ { - "__id__": 171 + "__id__": 174 } ], "_prefab": { - "__id__": 172 + "__id__": 175 }, "_opacity": 255, "_color": { @@ -6486,7 +6606,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 173 }, "_enabled": true, "_materials": [ @@ -6539,7 +6659,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 169 + "__id__": 172 }, "_enabled": true, "_normalMaterial": null, @@ -6548,7 +6668,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 174 + "__id__": 177 } ], "_N$interactable": true, @@ -6635,9 +6755,6 @@ "__id__": 1 }, "_children": [ - { - "__id__": 177 - }, { "__id__": 180 }, @@ -6646,12 +6763,15 @@ }, { "__id__": 186 + }, + { + "__id__": 189 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 189 + "__id__": 192 }, "_opacity": 255, "_color": { @@ -6705,17 +6825,17 @@ "_name": "声效0", "_objFlags": 0, "_parent": { - "__id__": 176 + "__id__": 179 }, "_children": [], "_active": false, "_components": [ { - "__id__": 178 + "__id__": 181 } ], "_prefab": { - "__id__": 179 + "__id__": 182 }, "_opacity": 255, "_color": { @@ -6769,7 +6889,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 177 + "__id__": 180 }, "_enabled": true, "_materials": [ @@ -6822,17 +6942,17 @@ "_name": "声效1", "_objFlags": 0, "_parent": { - "__id__": 176 + "__id__": 179 }, "_children": [], "_active": false, "_components": [ { - "__id__": 181 + "__id__": 184 } ], "_prefab": { - "__id__": 182 + "__id__": 185 }, "_opacity": 255, "_color": { @@ -6886,7 +7006,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 180 + "__id__": 183 }, "_enabled": true, "_materials": [ @@ -6939,17 +7059,17 @@ "_name": "声效2", "_objFlags": 0, "_parent": { - "__id__": 176 + "__id__": 179 }, "_children": [], "_active": false, "_components": [ { - "__id__": 184 + "__id__": 187 } ], "_prefab": { - "__id__": 185 + "__id__": 188 }, "_opacity": 255, "_color": { @@ -7003,7 +7123,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 183 + "__id__": 186 }, "_enabled": true, "_materials": [ @@ -7056,17 +7176,17 @@ "_name": "声效3", "_objFlags": 0, "_parent": { - "__id__": 176 + "__id__": 179 }, "_children": [], "_active": false, "_components": [ { - "__id__": 187 + "__id__": 190 } ], "_prefab": { - "__id__": 188 + "__id__": 191 }, "_opacity": 255, "_color": { @@ -7120,7 +7240,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 186 + "__id__": 189 }, "_enabled": true, "_materials": [ @@ -7188,22 +7308,22 @@ }, "_children": [ { - "__id__": 191 + "__id__": 194 }, { - "__id__": 197 + "__id__": 200 }, { - "__id__": 203 + "__id__": 206 }, { - "__id__": 209 + "__id__": 212 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 215 + "__id__": 218 }, "_opacity": 255, "_color": { @@ -7257,21 +7377,21 @@ "_name": "qiPao_0", "_objFlags": 0, "_parent": { - "__id__": 190 + "__id__": 193 }, "_children": [ { - "__id__": 192 + "__id__": 195 } ], "_active": false, "_components": [ { - "__id__": 195 + "__id__": 198 } ], "_prefab": { - "__id__": 196 + "__id__": 199 }, "_opacity": 255, "_color": { @@ -7325,17 +7445,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 191 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 193 + "__id__": 196 } ], "_prefab": { - "__id__": 194 + "__id__": 197 }, "_opacity": 255, "_color": { @@ -7389,7 +7509,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 192 + "__id__": 195 }, "_enabled": true, "_materials": [ @@ -7433,7 +7553,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 191 + "__id__": 194 }, "_enabled": true, "_materials": [ @@ -7476,21 +7596,21 @@ "_name": "qiPao_1", "_objFlags": 0, "_parent": { - "__id__": 190 + "__id__": 193 }, "_children": [ { - "__id__": 198 + "__id__": 201 } ], "_active": false, "_components": [ { - "__id__": 201 + "__id__": 204 } ], "_prefab": { - "__id__": 202 + "__id__": 205 }, "_opacity": 255, "_color": { @@ -7544,17 +7664,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 197 + "__id__": 200 }, "_children": [], "_active": true, "_components": [ { - "__id__": 199 + "__id__": 202 } ], "_prefab": { - "__id__": 200 + "__id__": 203 }, "_opacity": 255, "_color": { @@ -7608,7 +7728,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 198 + "__id__": 201 }, "_enabled": true, "_materials": [ @@ -7652,7 +7772,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 197 + "__id__": 200 }, "_enabled": true, "_materials": [ @@ -7695,21 +7815,21 @@ "_name": "qiPao_2", "_objFlags": 0, "_parent": { - "__id__": 190 + "__id__": 193 }, "_children": [ { - "__id__": 204 + "__id__": 207 } ], "_active": false, "_components": [ { - "__id__": 207 + "__id__": 210 } ], "_prefab": { - "__id__": 208 + "__id__": 211 }, "_opacity": 255, "_color": { @@ -7763,17 +7883,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 203 + "__id__": 206 }, "_children": [], "_active": true, "_components": [ { - "__id__": 205 + "__id__": 208 } ], "_prefab": { - "__id__": 206 + "__id__": 209 }, "_opacity": 255, "_color": { @@ -7827,7 +7947,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 204 + "__id__": 207 }, "_enabled": true, "_materials": [ @@ -7871,7 +7991,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 203 + "__id__": 206 }, "_enabled": true, "_materials": [ @@ -7914,21 +8034,21 @@ "_name": "qiPao_3", "_objFlags": 0, "_parent": { - "__id__": 190 + "__id__": 193 }, "_children": [ { - "__id__": 210 + "__id__": 213 } ], "_active": false, "_components": [ { - "__id__": 213 + "__id__": 216 } ], "_prefab": { - "__id__": 214 + "__id__": 217 }, "_opacity": 255, "_color": { @@ -7982,17 +8102,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 209 + "__id__": 212 }, "_children": [], "_active": true, "_components": [ { - "__id__": 211 + "__id__": 214 } ], "_prefab": { - "__id__": 212 + "__id__": 215 }, "_opacity": 255, "_color": { @@ -8046,7 +8166,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 210 + "__id__": 213 }, "_enabled": true, "_materials": [ @@ -8090,7 +8210,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 209 + "__id__": 212 }, "_enabled": true, "_materials": [ @@ -8148,20 +8268,20 @@ }, "_children": [ { - "__id__": 217 + "__id__": 220 }, { - "__id__": 226 + "__id__": 229 } ], "_active": true, "_components": [ { - "__id__": 232 + "__id__": 235 } ], "_prefab": { - "__id__": 233 + "__id__": 236 }, "_opacity": 255, "_color": { @@ -8215,24 +8335,24 @@ "_name": "diTu", "_objFlags": 0, "_parent": { - "__id__": 216 + "__id__": 219 }, "_children": [ { - "__id__": 218 + "__id__": 221 } ], "_active": false, "_components": [ { - "__id__": 222 + "__id__": 225 }, { - "__id__": 224 + "__id__": 227 } ], "_prefab": { - "__id__": 225 + "__id__": 228 }, "_opacity": 255, "_color": { @@ -8286,20 +8406,20 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 220 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 222 }, { - "__id__": 220 + "__id__": 223 } ], "_prefab": { - "__id__": 221 + "__id__": 224 }, "_opacity": 255, "_color": { @@ -8353,7 +8473,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 221 }, "_enabled": true, "_materials": [ @@ -8386,7 +8506,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 221 }, "_enabled": true, "_color": { @@ -8415,7 +8535,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 220 }, "_enabled": true, "_normalMaterial": null, @@ -8424,7 +8544,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 223 + "__id__": 226 } ], "_N$interactable": true, @@ -8485,7 +8605,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 216 + "__id__": 219 }, "component": "", "_componentId": "80d7bgwi4BEwLB3smYXVoys", @@ -8497,7 +8617,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 220 }, "_enabled": true, "_materials": [ @@ -8550,21 +8670,21 @@ "_name": "textNode", "_objFlags": 0, "_parent": { - "__id__": 216 + "__id__": 219 }, "_children": [ { - "__id__": 227 + "__id__": 230 } ], "_active": false, "_components": [ { - "__id__": 230 + "__id__": 233 } ], "_prefab": { - "__id__": 231 + "__id__": 234 }, "_opacity": 255, "_color": { @@ -8618,17 +8738,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 226 + "__id__": 229 }, "_children": [], "_active": true, "_components": [ { - "__id__": 228 + "__id__": 231 } ], "_prefab": { - "__id__": 229 + "__id__": 232 }, "_opacity": 255, "_color": { @@ -8682,7 +8802,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 227 + "__id__": 230 }, "_enabled": true, "_materials": [ @@ -8726,7 +8846,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 226 + "__id__": 229 }, "_enabled": true, "_materials": [ @@ -8769,14 +8889,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 216 + "__id__": 219 }, "_enabled": true, "diTu": { - "__id__": 217 + "__id__": 220 }, "textNode": { - "__id__": 226 + "__id__": 229 }, "_id": "" }, @@ -8802,11 +8922,11 @@ "_active": false, "_components": [ { - "__id__": 235 + "__id__": 238 } ], "_prefab": { - "__id__": 236 + "__id__": 239 }, "_opacity": 255, "_color": { @@ -8860,7 +8980,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 234 + "__id__": 237 }, "_enabled": true, "_materials": [ @@ -8917,20 +9037,20 @@ }, "_children": [ { - "__id__": 238 + "__id__": 241 } ], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 244 }, { - "__id__": 242 + "__id__": 245 } ], "_prefab": { - "__id__": 244 + "__id__": 247 }, "_opacity": 255, "_color": { @@ -8954,15 +9074,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 304.36430434782613, - -611, + 259.741, + -564.914, 0, 0, 0, 0, 1, - 0.8, - 0.8, + 1, + 1, 0 ] }, @@ -8984,17 +9104,17 @@ "_name": "spine", "_objFlags": 0, "_parent": { - "__id__": 237 + "__id__": 240 }, "_children": [], "_active": true, "_components": [ { - "__id__": 239 + "__id__": 242 } ], "_prefab": { - "__id__": 240 + "__id__": 243 }, "_opacity": 255, "_color": { @@ -9048,7 +9168,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 238 + "__id__": 241 }, "_enabled": true, "_materials": [ @@ -9101,16 +9221,16 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 237 + "__id__": 240 }, "_enabled": true, "alignMode": 1, "_target": null, "_alignFlags": 36, "_left": 0, - "_right": 26.635695652173865, + "_right": 60.259000000000015, "_top": 0, - "_bottom": 12, + "_bottom": 47.08600000000001, "_verticalCenter": 0, "_horizontalCenter": 0, "_isAbsLeft": true, @@ -9128,7 +9248,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 237 + "__id__": 240 }, "_enabled": true, "_normalMaterial": null, @@ -9137,7 +9257,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 243 + "__id__": 246 } ], "_N$interactable": true, diff --git a/assets/MainHall/prefab/MainHall.prefab b/assets/MainHall/prefab/MainHall.prefab index c9ee920b..d3f78571 100644 --- a/assets/MainHall/prefab/MainHall.prefab +++ b/assets/MainHall/prefab/MainHall.prefab @@ -30,71 +30,71 @@ "__id__": 22 }, { - "__id__": 493 + "__id__": 505 }, { - "__id__": 501 + "__id__": 513 }, { - "__id__": 513 + "__id__": 525 }, { - "__id__": 515 + "__id__": 527 }, { - "__id__": 519 + "__id__": 531 }, { - "__id__": 523 + "__id__": 535 }, { - "__id__": 527 + "__id__": 539 }, { - "__id__": 531 + "__id__": 543 }, { - "__id__": 535 + "__id__": 547 }, { - "__id__": 541 + "__id__": 553 }, { - "__id__": 544 + "__id__": 556 }, { - "__id__": 565 + "__id__": 577 }, { - "__id__": 586 + "__id__": 598 }, { - "__id__": 589 + "__id__": 601 }, { - "__id__": 595 + "__id__": 607 }, { - "__id__": 609 + "__id__": 621 } ], "_active": true, "_components": [ { - "__id__": 612 + "__id__": 624 }, { - "__id__": 613 + "__id__": 625 }, { - "__id__": 614 + "__id__": 626 }, { - "__id__": 615 + "__id__": 627 } ], "_prefab": { - "__id__": 616 + "__id__": 628 }, "_opacity": 255, "_color": { @@ -848,28 +848,25 @@ "__id__": 23 }, { - "__id__": 84 - }, - { - "__id__": 90 + "__id__": 87 }, { - "__id__": 96 + "__id__": 93 }, { - "__id__": 102 + "__id__": 99 }, { - "__id__": 116 + "__id__": 105 }, { - "__id__": 122 + "__id__": 119 }, { - "__id__": 130 + "__id__": 125 }, { - "__id__": 139 + "__id__": 136 }, { "__id__": 145 @@ -878,38 +875,41 @@ "__id__": 151 }, { - "__id__": 164 + "__id__": 157 }, { "__id__": 170 }, { - "__id__": 179 + "__id__": 176 }, { - "__id__": 188 + "__id__": 185 }, { - "__id__": 201 + "__id__": 194 }, { - "__id__": 437 + "__id__": 207 }, { - "__id__": 475 + "__id__": 449 }, { - "__id__": 485 + "__id__": 487 + }, + { + "__id__": 497 } ], "_active": true, "_components": [ { - "__id__": 491 + "__id__": 503 } ], "_prefab": { - "__id__": 492 + "__id__": 504 }, "_opacity": 255, "_color": { @@ -982,20 +982,20 @@ "__id__": 36 }, { - "__id__": 65 + "__id__": 68 } ], "_active": true, "_components": [ { - "__id__": 80 + "__id__": 83 }, { - "__id__": 82 + "__id__": 85 } ], "_prefab": { - "__id__": 83 + "__id__": 86 }, "_opacity": 255, "_color": { @@ -1071,7 +1071,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 229, + "width": 290, "height": 83 }, "_anchorPoint": { @@ -1083,7 +1083,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 179.921, + 206.301, 0, 0, 0, @@ -1493,11 +1493,11 @@ "_active": true, "_components": [ { - "__id__": 63 + "__id__": 66 } ], "_prefab": { - "__id__": 64 + "__id__": 67 }, "_opacity": 255, "_color": { @@ -1731,7 +1731,7 @@ "__id__": 40 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { "__id__": 42 @@ -1765,8 +1765,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -83.994, - -1.39, + -130.555, + -43.935, 0, 0, 0, @@ -1894,7 +1894,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -18.077, + 44.615, -43.706, 0, 0, @@ -2109,13 +2109,16 @@ "__id__": 54 }, { - "__id__": 58 + "__id__": 57 + }, + { + "__id__": 61 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 62 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -2166,7 +2169,7 @@ }, { "__type__": "cc.Node", - "_name": "yuanBaoNumStr", + "_name": "钞票", "_objFlags": 0, "_parent": { "__id__": 53 @@ -2176,13 +2179,120 @@ "_components": [ { "__id__": 55 + } + ], + "_prefab": { + "__id__": 56 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 57, + "height": 40 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -132.371, + 94.551, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 54 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "867686f2-9c0f-4ca6-b31f-0866cb610400" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 36 + }, + "asset": { + "__uuid__": "143177c8-0351-4731-b969-d7917a19b6f9" + }, + "fileId": "a8aELAw+BCyo3Ff8cP96An", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "yuanBaoNumStr", + "_objFlags": 0, + "_parent": { + "__id__": 53 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 58 }, { - "__id__": 56 + "__id__": 59 } ], "_prefab": { - "__id__": 57 + "__id__": 60 }, "_opacity": 255, "_color": { @@ -2206,7 +2316,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -37.509, + -5.329, 93.664, 0, 0, @@ -2236,7 +2346,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 57 }, "_enabled": true, "_materials": [ @@ -2269,7 +2379,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 57 }, "_enabled": true, "_color": { @@ -2304,14 +2414,14 @@ "_active": false, "_components": [ { - "__id__": 59 + "__id__": 62 }, { - "__id__": 60 + "__id__": 63 } ], "_prefab": { - "__id__": 61 + "__id__": 64 }, "_opacity": 255, "_color": { @@ -2365,7 +2475,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 58 + "__id__": 61 }, "_enabled": true, "_materials": [ @@ -2398,7 +2508,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 58 + "__id__": 61 }, "_enabled": true, "_color": { @@ -2442,10 +2552,10 @@ }, "_enabled": true, "yuanBaoNumStr": { - "__id__": 54 + "__id__": 57 }, "changeLabel": { - "__id__": 58 + "__id__": 61 }, "_id": "" }, @@ -2469,26 +2579,26 @@ }, "_children": [ { - "__id__": 66 + "__id__": 69 }, { - "__id__": 69 + "__id__": 72 }, { - "__id__": 73 + "__id__": 76 } ], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 80 }, { - "__id__": 78 + "__id__": 81 } ], "_prefab": { - "__id__": 79 + "__id__": 82 }, "_opacity": 255, "_color": { @@ -2542,17 +2652,17 @@ "_name": "djLab", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 68 }, "_children": [], "_active": false, "_components": [ { - "__id__": 67 + "__id__": 70 } ], "_prefab": { - "__id__": 68 + "__id__": 71 }, "_opacity": 255, "_color": { @@ -2606,7 +2716,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 69 }, "_enabled": true, "_materials": [ @@ -2650,20 +2760,20 @@ "_name": "mzLab", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 68 }, "_children": [], "_active": false, "_components": [ { - "__id__": 70 + "__id__": 73 }, { - "__id__": 71 + "__id__": 74 } ], "_prefab": { - "__id__": 72 + "__id__": 75 }, "_opacity": 255, "_color": { @@ -2717,7 +2827,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 72 }, "_enabled": true, "_materials": [ @@ -2750,7 +2860,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 72 }, "_enabled": true, "_color": { @@ -2779,20 +2889,20 @@ "_name": "danjiaLab", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 68 }, "_children": [], "_active": false, "_components": [ { - "__id__": 74 + "__id__": 77 }, { - "__id__": 75 + "__id__": 78 } ], "_prefab": { - "__id__": 76 + "__id__": 79 }, "_opacity": 255, "_color": { @@ -2846,7 +2956,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 73 + "__id__": 76 }, "_enabled": true, "_materials": [ @@ -2879,7 +2989,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 73 + "__id__": 76 }, "_enabled": true, "_color": { @@ -2908,7 +3018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 68 }, "_enabled": true, "_materials": [ @@ -2938,7 +3048,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 65 + "__id__": 68 }, "_enabled": true, "alignMode": 1, @@ -2985,7 +3095,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 81 + "__id__": 84 } ], "_N$interactable": true, @@ -3102,17 +3212,17 @@ "_active": true, "_components": [ { - "__id__": 85 + "__id__": 88 }, { - "__id__": 86 + "__id__": 89 }, { - "__id__": 87 + "__id__": 90 } ], "_prefab": { - "__id__": 89 + "__id__": 92 }, "_opacity": 255, "_color": { @@ -3136,8 +3246,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -333, - 387, + 82.32799999999997, + 478.9580000000001, 0, 0, 0, @@ -3166,7 +3276,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 87 }, "_enabled": true, "_materials": [ @@ -3198,15 +3308,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 87 }, "_enabled": true, "alignMode": 1, "_target": null, "_alignFlags": 9, - "_left": 13.5, + "_left": 428.828, "_right": 0, - "_top": 243.5, + "_top": 151.54199999999997, "_bottom": 997.698, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -3225,7 +3335,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 84 + "__id__": 87 }, "_enabled": true, "_normalMaterial": null, @@ -3234,7 +3344,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 88 + "__id__": 91 } ], "_N$interactable": true, @@ -3324,17 +3434,17 @@ "_active": true, "_components": [ { - "__id__": 91 + "__id__": 94 }, { - "__id__": 92 + "__id__": 95 }, { - "__id__": 93 + "__id__": 96 } ], "_prefab": { - "__id__": 95 + "__id__": 98 }, "_opacity": 255, "_color": { @@ -3358,8 +3468,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -264, - 387, + 154.90800000000002, + 478.9580000000001, 0, 0, 0, @@ -3388,7 +3498,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 93 }, "_enabled": true, "_materials": [ @@ -3420,15 +3530,15 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 93 }, "_enabled": true, "alignMode": 1, "_target": null, "_alignFlags": 9, - "_left": 82.49999999999997, + "_left": 501.408, "_right": 0, - "_top": 243, + "_top": 151.04199999999997, "_bottom": 997.198, "_verticalCenter": 0, "_horizontalCenter": 0, @@ -3447,7 +3557,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 + "__id__": 93 }, "_enabled": true, "_normalMaterial": null, @@ -3456,7 +3566,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 94 + "__id__": 97 } ], "_N$interactable": true, @@ -3546,17 +3656,17 @@ "_active": false, "_components": [ { - "__id__": 97 + "__id__": 100 }, { - "__id__": 98 + "__id__": 101 }, { - "__id__": 99 + "__id__": 102 } ], "_prefab": { - "__id__": 101 + "__id__": 104 }, "_opacity": 255, "_color": { @@ -3610,7 +3720,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 99 }, "_enabled": true, "_materials": [ @@ -3642,7 +3752,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 99 }, "_enabled": true, "alignMode": 1, @@ -3669,7 +3779,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 96 + "__id__": 99 }, "_enabled": true, "_normalMaterial": null, @@ -3678,7 +3788,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 100 + "__id__": 103 } ], "_N$interactable": true, @@ -3765,30 +3875,30 @@ "__id__": 22 }, "_children": [ - { - "__id__": 103 - }, { "__id__": 106 }, { "__id__": 109 + }, + { + "__id__": 112 } ], "_active": false, "_components": [ { - "__id__": 112 + "__id__": 115 }, { - "__id__": 113 + "__id__": 116 }, { - "__id__": 114 + "__id__": 117 } ], "_prefab": { - "__id__": 115 + "__id__": 118 }, "_opacity": 255, "_color": { @@ -3842,17 +3952,17 @@ "_name": "bar", "_objFlags": 0, "_parent": { - "__id__": 102 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 104 + "__id__": 107 } ], "_prefab": { - "__id__": 105 + "__id__": 108 }, "_opacity": 255, "_color": { @@ -3906,7 +4016,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 103 + "__id__": 106 }, "_enabled": true, "_materials": [ @@ -3949,17 +4059,17 @@ "_name": "礼盒无", "_objFlags": 0, "_parent": { - "__id__": 102 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 110 } ], "_prefab": { - "__id__": 108 + "__id__": 111 }, "_opacity": 255, "_color": { @@ -4013,7 +4123,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 106 + "__id__": 109 }, "_enabled": true, "_materials": [ @@ -4056,17 +4166,17 @@ "_name": "礼盒有", "_objFlags": 0, "_parent": { - "__id__": 102 + "__id__": 105 }, "_children": [], "_active": false, "_components": [ { - "__id__": 110 + "__id__": 113 } ], "_prefab": { - "__id__": 111 + "__id__": 114 }, "_opacity": 255, "_color": { @@ -4120,7 +4230,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 109 + "__id__": 112 }, "_enabled": true, "_materials": [ @@ -4163,7 +4273,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "_materials": [ @@ -4195,12 +4305,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "_N$totalLength": 300, "_N$barSprite": { - "__id__": 104 + "__id__": 107 }, "_N$mode": 0, "_N$progress": 0.6, @@ -4212,7 +4322,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 102 + "__id__": 105 }, "_enabled": true, "alignMode": 1, @@ -4256,17 +4366,17 @@ "_active": false, "_components": [ { - "__id__": 117 + "__id__": 120 }, { - "__id__": 119 + "__id__": 122 }, { - "__id__": 120 + "__id__": 123 } ], "_prefab": { - "__id__": 121 + "__id__": 124 }, "_opacity": 255, "_color": { @@ -4320,7 +4430,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 119 }, "_enabled": true, "_normalMaterial": null, @@ -4329,7 +4439,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 118 + "__id__": 121 } ], "_N$interactable": true, @@ -4402,7 +4512,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 119 }, "_enabled": true, "_materials": [ @@ -4434,7 +4544,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 116 + "__id__": 119 }, "_enabled": true, "alignMode": 1, @@ -4476,20 +4586,23 @@ }, "_children": [ { - "__id__": 123 + "__id__": 126 + }, + { + "__id__": 129 } ], - "_active": false, + "_active": true, "_components": [ { - "__id__": 126 + "__id__": 132 }, { - "__id__": 128 + "__id__": 134 } ], "_prefab": { - "__id__": 129 + "__id__": 135 }, "_opacity": 255, "_color": { @@ -4543,17 +4656,17 @@ "_name": "spine", "_objFlags": 0, "_parent": { - "__id__": 122 + "__id__": 125 }, "_children": [], "_active": true, "_components": [ { - "__id__": 124 + "__id__": 127 } ], "_prefab": { - "__id__": 125 + "__id__": 128 }, "_opacity": 255, "_color": { @@ -4607,7 +4720,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 123 + "__id__": 126 }, "_enabled": true, "_materials": [ @@ -4655,12 +4768,129 @@ "fileId": "5cRVLEz4ROfIFn+fMmgNtw", "sync": false }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 125 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 130 + } + ], + "_prefab": { + "__id__": 131 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 51.964, + -60.387, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 129 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "a4meygjpNJdawOYcLl6X/8", + "sync": false + }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 122 + "__id__": 125 }, "_enabled": true, "_normalMaterial": null, @@ -4669,7 +4899,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 127 + "__id__": 133 } ], "_N$interactable": true, @@ -4742,7 +4972,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 122 + "__id__": 125 }, "_enabled": true, "alignMode": 1, @@ -4784,23 +5014,23 @@ }, "_children": [ { - "__id__": 131 + "__id__": 137 } ], "_active": false, "_components": [ { - "__id__": 134 + "__id__": 140 }, { - "__id__": 136 + "__id__": 142 }, { - "__id__": 137 + "__id__": 143 } ], "_prefab": { - "__id__": 138 + "__id__": 144 }, "_opacity": 255, "_color": { @@ -4854,17 +5084,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 130 + "__id__": 136 }, "_children": [], "_active": true, "_components": [ { - "__id__": 132 + "__id__": 138 } ], "_prefab": { - "__id__": 133 + "__id__": 139 }, "_opacity": 255, "_color": { @@ -4918,7 +5148,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 131 + "__id__": 137 }, "_enabled": true, "_materials": [ @@ -4971,7 +5201,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 130 + "__id__": 136 }, "_enabled": true, "_normalMaterial": null, @@ -4980,7 +5210,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 135 + "__id__": 141 } ], "_N$interactable": true, @@ -5053,7 +5283,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 130 + "__id__": 136 }, "_enabled": true, "_materials": [ @@ -5085,7 +5315,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 130 + "__id__": 136 }, "_enabled": true, "alignMode": 1, @@ -5129,17 +5359,17 @@ "_active": false, "_components": [ { - "__id__": 140 + "__id__": 146 }, { - "__id__": 142 + "__id__": 148 }, { - "__id__": 143 + "__id__": 149 } ], "_prefab": { - "__id__": 144 + "__id__": 150 }, "_opacity": 255, "_color": { @@ -5193,7 +5423,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "_normalMaterial": null, @@ -5202,7 +5432,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 141 + "__id__": 147 } ], "_N$interactable": true, @@ -5275,7 +5505,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "alignMode": 1, @@ -5302,7 +5532,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "_materials": [ @@ -5351,17 +5581,17 @@ "_active": false, "_components": [ { - "__id__": 146 + "__id__": 152 }, { - "__id__": 148 + "__id__": 154 }, { - "__id__": 149 + "__id__": 155 } ], "_prefab": { - "__id__": 150 + "__id__": 156 }, "_opacity": 255, "_color": { @@ -5415,7 +5645,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 145 + "__id__": 151 }, "_enabled": true, "_normalMaterial": null, @@ -5424,7 +5654,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 147 + "__id__": 153 } ], "_N$interactable": true, @@ -5497,7 +5727,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 145 + "__id__": 151 }, "_enabled": true, "_materials": [ @@ -5529,7 +5759,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 145 + "__id__": 151 }, "_enabled": true, "alignMode": 1, @@ -5571,26 +5801,26 @@ }, "_children": [ { - "__id__": 152 + "__id__": 158 }, { - "__id__": 155 + "__id__": 161 } ], "_active": false, "_components": [ { - "__id__": 159 + "__id__": 165 }, { - "__id__": 161 + "__id__": 167 }, { - "__id__": 162 + "__id__": 168 } ], "_prefab": { - "__id__": 163 + "__id__": 169 }, "_opacity": 255, "_color": { @@ -5644,17 +5874,17 @@ "_name": "黄色按钮视频", "_objFlags": 0, "_parent": { - "__id__": 151 + "__id__": 157 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 + "__id__": 159 } ], "_prefab": { - "__id__": 154 + "__id__": 160 }, "_opacity": 255, "_color": { @@ -5708,7 +5938,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 152 + "__id__": 158 }, "_enabled": true, "_materials": [ @@ -5751,20 +5981,20 @@ "_name": "beishu", "_objFlags": 0, "_parent": { - "__id__": 151 + "__id__": 157 }, "_children": [], "_active": true, "_components": [ { - "__id__": 156 + "__id__": 162 }, { - "__id__": 157 + "__id__": 163 } ], "_prefab": { - "__id__": 158 + "__id__": 164 }, "_opacity": 255, "_color": { @@ -5818,7 +6048,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 161 }, "_enabled": true, "_materials": [ @@ -5851,7 +6081,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 155 + "__id__": 161 }, "_enabled": true, "_color": { @@ -5880,7 +6110,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 157 }, "_enabled": true, "_normalMaterial": null, @@ -5889,7 +6119,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 160 + "__id__": 166 } ], "_N$interactable": true, @@ -5962,7 +6192,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 157 }, "_enabled": true, "_materials": [ @@ -5994,7 +6224,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 157 }, "_enabled": true, "alignMode": 1, @@ -6038,17 +6268,17 @@ "_active": false, "_components": [ { - "__id__": 165 + "__id__": 171 }, { - "__id__": 166 + "__id__": 172 }, { - "__id__": 167 + "__id__": 173 } ], "_prefab": { - "__id__": 169 + "__id__": 175 }, "_opacity": 255, "_color": { @@ -6102,7 +6332,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 164 + "__id__": 170 }, "_enabled": true, "_materials": [ @@ -6134,7 +6364,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 164 + "__id__": 170 }, "_enabled": true, "alignMode": 1, @@ -6161,7 +6391,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 164 + "__id__": 170 }, "_enabled": true, "_normalMaterial": null, @@ -6170,7 +6400,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 168 + "__id__": 174 } ], "_N$interactable": true, @@ -6258,23 +6488,23 @@ }, "_children": [ { - "__id__": 171 + "__id__": 177 } ], "_active": false, "_components": [ { - "__id__": 174 + "__id__": 180 }, { - "__id__": 176 + "__id__": 182 }, { - "__id__": 177 + "__id__": 183 } ], "_prefab": { - "__id__": 178 + "__id__": 184 }, "_opacity": 255, "_color": { @@ -6328,17 +6558,17 @@ "_name": "城市图标", "_objFlags": 0, "_parent": { - "__id__": 170 + "__id__": 176 }, "_children": [], "_active": false, "_components": [ { - "__id__": 172 + "__id__": 178 } ], "_prefab": { - "__id__": 173 + "__id__": 179 }, "_opacity": 255, "_color": { @@ -6392,7 +6622,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 171 + "__id__": 177 }, "_enabled": true, "_materials": [ @@ -6445,7 +6675,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 176 }, "_enabled": true, "_normalMaterial": null, @@ -6454,7 +6684,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 175 + "__id__": 181 } ], "_N$interactable": true, @@ -6527,7 +6757,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 176 }, "_enabled": true, "_materials": [ @@ -6559,7 +6789,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 176 }, "_enabled": true, "alignMode": 1, @@ -6601,23 +6831,23 @@ }, "_children": [ { - "__id__": 180 + "__id__": 186 } ], "_active": false, "_components": [ { - "__id__": 183 + "__id__": 189 }, { - "__id__": 185 + "__id__": 191 }, { - "__id__": 186 + "__id__": 192 } ], "_prefab": { - "__id__": 187 + "__id__": 193 }, "_opacity": 255, "_color": { @@ -6671,17 +6901,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 179 + "__id__": 185 }, "_children": [], "_active": false, "_components": [ { - "__id__": 181 + "__id__": 187 } ], "_prefab": { - "__id__": 182 + "__id__": 188 }, "_opacity": 255, "_color": { @@ -6735,7 +6965,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 180 + "__id__": 186 }, "_enabled": true, "_materials": [ @@ -6788,7 +7018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 179 + "__id__": 185 }, "_enabled": true, "_normalMaterial": null, @@ -6797,7 +7027,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 184 + "__id__": 190 } ], "_N$interactable": true, @@ -6870,7 +7100,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 179 + "__id__": 185 }, "_enabled": true, "_materials": [ @@ -6902,7 +7132,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 179 + "__id__": 185 }, "_enabled": true, "alignMode": 1, @@ -6944,26 +7174,26 @@ }, "_children": [ { - "__id__": 189 + "__id__": 195 }, { - "__id__": 192 + "__id__": 198 } ], "_active": false, "_components": [ { - "__id__": 196 + "__id__": 202 }, { - "__id__": 198 + "__id__": 204 }, { - "__id__": 199 + "__id__": 205 } ], "_prefab": { - "__id__": 200 + "__id__": 206 }, "_opacity": 255, "_color": { @@ -7017,17 +7247,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 188 + "__id__": 194 }, "_children": [], "_active": true, "_components": [ { - "__id__": 190 + "__id__": 196 } ], "_prefab": { - "__id__": 191 + "__id__": 197 }, "_opacity": 255, "_color": { @@ -7081,7 +7311,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 189 + "__id__": 195 }, "_enabled": true, "_materials": [ @@ -7134,20 +7364,20 @@ "_name": "timeLab", "_objFlags": 0, "_parent": { - "__id__": 188 + "__id__": 194 }, "_children": [], "_active": false, "_components": [ { - "__id__": 193 + "__id__": 199 }, { - "__id__": 194 + "__id__": 200 } ], "_prefab": { - "__id__": 195 + "__id__": 201 }, "_opacity": 255, "_color": { @@ -7201,7 +7431,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 192 + "__id__": 198 }, "_enabled": true, "_materials": [ @@ -7234,7 +7464,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 192 + "__id__": 198 }, "_enabled": true, "_color": { @@ -7263,7 +7493,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 188 + "__id__": 194 }, "_enabled": true, "_normalMaterial": null, @@ -7272,7 +7502,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 197 + "__id__": 203 } ], "_N$interactable": true, @@ -7345,7 +7575,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 188 + "__id__": 194 }, "_enabled": true, "_materials": [ @@ -7377,7 +7607,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 188 + "__id__": 194 }, "_enabled": true, "alignMode": 1, @@ -7419,65 +7649,65 @@ }, "_children": [ { - "__id__": 202 + "__id__": 208 }, { - "__id__": 217 + "__id__": 223 }, { - "__id__": 272 + "__id__": 278 }, { - "__id__": 289 + "__id__": 295 }, { - "__id__": 295 + "__id__": 301 }, { - "__id__": 309 + "__id__": 315 }, { - "__id__": 314 + "__id__": 320 }, { - "__id__": 319 + "__id__": 328 }, { - "__id__": 333 + "__id__": 345 }, { - "__id__": 341 + "__id__": 353 }, { - "__id__": 386 + "__id__": 398 }, { - "__id__": 397 + "__id__": 409 }, { - "__id__": 405 + "__id__": 417 }, { - "__id__": 413 + "__id__": 425 }, { - "__id__": 421 + "__id__": 433 }, { - "__id__": 426 + "__id__": 438 } ], "_active": true, "_components": [ { - "__id__": 434 + "__id__": 446 }, { - "__id__": 435 + "__id__": 447 } ], "_prefab": { - "__id__": 436 + "__id__": 448 }, "_opacity": 255, "_color": { @@ -7531,27 +7761,27 @@ "_name": "详情框", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 203 + "__id__": 209 }, { - "__id__": 207 + "__id__": 213 }, { - "__id__": 211 + "__id__": 217 } ], "_active": true, "_components": [ { - "__id__": 215 + "__id__": 221 } ], "_prefab": { - "__id__": 216 + "__id__": 222 }, "_opacity": 255, "_color": { @@ -7563,8 +7793,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 683, - "height": 35 + "width": 571, + "height": 43 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -7575,8 +7805,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - 127.89599999999999, + -59.041, + 127.896, 0, 0, 0, @@ -7605,20 +7835,20 @@ "_name": "mzLab", "_objFlags": 0, "_parent": { - "__id__": 202 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 204 + "__id__": 210 }, { - "__id__": 205 + "__id__": 211 } ], "_prefab": { - "__id__": 206 + "__id__": 212 }, "_opacity": 255, "_color": { @@ -7642,7 +7872,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 269.221, + -76.873, 0.073, 0, 0, @@ -7672,7 +7902,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 203 + "__id__": 209 }, "_enabled": true, "_materials": [ @@ -7705,7 +7935,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 203 + "__id__": 209 }, "_enabled": true, "_color": { @@ -7734,20 +7964,20 @@ "_name": "danjiaLab", "_objFlags": 0, "_parent": { - "__id__": 202 + "__id__": 208 }, "_children": [], "_active": true, "_components": [ { - "__id__": 208 + "__id__": 214 }, { - "__id__": 209 + "__id__": 215 } ], "_prefab": { - "__id__": 210 + "__id__": 216 }, "_opacity": 255, "_color": { @@ -7771,7 +8001,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 56.684, + 189.155, -0.799, 0, 0, @@ -7801,7 +8031,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 207 + "__id__": 213 }, "_enabled": true, "_materials": [ @@ -7834,7 +8064,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 207 + "__id__": 213 }, "_enabled": true, "_color": { @@ -7863,20 +8093,20 @@ "_name": "level", "_objFlags": 0, "_parent": { - "__id__": 202 + "__id__": 208 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 212 + "__id__": 218 }, { - "__id__": 213 + "__id__": 219 } ], "_prefab": { - "__id__": 214 + "__id__": 220 }, "_opacity": 255, "_color": { @@ -7930,7 +8160,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 211 + "__id__": 217 }, "_enabled": true, "_materials": [ @@ -7963,7 +8193,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 211 + "__id__": 217 }, "_enabled": true, "_color": { @@ -7992,7 +8222,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "_materials": [ @@ -8035,45 +8265,45 @@ "_name": "任务", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 218 + "__id__": 224 }, { - "__id__": 221 + "__id__": 227 }, { - "__id__": 224 + "__id__": 230 }, { - "__id__": 227 + "__id__": 233 }, { - "__id__": 236 + "__id__": 242 }, { - "__id__": 239 + "__id__": 245 }, { - "__id__": 253 + "__id__": 259 } ], "_active": true, "_components": [ { - "__id__": 267 + "__id__": 273 }, { - "__id__": 269 + "__id__": 275 }, { - "__id__": 270 + "__id__": 276 } ], "_prefab": { - "__id__": 271 + "__id__": 277 }, "_opacity": 255, "_color": { @@ -8127,17 +8357,17 @@ "_name": "未完成", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [], "_active": true, "_components": [ { - "__id__": 219 + "__id__": 225 } ], "_prefab": { - "__id__": 220 + "__id__": 226 }, "_opacity": 255, "_color": { @@ -8191,7 +8421,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 224 }, "_enabled": true, "_materials": [ @@ -8244,17 +8474,17 @@ "_name": "完成", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [], "_active": false, "_components": [ { - "__id__": 222 + "__id__": 228 } ], "_prefab": { - "__id__": 223 + "__id__": 229 }, "_opacity": 255, "_color": { @@ -8308,7 +8538,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 221 + "__id__": 227 }, "_enabled": true, "_materials": [ @@ -8351,17 +8581,17 @@ "_name": "未完成old", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [], "_active": false, "_components": [ { - "__id__": 225 + "__id__": 231 } ], "_prefab": { - "__id__": 226 + "__id__": 232 }, "_opacity": 255, "_color": { @@ -8415,7 +8645,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 224 + "__id__": 230 }, "_enabled": true, "_materials": [ @@ -8458,20 +8688,20 @@ "_name": "任务描述", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [ { - "__id__": 228 + "__id__": 234 }, { - "__id__": 232 + "__id__": 238 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 235 + "__id__": 241 }, "_opacity": 255, "_color": { @@ -8525,20 +8755,20 @@ "_name": "lab", "_objFlags": 0, "_parent": { - "__id__": 227 + "__id__": 233 }, "_children": [], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 235 }, { - "__id__": 230 + "__id__": 236 } ], "_prefab": { - "__id__": 231 + "__id__": 237 }, "_opacity": 255, "_color": { @@ -8592,7 +8822,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 228 + "__id__": 234 }, "_enabled": true, "_materials": [ @@ -8625,7 +8855,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 228 + "__id__": 234 }, "_enabled": false, "_color": { @@ -8654,17 +8884,17 @@ "_name": "框发光", "_objFlags": 0, "_parent": { - "__id__": 227 + "__id__": 233 }, "_children": [], "_active": false, "_components": [ { - "__id__": 233 + "__id__": 239 } ], "_prefab": { - "__id__": 234 + "__id__": 240 }, "_opacity": 255, "_color": { @@ -8718,7 +8948,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 232 + "__id__": 238 }, "_enabled": true, "_materials": [ @@ -8782,17 +9012,17 @@ "_name": "提示叹号", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [], "_active": false, "_components": [ { - "__id__": 237 + "__id__": 243 } ], "_prefab": { - "__id__": 238 + "__id__": 244 }, "_opacity": 255, "_color": { @@ -8846,7 +9076,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 236 + "__id__": 242 }, "_enabled": true, "_materials": [ @@ -8889,30 +9119,30 @@ "_name": "钱进度条", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [ { - "__id__": 240 + "__id__": 246 }, { - "__id__": 243 + "__id__": 249 }, { - "__id__": 246 + "__id__": 252 } ], "_active": true, "_components": [ { - "__id__": 250 + "__id__": 256 }, { - "__id__": 251 + "__id__": 257 } ], "_prefab": { - "__id__": 252 + "__id__": 258 }, "_opacity": 255, "_color": { @@ -8966,17 +9196,17 @@ "_name": "bar", "_objFlags": 512, "_parent": { - "__id__": 239 + "__id__": 245 }, "_children": [], "_active": true, "_components": [ { - "__id__": 241 + "__id__": 247 } ], "_prefab": { - "__id__": 242 + "__id__": 248 }, "_opacity": 255, "_color": { @@ -9030,7 +9260,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 240 + "__id__": 246 }, "_enabled": true, "_materials": [ @@ -9073,17 +9303,17 @@ "_name": "钱-s", "_objFlags": 0, "_parent": { - "__id__": 239 + "__id__": 245 }, "_children": [], "_active": false, "_components": [ { - "__id__": 244 + "__id__": 250 } ], "_prefab": { - "__id__": 245 + "__id__": 251 }, "_opacity": 255, "_color": { @@ -9137,7 +9367,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 243 + "__id__": 249 }, "_enabled": true, "_materials": [ @@ -9180,20 +9410,20 @@ "_name": "jindu", "_objFlags": 0, "_parent": { - "__id__": 239 + "__id__": 245 }, "_children": [], "_active": true, "_components": [ { - "__id__": 247 + "__id__": 253 }, { - "__id__": 248 + "__id__": 254 } ], "_prefab": { - "__id__": 249 + "__id__": 255 }, "_opacity": 255, "_color": { @@ -9247,7 +9477,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 246 + "__id__": 252 }, "_enabled": true, "_materials": [ @@ -9280,7 +9510,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 246 + "__id__": 252 }, "_enabled": false, "_color": { @@ -9309,7 +9539,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "_materials": [ @@ -9341,12 +9571,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 239 + "__id__": 245 }, "_enabled": true, "_N$totalLength": 212, "_N$barSprite": { - "__id__": 241 + "__id__": 247 }, "_N$mode": 0, "_N$progress": 0, @@ -9369,30 +9599,30 @@ "_name": "等级进度条", "_objFlags": 0, "_parent": { - "__id__": 217 + "__id__": 223 }, "_children": [ { - "__id__": 254 + "__id__": 260 }, { - "__id__": 257 + "__id__": 263 }, { - "__id__": 260 + "__id__": 266 } ], "_active": false, "_components": [ { - "__id__": 264 + "__id__": 270 }, { - "__id__": 265 + "__id__": 271 } ], "_prefab": { - "__id__": 266 + "__id__": 272 }, "_opacity": 255, "_color": { @@ -9446,17 +9676,17 @@ "_name": "bar", "_objFlags": 512, "_parent": { - "__id__": 253 + "__id__": 259 }, "_children": [], "_active": false, "_components": [ { - "__id__": 255 + "__id__": 261 } ], "_prefab": { - "__id__": 256 + "__id__": 262 }, "_opacity": 255, "_color": { @@ -9510,7 +9740,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 254 + "__id__": 260 }, "_enabled": true, "_materials": [ @@ -9553,17 +9783,17 @@ "_name": "Lv-s", "_objFlags": 0, "_parent": { - "__id__": 253 + "__id__": 259 }, "_children": [], "_active": false, "_components": [ { - "__id__": 258 + "__id__": 264 } ], "_prefab": { - "__id__": 259 + "__id__": 265 }, "_opacity": 255, "_color": { @@ -9617,7 +9847,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 257 + "__id__": 263 }, "_enabled": true, "_materials": [ @@ -9660,20 +9890,20 @@ "_name": "jindu", "_objFlags": 0, "_parent": { - "__id__": 253 + "__id__": 259 }, "_children": [], "_active": false, "_components": [ { - "__id__": 261 + "__id__": 267 }, { - "__id__": 262 + "__id__": 268 } ], "_prefab": { - "__id__": 263 + "__id__": 269 }, "_opacity": 255, "_color": { @@ -9727,7 +9957,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 260 + "__id__": 266 }, "_enabled": true, "_materials": [ @@ -9760,7 +9990,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 260 + "__id__": 266 }, "_enabled": true, "_color": { @@ -9789,7 +10019,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 253 + "__id__": 259 }, "_enabled": true, "_materials": [ @@ -9821,12 +10051,12 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 253 + "__id__": 259 }, "_enabled": true, "_N$totalLength": 126, "_N$barSprite": { - "__id__": 255 + "__id__": 261 }, "_N$mode": 0, "_N$progress": 0, @@ -9849,7 +10079,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": false, "_normalMaterial": null, @@ -9858,7 +10088,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 268 + "__id__": 274 } ], "_N$interactable": true, @@ -9931,7 +10161,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": false, "alignMode": 1, @@ -9958,7 +10188,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 217 + "__id__": 223 }, "_enabled": true, "_materials": [ @@ -10001,33 +10231,33 @@ "_name": "自动点击", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 273 + "__id__": 279 }, { - "__id__": 276 + "__id__": 282 }, { - "__id__": 280 + "__id__": 286 } ], "_active": true, "_components": [ { - "__id__": 284 + "__id__": 290 }, { - "__id__": 286 + "__id__": 292 }, { - "__id__": 287 + "__id__": 293 } ], "_prefab": { - "__id__": 288 + "__id__": 294 }, "_opacity": 255, "_color": { @@ -10081,17 +10311,17 @@ "_name": "黄色按钮视频", "_objFlags": 0, "_parent": { - "__id__": 272 + "__id__": 278 }, "_children": [], "_active": false, "_components": [ { - "__id__": 274 + "__id__": 280 } ], "_prefab": { - "__id__": 275 + "__id__": 281 }, "_opacity": 255, "_color": { @@ -10145,7 +10375,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 273 + "__id__": 279 }, "_enabled": true, "_materials": [ @@ -10188,20 +10418,20 @@ "_name": "levelLab", "_objFlags": 0, "_parent": { - "__id__": 272 + "__id__": 278 }, "_children": [], "_active": false, "_components": [ { - "__id__": 277 + "__id__": 283 }, { - "__id__": 278 + "__id__": 284 } ], "_prefab": { - "__id__": 279 + "__id__": 285 }, "_opacity": 255, "_color": { @@ -10255,7 +10485,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 276 + "__id__": 282 }, "_enabled": true, "_materials": [ @@ -10288,7 +10518,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 276 + "__id__": 282 }, "_enabled": true, "_color": { @@ -10317,20 +10547,20 @@ "_name": "timeLab", "_objFlags": 0, "_parent": { - "__id__": 272 + "__id__": 278 }, "_children": [], "_active": false, "_components": [ { - "__id__": 281 + "__id__": 287 }, { - "__id__": 282 + "__id__": 288 } ], "_prefab": { - "__id__": 283 + "__id__": 289 }, "_opacity": 255, "_color": { @@ -10384,7 +10614,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "_materials": [ @@ -10417,7 +10647,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 280 + "__id__": 286 }, "_enabled": true, "_color": { @@ -10446,7 +10676,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "_normalMaterial": null, @@ -10455,7 +10685,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 285 + "__id__": 291 } ], "_N$interactable": true, @@ -10528,7 +10758,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "_materials": [ @@ -10560,7 +10790,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 272 + "__id__": 278 }, "_enabled": true, "alignMode": 1, @@ -10598,23 +10828,23 @@ "_name": "食神赐福", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 290 + "__id__": 296 }, { - "__id__": 292 + "__id__": 298 }, { - "__id__": 293 + "__id__": 299 } ], "_prefab": { - "__id__": 294 + "__id__": 300 }, "_opacity": 255, "_color": { @@ -10668,7 +10898,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 289 + "__id__": 295 }, "_enabled": true, "_normalMaterial": null, @@ -10677,7 +10907,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 291 + "__id__": 297 } ], "_N$interactable": true, @@ -10750,7 +10980,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 289 + "__id__": 295 }, "_enabled": true, "_materials": [ @@ -10782,7 +11012,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 289 + "__id__": 295 }, "_enabled": true, "alignMode": 1, @@ -10820,30 +11050,30 @@ "_name": "多倍收益", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 296 + "__id__": 302 }, { - "__id__": 300 + "__id__": 306 } ], "_active": true, "_components": [ { - "__id__": 304 + "__id__": 310 }, { - "__id__": 306 + "__id__": 312 }, { - "__id__": 307 + "__id__": 313 } ], "_prefab": { - "__id__": 308 + "__id__": 314 }, "_opacity": 255, "_color": { @@ -10897,20 +11127,20 @@ "_name": "timesLab", "_objFlags": 0, "_parent": { - "__id__": 295 + "__id__": 301 }, "_children": [], "_active": false, "_components": [ { - "__id__": 297 + "__id__": 303 }, { - "__id__": 298 + "__id__": 304 } ], "_prefab": { - "__id__": 299 + "__id__": 305 }, "_opacity": 255, "_color": { @@ -10964,7 +11194,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 296 + "__id__": 302 }, "_enabled": true, "_materials": [ @@ -10997,7 +11227,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 296 + "__id__": 302 }, "_enabled": true, "_color": { @@ -11026,20 +11256,20 @@ "_name": "timeLab", "_objFlags": 0, "_parent": { - "__id__": 295 + "__id__": 301 }, "_children": [], "_active": false, "_components": [ { - "__id__": 301 + "__id__": 307 }, { - "__id__": 302 + "__id__": 308 } ], "_prefab": { - "__id__": 303 + "__id__": 309 }, "_opacity": 255, "_color": { @@ -11093,7 +11323,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 300 + "__id__": 306 }, "_enabled": true, "_materials": [ @@ -11126,7 +11356,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 300 + "__id__": 306 }, "_enabled": true, "_color": { @@ -11155,7 +11385,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "_normalMaterial": null, @@ -11164,7 +11394,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 305 + "__id__": 311 } ], "_N$interactable": true, @@ -11237,7 +11467,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "_materials": [ @@ -11269,7 +11499,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 295 + "__id__": 301 }, "_enabled": true, "alignMode": 1, @@ -11307,20 +11537,20 @@ "_name": "商店", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [], "_active": false, "_components": [ { - "__id__": 310 + "__id__": 316 }, { - "__id__": 311 + "__id__": 317 } ], "_prefab": { - "__id__": 313 + "__id__": 319 }, "_opacity": 255, "_color": { @@ -11374,7 +11604,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 309 + "__id__": 315 }, "_enabled": true, "_materials": [ @@ -11406,7 +11636,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 309 + "__id__": 315 }, "_enabled": true, "_normalMaterial": null, @@ -11415,7 +11645,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 312 + "__id__": 318 } ], "_N$interactable": true, @@ -11499,20 +11729,24 @@ "_name": "街道", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, - "_children": [], + "_children": [ + { + "__id__": 321 + } + ], "_active": true, "_components": [ { - "__id__": 315 + "__id__": 324 }, { - "__id__": 317 + "__id__": 326 } ], "_prefab": { - "__id__": 318 + "__id__": 327 }, "_opacity": 255, "_color": { @@ -11561,12 +11795,129 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 320 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 322 + } + ], + "_prefab": { + "__id__": 323 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 42.82, + -47.28, + 0, + 0, + 0, + 0, + 1, + 0.8, + 0.8, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 321 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "54fGcdp0lL3KEXqFvALqYf", + "sync": false + }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "_normalMaterial": null, @@ -11575,7 +11926,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 316 + "__id__": 325 } ], "_N$interactable": true, @@ -11648,7 +11999,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 314 + "__id__": 320 }, "_enabled": true, "_materials": [ @@ -11691,30 +12042,33 @@ "_name": "早餐", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 320 + "__id__": 329 }, { - "__id__": 324 + "__id__": 333 + }, + { + "__id__": 337 } ], "_active": true, "_components": [ { - "__id__": 328 + "__id__": 340 }, { - "__id__": 330 + "__id__": 342 }, { - "__id__": 331 + "__id__": 343 } ], "_prefab": { - "__id__": 332 + "__id__": 344 }, "_opacity": 255, "_color": { @@ -11768,20 +12122,20 @@ "_name": "timesLab", "_objFlags": 0, "_parent": { - "__id__": 319 + "__id__": 328 }, "_children": [], "_active": false, "_components": [ { - "__id__": 321 + "__id__": 330 }, { - "__id__": 322 + "__id__": 331 } ], "_prefab": { - "__id__": 323 + "__id__": 332 }, "_opacity": 255, "_color": { @@ -11835,7 +12189,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 320 + "__id__": 329 }, "_enabled": true, "_materials": [ @@ -11868,7 +12222,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 320 + "__id__": 329 }, "_enabled": true, "_color": { @@ -11897,20 +12251,20 @@ "_name": "timeLab", "_objFlags": 0, "_parent": { - "__id__": 319 + "__id__": 328 }, "_children": [], "_active": false, "_components": [ { - "__id__": 325 + "__id__": 334 }, { - "__id__": 326 + "__id__": 335 } ], "_prefab": { - "__id__": 327 + "__id__": 336 }, "_opacity": 255, "_color": { @@ -11964,7 +12318,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 324 + "__id__": 333 }, "_enabled": true, "_materials": [ @@ -11997,7 +12351,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 324 + "__id__": 333 }, "_enabled": true, "_color": { @@ -12021,12 +12375,129 @@ "fileId": "cbANkm0EhGi4+y/duoBPhr", "sync": false }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 328 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 338 + } + ], + "_prefab": { + "__id__": 339 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 41.432, + -50.32, + 0, + 0, + 0, + 0, + 1, + 0.8, + 0.8, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 337 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "cehvRp+9RKCr0L2I769MYa", + "sync": false + }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 319 + "__id__": 328 }, "_enabled": true, "_normalMaterial": null, @@ -12035,7 +12506,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 329 + "__id__": 341 } ], "_N$interactable": true, @@ -12108,7 +12579,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 319 + "__id__": 328 }, "_enabled": true, "_materials": [ @@ -12140,7 +12611,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 319 + "__id__": 328 }, "_enabled": true, "alignMode": 1, @@ -12178,24 +12649,24 @@ "_name": "对战", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 334 + "__id__": 346 } ], "_active": false, "_components": [ { - "__id__": 337 + "__id__": 349 }, { - "__id__": 339 + "__id__": 351 } ], "_prefab": { - "__id__": 340 + "__id__": 352 }, "_opacity": 255, "_color": { @@ -12249,17 +12720,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 333 + "__id__": 345 }, "_children": [], "_active": false, "_components": [ { - "__id__": 335 + "__id__": 347 } ], "_prefab": { - "__id__": 336 + "__id__": 348 }, "_opacity": 255, "_color": { @@ -12313,7 +12784,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 334 + "__id__": 346 }, "_enabled": true, "_materials": [ @@ -12366,7 +12837,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 333 + "__id__": 345 }, "_enabled": true, "_normalMaterial": null, @@ -12375,7 +12846,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 338 + "__id__": 350 } ], "_N$interactable": true, @@ -12448,7 +12919,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 333 + "__id__": 345 }, "_enabled": true, "_materials": [ @@ -12491,54 +12962,54 @@ "_name": "升级", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 342 + "__id__": 354 }, { - "__id__": 345 + "__id__": 357 }, { - "__id__": 348 + "__id__": 360 }, { - "__id__": 351 + "__id__": 363 }, { - "__id__": 354 + "__id__": 366 }, { - "__id__": 357 + "__id__": 369 }, { - "__id__": 361 + "__id__": 373 }, { - "__id__": 368 + "__id__": 380 }, { - "__id__": 371 + "__id__": 383 }, { - "__id__": 374 + "__id__": 386 }, { - "__id__": 378 + "__id__": 390 } ], "_active": true, "_components": [ { - "__id__": 382 + "__id__": 394 }, { - "__id__": 384 + "__id__": 396 } ], "_prefab": { - "__id__": 385 + "__id__": 397 }, "_opacity": 255, "_color": { @@ -12592,17 +13063,17 @@ "_name": "升级收益", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 343 + "__id__": 355 } ], "_prefab": { - "__id__": 344 + "__id__": 356 }, "_opacity": 255, "_color": { @@ -12656,7 +13127,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 342 + "__id__": 354 }, "_enabled": true, "_materials": [ @@ -12699,17 +13170,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 346 + "__id__": 358 } ], "_prefab": { - "__id__": 347 + "__id__": 359 }, "_opacity": 255, "_color": { @@ -12763,7 +13234,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 345 + "__id__": 357 }, "_enabled": true, "_materials": [ @@ -12816,17 +13287,17 @@ "_name": "钞票", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 349 + "__id__": 361 } ], "_prefab": { - "__id__": 350 + "__id__": 362 }, "_opacity": 255, "_color": { @@ -12880,7 +13351,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 348 + "__id__": 360 }, "_enabled": true, "_materials": [ @@ -12923,17 +13394,17 @@ "_name": "lv", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 352 + "__id__": 364 } ], "_prefab": { - "__id__": 353 + "__id__": 365 }, "_opacity": 255, "_color": { @@ -12987,7 +13458,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 351 + "__id__": 363 }, "_enabled": true, "_materials": [ @@ -13031,17 +13502,17 @@ "_name": "按钮升级下方钱框", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": true, "_components": [ { - "__id__": 355 + "__id__": 367 } ], "_prefab": { - "__id__": 356 + "__id__": 368 }, "_opacity": 255, "_color": { @@ -13095,7 +13566,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 354 + "__id__": 366 }, "_enabled": true, "_materials": [ @@ -13138,20 +13609,20 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": true, "_components": [ { - "__id__": 358 + "__id__": 370 }, { - "__id__": 359 + "__id__": 371 } ], "_prefab": { - "__id__": 360 + "__id__": 372 }, "_opacity": 255, "_color": { @@ -13205,7 +13676,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 357 + "__id__": 369 }, "_enabled": true, "_materials": [ @@ -13238,7 +13709,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 357 + "__id__": 369 }, "_enabled": false, "_color": { @@ -13267,21 +13738,21 @@ "_name": "点击收益", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [ { - "__id__": 362 + "__id__": 374 } ], "_active": false, "_components": [ { - "__id__": 366 + "__id__": 378 } ], "_prefab": { - "__id__": 367 + "__id__": 379 }, "_opacity": 255, "_color": { @@ -13335,20 +13806,20 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 361 + "__id__": 373 }, "_children": [], "_active": true, "_components": [ { - "__id__": 363 + "__id__": 375 }, { - "__id__": 364 + "__id__": 376 } ], "_prefab": { - "__id__": 365 + "__id__": 377 }, "_opacity": 255, "_color": { @@ -13402,7 +13873,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 362 + "__id__": 374 }, "_enabled": true, "_materials": [ @@ -13435,7 +13906,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 362 + "__id__": 374 }, "_enabled": true, "_color": { @@ -13464,7 +13935,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 361 + "__id__": 373 }, "_enabled": true, "_materials": [ @@ -13507,17 +13978,17 @@ "_name": "手指箭头", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 369 + "__id__": 381 } ], "_prefab": { - "__id__": 370 + "__id__": 382 }, "_opacity": 255, "_color": { @@ -13571,7 +14042,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 368 + "__id__": 380 }, "_enabled": true, "_materials": [ @@ -13624,17 +14095,17 @@ "_name": "黄色按钮视频", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 372 + "__id__": 384 } ], "_prefab": { - "__id__": 373 + "__id__": 385 }, "_opacity": 255, "_color": { @@ -13688,7 +14159,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 371 + "__id__": 383 }, "_enabled": true, "_materials": [ @@ -13731,20 +14202,20 @@ "_name": "升级", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 375 + "__id__": 387 }, { - "__id__": 376 + "__id__": 388 } ], "_prefab": { - "__id__": 377 + "__id__": 389 }, "_opacity": 255, "_color": { @@ -13798,7 +14269,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 374 + "__id__": 386 }, "_enabled": true, "_materials": [ @@ -13831,7 +14302,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 374 + "__id__": 386 }, "_enabled": true, "_color": { @@ -13860,20 +14331,20 @@ "_name": "单价", "_objFlags": 0, "_parent": { - "__id__": 341 + "__id__": 353 }, "_children": [], "_active": false, "_components": [ { - "__id__": 379 + "__id__": 391 }, { - "__id__": 380 + "__id__": 392 } ], "_prefab": { - "__id__": 381 + "__id__": 393 }, "_opacity": 255, "_color": { @@ -13927,7 +14398,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 378 + "__id__": 390 }, "_enabled": true, "_materials": [ @@ -13960,7 +14431,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 378 + "__id__": 390 }, "_enabled": false, "_color": { @@ -13989,7 +14460,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 341 + "__id__": 353 }, "_enabled": true, "_normalMaterial": null, @@ -13998,7 +14469,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 383 + "__id__": 395 } ], "_N$interactable": true, @@ -14071,7 +14542,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 341 + "__id__": 353 }, "_enabled": true, "_materials": [ @@ -14114,27 +14585,27 @@ "_name": "秘书", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 387 + "__id__": 399 }, { - "__id__": 390 + "__id__": 402 } ], "_active": true, "_components": [ { - "__id__": 393 + "__id__": 405 }, { - "__id__": 395 + "__id__": 407 } ], "_prefab": { - "__id__": 396 + "__id__": 408 }, "_opacity": 255, "_color": { @@ -14188,17 +14659,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 386 + "__id__": 398 }, "_children": [], "_active": false, "_components": [ { - "__id__": 388 + "__id__": 400 } ], "_prefab": { - "__id__": 389 + "__id__": 401 }, "_opacity": 255, "_color": { @@ -14252,7 +14723,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 387 + "__id__": 399 }, "_enabled": true, "_materials": [ @@ -14305,17 +14776,17 @@ "_name": "手指箭头", "_objFlags": 0, "_parent": { - "__id__": 386 + "__id__": 398 }, "_children": [], "_active": false, "_components": [ { - "__id__": 391 + "__id__": 403 } ], "_prefab": { - "__id__": 392 + "__id__": 404 }, "_opacity": 255, "_color": { @@ -14339,8 +14810,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 56.902, - -55.373, + 41.432, + -50.32, 0, 0, 0, @@ -14369,7 +14840,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 390 + "__id__": 402 }, "_enabled": true, "_materials": [ @@ -14422,7 +14893,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 386 + "__id__": 398 }, "_enabled": true, "_normalMaterial": null, @@ -14431,7 +14902,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 394 + "__id__": 406 } ], "_N$interactable": true, @@ -14504,7 +14975,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 386 + "__id__": 398 }, "_enabled": true, "_materials": [ @@ -14547,24 +15018,24 @@ "_name": "房产", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 398 + "__id__": 410 } ], "_active": false, "_components": [ { - "__id__": 401 + "__id__": 413 }, { - "__id__": 403 + "__id__": 415 } ], "_prefab": { - "__id__": 404 + "__id__": 416 }, "_opacity": 255, "_color": { @@ -14618,17 +15089,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 397 + "__id__": 409 }, "_children": [], "_active": false, "_components": [ { - "__id__": 399 + "__id__": 411 } ], "_prefab": { - "__id__": 400 + "__id__": 412 }, "_opacity": 255, "_color": { @@ -14682,7 +15153,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 398 + "__id__": 410 }, "_enabled": true, "_materials": [ @@ -14735,7 +15206,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 397 + "__id__": 409 }, "_enabled": true, "_normalMaterial": null, @@ -14744,7 +15215,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 402 + "__id__": 414 } ], "_N$interactable": true, @@ -14817,7 +15288,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 397 + "__id__": 409 }, "_enabled": true, "_materials": [ @@ -14860,24 +15331,24 @@ "_name": "摊位", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 406 + "__id__": 418 } ], "_active": false, "_components": [ { - "__id__": 409 + "__id__": 421 }, { - "__id__": 411 + "__id__": 423 } ], "_prefab": { - "__id__": 412 + "__id__": 424 }, "_opacity": 255, "_color": { @@ -14931,17 +15402,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 405 + "__id__": 417 }, "_children": [], "_active": true, "_components": [ { - "__id__": 407 + "__id__": 419 } ], "_prefab": { - "__id__": 408 + "__id__": 420 }, "_opacity": 255, "_color": { @@ -14995,7 +15466,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 406 + "__id__": 418 }, "_enabled": true, "_materials": [ @@ -15048,7 +15519,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 405 + "__id__": 417 }, "_enabled": true, "_normalMaterial": null, @@ -15057,7 +15528,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 410 + "__id__": 422 } ], "_N$interactable": true, @@ -15130,7 +15601,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 405 + "__id__": 417 }, "_enabled": true, "_materials": [ @@ -15171,24 +15642,24 @@ "_name": "食谱", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 414 + "__id__": 426 } ], "_active": false, "_components": [ { - "__id__": 417 + "__id__": 429 }, { - "__id__": 419 + "__id__": 431 } ], "_prefab": { - "__id__": 420 + "__id__": 432 }, "_opacity": 255, "_color": { @@ -15242,17 +15713,17 @@ "_name": "红点", "_objFlags": 0, "_parent": { - "__id__": 413 + "__id__": 425 }, "_children": [], "_active": true, "_components": [ { - "__id__": 415 + "__id__": 427 } ], "_prefab": { - "__id__": 416 + "__id__": 428 }, "_opacity": 255, "_color": { @@ -15306,7 +15777,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 414 + "__id__": 426 }, "_enabled": true, "_materials": [ @@ -15359,7 +15830,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 425 }, "_enabled": true, "_normalMaterial": null, @@ -15368,7 +15839,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 418 + "__id__": 430 } ], "_N$interactable": true, @@ -15441,7 +15912,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 413 + "__id__": 425 }, "_enabled": true, "_materials": [ @@ -15482,20 +15953,20 @@ "_name": "回家", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [], "_active": false, "_components": [ { - "__id__": 422 + "__id__": 434 }, { - "__id__": 424 + "__id__": 436 } ], "_prefab": { - "__id__": 425 + "__id__": 437 }, "_opacity": 255, "_color": { @@ -15549,7 +16020,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 421 + "__id__": 433 }, "_enabled": true, "_normalMaterial": null, @@ -15558,7 +16029,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 423 + "__id__": 435 } ], "_N$interactable": true, @@ -15631,7 +16102,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 421 + "__id__": 433 }, "_enabled": true, "_materials": [ @@ -15674,24 +16145,24 @@ "_name": "手机", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [ { - "__id__": 427 + "__id__": 439 } ], "_active": true, "_components": [ { - "__id__": 430 + "__id__": 442 }, { - "__id__": 432 + "__id__": 444 } ], "_prefab": { - "__id__": 433 + "__id__": 445 }, "_opacity": 255, "_color": { @@ -15715,8 +16186,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 272.515, - 204.819, + 289.825, + 169.237, 0, 0, 0, @@ -15745,17 +16216,17 @@ "_name": "spine", "_objFlags": 0, "_parent": { - "__id__": 426 + "__id__": 438 }, "_children": [], "_active": true, "_components": [ { - "__id__": 428 + "__id__": 440 } ], "_prefab": { - "__id__": 429 + "__id__": 441 }, "_opacity": 255, "_color": { @@ -15809,7 +16280,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 427 + "__id__": 439 }, "_enabled": true, "_materials": [ @@ -15862,7 +16333,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 426 + "__id__": 438 }, "_enabled": true, "_normalMaterial": null, @@ -15871,7 +16342,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 431 + "__id__": 443 } ], "_N$interactable": true, @@ -15944,7 +16415,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 426 + "__id__": 438 }, "_enabled": false, "_materials": [ @@ -15987,7 +16458,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "alignMode": 1, @@ -16014,7 +16485,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "_materials": [ @@ -16061,29 +16532,29 @@ }, "_children": [ { - "__id__": 438 + "__id__": 450 }, { - "__id__": 445 + "__id__": 457 }, { - "__id__": 452 + "__id__": 464 }, { - "__id__": 459 + "__id__": 471 }, { - "__id__": 466 + "__id__": 478 } ], "_active": true, "_components": [ { - "__id__": 473 + "__id__": 485 } ], "_prefab": { - "__id__": 474 + "__id__": 486 }, "_opacity": 255, "_color": { @@ -16137,21 +16608,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 437 + "__id__": 449 }, "_children": [ { - "__id__": 439 + "__id__": 451 } ], "_active": false, "_components": [ { - "__id__": 442 + "__id__": 454 } ], "_prefab": { - "__id__": 444 + "__id__": 456 }, "_opacity": 255, "_color": { @@ -16205,17 +16676,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 438 + "__id__": 450 }, "_children": [], "_active": true, "_components": [ { - "__id__": 440 + "__id__": 452 } ], "_prefab": { - "__id__": 441 + "__id__": 453 }, "_opacity": 255, "_color": { @@ -16269,7 +16740,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 439 + "__id__": 451 }, "_enabled": true, "_materials": [ @@ -16322,7 +16793,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 438 + "__id__": 450 }, "_enabled": true, "_normalMaterial": null, @@ -16331,7 +16802,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 443 + "__id__": 455 } ], "_N$interactable": true, @@ -16415,21 +16886,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 437 + "__id__": 449 }, "_children": [ { - "__id__": 446 + "__id__": 458 } ], "_active": false, "_components": [ { - "__id__": 449 + "__id__": 461 } ], "_prefab": { - "__id__": 451 + "__id__": 463 }, "_opacity": 255, "_color": { @@ -16483,17 +16954,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 445 + "__id__": 457 }, "_children": [], "_active": true, "_components": [ { - "__id__": 447 + "__id__": 459 } ], "_prefab": { - "__id__": 448 + "__id__": 460 }, "_opacity": 255, "_color": { @@ -16547,7 +17018,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 446 + "__id__": 458 }, "_enabled": true, "_materials": [ @@ -16600,7 +17071,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 445 + "__id__": 457 }, "_enabled": true, "_normalMaterial": null, @@ -16609,7 +17080,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 450 + "__id__": 462 } ], "_N$interactable": true, @@ -16693,21 +17164,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 437 + "__id__": 449 }, "_children": [ { - "__id__": 453 + "__id__": 465 } ], "_active": false, "_components": [ { - "__id__": 456 + "__id__": 468 } ], "_prefab": { - "__id__": 458 + "__id__": 470 }, "_opacity": 255, "_color": { @@ -16761,17 +17232,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 452 + "__id__": 464 }, "_children": [], "_active": true, "_components": [ { - "__id__": 454 + "__id__": 466 } ], "_prefab": { - "__id__": 455 + "__id__": 467 }, "_opacity": 255, "_color": { @@ -16825,7 +17296,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 453 + "__id__": 465 }, "_enabled": true, "_materials": [ @@ -16878,7 +17349,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 452 + "__id__": 464 }, "_enabled": true, "_normalMaterial": null, @@ -16887,7 +17358,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 457 + "__id__": 469 } ], "_N$interactable": true, @@ -16971,21 +17442,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 437 + "__id__": 449 }, "_children": [ { - "__id__": 460 + "__id__": 472 } ], "_active": false, "_components": [ { - "__id__": 463 + "__id__": 475 } ], "_prefab": { - "__id__": 465 + "__id__": 477 }, "_opacity": 255, "_color": { @@ -17039,17 +17510,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 459 + "__id__": 471 }, "_children": [], "_active": true, "_components": [ { - "__id__": 461 + "__id__": 473 } ], "_prefab": { - "__id__": 462 + "__id__": 474 }, "_opacity": 255, "_color": { @@ -17103,7 +17574,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 460 + "__id__": 472 }, "_enabled": true, "_materials": [ @@ -17156,7 +17627,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 459 + "__id__": 471 }, "_enabled": true, "_normalMaterial": null, @@ -17165,7 +17636,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 464 + "__id__": 476 } ], "_N$interactable": true, @@ -17249,21 +17720,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 437 + "__id__": 449 }, "_children": [ { - "__id__": 467 + "__id__": 479 } ], "_active": false, "_components": [ { - "__id__": 470 + "__id__": 482 } ], "_prefab": { - "__id__": 472 + "__id__": 484 }, "_opacity": 255, "_color": { @@ -17317,17 +17788,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 466 + "__id__": 478 }, "_children": [], "_active": true, "_components": [ { - "__id__": 468 + "__id__": 480 } ], "_prefab": { - "__id__": 469 + "__id__": 481 }, "_opacity": 255, "_color": { @@ -17381,7 +17852,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 467 + "__id__": 479 }, "_enabled": true, "_materials": [ @@ -17434,7 +17905,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 466 + "__id__": 478 }, "_enabled": true, "_normalMaterial": null, @@ -17443,7 +17914,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 471 + "__id__": 483 } ], "_N$interactable": true, @@ -17527,7 +17998,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 437 + "__id__": 449 }, "_enabled": true, "alignMode": 1, @@ -17569,17 +18040,17 @@ }, "_children": [ { - "__id__": 476 + "__id__": 488 } ], "_active": true, "_components": [ { - "__id__": 483 + "__id__": 495 } ], "_prefab": { - "__id__": 484 + "__id__": 496 }, "_opacity": 255, "_color": { @@ -17633,21 +18104,21 @@ "_name": "礼盒", "_objFlags": 0, "_parent": { - "__id__": 475 + "__id__": 487 }, "_children": [ { - "__id__": 477 + "__id__": 489 } ], "_active": false, "_components": [ { - "__id__": 480 + "__id__": 492 } ], "_prefab": { - "__id__": 482 + "__id__": 494 }, "_opacity": 255, "_color": { @@ -17701,17 +18172,17 @@ "_name": "礼物盒", "_objFlags": 0, "_parent": { - "__id__": 476 + "__id__": 488 }, "_children": [], "_active": true, "_components": [ { - "__id__": 478 + "__id__": 490 } ], "_prefab": { - "__id__": 479 + "__id__": 491 }, "_opacity": 255, "_color": { @@ -17765,7 +18236,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 477 + "__id__": 489 }, "_enabled": true, "_materials": [ @@ -17818,7 +18289,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 476 + "__id__": 488 }, "_enabled": true, "_normalMaterial": null, @@ -17827,7 +18298,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 481 + "__id__": 493 } ], "_N$interactable": true, @@ -17911,7 +18382,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 475 + "__id__": 487 }, "_enabled": true, "alignMode": 1, @@ -17955,17 +18426,17 @@ "_active": false, "_components": [ { - "__id__": 486 + "__id__": 498 }, { - "__id__": 488 + "__id__": 500 }, { - "__id__": 489 + "__id__": 501 } ], "_prefab": { - "__id__": 490 + "__id__": 502 }, "_opacity": 255, "_color": { @@ -18019,7 +18490,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 485 + "__id__": 497 }, "_enabled": true, "_normalMaterial": null, @@ -18028,7 +18499,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 487 + "__id__": 499 } ], "_N$interactable": true, @@ -18101,7 +18572,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 485 + "__id__": 497 }, "_enabled": true, "_materials": [ @@ -18133,7 +18604,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 485 + "__id__": 497 }, "_enabled": true, "alignMode": 1, @@ -18213,20 +18684,20 @@ }, "_children": [ { - "__id__": 494 + "__id__": 506 } ], "_active": true, "_components": [ { - "__id__": 498 + "__id__": 510 }, { - "__id__": 499 + "__id__": 511 } ], "_prefab": { - "__id__": 500 + "__id__": 512 }, "_opacity": 255, "_color": { @@ -18280,17 +18751,17 @@ "_name": "New Node", "_objFlags": 0, "_parent": { - "__id__": 493 + "__id__": 505 }, "_children": [], "_active": true, "_components": [ { - "__id__": 495 + "__id__": 507 } ], "_prefab": { - "__id__": 497 + "__id__": 509 }, "_opacity": 255, "_color": { @@ -18344,7 +18815,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 494 + "__id__": 506 }, "_enabled": true, "_normalMaterial": null, @@ -18353,7 +18824,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 496 + "__id__": 508 } ], "_N$interactable": true, @@ -18437,7 +18908,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 493 + "__id__": 505 }, "_enabled": true, "_materials": [ @@ -18477,7 +18948,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 493 + "__id__": 505 }, "_enabled": true, "_defaultClip": { @@ -18511,23 +18982,23 @@ }, "_children": [ { - "__id__": 502 + "__id__": 514 }, { - "__id__": 505 + "__id__": 517 } ], "_active": false, "_components": [ { - "__id__": 509 + "__id__": 521 }, { - "__id__": 510 + "__id__": 522 } ], "_prefab": { - "__id__": 512 + "__id__": 524 }, "_opacity": 255, "_color": { @@ -18581,17 +19052,17 @@ "_name": "视频绿", "_objFlags": 0, "_parent": { - "__id__": 501 + "__id__": 513 }, "_children": [], "_active": true, "_components": [ { - "__id__": 503 + "__id__": 515 } ], "_prefab": { - "__id__": 504 + "__id__": 516 }, "_opacity": 255, "_color": { @@ -18645,7 +19116,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 502 + "__id__": 514 }, "_enabled": true, "_materials": [ @@ -18688,20 +19159,20 @@ "_name": "lab", "_objFlags": 0, "_parent": { - "__id__": 501 + "__id__": 513 }, "_children": [], "_active": true, "_components": [ { - "__id__": 506 + "__id__": 518 }, { - "__id__": 507 + "__id__": 519 } ], "_prefab": { - "__id__": 508 + "__id__": 520 }, "_opacity": 255, "_color": { @@ -18755,7 +19226,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 505 + "__id__": 517 }, "_enabled": true, "_materials": [ @@ -18788,7 +19259,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 505 + "__id__": 517 }, "_enabled": true, "_color": { @@ -18817,7 +19288,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 501 + "__id__": 513 }, "_enabled": true, "_materials": [ @@ -18849,7 +19320,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 501 + "__id__": 513 }, "_enabled": true, "_normalMaterial": null, @@ -18858,7 +19329,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 511 + "__id__": 523 } ], "_N$interactable": true, @@ -18948,7 +19419,7 @@ "_active": false, "_components": [], "_prefab": { - "__id__": 514 + "__id__": 526 }, "_opacity": 255, "_color": { @@ -19019,14 +19490,14 @@ "_active": false, "_components": [ { - "__id__": 516 + "__id__": 528 }, { - "__id__": 517 + "__id__": 529 } ], "_prefab": { - "__id__": 518 + "__id__": 530 }, "_opacity": 255, "_color": { @@ -19080,7 +19551,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 515 + "__id__": 527 }, "_enabled": true, "curJsonName": "DH_ZhaoCheng", @@ -19094,7 +19565,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 515 + "__id__": 527 }, "_enabled": true, "alignMode": 1, @@ -19138,14 +19609,14 @@ "_active": false, "_components": [ { - "__id__": 520 + "__id__": 532 }, { - "__id__": 521 + "__id__": 533 } ], "_prefab": { - "__id__": 522 + "__id__": 534 }, "_opacity": 255, "_color": { @@ -19199,7 +19670,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 519 + "__id__": 531 }, "_enabled": true, "curJsonName": "DH_JiangXiaoTian", @@ -19213,7 +19684,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 519 + "__id__": 531 }, "_enabled": true, "alignMode": 1, @@ -19257,14 +19728,14 @@ "_active": false, "_components": [ { - "__id__": 524 + "__id__": 536 }, { - "__id__": 525 + "__id__": 537 } ], "_prefab": { - "__id__": 526 + "__id__": 538 }, "_opacity": 255, "_color": { @@ -19318,7 +19789,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 523 + "__id__": 535 }, "_enabled": true, "curJsonName": "DH_SongDeKuai", @@ -19332,7 +19803,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 523 + "__id__": 535 }, "_enabled": true, "alignMode": 1, @@ -19376,14 +19847,14 @@ "_active": false, "_components": [ { - "__id__": 528 + "__id__": 540 }, { - "__id__": 529 + "__id__": 541 } ], "_prefab": { - "__id__": 530 + "__id__": 542 }, "_opacity": 255, "_color": { @@ -19437,7 +19908,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 527 + "__id__": 539 }, "_enabled": true, "curJsonName": "DH_QianDuoFa", @@ -19452,7 +19923,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 527 + "__id__": 539 }, "_enabled": true, "alignMode": 1, @@ -19496,14 +19967,14 @@ "_active": false, "_components": [ { - "__id__": 532 + "__id__": 544 }, { - "__id__": 533 + "__id__": 545 } ], "_prefab": { - "__id__": 534 + "__id__": 546 }, "_opacity": 255, "_color": { @@ -19557,7 +20028,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 531 + "__id__": 543 }, "_enabled": true, "curJsonName": "DH_BuTianGuo", @@ -19572,7 +20043,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 531 + "__id__": 543 }, "_enabled": true, "alignMode": 1, @@ -19614,17 +20085,17 @@ }, "_children": [ { - "__id__": 536 + "__id__": 548 } ], "_active": false, "_components": [ { - "__id__": 539 + "__id__": 551 } ], "_prefab": { - "__id__": 540 + "__id__": 552 }, "_opacity": 255, "_color": { @@ -19678,17 +20149,17 @@ "_name": "lab", "_objFlags": 0, "_parent": { - "__id__": 535 + "__id__": 547 }, "_children": [], "_active": true, "_components": [ { - "__id__": 537 + "__id__": 549 } ], "_prefab": { - "__id__": 538 + "__id__": 550 }, "_opacity": 255, "_color": { @@ -19742,7 +20213,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 536 + "__id__": 548 }, "_enabled": true, "_materials": [ @@ -19786,7 +20257,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 535 + "__id__": 547 }, "_enabled": true, "_materials": [ @@ -19835,11 +20306,11 @@ "_active": true, "_components": [ { - "__id__": 542 + "__id__": 554 } ], "_prefab": { - "__id__": 543 + "__id__": 555 }, "_opacity": 255, "_color": { @@ -19893,7 +20364,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 541 + "__id__": 553 }, "_enabled": true, "alignMode": 1, @@ -19935,23 +20406,23 @@ }, "_children": [ { - "__id__": 545 + "__id__": 557 }, { - "__id__": 551 + "__id__": 563 }, { - "__id__": 557 + "__id__": 569 } ], "_active": true, "_components": [ { - "__id__": 563 + "__id__": 575 } ], "_prefab": { - "__id__": 564 + "__id__": 576 }, "_opacity": 255, "_color": { @@ -20005,21 +20476,21 @@ "_name": "qipao1", "_objFlags": 0, "_parent": { - "__id__": 544 + "__id__": 556 }, "_children": [ { - "__id__": 546 + "__id__": 558 } ], "_active": false, "_components": [ { - "__id__": 549 + "__id__": 561 } ], "_prefab": { - "__id__": 550 + "__id__": 562 }, "_opacity": 255, "_color": { @@ -20073,17 +20544,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 545 + "__id__": 557 }, "_children": [], "_active": true, "_components": [ { - "__id__": 547 + "__id__": 559 } ], "_prefab": { - "__id__": 548 + "__id__": 560 }, "_opacity": 255, "_color": { @@ -20137,7 +20608,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 546 + "__id__": 558 }, "_enabled": true, "_materials": [ @@ -20181,7 +20652,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 545 + "__id__": 557 }, "_enabled": true, "_materials": [ @@ -20224,21 +20695,21 @@ "_name": "qipao2", "_objFlags": 0, "_parent": { - "__id__": 544 + "__id__": 556 }, "_children": [ { - "__id__": 552 + "__id__": 564 } ], "_active": false, "_components": [ { - "__id__": 555 + "__id__": 567 } ], "_prefab": { - "__id__": 556 + "__id__": 568 }, "_opacity": 255, "_color": { @@ -20292,17 +20763,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 551 + "__id__": 563 }, "_children": [], "_active": true, "_components": [ { - "__id__": 553 + "__id__": 565 } ], "_prefab": { - "__id__": 554 + "__id__": 566 }, "_opacity": 255, "_color": { @@ -20356,7 +20827,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 552 + "__id__": 564 }, "_enabled": true, "_materials": [ @@ -20400,7 +20871,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 551 + "__id__": 563 }, "_enabled": true, "_materials": [ @@ -20443,21 +20914,21 @@ "_name": "qipao3", "_objFlags": 0, "_parent": { - "__id__": 544 + "__id__": 556 }, "_children": [ { - "__id__": 558 + "__id__": 570 } ], "_active": false, "_components": [ { - "__id__": 561 + "__id__": 573 } ], "_prefab": { - "__id__": 562 + "__id__": 574 }, "_opacity": 255, "_color": { @@ -20511,17 +20982,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 557 + "__id__": 569 }, "_children": [], "_active": true, "_components": [ { - "__id__": 559 + "__id__": 571 } ], "_prefab": { - "__id__": 560 + "__id__": 572 }, "_opacity": 255, "_color": { @@ -20575,7 +21046,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 558 + "__id__": 570 }, "_enabled": true, "_materials": [ @@ -20619,7 +21090,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 557 + "__id__": 569 }, "_enabled": true, "_materials": [ @@ -20662,7 +21133,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 544 + "__id__": 556 }, "_enabled": true, "alignMode": 1, @@ -20704,23 +21175,23 @@ }, "_children": [ { - "__id__": 566 + "__id__": 578 }, { - "__id__": 572 + "__id__": 584 }, { - "__id__": 578 + "__id__": 590 } ], "_active": true, "_components": [ { - "__id__": 584 + "__id__": 596 } ], "_prefab": { - "__id__": 585 + "__id__": 597 }, "_opacity": 255, "_color": { @@ -20774,21 +21245,21 @@ "_name": "qipao1", "_objFlags": 0, "_parent": { - "__id__": 565 + "__id__": 577 }, "_children": [ { - "__id__": 567 + "__id__": 579 } ], "_active": false, "_components": [ { - "__id__": 570 + "__id__": 582 } ], "_prefab": { - "__id__": 571 + "__id__": 583 }, "_opacity": 255, "_color": { @@ -20842,17 +21313,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 566 + "__id__": 578 }, "_children": [], "_active": true, "_components": [ { - "__id__": 568 + "__id__": 580 } ], "_prefab": { - "__id__": 569 + "__id__": 581 }, "_opacity": 255, "_color": { @@ -20906,7 +21377,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 567 + "__id__": 579 }, "_enabled": true, "_materials": [ @@ -20950,7 +21421,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 566 + "__id__": 578 }, "_enabled": true, "_materials": [ @@ -20993,21 +21464,21 @@ "_name": "qipao2", "_objFlags": 0, "_parent": { - "__id__": 565 + "__id__": 577 }, "_children": [ { - "__id__": 573 + "__id__": 585 } ], "_active": false, "_components": [ { - "__id__": 576 + "__id__": 588 } ], "_prefab": { - "__id__": 577 + "__id__": 589 }, "_opacity": 255, "_color": { @@ -21061,17 +21532,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 572 + "__id__": 584 }, "_children": [], "_active": true, "_components": [ { - "__id__": 574 + "__id__": 586 } ], "_prefab": { - "__id__": 575 + "__id__": 587 }, "_opacity": 255, "_color": { @@ -21125,7 +21596,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 573 + "__id__": 585 }, "_enabled": true, "_materials": [ @@ -21169,7 +21640,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 572 + "__id__": 584 }, "_enabled": true, "_materials": [ @@ -21212,21 +21683,21 @@ "_name": "qipao3", "_objFlags": 0, "_parent": { - "__id__": 565 + "__id__": 577 }, "_children": [ { - "__id__": 579 + "__id__": 591 } ], "_active": false, "_components": [ { - "__id__": 582 + "__id__": 594 } ], "_prefab": { - "__id__": 583 + "__id__": 595 }, "_opacity": 255, "_color": { @@ -21280,17 +21751,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 578 + "__id__": 590 }, "_children": [], "_active": true, "_components": [ { - "__id__": 580 + "__id__": 592 } ], "_prefab": { - "__id__": 581 + "__id__": 593 }, "_opacity": 255, "_color": { @@ -21344,7 +21815,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 579 + "__id__": 591 }, "_enabled": true, "_materials": [ @@ -21388,7 +21859,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 578 + "__id__": 590 }, "_enabled": true, "_materials": [ @@ -21431,7 +21902,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 565 + "__id__": 577 }, "_enabled": true, "alignMode": 1, @@ -21475,11 +21946,11 @@ "_active": true, "_components": [ { - "__id__": 587 + "__id__": 599 } ], "_prefab": { - "__id__": 588 + "__id__": 600 }, "_opacity": 255, "_color": { @@ -21533,7 +22004,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 586 + "__id__": 598 }, "_enabled": true, "alignMode": 1, @@ -21575,17 +22046,17 @@ }, "_children": [ { - "__id__": 590 + "__id__": 602 } ], "_active": false, "_components": [ { - "__id__": 593 + "__id__": 605 } ], "_prefab": { - "__id__": 594 + "__id__": 606 }, "_opacity": 255, "_color": { @@ -21639,17 +22110,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 589 + "__id__": 601 }, "_children": [], "_active": true, "_components": [ { - "__id__": 591 + "__id__": 603 } ], "_prefab": { - "__id__": 592 + "__id__": 604 }, "_opacity": 255, "_color": { @@ -21703,7 +22174,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 590 + "__id__": 602 }, "_enabled": true, "_materials": [ @@ -21747,7 +22218,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 589 + "__id__": 601 }, "_enabled": true, "_materials": [ @@ -21794,23 +22265,23 @@ }, "_children": [ { - "__id__": 596 + "__id__": 608 }, { - "__id__": 599 + "__id__": 611 }, { - "__id__": 603 + "__id__": 615 } ], "_active": false, "_components": [ { - "__id__": 606 + "__id__": 618 } ], "_prefab": { - "__id__": 608 + "__id__": 620 }, "_opacity": 255, "_color": { @@ -21864,17 +22335,17 @@ "_name": "语音播放", "_objFlags": 0, "_parent": { - "__id__": 595 + "__id__": 607 }, "_children": [], "_active": true, "_components": [ { - "__id__": 597 + "__id__": 609 } ], "_prefab": { - "__id__": 598 + "__id__": 610 }, "_opacity": 255, "_color": { @@ -21928,7 +22399,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 596 + "__id__": 608 }, "_enabled": true, "_materials": [ @@ -21981,20 +22452,20 @@ "_name": "lab", "_objFlags": 0, "_parent": { - "__id__": 595 + "__id__": 607 }, "_children": [], "_active": false, "_components": [ { - "__id__": 600 + "__id__": 612 }, { - "__id__": 601 + "__id__": 613 } ], "_prefab": { - "__id__": 602 + "__id__": 614 }, "_opacity": 255, "_color": { @@ -22048,7 +22519,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 599 + "__id__": 611 }, "_enabled": true, "_materials": [ @@ -22081,7 +22552,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 599 + "__id__": 611 }, "_enabled": true, "_color": { @@ -22110,17 +22581,17 @@ "_name": "头像", "_objFlags": 0, "_parent": { - "__id__": 595 + "__id__": 607 }, "_children": [], "_active": false, "_components": [ { - "__id__": 604 + "__id__": 616 } ], "_prefab": { - "__id__": 605 + "__id__": 617 }, "_opacity": 255, "_color": { @@ -22174,7 +22645,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 603 + "__id__": 615 }, "_enabled": true, "_materials": [ @@ -22215,7 +22686,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 595 + "__id__": 607 }, "_enabled": true, "_normalMaterial": null, @@ -22224,7 +22695,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 607 + "__id__": 619 } ], "_N$interactable": true, @@ -22280,7 +22751,7 @@ "hoverSprite": null, "_N$disabledSprite": null, "_N$target": { - "__id__": 595 + "__id__": 607 }, "_id": "" }, @@ -22316,11 +22787,11 @@ "_active": true, "_components": [ { - "__id__": 610 + "__id__": 622 } ], "_prefab": { - "__id__": 611 + "__id__": 623 }, "_opacity": 255, "_color": { @@ -22374,7 +22845,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 609 + "__id__": 621 }, "_enabled": true, "alignMode": 1, @@ -22443,31 +22914,31 @@ }, "_enabled": true, "clickMoneyLab": { - "__id__": 67 + "__id__": 70 }, "secondMoneyLab": { - "__id__": 204 + "__id__": 210 }, "danJiaMoneyLab": { - "__id__": 208 + "__id__": 214 }, "chenghaoPic": { "__id__": 50 }, "levelLab": { - "__id__": 212 + "__id__": 42 }, "chenghao": { "__id__": 46 }, "qipaoNode": { - "__id__": 535 + "__id__": 547 }, "qian_ProgressBar": { - "__id__": 251 + "__id__": 257 }, "level_ProgressBar": { - "__id__": 265 + "__id__": 271 }, "_id": "" }, @@ -22481,35 +22952,41 @@ "_enabled": true, "redPointArray": [ { - "__id__": 130 + "__id__": 136 }, { - "__id__": 341 + "__id__": 353 }, { - "__id__": 386 + "__id__": 398 }, { - "__id__": 333 + "__id__": 345 }, { - "__id__": 397 + "__id__": 409 }, { - "__id__": 405 + "__id__": 417 }, { - "__id__": 413 + "__id__": 425 }, { - "__id__": 179 + "__id__": 185 + }, + { + "__id__": 328 + }, + { + "__id__": 320 } ], "adBtn": { - "__id__": 371 + "__id__": 383 }, "adBtnLab": { - "__id__": 375 + "__id__": 387 }, "diaoLuoPrefab": { "__uuid__": "1595541f-244b-40fb-b91b-cbe932cb45c6" diff --git a/assets/MainHall/texture/头像条.png b/assets/MainHall/texture/头像条.png index 94c9ef6e..c32d649f 100644 Binary files a/assets/MainHall/texture/头像条.png and b/assets/MainHall/texture/头像条.png differ diff --git a/assets/MainHall/texture/头像条.png.meta b/assets/MainHall/texture/头像条.png.meta index f932b212..12c80ecf 100644 --- a/assets/MainHall/texture/头像条.png.meta +++ b/assets/MainHall/texture/头像条.png.meta @@ -24,9 +24,9 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 229, + "width": 290, "height": 83, - "rawWidth": 229, + "rawWidth": 290, "rawHeight": 83, "borderTop": 0, "borderBottom": 0, diff --git a/assets/MainHall/texture/详情框.png b/assets/MainHall/texture/详情框.png index f6adf1e2..43e3f61d 100644 Binary files a/assets/MainHall/texture/详情框.png and b/assets/MainHall/texture/详情框.png differ diff --git a/assets/MainHall/texture/详情框.png.meta b/assets/MainHall/texture/详情框.png.meta index 1c75c42e..f816febc 100644 --- a/assets/MainHall/texture/详情框.png.meta +++ b/assets/MainHall/texture/详情框.png.meta @@ -24,10 +24,10 @@ "offsetY": 0, "trimX": 0, "trimY": 0, - "width": 683, - "height": 35, - "rawWidth": 683, - "rawHeight": 35, + "width": 571, + "height": 43, + "rawWidth": 571, + "rawHeight": 43, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/Scripts/DH/DH_3.ts b/assets/Scripts/DH/DH_3.ts index f8950c66..f79c9d6d 100644 --- a/assets/Scripts/DH/DH_3.ts +++ b/assets/Scripts/DH/DH_3.ts @@ -144,23 +144,8 @@ export default class DH_3 extends DHBase { this.door.setAnimation(0, "砸锁", true) if (this.progress.progress >= 1) { this.m_bg.getChildByName("砸").active = false - this.door.setAnimation(0, "打开门", false) - this.door.setCompleteListener(() => { - this.door.setCompleteListener(null) - this.door.node.active = false - this.runBg(1, 2, this.MoveNodes.getChildByName("女儿"), () => { - this.showQiPao(this.chatConfig[5], () => { - User.setStatistics("zhangJie", 6) - TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_606) - TaskManager.setCurTask(MainTaskIdEnum.MainTask_701) - - this.node.getChildByName("前往医院").active = true - }, () => { - // this.heishehui.setAnimation(0, "小弟说话", true) - }); - }) - }) - + this.node.getChildByName("推开").active = true + this.door.setAnimation(0, "没锁门", false) } if (!this.isTouch) { @@ -176,6 +161,28 @@ export default class DH_3 extends DHBase { } + onTouchTuiKai() { + this.node.getChildByName("推开").active = false + this.door.setAnimation(0, "打开门", false) + Common5.playRemoteAudioEffect('effect/铁门打开') + this.door.setCompleteListener(() => { + this.door.setCompleteListener(null) + this.door.node.active = false + Common5.playRemoteAudioMusic("DH/DH_3/sound/打开后女孩晕倒的场景背景音", true) + this.runBg(1, 2, this.MoveNodes.getChildByName("女儿"), () => { + this.showQiPao(this.chatConfig[5], () => { + User.setStatistics("zhangJie", 6) + TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_606) + TaskManager.setCurTask(MainTaskIdEnum.MainTask_701) + + this.node.getChildByName("前往医院").active = true + }, () => { + // this.heishehui.setAnimation(0, "小弟说话", true) + }); + }) + }) + } + onTouchGoYiYuan() { PrefabManage.showBlackGuoDu(() => { PrefabManage.loadPrefabByType(GameType.DH_4) diff --git a/assets/Scripts/GameRoomRes/Room1/Room1.ts b/assets/Scripts/GameRoomRes/Room1/Room1.ts index 6ef8ecc5..bcebea1b 100644 --- a/assets/Scripts/GameRoomRes/Room1/Room1.ts +++ b/assets/Scripts/GameRoomRes/Room1/Room1.ts @@ -129,7 +129,9 @@ export default class Room1 extends cc.Component { updateMainTask() { this.node.getChildByName('手机').active = false this.node.getChildByName('回家').active = true - this.guideView([this.node.getChildByName('回家')]) + let node = this.node.getChildByName('回家') + node.getComponent(cc.Widget).updateAlignment() + this.guideView([node]) } clickGoHome() { @@ -159,7 +161,7 @@ export default class Room1 extends cc.Component { PrefabManage.loadPrefabByType(GameType.TaskInfoNode) } else { if (TaskManager.getIsLastTaskFinish()) { - PrefabManage.showTextTips('后续剧情策划挠头制作中，敬请期待！') + PrefabManage.showTextTips('后续剧情策划挠头制作中，敬请期待！') } else { PrefabManage.showTextTips('当前无任务') } @@ -168,18 +170,18 @@ export default class Room1 extends cc.Component { } guideView(nodeArray) { - if (this.maskGuideNode == null) { + // if (this.maskGuideNode == null) { PrefabManage.loadPrefabByType(GameType.GuideMskNode, this.node, (prefab) => { let guideNodeArray = nodeArray this.maskGuideNode = prefab let firstNode = guideNodeArray.shift() prefab.getComponent(NewGuideScript).setBindNode(firstNode, guideNodeArray) }) - } else { - this.maskGuideNode.active = true - let guideNodeArray = nodeArray - let firstNode = guideNodeArray.shift() - this.maskGuideNode.getComponent(NewGuideScript).setBindNode(firstNode, guideNodeArray) - } + // } else { + // this.maskGuideNode.active = true + // let guideNodeArray = nodeArray + // let firstNode = guideNodeArray.shift() + // this.maskGuideNode.getComponent(NewGuideScript).setBindNode(firstNode, guideNodeArray) + // } } } diff --git a/assets/Scripts/GameRoomRes/Room2/Room2.ts b/assets/Scripts/GameRoomRes/Room2/Room2.ts index cd78fb79..978c6ba1 100644 --- a/assets/Scripts/GameRoomRes/Room2/Room2.ts +++ b/assets/Scripts/GameRoomRes/Room2/Room2.ts @@ -86,10 +86,10 @@ let ChadianConfig = { ], chadianLog402: [ { - str: "爸爸，妈妈怎么跟丑叔叔走了。", + str: "我脸好疼，妈妈，怎么跟丑叔叔走了", qiPaoPos: 3, delay: 2, - effectUrl: "GameRoomRes/sound/Room2/爸爸，妈妈怎么跟丑叔叔走了。" + effectUrl: "GameRoomRes/sound/Room2/我脸好疼，妈妈，怎么跟丑叔叔走了" }, { str: "以后爸爸一个人也会好好照顾你的。", @@ -120,6 +120,9 @@ export default class Room2 extends cc.Component { start() { GameBaseScript.preLoadRemoteAudio(ChadianConfig); + this.scheduleOnce(()=>{ + PrefabManage.preloadPrefabByType(GameType.ZaoCanDian) + },0.5) EventMgr.onEvent_custom(ryw_Event.NormalTouchEndCheck, (data_) => { this.normalTouchCallback(data_.targetNode); diff --git a/assets/Scripts/GameStoryRes/KaiChangGuanQia1Gai.ts b/assets/Scripts/GameStoryRes/KaiChangGuanQia1Gai.ts index ec3342ed..26cfb43c 100644 --- a/assets/Scripts/GameStoryRes/KaiChangGuanQia1Gai.ts +++ b/assets/Scripts/GameStoryRes/KaiChangGuanQia1Gai.ts @@ -62,10 +62,10 @@ let ChadianConfig = { effectUrl: "GameStoryRes/sound/KaiChangGuanQia1Gai/你们是觉得我很好欺负吗？" }, { - str: "你**敢对老子动手？你找死是吧！", + str: "你他妈敢对老子动手？", qiPaoPos: 6, delay: 3.7, - effectUrl: "GameStoryRes/sound/KaiChangGuanQia1Gai/你**敢对老子动手？你找死是吧！" + effectUrl: "GameStoryRes/sound/KaiChangGuanQia1Gai/你他妈敢对老子动手？" }, { str: "陈天霸你给我等着，一年内我让你西餐厅破产！", diff --git a/assets/Scripts/JuQingChat/ChatList.ts b/assets/Scripts/JuQingChat/ChatList.ts index 49e8ccf4..b30b1054 100644 --- a/assets/Scripts/JuQingChat/ChatList.ts +++ b/assets/Scripts/JuQingChat/ChatList.ts @@ -8,23 +8,25 @@ import ChatManager from "./ChatManager"; import JuQingManager from "./JuQingManager"; import { ryw_Event } from "../../FrameWork/Event/EventEnum"; import EventMgr from "../../FrameWork/Event/EventMgr"; -const {ccclass, property} = cc._decorator; +import NewGuideScript from "../NewGuide/NewGuideScript"; +import TaskManager, { MainTaskIdEnum } from "./TaskManager"; +const { ccclass, property } = cc._decorator; @ccclass export default class ChatList extends GameBase { //聊天列表 @property(cc.Node) - chatListNode:cc.Node = null + chatListNode: cc.Node = null @property(cc.Node) - chatListContent:cc.Node = null + chatListContent: cc.Node = null @property(cc.Node) - listItem:cc.Node = null + listItem: cc.Node = null curDay = 0//当天 - curChatTag = '' - isChange = true + curChatTag = '' + isChange = true - initView(chatTag){ + initView(chatTag) { this.curChatTag = chatTag this.curDay = User.getDay() this.initListInfo() @@ -32,7 +34,7 @@ export default class ChatList extends GameBase { onLoad() { super.onLoad() - + } protected start(): void { @@ -40,37 +42,43 @@ export default class ChatList extends GameBase { this.isChange = true this.initListInfo() - EventMgr.onEvent_custom(ryw_Event.ExitBtnEvent,()=>{ - - if(cc.isValid(this.node, true)){ + EventMgr.onEvent_custom(ryw_Event.ExitBtnEvent, () => { + + if (cc.isValid(this.node, true)) { this.isChange = true console.log('initListInfo++++++++++++刷新') this.chatListContent.removeAllChildren() this.chatListContent.destroyAllChildren() this.initListInfo() } - - },this) + + }, this) console.log('isHaveNewMessage=========================', ChatManager.isHaveNewMessage()); - - this.scheduleOnce(()=>{ + + this.scheduleOnce(() => { PrefabManage.preloadPrefabByType(GameType.ChatDialog) - },0) + }, 0) + + let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo() + let mainId = mainTaskInfo.Id + if (mainId == MainTaskIdEnum.MainTask_101) { + this.guideView([this.node.getChildByName("guide")]) + } } onDestroy(): void { super.onDestroy() } //初始化聊天列表(第几天) - initListInfo(){ - console.log("当前是第"+this.curDay+"天--") - - let allJuQingChatConfig:any = Common5.allJuQingChatConfig - + initListInfo() { + console.log("当前是第" + this.curDay + "天--") + + let allJuQingChatConfig: any = Common5.allJuQingChatConfig + let nameArray = [] let tempNameTab = [] let tempChilds = [] - Object.keys(allJuQingChatConfig).forEach(name => { + Object.keys(allJuQingChatConfig).forEach(name => { //console.log(name) nameArray.push(name) }); @@ -79,63 +87,63 @@ export default class ChatList extends GameBase { this.schedule(() => { let name = nameArray[i] let personConfig = JuQingManager.getPersonJsonByJsonName(name) - if(personConfig.type == 'RJB' || personConfig.type == 'DH'){ - - }else{ + if (personConfig.type == 'RJB' || personConfig.type == 'DH') { + + } else { let personJson = ChatManager.getPersonConfig(name) let recordData = ChatManager.getChatRecordDataByJson(name) - + //console.log(recordData,'recordData+++++++++++++===') - if(recordData && recordData.length > 0){ + if (recordData && recordData.length > 0) { //duihuaArray.push[] let childItem = cc.instantiate(this.listItem) let nameStr = ChatManager.getNameByJson(name) childItem.getChildByName("nameStr").getComponent(cc.Label).string = nameStr tempNameTab.push(nameStr) let chatPerson = ChatManager.getConfigByJsonName(name) - - Common5.addUrlSprite_custom("head/"+chatPerson.imgPath, childItem.getChildByName("avatar").getComponent(cc.Sprite)); - let itemInfo = this.getListItemStr(name,personJson,recordData,childItem.getChildByName("flag")) + + Common5.addUrlSprite_custom("head/" + chatPerson.imgPath, childItem.getChildByName("avatar").getComponent(cc.Sprite)); + let itemInfo = this.getListItemStr(name, personJson, recordData, childItem.getChildByName("flag")) let contentStr = itemInfo.contentDesc let indexStr = itemInfo.indexStr - if(contentStr.length > 14){ + if (contentStr.length > 14) { contentStr = contentStr.substr(0, 14) + "..." } childItem.getChildByName("contentStr").getComponent(cc.Label).string = contentStr - childItem.attr({jsonName:name,playInfo:allJuQingChatConfig[name],indexStr:indexStr}) + childItem.attr({ jsonName: name, playInfo: allJuQingChatConfig[name], indexStr: indexStr }) childItem.active = true let isFinish = true - for(let rei = 0;rei0){ + + if (i == count && this.isChange) { + //聊天置顶 + this.isChange = false + if (tempChilds.length > 0) { let idexz = 0 - for(let i = 0;i{ - prefabNode.getComponent(ChatDialog).enterDialog(event.target.jsonName,null,()=>{ + onItemListClick(event) { + PrefabManage.loadPrefabByType(GameType.ChatDialog, null, (prefabNode) => { + prefabNode.getComponent(ChatDialog).enterDialog(event.target.jsonName, null, () => { this.initListInfo() }) }) } - + //显示列表的显示内容 - getListItemStr(jsonName,personJson,recordData,flagNode){ + getListItemStr(jsonName, personJson, recordData, flagNode) { let indexStr = '' //优先显示未完成对话的第一条 - for(let i=0;i=0;k--){ - if(personJson[k].indexStr == indexStr){ + indexStr = recordData[recordData.length - 1].indexStr + for (let k = personJson.length - 1; k >= 0; k--) { + if (personJson[k].indexStr == indexStr) { flagNode.active = false - return {contentDesc:personJson[k].contentDesc,indexStr:indexStr} + return { contentDesc: personJson[k].contentDesc, indexStr: indexStr } } } - - PrefabManage.showTextTips('这里没获取到内容？'+jsonName) + + PrefabManage.showTextTips('这里没获取到内容？' + jsonName) flagNode.active = false - return {contentDesc:"",indexStr:""} + return { contentDesc: "", indexStr: "" } + } + + guideView(nodeArray, opacity = -1) { + PrefabManage.loadPrefabByType(GameType.GuideMskNode, this.node, (prefab) => { + // prefab.zIndex = 199 + let guideNodeArray = nodeArray + let firstNode = guideNodeArray.shift() + prefab.getComponent(NewGuideScript).setBindNode(firstNode, guideNodeArray) + if (opacity != -1) { + prefab.getComponent(NewGuideScript).setOpacityMaskNode(opacity) + } + }) } } diff --git a/assets/Scripts/JuQingChat/TaskManager.ts b/assets/Scripts/JuQingChat/TaskManager.ts index abf305b8..3e17988b 100644 --- a/assets/Scripts/JuQingChat/TaskManager.ts +++ b/assets/Scripts/JuQingChat/TaskManager.ts @@ -256,13 +256,13 @@ let TaskListConfig = [ { TaskId: MainTaskIdEnum.MainTask_502, includeSubTaskId: [], needFinishSubTaskId: SubTaskIdEnum.SubTask_None, - TaskTittle: '骤至的债务', TaskDesc: '筹齐【500万】偿还高利贷', TaskNeedMoney: 0, taskNum: 5000000, finishUnLockJuQingIndex: '', + TaskTittle: '骤至的债务', TaskDesc: '筹齐【500万】还黑贷', TaskNeedMoney: 0, taskNum: 5000000, finishUnLockJuQingIndex: '', subtitle: 10, isAutoTanChu: true }, { TaskId: MainTaskIdEnum.MainTask_503, includeSubTaskId: [], needFinishSubTaskId: SubTaskIdEnum.SubTask_None, - TaskTittle: '骤至的债务', TaskDesc: '骑电驴前往贷款公司偿还', TaskNeedMoney: 0, finishUnLockJuQingIndex: 'WX_5', wanFaRuKouTip: ['rk_chuZuChe'], + TaskTittle: '骤至的债务', TaskDesc: '前往贷款公司偿还', TaskNeedMoney: 0, finishUnLockJuQingIndex: 'WX_5', wanFaRuKouTip: ['rk_chuZuChe'], subtitle: 11, isAutoTanChu: true }, @@ -284,7 +284,7 @@ let TaskListConfig = [ }, { TaskId: MainTaskIdEnum.MainTask_604, includeSubTaskId: [], needFinishSubTaskId: SubTaskIdEnum.SubTask_None, - TaskTittle: '女儿被绑架', TaskDesc: '筹齐女儿的【赎金2000万】', TaskNeedMoney: 0, finishUnLockJuQingIndex: '',taskNum: 20000000, + TaskTittle: '女儿被绑架', TaskDesc: '筹齐【2000万】赎金', TaskNeedMoney: 0, finishUnLockJuQingIndex: '',taskNum: 20000000, subtitle: 15, isAutoTanChu: true }, { @@ -313,7 +313,7 @@ let TaskListConfig = [ { TaskId: MainTaskIdEnum.MainTask_703, includeSubTaskId: [], needFinishSubTaskId: SubTaskIdEnum.SubTask_None, - TaskTittle: '命运的捉弄', TaskDesc: '筹齐女儿的医疗费用【100亿】', TaskNeedMoney: 0, taskNum: 10000000000, finishUnLockJuQingIndex: '', + TaskTittle: '命运的捉弄', TaskDesc: '筹齐医疗费【100亿】', TaskNeedMoney: 0, taskNum: 10000000000, finishUnLockJuQingIndex: '', subtitle: 20, isAutoTanChu: true }, diff --git a/assets/Scripts/MainHall/MainHall.ts b/assets/Scripts/MainHall/MainHall.ts index 002741ad..fa043891 100644 --- a/assets/Scripts/MainHall/MainHall.ts +++ b/assets/Scripts/MainHall/MainHall.ts @@ -680,7 +680,7 @@ export default class MainHall extends UiBase { // Common5.addUrlSprite_custom('jingjie/' + chenghao, this.chenghaoPic) this.chenghao.string = chenghao let levelLab = User.getMyLevel() - this.levelLab.string = levelLab + '' + this.levelLab.string = 'Lv.' + levelLab + '' let node = this.node.getChildByName('UINode').getChildByName('bottom').getChildByName('升级') //等级 @@ -1108,9 +1108,9 @@ export default class MainHall extends UiBase { let mainId = mainTaskInfo.Id let ziChanData = User.getZiChanData() let config = TaskManager.getTaskConfigById(mainId) - if (mainId == MainTaskIdEnum.MainTask_301) { - // User.setFirstStepIndex(1000) - // this.My_Guide() + if (mainId == MainTaskIdEnum.MainTask_303) { + let node = this.node.getChildByName('UINode').getChildByName('主线剧情') + this.guideView([node], 150) } else if (mainId == MainTaskIdEnum.MainTask_532 && ziChanData.unLockNum[1] >= 1) { // TaskManager.finishCurMainTask(MainTaskIdEnum.MainTask_532) // TaskManager.setCurTask(MainTaskIdEnum.MainTask_533) @@ -1216,7 +1216,7 @@ export default class MainHall extends UiBase { let uplab = this.node.getChildByName('收入提升').getChildByName('提升').getChildByName("lab") let addlab = this.node.getChildByName('收入提升').getChildByName('提升').getChildByName("addlab") let cha = ZaoCanManager.getDanJia() - ZaoCanManager.getLastDanJia() - uplab.getComponent(cc.Label).string = `${Common5.getNumberChangeHanzi(ZaoCanManager.getDanJia())}元` + uplab.getComponent(cc.Label).string = `${Common5.getNumberChangeHanzi(ZaoCanManager.getDanJia())}` // let str = '' // for (let i = 0; i < cha.toString().length; i++) { @@ -1229,7 +1229,7 @@ export default class MainHall extends UiBase { // addlab.getComponent(cc.Label).string = `+${str}元` if (this.tween_ShouYiUpState) { clearTimeout(this.clickTimeOutEvent); - addlab.getComponent(cc.Label).string = `+${Common5.getNumberChangeHanzi(cha)}元` + addlab.getComponent(cc.Label).string = `+${Common5.getNumberChangeHanzi(cha)}` } else { cc.Tween.stopAllByTarget(this.node.getChildByName('收入提升')) this.tween_ShouYiUpState = true @@ -1240,7 +1240,7 @@ export default class MainHall extends UiBase { cc.tween().to(0.03, { scale: 1.2 }), // cc.tween().delay(0.3), cc.tween().call(() => { - addlab.getComponent(cc.Label).string = `+${Common5.getNumberChangeHanzi(cha)}元` + addlab.getComponent(cc.Label).string = `+${Common5.getNumberChangeHanzi(cha)}` }), cc.tween().delay(1), cc.tween().call(() => { diff --git a/assets/Scripts/MainHall/MainHallBtn.ts b/assets/Scripts/MainHall/MainHallBtn.ts index 49b6cba7..64049d2a 100644 --- a/assets/Scripts/MainHall/MainHallBtn.ts +++ b/assets/Scripts/MainHall/MainHallBtn.ts @@ -19,12 +19,14 @@ import JuQingManager from "../JuQingChat/JuQingManager"; import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager"; import ChengJiuManager from "../Manager/ChengJiuManager"; import DiaoLuoManager from "../Manager/DiaoLuoManager1"; +import JieDaoManager from "../Manager/JieDaoManager"; import LevelUpManager from "../Manager/LevelUpManager"; import MiShuManager from "../Manager/MiShuManager"; import ShipuManager from "../Manager/ShipuManager"; import TanWeiManager from "../Manager/TanWeiManager"; import UserManager from "../Manager/UserManager"; +import ZaoCanManager from "../Manager/ZaoCanManager"; import NewGuideScript from "../NewGuide/NewGuideScript"; import PaiHangBang from "../PaiHangBang/PaiHangBang"; import PrefabManage, { GameType } from "../PrefabManager/PrefabManage"; @@ -97,9 +99,9 @@ export default class MainHallBtn extends cc.Component { this.refreshBtnLab() }, this) - // this.checkRedPoint() + this.checkRedPoint() this.schedule(() => { - // this.checkRedPoint() + this.checkRedPoint() this.checkHomeBtn() }, 1) this.showChatBtnStatus() @@ -376,133 +378,140 @@ export default class MainHallBtn extends cc.Component { } checkHomeBtn() { - // 回家 - let isHaveTask = false let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo() let mainId = mainTaskInfo.Id - + let config = TaskManager.getTaskConfigById(mainId) let uiNode = this.node.getChildByName('UINode') - let huijiaArray = [ - MainTaskIdEnum.MainTask_504, MainTaskIdEnum.MainTask_507, MainTaskIdEnum.MainTask_508, MainTaskIdEnum.MainTask_510, MainTaskIdEnum.MainTask_513, MainTaskIdEnum.MainTask_514_1, MainTaskIdEnum.MainTask_515, - MainTaskIdEnum.MainTask_516_1, MainTaskIdEnum.MainTask_517, MainTaskIdEnum.MainTask_518_1, MainTaskIdEnum.MainTask_519, MainTaskIdEnum.MainTask_520, MainTaskIdEnum.MainTask_525, MainTaskIdEnum.MainTask_527_1, MainTaskIdEnum.MainTask_529, - MainTaskIdEnum.MainTask_531_1, MainTaskIdEnum.MainTask_533, MainTaskIdEnum.MainTask_534_1, MainTaskIdEnum.MainTask_535, MainTaskIdEnum.MainTask_538, - MainTaskIdEnum.MainTask_541_1, MainTaskIdEnum.MainTask_543_2, MainTaskIdEnum.MainTask_544_1, MainTaskIdEnum.MainTask_546, MainTaskIdEnum.MainTask_547_1, MainTaskIdEnum.MainTask_549, MainTaskIdEnum.MainTask_550_1, - MainTaskIdEnum.MainTask_551_1, MainTaskIdEnum.MainTask_553, MainTaskIdEnum.MainTask_554_1 - ] - - // let huijiaArray = [] - - if (mainId != MainTaskIdEnum.MainTask_None && huijiaArray.indexOf(mainId) >= 0) { - isHaveTask = true - } let spineNodeTask = uiNode.getChildByName('主线剧情').getChildByName('spine') - if (isHaveTask) { - + if (config && config.wanFaRuKouTip && config.wanFaRuKouTip.includes('rk_chuZuChe')) { spineNodeTask.getComponent(sp.Skeleton).setAnimation(0, '呼吸', true) + uiNode.getChildByName('主线剧情').getChildByName('手指箭头').active = true } else { spineNodeTask.getComponent(sp.Skeleton).setAnimation(0, '静止', false) - } - - - let chengshiRedArr = [ - MainTaskIdEnum.MainTask_509, MainTaskIdEnum.MainTask_512, MainTaskIdEnum.MainTask_516_2, MainTaskIdEnum.MainTask_524, MainTaskIdEnum.MainTask_528, MainTaskIdEnum.MainTask_537, - MainTaskIdEnum.MainTask_540, MainTaskIdEnum.MainTask_548, MainTaskIdEnum.MainTask_552, MainTaskIdEnum.MainTask_554_2, MainTaskIdEnum.MainTask_555 - ] - let chengshi = uiNode.getChildByName('城市').getChildByName('城市图标') - if (mainId != MainTaskIdEnum.MainTask_None && chengshiRedArr.indexOf(mainId) >= 0) { - chengshi.getComponent(sp.Skeleton).setAnimation(0, '呼吸', true) - } else { - chengshi.getComponent(sp.Skeleton).setAnimation(0, '静止', false) + uiNode.getChildByName('主线剧情').getChildByName('手指箭头').active = false } } checkRedPoint() { - - for (let i = 0; i < this.redPointArray.length; i++) { - this.redPointArray[i].getChildByName('红点').active = false + //需要过了任务301的引导后 + if (User.getFirstStepIndex() < 9) { + return } + // for (let i = 0; i < this.redPointArray.length; i++) { + // this.redPointArray[i].getChildByName('红点').active = false + // } for (let i = 0; i < this.redPointArray.length; i++) { let node = this.redPointArray[i] - if (node.name == '签到') { - let signList = User.getSignList() - let curSignDay = -1 - for (let i = 0; i < 7; i++) { - if (signList[i] == 0) { - curSignDay = i - break - } - } - let isGetReward = signList[signList.length - 1] - let haveRed = false - if (isGetReward == 0 && curSignDay >= 0) { - haveRed = true - } - node.getChildByName('红点').active = haveRed - - if (isGetReward == 1) { - node.active = false - } - - } else if (node.name == '升级') { + // if (node.name == '签到') { + // let signList = User.getSignList() + // let curSignDay = -1 + // for (let i = 0; i < 7; i++) { + // if (signList[i] == 0) { + // curSignDay = i + // break + // } + // } + // let isGetReward = signList[signList.length - 1] + // let haveRed = false + // if (isGetReward == 0 && curSignDay >= 0) { + // haveRed = true + // } + // node.getChildByName('红点').active = haveRed + + // if (isGetReward == 1) { + // node.active = false + // } + + // } + if (node.name == '升级') { let haveRed = false let myMoney = UserManager.getCurMoney() let levelUpSpned = LevelUpManager.levelUpSpned() + // if (myMoney - levelUpSpned >= 0) { + // haveRed = true + // } + // node.getChildByName('红点').active = haveRed + if (myMoney - levelUpSpned >= 0) { - haveRed = true + node.getChildByName("手指箭头").active = true + } else { + node.getChildByName("手指箭头").active = false } - node.getChildByName('红点').active = haveRed } else if (node.name == '秘书') { let haveRed = false haveRed = MiShuManager.getMishuRedPoint() - node.getChildByName('红点').active = haveRed - - } else if (node.name == '对战') { - // let haveRed = false - // haveRed = ChallengeManager.canChallengeProple() // node.getChildByName('红点').active = haveRed - - } else if (node.name == '房产') { - // let haveRed = false - // haveRed = FangChanManager.refreshHaveMoney() - // node.getChildByName('红点').active = haveRed - - } else if (node.name == '摊位') { + if (haveRed) { + node.getChildByName("手指箭头").active = true + } else { + node.getChildByName("手指箭头").active = false + } + } else if (node.name == '早餐') { let haveRed = false - haveRed = TanWeiManager.haveMoneyLockItem() - node.getChildByName('红点').active = haveRed - - } else if (node.name == '食谱') { + haveRed = ZaoCanManager.getIsHaveUnLock() + // node.getChildByName('红点').active = haveRed + if (haveRed) { + node.getChildByName("手指箭头").active = true + } else { + node.getChildByName("手指箭头").active = false + } + } else if (node.name == '街道') { let haveRed = false - haveRed = ShipuManager.haveMoneyLockItem() - node.getChildByName('红点').active = haveRed - - - } else if (node.name == '成就') { - // let onlineGameRewards = User.getOnlineGameReward() - // let onlineTime = [3,5,10,15,30] - // let haveRed = false - // for(let i = 0;i= timeLimit){ - // haveRed = true - // break - // } - // } - // } - - let active = ChengJiuManager.isHaveRedPoint() - node.getChildByName('红点').active = active - if (active) { - let isNeedGuide = cc.sys.localStorage.getItem("成就引导") ?? 0 - if (!isNeedGuide && TaskManager.getCurUnLockMainTaskId() >= MainTaskIdEnum.MainTask_505) { - if (!this.guideChengJiu) { - User.setFirstStepIndex(1002) - EventMgr.emitEvent_custom(ryw_Event.My_Guide) - this.guideChengJiu = true - } - } + haveRed = JieDaoManager.getIsHaveUnLock() + // node.getChildByName('红点').active = haveRed + if (haveRed) { + node.getChildByName("手指箭头").active = true + } else { + node.getChildByName("手指箭头").active = false } - } + } + // else if (node.name == '对战') { + // // let haveRed = false + // // haveRed = ChallengeManager.canChallengeProple() + // // node.getChildByName('红点').active = haveRed + + // } else if (node.name == '房产') { + // // let haveRed = false + // // haveRed = FangChanManager.refreshHaveMoney() + // // node.getChildByName('红点').active = haveRed + + // } else if (node.name == '摊位') { + // let haveRed = false + // haveRed = TanWeiManager.haveMoneyLockItem() + // node.getChildByName('红点').active = haveRed + + // } else if (node.name == '食谱') { + // let haveRed = false + // haveRed = ShipuManager.haveMoneyLockItem() + // node.getChildByName('红点').active = haveRed + + + // } else if (node.name == '成就') { + // // let onlineGameRewards = User.getOnlineGameReward() + // // let onlineTime = [3,5,10,15,30] + // // let haveRed = false + // // for(let i = 0;i= timeLimit){ + // // haveRed = true + // // break + // // } + // // } + // // } + + // let active = ChengJiuManager.isHaveRedPoint() + // node.getChildByName('红点').active = active + // if (active) { + // let isNeedGuide = cc.sys.localStorage.getItem("成就引导") ?? 0 + // if (!isNeedGuide && TaskManager.getCurUnLockMainTaskId() >= MainTaskIdEnum.MainTask_505) { + // if (!this.guideChengJiu) { + // User.setFirstStepIndex(1002) + // EventMgr.emitEvent_custom(ryw_Event.My_Guide) + // this.guideChengJiu = true + // } + // } + // } + // } } } @@ -947,169 +956,36 @@ export default class MainHallBtn extends cc.Component { let mainTaskInfo: any = TaskManager.getCurUnLockMainTaskInfo() let mainId = mainTaskInfo.Id let curFinishTask = User.getCurTaskId() - if (mainId == MainTaskIdEnum.MainTask_504) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_7) - } else if (mainId == MainTaskIdEnum.MainTask_507) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_9) - } else if (mainId == MainTaskIdEnum.MainTask_508) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_10) - } else if (mainId == MainTaskIdEnum.MainTask_510) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_11) - } else if (mainId == MainTaskIdEnum.MainTask_513) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_12) - } else if (curFinishTask[0] == MainTaskIdEnum.MainTask_514_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_13) - } else if (mainId == MainTaskIdEnum.MainTask_515) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_14) - } else if (curFinishTask[0] == MainTaskIdEnum.MainTask_516_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_15) - } else if (mainId == MainTaskIdEnum.MainTask_517) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_16) - } else if (curFinishTask[0] == MainTaskIdEnum.MainTask_518_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_17) - } else if (mainId == MainTaskIdEnum.MainTask_519) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_18) - } else if (mainId == MainTaskIdEnum.MainTask_520) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_19) - } else if (mainId == MainTaskIdEnum.MainTask_525) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_22) - } else if (mainId == MainTaskIdEnum.MainTask_527_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_24) - } else if (mainId == MainTaskIdEnum.MainTask_529) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_25) - } else if (mainId == MainTaskIdEnum.MainTask_531_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_26) - } else if (mainId == MainTaskIdEnum.MainTask_533) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_27) - } else if (mainId == MainTaskIdEnum.MainTask_534_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_28) - } else if (mainId == MainTaskIdEnum.MainTask_535) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_29) - } else if (mainId == MainTaskIdEnum.MainTask_538) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_30) - // } else if (mainId == MainTaskIdEnum.MainTask_541) { - } else if (mainId == MainTaskIdEnum.MainTask_541_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_32) - } else if (mainId == MainTaskIdEnum.MainTask_542) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - // PrefabManage.loadPrefabByType(GameType.DH_32) - } else if (mainId == MainTaskIdEnum.MainTask_543_2) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - // PrefabManage.loadPrefabByType(GameType.DH_33) - // this.jiuzhumeinv() - PrefabManage.loadPrefabByType(GameType.JiuZhuMeiNv) - } else if (mainId == MainTaskIdEnum.MainTask_544_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_34) - } else if (mainId == MainTaskIdEnum.MainTask_546) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_35) - } else if (mainId == MainTaskIdEnum.MainTask_547_1) { - Common5.stopMusic() - this.node.removeFromParent() - this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_36) - } else if (mainId == MainTaskIdEnum.MainTask_549) { + if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401 || mainId == MainTaskIdEnum.MainTask_402) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_37) - } else if (mainId == MainTaskIdEnum.MainTask_550_1) { + PrefabManage.loadPrefabByType(GameType.Room2) + } else if (mainId == MainTaskIdEnum.MainTask_501) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_38) - } else if (mainId == MainTaskIdEnum.MainTask_551_1) { + PrefabManage.loadPrefabByType(GameType.DH_1) + } else if (mainId == MainTaskIdEnum.MainTask_503) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_39) - } else if (mainId == MainTaskIdEnum.MainTask_552) { + PrefabManage.loadPrefabByType(GameType.DH_5) + } else if (mainId == MainTaskIdEnum.MainTask_602) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - // PrefabManage.loadPrefabByType(GameType.DH_40) - } else if (mainId == MainTaskIdEnum.MainTask_553) { + PrefabManage.loadPrefabByType(GameType.GameStory4) + } else if (mainId == MainTaskIdEnum.MainTask_605 || mainId == MainTaskIdEnum.MainTask_606) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_41) - } else if (mainId == MainTaskIdEnum.MainTask_554_1) { + PrefabManage.loadPrefabByType(GameType.DH_3) + } else if (mainId == MainTaskIdEnum.MainTask_701 || mainId == MainTaskIdEnum.MainTask_702) { Common5.stopMusic() this.node.removeFromParent() this.node.destroy() - PrefabManage.loadPrefabByType(GameType.DH_42) + PrefabManage.loadPrefabByType(GameType.DH_4) } else { PrefabManage.showTextTips("当前无剧情") } @@ -1316,6 +1192,13 @@ export default class MainHallBtn extends cc.Component { } else { } + + if (level == 10) { + User.setZhuanPanFree(true) + this.clickFanbeiBtnEvent() + } else if (level == 20) { + PrefabManage.loadPrefabByType(GameType.AddDesk) + } // let jiachengGY = MiShuManager.getMishuAllClickInCome() // let jiachengTw = ShipuManager.getAllClickInCome() // let clickIncomeNum = User.getClickIncomeNum() @@ -1346,7 +1229,7 @@ export default class MainHallBtn extends cc.Component { levelUpClickEvent() { // PrefabManage.loadPrefabByType(GameType.PeopleLevelUp) - Common5.playRemoteAudioEffect('sound/diandiandian/点击升级') + // Common5.playRemoteAudioEffect('sound/diandiandian/点击升级') let myMoney = UserManager.getCurMoney() let levelUpSpned = LevelUpManager.levelUpSpned() if (myMoney - levelUpSpned >= 0) { diff --git a/assets/Scripts/MainScene/MainScene.ts b/assets/Scripts/MainScene/MainScene.ts index 785a8171..9cd14ac5 100644 --- a/assets/Scripts/MainScene/MainScene.ts +++ b/assets/Scripts/MainScene/MainScene.ts @@ -91,8 +91,8 @@ export default class MainScene extends cc.Component { // this.getServerData() // }) // return - // User.setFirstStepIndex(3) - // TaskManager.setCurTask(MainTaskIdEnum.MainTask_301) + // User.setFirstStepIndex(9) + // TaskManager.setCurTask(MainTaskIdEnum.MainTask_101) // User.setCurGameLevelIndex(1) // for (let i = 0; i < 18; i++) { // MiShuManager.setMishuLock(i, true, false) diff --git a/assets/Scripts/Manager/JieDaoManager.ts b/assets/Scripts/Manager/JieDaoManager.ts index 69a676ca..694873eb 100644 --- a/assets/Scripts/Manager/JieDaoManager.ts +++ b/assets/Scripts/Manager/JieDaoManager.ts @@ -10,8 +10,8 @@ import TaskManager, { MainTaskIdEnum } from "../JuQingChat/TaskManager"; let Config = [ { level: 0, icon: 'res/图片1', isNeedAd: false, name: '解放路', descLab: '解放路', miaozhuan: 1, jiesuoMoney: 1, jiesuoBeiShu: 1 }, - { level: 1, icon: 'res/图片2', isNeedAd: false, name: '朝阳路', descLab: '朝阳路', miaozhuan: 2, jiesuoMoney: 2, jiesuoBeiShu: 2 }, - { level: 2, icon: 'res/图片3', isNeedAd: false, name: '太平路', descLab: '太平路', miaozhuan: 3, jiesuoMoney: 3, jiesuoBeiShu: 3 }, + { level: 1, icon: 'res/图片2', isNeedAd: false, name: '朝阳路', descLab: '朝阳路', miaozhuan: 2, jiesuoMoney: 20000000, jiesuoBeiShu: 3 }, + { level: 2, icon: 'res/图片3', isNeedAd: false, name: '太平路', descLab: '太平路', miaozhuan: 3, jiesuoMoney: 2000000000, jiesuoBeiShu: 6 }, // { level: 3, icon: 'res/图片2', isNeedAd: false, name: '劳动路', descLab: '劳动路', miaozhuan: 4, jiesuoMoney: 4, jiesuoBeiShu: 4 }, ] @@ -63,4 +63,16 @@ export default class JieDaoManager { } return _config } + + public static getIsHaveUnLock(){ + let isHave = false + let myMoney = User.getMoney() + for (let i = 0; i < Config.length; i++) { + if (myMoney >= Config[i].jiesuoMoney && this.getJieDaoLevel() < i) { + isHave = true + break + } + } + return isHave + } } diff --git a/assets/Scripts/Manager/LevelUpManager.ts b/assets/Scripts/Manager/LevelUpManager.ts index 3ed482f4..f27cd3e6 100644 --- a/assets/Scripts/Manager/LevelUpManager.ts +++ b/assets/Scripts/Manager/LevelUpManager.ts @@ -142,18 +142,18 @@ let jiesuoProConfig = [ export default class LevelUpManager { //等级系数 public static levelArray = [ - 1.06, 1.06, 1.033, 1.035, 1.025, 1.042, 1.028, 1.028, 1.03, 1.032, - 1.028, 1.04, 1.013, 1.02, 1.042, 1.01, 1.04, 1.04, 1.04, 1.04, - 1.01, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, - 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, - 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, - 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, 1.047, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, + 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, 1.046, ] //收益系数 public static incomeArray = [ - 1.015, 1.015, 1.012, 1.02, 1.013, 1.012, 1.022, 1.05, 1.012, 1.025, - 1.015, 1.015, 1.025, 1.015, 1.015, 1.025, 1.015, 1.015, 1.016, 1.016, - 1.025, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, + 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, + 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, + 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, 1.02, @@ -316,15 +316,15 @@ export default class LevelUpManager { } User.setMyLevel(level) - if (level >= 200 && level <= 300) { - for (let index = 200; index <= 300; index += 10) { - if (level == index) { - console.log(`等级提升-等级提升至${level}`) - Common5.ReportDY("inLevel", `等级提升-等级提升至${level}`) - break - } - } - } + // if (level >= 200 && level <= 300) { + // for (let index = 200; index <= 300; index += 10) { + // if (level == index) { + // console.log(`等级提升-等级提升至${level}`) + // Common5.ReportDY("inLevel", `等级提升-等级提升至${level}`) + // break + // } + // } + // } EventMgr.emitEvent_custom(ryw_Event.levelUpChange) return dataPro diff --git a/assets/Scripts/Manager/MiShuManager.ts b/assets/Scripts/Manager/MiShuManager.ts index e75f10e0..69a35216 100644 --- a/assets/Scripts/Manager/MiShuManager.ts +++ b/assets/Scripts/Manager/MiShuManager.ts @@ -15,27 +15,27 @@ import TaskManager from "../JuQingChat/TaskManager" //mishuType 0秘书1队友 ,lockLevel上个队友的级别需要多少级 //mishuType 0秘书1队友 ,lockLevel上个队友的级别需要多少级 let configData = [ - {mishuId:0, addPercent:2.0, spineName:'右一',spineName2:'待机', mishuLevel:0, mishuType:0, name:'云欣',selfLevel:0, selfLevelStr:'',lockLevel:0, lockLevelStr:'茜滢10级时解锁',lockMoney:500 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:1, addPercent:1.5, spineName:'左一',spineName2:'待机', mishuLevel:0, mishuType:0, name:'茜滢',selfLevel:100, selfLevelStr:'主角100级时解锁',lockLevel:0, lockLevelStr:'云欣10级时解锁',lockMoney:1200 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:2, addPercent:2.5, spineName:'中间1',spineName2:'中间1', mishuLevel:0, mishuType:0, name:'媱安',selfLevel:150, selfLevelStr:'主角150级时解锁',lockLevel:0, lockLevelStr:'云欣10级时解锁',lockMoney:30000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:3, addPercent:3.0, spineName:'中间2',spineName2:'中间2', mishuLevel:0, mishuType:0, name:'诗涵',selfLevel:200, selfLevelStr:'主角200级时解锁',lockLevel:0, lockLevelStr:'媱安10级时解锁',lockMoney:300000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:4, addPercent:3.0, spineName:'中间4',spineName2:'中间4', mishuLevel:0, mishuType:0, name:'婉仪',selfLevel:300, selfLevelStr:'主角300级时解锁',lockLevel:0, lockLevelStr:'诗涵10级时解锁',lockMoney:2000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:5, addPercent:3.5, spineName:'中间3',spineName2:'中间3', mishuLevel:0, mishuType:0, name:'诺依',selfLevel:400, selfLevelStr:'主角400级时解锁',lockLevel:0, lockLevelStr:'婉仪10级时解锁',lockMoney:100000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:6, addPercent:4.0, spineName:'最后1',spineName2:'最后1', mishuLevel:0, mishuType:0, name:'晴萱',selfLevel:500, selfLevelStr:'主角500级时解锁',lockLevel:0, lockLevelStr:'诺依10级时解锁',lockMoney:1000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:7, addPercent:4.5, spineName:'最后2',spineName2:'最后2', mishuLevel:0, mishuType:0, name:'蕾蕾',selfLevel:600, selfLevelStr:'主角600级时解锁',lockLevel:0, lockLevelStr:'晴萱10级时解锁',lockMoney:10000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:8, addPercent:5.0, spineName:'最后6',spineName2:'最后6', mishuLevel:0, mishuType:0, name:'水萌',selfLevel:700, selfLevelStr:'主角700级时解锁',lockLevel:0, lockLevelStr:'蕾蕾10级时解锁',lockMoney:1000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:9, addPercent:6.0, spineName:'最后3',spineName2:'最后3', mishuLevel:0, mishuType:0, name:'可微',selfLevel:800, selfLevelStr:'主角800级时解锁',lockLevel:0, lockLevelStr:'水萌10级时解锁',lockMoney:10000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:10, addPercent:8.0, spineName:'最后4',spineName2:'最后4', mishuLevel:0, mishuType:0, name:'以南',selfLevel:900, selfLevelStr:'主角900级时解锁',lockLevel:0, lockLevelStr:'可微10级时解锁',lockMoney:100000000000000, isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:11, addPercent:10.0, spineName:'秘书2',spineName2:'秘书2', mishuLevel:0, mishuType:0, name:'悦澄',selfLevel:1000, selfLevelStr:'主角1000级时解锁',lockLevel:0, lockLevelStr:'以南10级时解锁',lockMoney:30000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:12, addPercent:15.0, spineName:'最后5',spineName2:'最后5', mishuLevel:0, mishuType:0, name:'夏彤',selfLevel:1100, selfLevelStr:'主角1100级时解锁',lockLevel:0, lockLevelStr:'悦澄10级时解锁',lockMoney:100000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:13, addPercent:50.0, spineName:'秘书4',spineName2:'秘书4', mishuLevel:0, mishuType:0, name:'紫琳',selfLevel:1200, selfLevelStr:'主角1200级时解锁',lockLevel:0, lockLevelStr:'夏彤10级时解锁',lockMoney:5000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:14, addPercent:100.0, spineName:'秘书6',spineName2:'秘书6', mishuLevel:0, mishuType:0, name:'羽婷',selfLevel:1300, selfLevelStr:'主角1300级时解锁',lockLevel:0, lockLevelStr:'紫琳10级时解锁',lockMoney:10000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:15, addPercent:150.0, spineName:'秘书5',spineName2:'秘书5', mishuLevel:0, mishuType:0, name:'梵音',selfLevel:1400, selfLevelStr:'主角1400级时解锁',lockLevel:0, lockLevelStr:'羽婷10级时解锁',lockMoney:100000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:16, addPercent:200.0, spineName:'秘书3',spineName2:'秘书3', mishuLevel:0, mishuType:0, name:'诗锦',selfLevel:1500, selfLevelStr:'主角1500级时解锁',lockLevel:0, lockLevelStr:'梵音10级时解锁',lockMoney:10000000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:17, addPercent:300.0, spineName:'秘书1',spineName2:'秘书1', mishuLevel:0, mishuType:0, name:'绮罗',selfLevel:2000, selfLevelStr:'主角2000级时解锁',lockLevel:0, lockLevelStr:'诗锦10级时解锁',lockMoney:300000000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:0, addPercent:2.0, spineName:'右一',spineName2:'待机', mishuLevel:0, mishuType:0, name:'云欣',selfLevel:1, selfLevelStr:'',lockLevel:0, lockLevelStr:'茜滢10级时解锁',lockMoney:0 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:1, addPercent:1.5, spineName:'左一',spineName2:'待机', mishuLevel:0, mishuType:0, name:'茜滢',selfLevel:50, selfLevelStr:'主角50级时解锁',lockLevel:0, lockLevelStr:'云欣10级时解锁',lockMoney:25500 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:2, addPercent:2.5, spineName:'中间1',spineName2:'中间1', mishuLevel:0, mishuType:0, name:'媱安',selfLevel:100, selfLevelStr:'主角100级时解锁',lockLevel:0, lockLevelStr:'云欣10级时解锁',lockMoney:60000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:3, addPercent:3.0, spineName:'中间2',spineName2:'中间2', mishuLevel:0, mishuType:0, name:'诗涵',selfLevel:150, selfLevelStr:'主角150级时解锁',lockLevel:0, lockLevelStr:'媱安10级时解锁',lockMoney:180000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:4, addPercent:3.0, spineName:'中间4',spineName2:'中间4', mishuLevel:0, mishuType:0, name:'婉仪',selfLevel:200, selfLevelStr:'主角200级时解锁',lockLevel:0, lockLevelStr:'诗涵10级时解锁',lockMoney:480000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:5, addPercent:3.5, spineName:'中间3',spineName2:'中间3', mishuLevel:0, mishuType:0, name:'诺依',selfLevel:250, selfLevelStr:'主角250级时解锁',lockLevel:0, lockLevelStr:'婉仪10级时解锁',lockMoney:1350000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:6, addPercent:4.0, spineName:'最后1',spineName2:'最后1', mishuLevel:0, mishuType:0, name:'晴萱',selfLevel:300, selfLevelStr:'主角300级时解锁',lockLevel:0, lockLevelStr:'诺依10级时解锁',lockMoney:3600000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:7, addPercent:4.5, spineName:'最后2',spineName2:'最后2', mishuLevel:0, mishuType:0, name:'蕾蕾',selfLevel:350, selfLevelStr:'主角350级时解锁',lockLevel:0, lockLevelStr:'晴萱10级时解锁',lockMoney:9600000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:8, addPercent:5.0, spineName:'最后6',spineName2:'最后6', mishuLevel:0, mishuType:0, name:'水萌',selfLevel:400, selfLevelStr:'主角400级时解锁',lockLevel:0, lockLevelStr:'蕾蕾10级时解锁',lockMoney:25800000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:9, addPercent:6.0, spineName:'最后3',spineName2:'最后3', mishuLevel:0, mishuType:0, name:'可微',selfLevel:450, selfLevelStr:'主角450级时解锁',lockLevel:0, lockLevelStr:'水萌10级时解锁',lockMoney:69000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:10, addPercent:8.0, spineName:'最后4',spineName2:'最后4', mishuLevel:0, mishuType:0, name:'以南',selfLevel:500, selfLevelStr:'主角500级时解锁',lockLevel:0, lockLevelStr:'可微10级时解锁',lockMoney:189000000, isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:11, addPercent:10.0, spineName:'秘书2',spineName2:'秘书2', mishuLevel:0, mishuType:0, name:'悦澄',selfLevel:550, selfLevelStr:'主角550级时解锁',lockLevel:0, lockLevelStr:'以南10级时解锁',lockMoney:510000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:12, addPercent:15.0, spineName:'最后5',spineName2:'最后5', mishuLevel:0, mishuType:0, name:'夏彤',selfLevel:600, selfLevelStr:'主角600级时解锁',lockLevel:0, lockLevelStr:'悦澄10级时解锁',lockMoney:1350000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:13, addPercent:50.0, spineName:'秘书4',spineName2:'秘书4', mishuLevel:0, mishuType:0, name:'紫琳',selfLevel:650, selfLevelStr:'主角650级时解锁',lockLevel:0, lockLevelStr:'夏彤10级时解锁',lockMoney:3600000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:14, addPercent:100.0, spineName:'秘书6',spineName2:'秘书6', mishuLevel:0, mishuType:0, name:'羽婷',selfLevel:700, selfLevelStr:'主角700级时解锁',lockLevel:0, lockLevelStr:'紫琳10级时解锁',lockMoney:9600000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:15, addPercent:150.0, spineName:'秘书5',spineName2:'秘书5', mishuLevel:0, mishuType:0, name:'梵音',selfLevel:750, selfLevelStr:'主角750级时解锁',lockLevel:0, lockLevelStr:'羽婷10级时解锁',lockMoney:26400000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:16, addPercent:200.0, spineName:'秘书3',spineName2:'秘书3', mishuLevel:0, mishuType:0, name:'诗锦',selfLevel:800, selfLevelStr:'主角800级时解锁',lockLevel:0, lockLevelStr:'梵音10级时解锁',lockMoney:69000000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:17, addPercent:300.0, spineName:'秘书1',spineName2:'秘书1', mishuLevel:0, mishuType:0, name:'绮罗',selfLevel:850, selfLevelStr:'主角850级时解锁',lockLevel:0, lockLevelStr:'诗锦10级时解锁',lockMoney:192000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:18,addPercent:50.0, mishuLevel:0, spineName:'工人', spineName2:'animation', mishuType:1, name:'班的多',selfLevel:400, selfLevelStr:'主角400级时解锁',lockLevel:0, lockLevelStr:'主角400级时解锁',lockMoney:5000000000 , isLock:true, isSign:false , isNeedTask:-1}, - {mishuId:19,addPercent:800.0, mishuLevel:0, spineName:'环卫', spineName2:'animation', mishuType:1, name:'邵干净',selfLevel:600, selfLevelStr:'主角600级时解锁',lockLevel:20, lockLevelStr:'班的多20级时解锁',lockMoney:150000000000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:18,addPercent:50.0, mishuLevel:0, spineName:'工人', spineName2:'animation', mishuType:1, name:'班的多',selfLevel:1000, selfLevelStr:'主角1000级时解锁',lockLevel:0, lockLevelStr:'主角400级时解锁',lockMoney:5000000000 , isLock:true, isSign:false , isNeedTask:-1}, + {mishuId:19,addPercent:800.0, mishuLevel:0, spineName:'环卫', spineName2:'animation', mishuType:1, name:'邵干净',selfLevel:1200, selfLevelStr:'主角1200级时解锁',lockLevel:20, lockLevelStr:'班的多20级时解锁',lockMoney:150000000000000 , isLock:true, isSign:false , isNeedTask:-1}, {mishuId:20,addPercent:5000.0, mishuLevel:0, spineName:'外卖',spineName2:'animation', mishuType:1, name:'宋的快',selfLevel:700, selfLevelStr:'主角700级时解锁',lockLevel:20, lockLevelStr:'邵干净20级时解锁',lockMoney:15000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, {mishuId:21,addPercent:4500000.0, mishuLevel:0, spineName:'发传单',spineName2:'animation', mishuType:1, name:'花传单',selfLevel:1000, selfLevelStr:'主角1000级时解锁',lockLevel:20, lockLevelStr:'宋的快20级时解锁',lockMoney:25000000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, {mishuId:22,addPercent:3000000000.0, mishuLevel:0, spineName:'保安',spineName2:'animation', mishuType:1, name:'保平安',selfLevel:1300, selfLevelStr:'主角1300级时解锁',lockLevel:20, lockLevelStr:'花传单20级时解锁',lockMoney:30000000000000000000000000000 , isLock:true, isSign:false , isNeedTask:-1}, @@ -63,10 +63,10 @@ let peixunShoiyi = [ export default class MiShuManager { public static mishuShouyiStart = [ - 50,400,1000,15000,50000, - 100000,1000000,6000000,10000000,30000000, - 1000000000,6000000000,8000000000,10000000000,50000000000, - 100000000000,150000000000000,80000000000000000,2700000,150000000, + 211,568,1529,4116,11080, + 29822,80269,216052,581523,1565221, + 4212930,11339473,30521189,82150469,221115219, + 595151078,1601901517,80000000000000000,2700000,150000000, 3000000000,20000000000000,170000000000000000,7000000000000000000000000,400000000000000,0,0,0,0,0, ] //秘书加成等级 incomeNum每秒收益 @@ -285,7 +285,7 @@ export default class MiShuManager { let levelNum = curUserDate.mishuLevel let lockMoney = this.mishuShouyiStart[mishuId] - let xishu = 1.1 + let xishu = 1 shouyiNum = Math.pow(xishu, levelNum) shouyiNum = Math.floor(lockMoney*shouyiNum) @@ -625,22 +625,22 @@ export default class MiShuManager { if(isHaveRed){ return isHaveRed } - let maxLevel = 100 - //可以升级的 - for(let i =0; i=0){ - isHaveRed = true - break - } + // let spend = this.getlevelUpMoneyById(configData[i].mishuId) + // if(User.getMoney()-spend>=0){ + // isHaveRed = true + // break + // } - } + // } - } + // } return isHaveRed } diff --git a/assets/Scripts/Manager/ZaoCanManager.ts b/assets/Scripts/Manager/ZaoCanManager.ts index 6c0b12ee..306f9009 100644 --- a/assets/Scripts/Manager/ZaoCanManager.ts +++ b/assets/Scripts/Manager/ZaoCanManager.ts @@ -29,23 +29,23 @@ let zaocanConfig = [ { id: 3, type: 3, zaocan: '油条', needLevel: 1, jiacheng: 1 }, { id: 4, type: 4, zaocan: '豆浆', needLevel: 1, jiacheng: 1 }, - { id: 5, type: 0, zaocan: '肉包', needLevel: 250, jiacheng: 0.3 }, - { id: 6, type: 1, zaocan: '茶叶蛋', needLevel: 300, jiacheng: 0.5 }, - { id: 7, type: 2, zaocan: '韭菜盒子', needLevel: 350, jiacheng: 0.7 }, - { id: 8, type: 3, zaocan: '麻球', needLevel: 400, jiacheng: 1 }, - { id: 9, type: 4, zaocan: '小米粥', needLevel: 450, jiacheng: 1.5 }, - - { id: 10, type: 0, zaocan: '烧卖', needLevel: 500, jiacheng: 2 }, - { id: 11, type: 1, zaocan: '玉米', needLevel: 550, jiacheng: 3 }, - { id: 12, type: 2, zaocan: '葱油饼', needLevel: 600, jiacheng: 4 }, - { id: 13, type: 3, zaocan: '油饼', needLevel: 650, jiacheng: 5 }, - { id: 14, type: 4, zaocan: '燕麦粥', needLevel: 700, jiacheng: 7 }, - - { id: 15, type: 0, zaocan: '红薯', needLevel: 750, jiacheng: 8 }, - { id: 16, type: 1, zaocan: '西兰花', needLevel: 800, jiacheng: 9 }, - { id: 17, type: 2, zaocan: '牛排', needLevel: 900, jiacheng: 10 }, - { id: 18, type: 3, zaocan: '鸡腿', needLevel: 1000, jiacheng: 12 }, - { id: 19, type: 4, zaocan: '咖啡', needLevel: 1200, jiacheng: 15 }, + { id: 5, type: 0, zaocan: '肉包', needLevel: 230, jiacheng: 0.1 }, + { id: 6, type: 1, zaocan: '茶叶蛋', needLevel: 250, jiacheng: 0.15 }, + { id: 7, type: 2, zaocan: '韭菜盒子', needLevel: 280, jiacheng: 0.2 }, + { id: 8, type: 3, zaocan: '麻球', needLevel: 300, jiacheng: 0.3 }, + { id: 9, type: 4, zaocan: '小米粥', needLevel: 330, jiacheng: 0.5 }, + + { id: 10, type: 0, zaocan: '烧卖', needLevel: 350, jiacheng: 0.7 }, + { id: 11, type: 1, zaocan: '玉米', needLevel: 380, jiacheng: 1 }, + { id: 12, type: 2, zaocan: '葱油饼', needLevel: 400, jiacheng: 1.5 }, + { id: 13, type: 3, zaocan: '油饼', needLevel: 430, jiacheng: 2 }, + { id: 14, type: 4, zaocan: '燕麦粥', needLevel: 450, jiacheng: 3 }, + + { id: 15, type: 0, zaocan: '红薯', needLevel: 500, jiacheng: 4 }, + { id: 16, type: 1, zaocan: '西兰花', needLevel: 650, jiacheng: 5 }, + { id: 17, type: 2, zaocan: '牛排', needLevel: 800, jiacheng: 6 }, + { id: 18, type: 3, zaocan: '鸡腿', needLevel: 900, jiacheng: 7 }, + { id: 19, type: 4, zaocan: '咖啡', needLevel: 1000, jiacheng: 10 }, ] let levelUpUnLockTanWei = [ @@ -141,6 +141,18 @@ export default class ZaoCanManager { return lockType } + public static getIsHaveUnLock() { + let isHave = false + let getzaoCanArray = User.getzaoCanArray() + for (let i = 5; i < getzaoCanArray.length; i++) { + if (this.getIsLockById(i) == 1) { + isHave = true + break + } + } + return isHave + } + /** * 解锁 */ @@ -162,10 +174,10 @@ export default class ZaoCanManager { public static getDanJia() { let level = User.getMyLevel() - let price = Math.ceil(35 * Math.pow(1.025, level - 1)) - // let jiedaoJiacheng = JieDaoManager.getJieDaoBeiShu() - // return Math.ceil(level * jiedaoJiacheng) - return price + let price = Math.ceil(200 * Math.pow(1.02, level - 1)) + let jiedaoJiacheng = JieDaoManager.getJieDaoBeiShu() + return Math.ceil(price * jiedaoJiacheng) + // return price } public static getLastDanJia() { @@ -191,7 +203,7 @@ export default class ZaoCanManager { public static getEffectUrlByType(type) { let name let getzaoCanArray = User.getzaoCanArray() - let effectUrls = ['sound/蒸笼/放饺子', 'sound/煮锅/煮东西', 'sound/煎锅/煎东西', 'sound/油锅/油炸', 'sound/豆浆桶/盛东西'] + let effectUrls = ['sound/蒸笼/放饺子', 'sound/煮锅/煮东西', 'sound/煎锅/煎东西', 'sound/油锅/油炸', 'sound/豆浆桶/豆浆桶抛物线'] for (let i = 0; i < getzaoCanArray.length; i++) { if (zaocanConfig[i].type == type) { name = effectUrls[i] diff --git a/assets/Scripts/Mishu/MishuItem.ts b/assets/Scripts/Mishu/MishuItem.ts index 516a82a3..b76b7644 100644 --- a/assets/Scripts/Mishu/MishuItem.ts +++ b/assets/Scripts/Mishu/MishuItem.ts @@ -60,6 +60,10 @@ export default class MishuItem extends cc.Component { this.refreshShowBtn() // this.refreshLevelBtn() this.refreshGuyongBtn() + + let mishuId = this.userDate.mishuId + let shouyi = MiShuManager.getIncomeById(mishuId) + this.miaozhuanLab.string = Common5.getNumberChangeHanzi(shouyi) + '' }, this) @@ -121,13 +125,13 @@ export default class MishuItem extends cc.Component { this.guyongNeedMoney = configDate.lockMoney - if (configDate.name == '茜滢') { + if (configDate.name == '云欣') { this.guyongNeedMoney = 0 } let labMoney = this.guyongBtn.getChildByName('labMoney').getComponent(cc.Label) - if (configDate.name == '茜滢') { + if (configDate.name == '云欣') { labMoney.string = '免费' } else { labMoney.string = Common5.getNumberChangeHanzi(configDate.lockMoney) + '' diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts index 81ecfe65..cfe43f31 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts @@ -75,11 +75,11 @@ export default class ZaoCanDian extends cc.Component { m_NpcIndexValue chatConfig = [ - { effectUrl: 'DH/MainHall/sound/老板你终于来了，顾客都在排队等着买早餐呢！', delayTime: 3.54, str: '老板你终于来了，顾客都在排队等着买早餐呢！', posi: '员工对话' }, - { effectUrl: 'DH/MainHall/sound/先把锅具摆上吧！', delayTime: 1.31, str: '先把锅具摆上吧！', posi: '员工对话' }, - { effectUrl: 'DH/MainHall/sound/客人都等着急了', delayTime: 1.32, str: '客人都等着急了', posi: '员工对话' }, - { effectUrl: 'DH/MainHall/sound/油条出锅了，快点击油条递给客人吧！', delayTime: 2.85, str: '油条出锅了，快点击油条递给客人吧！', posi: '员工对话' }, - { effectUrl: 'DH/MainHall/sound/接下来我们来升级摊位，能提升早餐售卖单价哦！', delayTime: 3.63, str: '接下来我们来升级摊位，能提升早餐售卖单价哦！', posi: '员工对话' }, + { effectUrl: 'DH/MainHall/sound/老板你终于来了，顾客都在排队等着买早餐呢！', delayTime: 4, str: '老板你终于来了，顾客都在排队等着买早餐呢！', posi: '员工对话' }, + { effectUrl: 'DH/MainHall/sound/先把锅具摆上吧！', delayTime: 1.5, str: '先把锅具摆上吧！', posi: '员工对话' }, + { effectUrl: 'DH/MainHall/sound/客人都等着急了', delayTime: 1.5, str: '客人都等着急了', posi: '员工对话' }, + { effectUrl: 'DH/MainHall/sound/油条出锅了，快点击油条递给客人吧！', delayTime: 3, str: '油条出锅了，快点击油条递给客人吧！', posi: '员工对话' }, + { effectUrl: 'DH/MainHall/sound/接下来我们来升级摊位，能提升早餐售卖单价哦！', delayTime: 4, str: '接下来我们来升级摊位，能提升早餐售卖单价哦！', posi: '员工对话' }, { effectUrl: 'DH/MainHall/sound/招聘员工可以增加摊位的秒赚收益哦！', delayTime: 2.8, str: '招聘员工可以增加摊位的秒赚收益哦！', posi: '员工对话' }, { effectUrl: 'DH/MainHall/sound/好啦，老板你开始营业赚钱吧！', delayTime: 2.31, str: '好啦，老板你开始营业赚钱吧！', posi: '员工对话' }, ] @@ -87,12 +87,14 @@ export default class ZaoCanDian extends cc.Component { clickTieHeNum: any = 0; clickTimeOutEvent: number; audioId; + skillSchedule: any; // LIFE-CYCLE CALLBACKS: // onLoad () {} start() { + Common5.playRemoteAudioMusic("bgm/背景bgm", true) this.updateMainTask() EventMgr.onEvent_custom(ryw_Event.updateMainTask, () => { this.updateMainTask() @@ -133,6 +135,9 @@ export default class ZaoCanDian extends cc.Component { let name = ZaoCanManager.getCurNameByType(i) if (unlocks.includes(names[i])) { this.ZaoCanArr[i] = name + if (!tanwei.active) { + tanwei.getChildByName("手指箭头").active = true + } tanwei.active = true } else { this.ZaoCanArr[i] = '' @@ -288,12 +293,6 @@ export default class ZaoCanDian extends cc.Component { onTouchZaoCan(event, custom) { custom = Number(custom) //对应ZaoCanManager的zaocanConfig下标 - //摊位动画正在运行直接返回 - if (this.TanWeiSpineState[custom]) { - return - } - let zaoCanStr = ZaoCanManager.getCurNameByType(custom) - let _npc = this.getNpcByNeedStr(zaoCanStr) //摊位节点名字 let names = ['馒头', '鸡蛋', '饺子', '油条', '豆浆'] @@ -303,6 +302,20 @@ export default class ZaoCanDian extends cc.Component { let animation_names2 = ['', '', '静止', '静止放', ''] let tanwei = this.node.getChildByName("桌子").getChildByName(names[custom] + "摊位") + tanwei.getChildByName("手指箭头").active = false + + let zaoCanStr = ZaoCanManager.getCurNameByType(custom) + let _npc = this.getNpcByNeedStr(zaoCanStr) + + //摊位动画正在运行直接返回 + if (this.TanWeiSpineState[custom]) { + if (_npc) { + let TrackEntry: sp.spine.TrackEntry = tanwei.getComponent(sp.Skeleton).getCurrent(0) + TrackEntry.animationStart = TrackEntry.animationEnd + } + return + } + let shengyuNum = 0 let _child let children = this.fly_zaocan_parent.getChildByName(names[custom] + "摊位").children @@ -382,17 +395,21 @@ export default class ZaoCanDian extends cc.Component { // cc.tween().to(time, { position: _position }), cc.tween().call(() => { UserManager.addMoney(ZaoCanManager.getDanJia(), child, null, this.node.parent.parent.getChildByName("prefabMoneyNode")) - let com = _npc.getComponent(ZaoCanDianNpc) - com.setNeedNumLabel() - if (com.getNeedNum() == 0) { - this.npc_Position_States[com.getStateIndex()].isHaveNpc = false - com.getZaoCanAfter() - for (let j = this.npcNodes.length - 1; j >= 0; j--) { - if (this.npcNodes[j] === com.node) { - this.npcNodes.splice(j, 1) + if (cc.isValid(_npc)) { + let com = _npc.getComponent(ZaoCanDianNpc) + com.setNeedNumLabel() + com.runMoney(ZaoCanManager.getDanJia()) + let num = com.getNeedNumLabel() + if (num == 0) { + this.npc_Position_States[com.getStateIndex()].isHaveNpc = false + com.getZaoCanAfter() + for (let j = this.npcNodes.length - 1; j >= 0; j--) { + if (this.npcNodes[j] === com.node) { + this.npcNodes.splice(j, 1) + } } + com.setNeedNum(-1) //避免重复点击导致进多次这个判断..多次会一直重置isHaveNpc } - com.setNeedNum(-1) //避免重复点击导致进多次这个判断..多次会一直重置isHaveNpc } child.removeFromParent() child.destroy() @@ -412,6 +429,7 @@ export default class ZaoCanDian extends cc.Component { tanweiSpine.setAnimation(0, `装${zaoCanStr}`, false) tanweiSpine.setCompleteListener(() => { tanweiSpine.setCompleteListener(null) + tanweiSpine.setAnimation(0, `${zaoCanStr}`, false) this.TanWeiSpineState[custom] = false let _child = this.fly_zaocan_parent.getChildByName(names[custom] + "摊位").children[0] let child = cc.instantiate(_child) @@ -431,19 +449,23 @@ export default class ZaoCanDian extends cc.Component { // cc.tween().to(time, { position: _position }), cc.tween().call(() => { UserManager.addMoney(ZaoCanManager.getDanJia(), child, null, this.node.parent.parent.getChildByName("prefabMoneyNode")) - let com = _npc.getComponent(ZaoCanDianNpc) - com.setNeedNumLabel() - if (com.getNeedNum() == 0) { - this.npc_Position_States[com.getStateIndex()].isHaveNpc = false - com.getZaoCanAfter() - for (let j = this.npcNodes.length - 1; j >= 0; j--) { - if (this.npcNodes[j] === com.node) { - this.npcNodes.splice(j, 1) + if (cc.isValid(_npc)) { + let com = _npc.getComponent(ZaoCanDianNpc) + com.setNeedNumLabel() + com.runMoney(ZaoCanManager.getDanJia()) + let num = com.getNeedNumLabel() + if (num == 0) { + this.npc_Position_States[com.getStateIndex()].isHaveNpc = false + com.getZaoCanAfter() + for (let j = this.npcNodes.length - 1; j >= 0; j--) { + if (this.npcNodes[j] === com.node) { + this.npcNodes.splice(j, 1) + } } + com.setNeedNum(-1) //避免重复点击导致进多次这个判断..多次会一直重置isHaveNpc } - com.setNeedNum(-1) //避免重复点击导致进多次这个判断..多次会一直重置isHaveNpc + child.removeFromParent() } - child.removeFromParent() child.destroy() }) ) @@ -572,13 +594,13 @@ export default class ZaoCanDian extends cc.Component { let index = User.getFirstStepIndex() - if (config && config.wanFaRuKouTip && config.wanFaRuKouTip.includes('rk_chuZuChe')) { - this.car.node.active = true - this.car.setAnimation(0, "空车", false) - this.car.node.setPosition(cc.v3(0, this.car.node.position.y, 0)) - } else { - this.car.node.active = false - } + // if (config && config.wanFaRuKouTip && config.wanFaRuKouTip.includes('rk_chuZuChe')) { + // this.car.node.active = true + // this.car.setAnimation(0, "空车", false) + // this.car.node.setPosition(cc.v3(0, this.car.node.position.y, 0)) + // } else { + // this.car.node.active = false + // } } onTouchTieHe() { @@ -627,14 +649,17 @@ export default class ZaoCanDian extends cc.Component { if (chat.effectUrl && chat.effectUrl.length > 0) { Common5.playRemoteAudioEffect(chat.effectUrl); } - this.scheduleOnce(() => { - if (isNotHide) { + this.skillSchedule = this.yuanGongChatFunc.bind(this, callback, isNotHide) + this.scheduleOnce(this.skillSchedule, chat.delayTime) + } - } else { - this.node.getChildByName("员工对话框").active = false - } - callback && callback() - }, chat.delayTime) + yuanGongChatFunc(callback?, isNotHide?) { + if (isNotHide) { + + } else { + this.node.getChildByName("员工对话框").active = false + } + callback && callback() } onTouchStartBaiTan() { @@ -653,10 +678,23 @@ export default class ZaoCanDian extends cc.Component { }, 2) } + onTouchTiaoGuoYinDao() { + this.node.getChildByName("跳过引导").active = false + this.unschedule(this.skillSchedule) + this.scheduleOnce(() => { + User.setFirstStepIndex(8) + this.guideStep() + this.node.getChildByName("guideParent").removeAllChildren() + this.node.getChildByName("开始摆摊").active = false + this.node.parent.parent.getChildByName('UINode').active = true + }) + } + guideStep() { let index = User.getFirstStepIndex() if (index == 3 && !this.isJoin) { //早餐摊引导 this.isJoin = true + this.node.getChildByName("跳过引导").active = true let names = ['馒头', '鸡蛋', '饺子', '油条', '豆浆'] for (let i = 0; i < names.length; i++) { let tanwei = this.node.getChildByName("桌子").getChildByName(names[i] + "摊位") @@ -696,12 +734,13 @@ export default class ZaoCanDian extends cc.Component { } this.refreshZaoCan() }) + this.node.getChildByName("跳过引导").active = false User.setFirstStepIndex(9) } } guideView(nodeArray, opacity = -1) { - PrefabManage.loadPrefabByType(GameType.GuideMskNode, this.node, (prefab) => { + PrefabManage.loadPrefabByType(GameType.GuideMskNode, this.node.getChildByName("guideParent"), (prefab) => { // prefab.zIndex = 199 let guideNodeArray = nodeArray let firstNode = guideNodeArray.shift() diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts b/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts index 7fa2f2f7..d3103754 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDianNpc.ts @@ -148,7 +148,13 @@ export default class ZaoCanDianNpc extends cc.Component { } setNeedNumLabel() { - this.numLabel.string = `${this.getNeedNum()}` + //为什么不用this.needNum去设置 + // 这里是因为判断npc需要的时候this.needNum已经为0了，但是物品移动的动效还没播完，会导致npc都走了，还有物品往他头上飞，其实每进一次这个函数就是物品移过去一个了 + this.numLabel.string = `${Number(this.numLabel.string) - 1}` + } + + getNeedNumLabel() { + return Number(this.numLabel.string) } getNeedNum() { @@ -207,5 +213,22 @@ export default class ZaoCanDianNpc extends cc.Component { return this.needNode.parent.convertToWorldSpaceAR(this.needNode.getPosition()) } + runMoney(money) { + let label = cc.instantiate(this.node.getChildByName("money")) + label.active = true + label.parent = this.node + if (money && money > 0) { + label.getComponent(cc.Label).string = "+" + Common5.getNumberChangeHanzi(money, '1', 1) + } + cc.tween(label) + .delay(0.2) + .by(1, { y: 20, opacity: 0 }) + .call(() => { + label.removeFromParent() + label.destroy() + }) + .start() + } + // update (dt) {} } diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDianYeWuitemNode.ts b/assets/Scripts/ZaoCanDian/ZaoCanDianYeWuitemNode.ts index 35d382df..fe448365 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDianYeWuitemNode.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDianYeWuitemNode.ts @@ -89,9 +89,16 @@ export default class ZaoCanDianYeWuitemNode extends cc.Component { onTouchUnLock() { let lockType = ZaoCanManager.getIsLockById(this.config.id) + if (this.config.id > 0) { + //要按顺序解锁,前面那个没解锁不能解锁当前这个 + let lastLockType = ZaoCanManager.getIsLockById(this.config.id - 1) + if (lastLockType != 2) { + PrefabManage.showTextTips("请先解锁前面早点") + return + } + } //是不是等待解锁的状态 if (lockType == 1) { - + PrefabManage.loadPrefabByType(GameType.ZaoCanDianUnLock, null, (node) => { node.getComponent(ZaoCanDianUnLock).setViewData(this.config.id) diff --git a/assets/ZaoCanDian/prefab/ZaoCanDian.prefab b/assets/ZaoCanDian/prefab/ZaoCanDian.prefab index acc6eeb3..9bc2c036 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDian.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDian.prefab @@ -39,26 +39,32 @@ "__id__": 28 }, { - "__id__": 100 + "__id__": 115 }, { - "__id__": 151 + "__id__": 166 }, { - "__id__": 166 + "__id__": 181 + }, + { + "__id__": 190 + }, + { + "__id__": 193 } ], "_active": true, "_components": [ { - "__id__": 175 + "__id__": 203 }, { - "__id__": 176 + "__id__": 204 } ], "_prefab": { - "__id__": 177 + "__id__": 205 }, "_opacity": 255, "_color": { @@ -341,7 +347,7 @@ "__id__": 10 } ], - "_active": true, + "_active": false, "_components": [ { "__id__": 14 @@ -1055,38 +1061,38 @@ "__id__": 29 }, { - "__id__": 39 + "__id__": 42 }, { - "__id__": 42 + "__id__": 45 }, { - "__id__": 52 + "__id__": 58 }, { - "__id__": 55 + "__id__": 61 }, { - "__id__": 65 + "__id__": 74 }, { - "__id__": 75 + "__id__": 87 }, { - "__id__": 85 + "__id__": 100 }, { - "__id__": 95 + "__id__": 110 } ], "_active": true, "_components": [ { - "__id__": 98 + "__id__": 113 } ], "_prefab": { - "__id__": 99 + "__id__": 114 }, "_opacity": 255, "_color": { @@ -1148,16 +1154,19 @@ }, { "__id__": 34 + }, + { + "__id__": 37 } ], "_active": true, "_components": [ { - "__id__": 37 + "__id__": 40 } ], "_prefab": { - "__id__": 38 + "__id__": 41 }, "_opacity": 255, "_color": { @@ -1480,6 +1489,123 @@ "fileId": "2bDILpLdxNc5+zhlMkFfHf", "sync": false }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 29 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 38 + } + ], + "_prefab": { + "__id__": 39 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 55.846, + 44.015, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 37 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "340kpzdS9OWq6QmcZebjx0", + "sync": false + }, { "__type__": "sp.Skeleton", "_name": "", @@ -1500,7 +1626,7 @@ "_cacheMode": 0, "loop": true, "premultipliedAlpha": true, - "timeScale": 2, + "timeScale": 1.5, "_accTime": 0, "_playCount": 0, "_frameCache": null, @@ -1544,11 +1670,11 @@ "_active": true, "_components": [ { - "__id__": 40 + "__id__": 43 } ], "_prefab": { - "__id__": 41 + "__id__": 44 }, "_opacity": 255, "_color": { @@ -1602,7 +1728,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 39 + "__id__": 42 }, "_enabled": true, "_materials": [ @@ -1649,20 +1775,23 @@ }, "_children": [ { - "__id__": 43 + "__id__": 46 }, { - "__id__": 47 + "__id__": 50 + }, + { + "__id__": 53 } ], "_active": true, "_components": [ { - "__id__": 50 + "__id__": 56 } ], "_prefab": { - "__id__": 51 + "__id__": 57 }, "_opacity": 255, "_color": { @@ -1716,17 +1845,17 @@ "_name": "touch", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 45 }, "_children": [], "_active": true, "_components": [ { - "__id__": 44 + "__id__": 47 } ], "_prefab": { - "__id__": 46 + "__id__": 49 }, "_opacity": 255, "_color": { @@ -1780,7 +1909,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 43 + "__id__": 46 }, "_enabled": true, "_normalMaterial": null, @@ -1789,7 +1918,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 45 + "__id__": 48 } ], "_N$interactable": true, @@ -1873,17 +2002,17 @@ "_name": "获取光效", "_objFlags": 0, "_parent": { - "__id__": 42 + "__id__": 45 }, "_children": [], "_active": false, "_components": [ { - "__id__": 48 + "__id__": 51 } ], "_prefab": { - "__id__": 49 + "__id__": 52 }, "_opacity": 255, "_color": { @@ -1937,7 +2066,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 47 + "__id__": 50 }, "_enabled": true, "_materials": [ @@ -1985,75 +2114,22 @@ "fileId": "cbH47roFNMk48EYvvvTrfM", "sync": false }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 42 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" - } - ], - "paused": false, - "defaultSkin": "default", - "defaultAnimation": "豆浆", - "_preCacheMode": 0, - "_cacheMode": 0, - "loop": true, - "premultipliedAlpha": true, - "timeScale": 2, - "_accTime": 0, - "_playCount": 0, - "_frameCache": null, - "_curFrame": null, - "_skeletonCache": null, - "_animationName": "豆浆", - "_animationQueue": [], - "_headAniInfo": null, - "_playTimes": 0, - "_isAniComplete": true, - "_N$skeletonData": { - "__uuid__": "7c5f6788-3aaf-4094-9dbf-6c653290972d" - }, - "_N$_defaultCacheMode": 0, - "_N$debugSlots": false, - "_N$debugBones": false, - "_N$debugMesh": false, - "_N$useTint": false, - "_N$enableBatch": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "0f17G5wpRF34POx0OVa1JH", - "sync": false - }, { "__type__": "cc.Node", - "_name": "铁盆", + "_name": "手指箭头", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 45 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { - "__id__": 53 + "__id__": 54 } ], "_prefab": { - "__id__": 54 + "__id__": 55 }, "_opacity": 255, "_color": { @@ -2065,8 +2141,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 251, - "height": 172 + "width": 0, + "height": 0 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2077,8 +2153,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -79.39, - -118.392, + 54.547, + 36.223, 0, 0, 0, @@ -2103,38 +2179,208 @@ "_id": "" }, { - "__type__": "cc.Sprite", + "__type__": "sp.Skeleton", "_name": "", "_objFlags": 0, "node": { - "__id__": 52 + "__id__": 53 }, "_enabled": true, "_materials": [ { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" } ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "408d874e-e79c-474e-9862-48a4879ad87e" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d0doSsxHVE3ppje5jdA+VQ", + "sync": false + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 45 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "豆浆", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1.5, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "豆浆", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 1, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "7c5f6788-3aaf-4094-9dbf-6c653290972d" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0f17G5wpRF34POx0OVa1JH", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "铁盆", + "_objFlags": 0, + "_parent": { + "__id__": 28 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 59 + } + ], + "_prefab": { + "__id__": 60 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 251, + "height": 172 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -79.39, + -118.392, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 58 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "408d874e-e79c-474e-9862-48a4879ad87e" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { "__type__": "cc.PrefabInfo", "root": { "__id__": 1 @@ -2154,20 +2400,23 @@ }, "_children": [ { - "__id__": 56 + "__id__": 62 + }, + { + "__id__": 66 }, { - "__id__": 60 + "__id__": 69 } ], "_active": true, "_components": [ { - "__id__": 63 + "__id__": 72 } ], "_prefab": { - "__id__": 64 + "__id__": 73 }, "_opacity": 255, "_color": { @@ -2221,17 +2470,17 @@ "_name": "touch", "_objFlags": 0, "_parent": { - "__id__": 55 + "__id__": 61 }, "_children": [], "_active": true, "_components": [ { - "__id__": 57 + "__id__": 63 } ], "_prefab": { - "__id__": 59 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -2285,7 +2534,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 56 + "__id__": 62 }, "_enabled": true, "_normalMaterial": null, @@ -2294,7 +2543,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 58 + "__id__": 64 } ], "_N$interactable": true, @@ -2378,17 +2627,17 @@ "_name": "获取光效", "_objFlags": 0, "_parent": { - "__id__": 55 + "__id__": 61 }, "_children": [], "_active": false, "_components": [ { - "__id__": 61 + "__id__": 67 } ], "_prefab": { - "__id__": 62 + "__id__": 68 }, "_opacity": 255, "_color": { @@ -2442,7 +2691,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "_materials": [ @@ -2491,54 +2740,171 @@ "sync": false }, { - "__type__": "sp.Skeleton", - "_name": "", + "__type__": "cc.Node", + "_name": "手指箭头", "_objFlags": 0, - "node": { - "__id__": 55 + "_parent": { + "__id__": 61 }, - "_enabled": true, - "_materials": [ + "_children": [], + "_active": false, + "_components": [ { - "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + "__id__": 70 } ], - "paused": false, - "defaultSkin": "default", - "defaultAnimation": "汤锅", - "_preCacheMode": 0, - "_cacheMode": 0, - "loop": true, - "premultipliedAlpha": true, - "timeScale": 2, - "_accTime": 0, - "_playCount": 0, - "_frameCache": null, - "_curFrame": null, - "_skeletonCache": null, - "_animationName": "汤锅", - "_animationQueue": [], - "_headAniInfo": null, - "_playTimes": 0, - "_isAniComplete": true, - "_N$skeletonData": { - "__uuid__": "e1a5421a-8548-4f6a-801f-7e27b771af75" + "_prefab": { + "__id__": 71 }, - "_N$_defaultCacheMode": 0, - "_N$debugSlots": false, - "_N$debugBones": false, - "_N$debugMesh": false, - "_N$useTint": false, - "_N$enableBatch": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 }, - "asset": { - "__id__": 0 + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 52.736, + 27.166, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 69 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "26G4gzbdZO6ZkF3aqwpw/g", + "sync": false + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 61 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "汤锅", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1.5, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "汤锅", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "e1a5421a-8548-4f6a-801f-7e27b771af75" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 }, "fileId": "6ccBBzvm9IaKuMsSUe4L0+", "sync": false @@ -2552,20 +2918,23 @@ }, "_children": [ { - "__id__": 66 + "__id__": 75 }, { - "__id__": 70 + "__id__": 79 + }, + { + "__id__": 82 } ], "_active": true, "_components": [ { - "__id__": 73 + "__id__": 85 } ], "_prefab": { - "__id__": 74 + "__id__": 86 }, "_opacity": 255, "_color": { @@ -2619,17 +2988,17 @@ "_name": "touch", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 74 }, "_children": [], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 76 } ], "_prefab": { - "__id__": 69 + "__id__": 78 }, "_opacity": 255, "_color": { @@ -2683,7 +3052,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 75 }, "_enabled": true, "_normalMaterial": null, @@ -2692,7 +3061,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 68 + "__id__": 77 } ], "_N$interactable": true, @@ -2776,17 +3145,17 @@ "_name": "获取光效", "_objFlags": 0, "_parent": { - "__id__": 65 + "__id__": 74 }, "_children": [], "_active": false, "_components": [ { - "__id__": 71 + "__id__": 80 } ], "_prefab": { - "__id__": 72 + "__id__": 81 }, "_opacity": 255, "_color": { @@ -2840,7 +3209,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 70 + "__id__": 79 }, "_enabled": true, "_materials": [ @@ -2888,75 +3257,15 @@ "fileId": "9a41C3Kj9L8IsqqGB9byLJ", "sync": false }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 65 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" - } - ], - "paused": false, - "defaultSkin": "default", - "defaultAnimation": "煎锅", - "_preCacheMode": 0, - "_cacheMode": 0, - "loop": true, - "premultipliedAlpha": true, - "timeScale": 2, - "_accTime": 0, - "_playCount": 0, - "_frameCache": null, - "_curFrame": null, - "_skeletonCache": null, - "_animationName": "煎锅", - "_animationQueue": [], - "_headAniInfo": null, - "_playTimes": 0, - "_isAniComplete": true, - "_N$skeletonData": { - "__uuid__": "bdd778b7-b48e-46ca-b716-7c03c2cf1468" - }, - "_N$_defaultCacheMode": 0, - "_N$debugSlots": false, - "_N$debugBones": false, - "_N$debugMesh": false, - "_N$useTint": false, - "_N$enableBatch": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "33CJ0xiGlJNoBHIknWkfg3", - "sync": false - }, { "__type__": "cc.Node", - "_name": "油条摊位", + "_name": "手指箭头", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 74 }, - "_children": [ - { - "__id__": 76 - }, - { - "__id__": 80 - } - ], - "_active": true, + "_children": [], + "_active": false, "_components": [ { "__id__": 83 @@ -2975,8 +3284,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 423, - "height": 225 + "width": 0, + "height": 0 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -2987,8 +3296,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 186.893, - -322.486, + 55.855, + 3.832, 0, 0, 0, @@ -2996,7 +3305,7 @@ 1, 1, 1, - 0 + 1 ] }, "_eulerAngles": { @@ -3013,242 +3322,21 @@ "_id": "" }, { - "__type__": "cc.Node", - "_name": "touch", + "__type__": "sp.Skeleton", + "_name": "", "_objFlags": 0, - "_parent": { - "__id__": 75 + "node": { + "__id__": 82 }, - "_children": [], - "_active": true, - "_components": [ + "_enabled": true, + "_materials": [ { - "__id__": 77 - } - ], - "_prefab": { - "__id__": 79 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 300, - "height": 200 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 44.743, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Button", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 76 - }, - "_enabled": true, - "_normalMaterial": null, - "_grayMaterial": null, - "duration": 0.1, - "zoomScale": 1.2, - "clickEvents": [ - { - "__id__": 78 - } - ], - "_N$interactable": true, - "_N$enableAutoGrayEffect": false, - "_N$transition": 0, - "transition": 0, - "_N$normalColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "pressedColor": { - "__type__": "cc.Color", - "r": 211, - "g": 211, - "b": 211, - "a": 255 - }, - "_N$hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "hoverColor": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_N$disabledColor": { - "__type__": "cc.Color", - "r": 124, - "g": 124, - "b": 124, - "a": 255 - }, - "_N$normalSprite": null, - "_N$pressedSprite": null, - "pressedSprite": null, - "_N$hoverSprite": null, - "hoverSprite": null, - "_N$disabledSprite": null, - "_N$target": null, - "_id": "" - }, - { - "__type__": "cc.ClickEvent", - "target": { - "__id__": 1 - }, - "component": "", - "_componentId": "78aa92gum1MDL6YWVymp3nP", - "handler": "onTouchZaoCan", - "customEventData": "3" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "53s/q9WzdHS7EGKCaAd/c0", - "sync": false - }, - { - "__type__": "cc.Node", - "_name": "获取光效", - "_objFlags": 0, - "_parent": { - "__id__": 75 - }, - "_children": [], - "_active": false, - "_components": [ - { - "__id__": 81 - } - ], - "_prefab": { - "__id__": 82 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 383.65, - "height": 261.69 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 0, - 104.757, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 80 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" } ], "paused": false, "defaultSkin": "default", - "defaultAnimation": "animation", + "defaultAnimation": "dianji", "_preCacheMode": 0, "_cacheMode": 0, "loop": true, @@ -3259,13 +3347,13 @@ "_frameCache": null, "_curFrame": null, "_skeletonCache": null, - "_animationName": "animation", + "_animationName": "dianji", "_animationQueue": [], "_headAniInfo": null, - "_playTimes": 1, + "_playTimes": 0, "_isAniComplete": true, "_N$skeletonData": { - "__uuid__": "7ed0998a-87c7-4e08-b58a-cb0a69d5c6b8" + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" }, "_N$_defaultCacheMode": 0, "_N$debugSlots": false, @@ -3283,7 +3371,7 @@ "asset": { "__id__": 0 }, - "fileId": "39D8q3DHBKTJxyJxd4xdNH", + "fileId": "2biW80I1NK2a/8Z4zsjYAo", "sync": false }, { @@ -3291,7 +3379,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 74 }, "_enabled": true, "_materials": [ @@ -3301,24 +3389,24 @@ ], "paused": false, "defaultSkin": "default", - "defaultAnimation": "aa雾气", + "defaultAnimation": "煎锅", "_preCacheMode": 0, "_cacheMode": 0, "loop": true, "premultipliedAlpha": true, - "timeScale": 2, + "timeScale": 1.5, "_accTime": 0, "_playCount": 0, "_frameCache": null, "_curFrame": null, "_skeletonCache": null, - "_animationName": "aa雾气", + "_animationName": "煎锅", "_animationQueue": [], "_headAniInfo": null, "_playTimes": 0, "_isAniComplete": true, "_N$skeletonData": { - "__uuid__": "2ac23cea-5902-40b8-bf74-c8029eb7e600" + "__uuid__": "bdd778b7-b48e-46ca-b716-7c03c2cf1468" }, "_N$_defaultCacheMode": 0, "_N$debugSlots": false, @@ -3336,32 +3424,35 @@ "asset": { "__id__": 0 }, - "fileId": "b9gEGMIkREwpybONgMeL81", + "fileId": "33CJ0xiGlJNoBHIknWkfg3", "sync": false }, { "__type__": "cc.Node", - "_name": "钱盒", + "_name": "油条摊位", "_objFlags": 0, "_parent": { "__id__": 28 }, "_children": [ { - "__id__": 86 + "__id__": 88 }, { - "__id__": 90 + "__id__": 92 + }, + { + "__id__": 95 } ], "_active": true, "_components": [ { - "__id__": 93 + "__id__": 98 } ], "_prefab": { - "__id__": 94 + "__id__": 99 }, "_opacity": 255, "_color": { @@ -3373,8 +3464,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 167, - "height": 124 + "width": 423, + "height": 225 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3385,8 +3476,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -17.673, - -347.492, + 192.088, + -335.473, 0, 0, 0, @@ -3394,7 +3485,7 @@ 1, 1, 1, - 1 + 0 ] }, "_eulerAngles": { @@ -3415,17 +3506,17 @@ "_name": "touch", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 87 + "__id__": 89 } ], "_prefab": { - "__id__": 89 + "__id__": 91 }, "_opacity": 255, "_color": { @@ -3437,8 +3528,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 140, - "height": 100 + "width": 300, + "height": 200 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3449,8 +3540,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -7.787, - 21.137, + 0, + 44.743, 0, 0, 0, @@ -3479,7 +3570,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 86 + "__id__": 88 }, "_enabled": true, "_normalMaterial": null, @@ -3488,7 +3579,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 88 + "__id__": 90 } ], "_N$interactable": true, @@ -3553,8 +3644,8 @@ }, "component": "", "_componentId": "78aa92gum1MDL6YWVymp3nP", - "handler": "onTouchTieHe", - "customEventData": "" + "handler": "onTouchZaoCan", + "customEventData": "3" }, { "__type__": "cc.PrefabInfo", @@ -3564,25 +3655,25 @@ "asset": { "__id__": 0 }, - "fileId": "bb4XlCOqJIebkoJPjwAVK6", + "fileId": "53s/q9WzdHS7EGKCaAd/c0", "sync": false }, { "__type__": "cc.Node", - "_name": "手指箭头", + "_name": "获取光效", "_objFlags": 0, "_parent": { - "__id__": 85 + "__id__": 87 }, "_children": [], "_active": false, "_components": [ { - "__id__": 91 + "__id__": 93 } ], "_prefab": { - "__id__": 92 + "__id__": 94 }, "_opacity": 255, "_color": { @@ -3594,8 +3685,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, - "height": 0 + "width": 383.65, + "height": 261.69 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3606,8 +3697,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 45.731, - -36.269, + 0, + 104.757, 0, 0, 0, @@ -3636,60 +3727,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 90 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" - } - ], - "paused": false, - "defaultSkin": "default", - "defaultAnimation": "dianji", - "_preCacheMode": 0, - "_cacheMode": 0, - "loop": true, - "premultipliedAlpha": true, - "timeScale": 1, - "_accTime": 0, - "_playCount": 0, - "_frameCache": null, - "_curFrame": null, - "_skeletonCache": null, - "_animationName": "dianji", - "_animationQueue": [], - "_headAniInfo": null, - "_playTimes": 0, - "_isAniComplete": true, - "_N$skeletonData": { - "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" - }, - "_N$_defaultCacheMode": 0, - "_N$debugSlots": false, - "_N$debugBones": false, - "_N$debugMesh": false, - "_N$useTint": false, - "_N$enableBatch": false, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "8fALGT+a1Ap733QTkNfq6N", - "sync": false - }, - { - "__type__": "sp.Skeleton", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 85 + "__id__": 92 }, "_enabled": true, "_materials": [ @@ -3699,7 +3737,7 @@ ], "paused": false, "defaultSkin": "default", - "defaultAnimation": "钱盒", + "defaultAnimation": "animation", "_preCacheMode": 0, "_cacheMode": 0, "loop": true, @@ -3710,13 +3748,13 @@ "_frameCache": null, "_curFrame": null, "_skeletonCache": null, - "_animationName": "钱盒", + "_animationName": "animation", "_animationQueue": [], "_headAniInfo": null, - "_playTimes": 0, + "_playTimes": 1, "_isAniComplete": true, "_N$skeletonData": { - "__uuid__": "301006c5-6bf9-4fa4-9612-2f6f7c2b37f3" + "__uuid__": "7ed0998a-87c7-4e08-b58a-cb0a69d5c6b8" }, "_N$_defaultCacheMode": 0, "_N$debugSlots": false, @@ -3734,18 +3772,18 @@ "asset": { "__id__": 0 }, - "fileId": "3bUpJZCWtNm42UjE2K78Ny", + "fileId": "39D8q3DHBKTJxyJxd4xdNH", "sync": false }, { "__type__": "cc.Node", - "_name": "碗", + "_name": "手指箭头", "_objFlags": 0, "_parent": { - "__id__": 28 + "__id__": 87 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 96 @@ -3764,8 +3802,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 180, - "height": 124 + "width": 0, + "height": 0 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3776,8 +3814,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 36.306, - -36.478, + 54.038, + 4.478, 0, 0, 0, @@ -3802,7 +3840,7 @@ "_id": "" }, { - "__type__": "cc.Sprite", + "__type__": "sp.Skeleton", "_name": "", "_objFlags": 0, "node": { @@ -3811,26 +3849,36 @@ "_enabled": true, "_materials": [ { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" } ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "d8438aa2-da62-434a-8e6c-3f378c69d96b" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, "_id": "" }, { @@ -3841,39 +3889,49 @@ "asset": { "__id__": 0 }, - "fileId": "44IgRRDXtDqpUt7N3MLM2m", + "fileId": "384CihjYtEgYUtMr7c5N+o", "sync": false }, { - "__type__": "cc.Sprite", + "__type__": "sp.Skeleton", "_name": "", "_objFlags": 0, "node": { - "__id__": 28 + "__id__": 87 }, "_enabled": true, "_materials": [ { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" } ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "bbfa028b-811b-45ba-bca7-b4f9ccb42400" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "aa雾气", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1.5, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "aa雾气", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "2ac23cea-5902-40b8-bf74-c8029eb7e600" }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, "_id": "" }, { @@ -3884,37 +3942,32 @@ "asset": { "__id__": 0 }, - "fileId": "b69fwV+45C2pRZ9hT5fsWs", + "fileId": "b9gEGMIkREwpybONgMeL81", "sync": false }, { "__type__": "cc.Node", - "_name": "飞行的早餐", + "_name": "钱盒", "_objFlags": 0, "_parent": { - "__id__": 1 + "__id__": 28 }, "_children": [ { "__id__": 101 }, { - "__id__": 112 - }, - { - "__id__": 117 - }, - { - "__id__": 128 - }, - { - "__id__": 139 + "__id__": 105 } ], "_active": true, - "_components": [], + "_components": [ + { + "__id__": 108 + } + ], "_prefab": { - "__id__": 150 + "__id__": 109 }, "_opacity": 255, "_color": { @@ -3926,8 +3979,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 0, - "height": 0 + "width": 167, + "height": 124 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -3938,8 +3991,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - -72.246, + -17.673, + -347.492, 0, 0, 0, @@ -3965,26 +4018,20 @@ }, { "__type__": "cc.Node", - "_name": "馒头摊位", + "_name": "touch", "_objFlags": 0, "_parent": { "__id__": 100 }, - "_children": [ + "_children": [], + "_active": true, + "_components": [ { "__id__": 102 - }, - { - "__id__": 105 - }, - { - "__id__": 108 } ], - "_active": true, - "_components": [], "_prefab": { - "__id__": 111 + "__id__": 104 }, "_opacity": 255, "_color": { @@ -3996,8 +4043,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 423, - "height": 225 + "width": 140, + "height": 100 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4008,8 +4055,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -218.59, - 2.765, + -7.787, + 21.137, 0, 0, 0, @@ -4034,22 +4081,1093 @@ "_id": "" }, { - "__type__": "cc.Node", - "_name": "1", + "__type__": "cc.Button", + "_name": "", "_objFlags": 0, - "_parent": { + "node": { "__id__": 101 }, - "_children": [], - "_active": false, - "_components": [ + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [ { "__id__": 103 } ], - "_prefab": { - "__id__": 104 - }, + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 0, + "transition": 0, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": null, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": { + "__id__": 1 + }, + "component": "", + "_componentId": "78aa92gum1MDL6YWVymp3nP", + "handler": "onTouchTieHe", + "customEventData": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "bb4XlCOqJIebkoJPjwAVK6", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "手指箭头", + "_objFlags": 0, + "_parent": { + "__id__": 100 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 106 + } + ], + "_prefab": { + "__id__": 107 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 45.731, + -36.269, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 105 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "dianji", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "dianji", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "ffa2200b-5e12-4bdc-8f29-813153429b6b" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "8fALGT+a1Ap733QTkNfq6N", + "sync": false + }, + { + "__type__": "sp.Skeleton", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 100 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "7afd064b-113f-480e-b793-8817d19f63c3" + } + ], + "paused": false, + "defaultSkin": "default", + "defaultAnimation": "钱盒", + "_preCacheMode": 0, + "_cacheMode": 0, + "loop": true, + "premultipliedAlpha": true, + "timeScale": 1, + "_accTime": 0, + "_playCount": 0, + "_frameCache": null, + "_curFrame": null, + "_skeletonCache": null, + "_animationName": "钱盒", + "_animationQueue": [], + "_headAniInfo": null, + "_playTimes": 0, + "_isAniComplete": true, + "_N$skeletonData": { + "__uuid__": "301006c5-6bf9-4fa4-9612-2f6f7c2b37f3" + }, + "_N$_defaultCacheMode": 0, + "_N$debugSlots": false, + "_N$debugBones": false, + "_N$debugMesh": false, + "_N$useTint": false, + "_N$enableBatch": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "3bUpJZCWtNm42UjE2K78Ny", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "碗", + "_objFlags": 0, + "_parent": { + "__id__": 28 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 111 + } + ], + "_prefab": { + "__id__": 112 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 180, + "height": 124 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 36.306, + -36.478, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 110 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "d8438aa2-da62-434a-8e6c-3f378c69d96b" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "44IgRRDXtDqpUt7N3MLM2m", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 28 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": { + "__uuid__": "bbfa028b-811b-45ba-bca7-b4f9ccb42400" + }, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b69fwV+45C2pRZ9hT5fsWs", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "飞行的早餐", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [ + { + "__id__": 116 + }, + { + "__id__": 127 + }, + { + "__id__": 132 + }, + { + "__id__": 143 + }, + { + "__id__": 154 + } + ], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 165 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -72.246, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "馒头摊位", + "_objFlags": 0, + "_parent": { + "__id__": 115 + }, + "_children": [ + { + "__id__": 117 + }, + { + "__id__": 120 + }, + { + "__id__": 123 + } + ], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 126 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 423, + "height": 225 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -218.59, + 2.765, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "1", + "_objFlags": 0, + "_parent": { + "__id__": 116 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 118 + } + ], + "_prefab": { + "__id__": 119 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 67 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 110.712, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 117 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "c6HVpKBr1D5LmRZUecZVe9", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "2", + "_objFlags": 0, + "_parent": { + "__id__": 116 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 121 + } + ], + "_prefab": { + "__id__": 122 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 67 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 110.712, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 120 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "d2dzYk9WhOEKpVayVnYYX9", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "3", + "_objFlags": 0, + "_parent": { + "__id__": 116 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 124 + } + ], + "_prefab": { + "__id__": 125 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 67 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 110.712, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 123 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "805pMAhXZEIofTqXoBItSk", + "sync": false + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "ff8rvj1HFKwLxWdkeK3XQO", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "豆浆摊位", + "_objFlags": 0, + "_parent": { + "__id__": 115 + }, + "_children": [ + { + "__id__": 128 + } + ], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 131 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 0, + "height": 0 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 245.551, + 23.822, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Node", + "_name": "1", + "_objFlags": 0, + "_parent": { + "__id__": 127 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 129 + } + ], + "_prefab": { + "__id__": 130 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 88, + "height": 67 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 218.527, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 128 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_spriteFrame": null, + "_type": 0, + "_sizeMode": 1, + "_fillType": 0, + "_fillCenter": { + "__type__": "cc.Vec2", + "x": 0, + "y": 0 + }, + "_fillStart": 0, + "_fillRange": 0, + "_isTrimmedMode": true, + "_atlas": null, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "79aKlECilFa58EV7LGBDMc", + "sync": false + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "9e0sr63eJGVbekQ9kZjn72", + "sync": false + }, + { + "__type__": "cc.Node", + "_name": "鸡蛋摊位", + "_objFlags": 0, + "_parent": { + "__id__": 115 + }, + "_children": [ + { + "__id__": 133 + }, + { + "__id__": 136 + }, + { + "__id__": 139 + } + ], + "_active": true, + "_components": [], + "_prefab": { + "__id__": 142 + }, "_opacity": 255, "_color": { "__type__": "cc.Color", @@ -4060,8 +5178,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 67 + "width": 335, + "height": 245 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4072,8 +5190,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - 110.712, + -214.716, + -296.672, 0, 0, 0, @@ -4097,63 +5215,22 @@ "groupIndex": 0, "_id": "" }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 102 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": null, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "c6HVpKBr1D5LmRZUecZVe9", - "sync": false - }, { "__type__": "cc.Node", - "_name": "2", + "_name": "1", "_objFlags": 0, "_parent": { - "__id__": 101 + "__id__": 132 }, "_children": [], "_active": false, "_components": [ { - "__id__": 106 + "__id__": 134 } ], "_prefab": { - "__id__": 107 + "__id__": 135 }, "_opacity": 255, "_color": { @@ -4178,7 +5255,7 @@ "ctor": "Float64Array", "array": [ 0, - 110.712, + 103.984, 0, 0, 0, @@ -4207,7 +5284,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 105 + "__id__": 133 }, "_enabled": true, "_materials": [ @@ -4240,25 +5317,25 @@ "asset": { "__id__": 0 }, - "fileId": "d2dzYk9WhOEKpVayVnYYX9", + "fileId": "38FKh/+FhKxLp/AQhNqTWF", "sync": false }, { "__type__": "cc.Node", - "_name": "3", + "_name": "2", "_objFlags": 0, "_parent": { - "__id__": 101 + "__id__": 132 }, "_children": [], "_active": false, "_components": [ { - "__id__": 109 + "__id__": 137 } ], "_prefab": { - "__id__": 110 + "__id__": 138 }, "_opacity": 255, "_color": { @@ -4283,7 +5360,7 @@ "ctor": "Float64Array", "array": [ 0, - 110.712, + 103.984, 0, 0, 0, @@ -4312,7 +5389,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 136 }, "_enabled": true, "_materials": [ @@ -4345,100 +5422,25 @@ "asset": { "__id__": 0 }, - "fileId": "805pMAhXZEIofTqXoBItSk", - "sync": false - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "ff8rvj1HFKwLxWdkeK3XQO", + "fileId": "4eKyLoHZ1K2Ks094aIXP+d", "sync": false }, { "__type__": "cc.Node", - "_name": "豆浆摊位", - "_objFlags": 0, - "_parent": { - "__id__": 100 - }, - "_children": [ - { - "__id__": 113 - } - ], - "_active": true, - "_components": [], - "_prefab": { - "__id__": 116 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 0, - "height": 0 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 245.551, - 23.822, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Node", - "_name": "1", + "_name": "3", "_objFlags": 0, "_parent": { - "__id__": 112 + "__id__": 132 }, "_children": [], "_active": false, "_components": [ { - "__id__": 114 + "__id__": 140 } ], "_prefab": { - "__id__": 115 + "__id__": 141 }, "_opacity": 255, "_color": { @@ -4463,7 +5465,7 @@ "ctor": "Float64Array", "array": [ 0, - 218.527, + 103.984, 0, 0, 0, @@ -4492,7 +5494,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 139 }, "_enabled": true, "_materials": [ @@ -4525,7 +5527,7 @@ "asset": { "__id__": 0 }, - "fileId": "79aKlECilFa58EV7LGBDMc", + "fileId": "feWeKovmpG/ZsLnq49pTuM", "sync": false }, { @@ -4536,31 +5538,31 @@ "asset": { "__id__": 0 }, - "fileId": "9e0sr63eJGVbekQ9kZjn72", + "fileId": "06Me8y2fZLZKSz0+dl6snc", "sync": false }, { "__type__": "cc.Node", - "_name": "鸡蛋摊位", + "_name": "饺子摊位", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 115 }, "_children": [ { - "__id__": 118 + "__id__": 144 }, { - "__id__": 121 + "__id__": 147 }, { - "__id__": 124 + "__id__": 150 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 127 + "__id__": 153 }, "_opacity": 255, "_color": { @@ -4572,8 +5574,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 335, - "height": 245 + "width": 310, + "height": 177 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4584,8 +5586,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -214.716, - -296.672, + 218.064, + -152.095, 0, 0, 0, @@ -4614,17 +5616,17 @@ "_name": "1", "_objFlags": 0, "_parent": { - "__id__": 117 + "__id__": 143 }, "_children": [], "_active": false, "_components": [ { - "__id__": 119 + "__id__": 145 } ], "_prefab": { - "__id__": 120 + "__id__": 146 }, "_opacity": 255, "_color": { @@ -4649,7 +5651,7 @@ "ctor": "Float64Array", "array": [ 0, - 103.984, + 60.497, 0, 0, 0, @@ -4678,7 +5680,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 118 + "__id__": 144 }, "_enabled": true, "_materials": [ @@ -4711,7 +5713,7 @@ "asset": { "__id__": 0 }, - "fileId": "38FKh/+FhKxLp/AQhNqTWF", + "fileId": "12QdA06QJMEK8G2uw3QS+b", "sync": false }, { @@ -4719,17 +5721,17 @@ "_name": "2", "_objFlags": 0, "_parent": { - "__id__": 117 + "__id__": 143 }, "_children": [], "_active": false, "_components": [ { - "__id__": 122 + "__id__": 148 } ], "_prefab": { - "__id__": 123 + "__id__": 149 }, "_opacity": 255, "_color": { @@ -4754,7 +5756,7 @@ "ctor": "Float64Array", "array": [ 0, - 103.984, + 60.497, 0, 0, 0, @@ -4783,7 +5785,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 121 + "__id__": 147 }, "_enabled": true, "_materials": [ @@ -4816,7 +5818,7 @@ "asset": { "__id__": 0 }, - "fileId": "4eKyLoHZ1K2Ks094aIXP+d", + "fileId": "41qfDi18xBU5wIWXFfzihO", "sync": false }, { @@ -4824,17 +5826,17 @@ "_name": "3", "_objFlags": 0, "_parent": { - "__id__": 117 + "__id__": 143 }, "_children": [], "_active": false, "_components": [ { - "__id__": 125 + "__id__": 151 } ], "_prefab": { - "__id__": 126 + "__id__": 152 }, "_opacity": 255, "_color": { @@ -4859,7 +5861,7 @@ "ctor": "Float64Array", "array": [ 0, - 103.984, + 60.497, 0, 0, 0, @@ -4888,7 +5890,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 124 + "__id__": 150 }, "_enabled": true, "_materials": [ @@ -4921,7 +5923,7 @@ "asset": { "__id__": 0 }, - "fileId": "feWeKovmpG/ZsLnq49pTuM", + "fileId": "951yjdFa5OA6xm2SdVC/zS", "sync": false }, { @@ -4932,31 +5934,31 @@ "asset": { "__id__": 0 }, - "fileId": "06Me8y2fZLZKSz0+dl6snc", + "fileId": "0755lHSEdBUIdVF4sdXLMY", "sync": false }, { "__type__": "cc.Node", - "_name": "饺子摊位", + "_name": "油条摊位", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 115 }, "_children": [ { - "__id__": 129 + "__id__": 155 }, { - "__id__": 132 + "__id__": 158 }, { - "__id__": 135 + "__id__": 161 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 138 + "__id__": 164 }, "_opacity": 255, "_color": { @@ -4968,8 +5970,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 310, - "height": 177 + "width": 423, + "height": 225 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -4980,8 +5982,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 218.064, - -152.095, + 192.088, + -335.473, 0, 0, 0, @@ -5010,17 +6012,17 @@ "_name": "1", "_objFlags": 0, "_parent": { - "__id__": 128 + "__id__": 154 }, "_children": [], "_active": false, "_components": [ { - "__id__": 130 + "__id__": 156 } ], "_prefab": { - "__id__": 131 + "__id__": 157 }, "_opacity": 255, "_color": { @@ -5045,7 +6047,7 @@ "ctor": "Float64Array", "array": [ 0, - 60.497, + 90.19, 0, 0, 0, @@ -5074,7 +6076,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 129 + "__id__": 155 }, "_enabled": true, "_materials": [ @@ -5107,7 +6109,7 @@ "asset": { "__id__": 0 }, - "fileId": "12QdA06QJMEK8G2uw3QS+b", + "fileId": "e5LKqWYaRHlKt/CXAMbk2z", "sync": false }, { @@ -5115,17 +6117,17 @@ "_name": "2", "_objFlags": 0, "_parent": { - "__id__": 128 + "__id__": 154 }, "_children": [], "_active": false, "_components": [ { - "__id__": 133 + "__id__": 159 } ], "_prefab": { - "__id__": 134 + "__id__": 160 }, "_opacity": 255, "_color": { @@ -5150,7 +6152,7 @@ "ctor": "Float64Array", "array": [ 0, - 60.497, + 90.19, 0, 0, 0, @@ -5179,7 +6181,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 132 + "__id__": 158 }, "_enabled": true, "_materials": [ @@ -5212,7 +6214,7 @@ "asset": { "__id__": 0 }, - "fileId": "41qfDi18xBU5wIWXFfzihO", + "fileId": "8dzUnHj+dJUZgRoaTTscMT", "sync": false }, { @@ -5220,17 +6222,17 @@ "_name": "3", "_objFlags": 0, "_parent": { - "__id__": 128 + "__id__": 154 }, "_children": [], "_active": false, "_components": [ { - "__id__": 136 + "__id__": 162 } ], "_prefab": { - "__id__": 137 + "__id__": 163 }, "_opacity": 255, "_color": { @@ -5255,7 +6257,7 @@ "ctor": "Float64Array", "array": [ 0, - 60.497, + 90.19, 0, 0, 0, @@ -5284,7 +6286,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 135 + "__id__": 161 }, "_enabled": true, "_materials": [ @@ -5317,7 +6319,7 @@ "asset": { "__id__": 0 }, - "fileId": "951yjdFa5OA6xm2SdVC/zS", + "fileId": "bf55djC9tI6q/3VO0hCRJR", "sync": false }, { @@ -5328,31 +6330,43 @@ "asset": { "__id__": 0 }, - "fileId": "0755lHSEdBUIdVF4sdXLMY", + "fileId": "0aH5iShPpHSLEwmby23/KL", + "sync": false + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "32nW2K1aZAv5d2qKYI+hLg", "sync": false }, { "__type__": "cc.Node", - "_name": "油条摊位", + "_name": "员工对话框", "_objFlags": 0, "_parent": { - "__id__": 100 + "__id__": 1 }, "_children": [ { - "__id__": 140 + "__id__": 167 }, { - "__id__": 143 - }, + "__id__": 173 + } + ], + "_active": false, + "_components": [ { - "__id__": 146 + "__id__": 179 } ], - "_active": true, - "_components": [], "_prefab": { - "__id__": 149 + "__id__": 180 }, "_opacity": 255, "_color": { @@ -5364,8 +6378,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 423, - "height": 225 + "width": 750, + "height": 1334 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5376,8 +6390,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 186.893, - -322.486, + 0, + 0, 0, 0, 0, @@ -5403,33 +6417,39 @@ }, { "__type__": "cc.Node", - "_name": "1", + "_name": "蒙版", "_objFlags": 0, "_parent": { - "__id__": 139 + "__id__": 166 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 141 + "__id__": 168 + }, + { + "__id__": 169 + }, + { + "__id__": 170 } ], "_prefab": { - "__id__": 142 + "__id__": 172 }, - "_opacity": 255, + "_opacity": 135, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 67 + "width": 750, + "height": 1334 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5441,7 +6461,7 @@ "ctor": "Float64Array", "array": [ 0, - 90.19, + 0, 0, 0, 0, @@ -5470,7 +6490,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 140 + "__id__": 167 }, "_enabled": true, "_materials": [ @@ -5480,9 +6500,11 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + }, "_type": 0, - "_sizeMode": 1, + "_sizeMode": 0, "_fillType": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -5495,6 +6517,113 @@ "_atlas": null, "_id": "" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 167 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_id": "" + }, + { + "__type__": "cc.Button", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 167 + }, + "_enabled": true, + "_normalMaterial": null, + "_grayMaterial": null, + "duration": 0.1, + "zoomScale": 1.2, + "clickEvents": [ + { + "__id__": 171 + } + ], + "_N$interactable": true, + "_N$enableAutoGrayEffect": false, + "_N$transition": 0, + "transition": 0, + "_N$normalColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "pressedColor": { + "__type__": "cc.Color", + "r": 211, + "g": 211, + "b": 211, + "a": 255 + }, + "_N$hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "hoverColor": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_N$disabledColor": { + "__type__": "cc.Color", + "r": 124, + "g": 124, + "b": 124, + "a": 255 + }, + "_N$normalSprite": null, + "_N$pressedSprite": null, + "pressedSprite": null, + "_N$hoverSprite": null, + "hoverSprite": null, + "_N$disabledSprite": null, + "_N$target": null, + "_id": "" + }, + { + "__type__": "cc.ClickEvent", + "target": null, + "component": "", + "_componentId": "", + "handler": "", + "customEventData": "" + }, { "__type__": "cc.PrefabInfo", "root": { @@ -5503,25 +6632,29 @@ "asset": { "__id__": 0 }, - "fileId": "e5LKqWYaRHlKt/CXAMbk2z", + "fileId": "71p1OC/LlM1YOdZfVwqPSe", "sync": false }, { "__type__": "cc.Node", - "_name": "2", + "_name": "员工对话", "_objFlags": 0, "_parent": { - "__id__": 139 + "__id__": 166 }, - "_children": [], - "_active": false, + "_children": [ + { + "__id__": 174 + } + ], + "_active": true, "_components": [ { - "__id__": 144 + "__id__": 177 } ], "_prefab": { - "__id__": 145 + "__id__": 178 }, "_opacity": 255, "_color": { @@ -5533,8 +6666,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 67 + "width": 457, + "height": 189 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5546,7 +6679,7 @@ "ctor": "Float64Array", "array": [ 0, - 90.19, + 0, 0, 0, 0, @@ -5557,89 +6690,48 @@ 1 ] }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 143 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": null, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 }, - "fileId": "8dzUnHj+dJUZgRoaTTscMT", - "sync": false + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" }, { "__type__": "cc.Node", - "_name": "3", + "_name": "lab", "_objFlags": 0, "_parent": { - "__id__": 139 + "__id__": 173 }, "_children": [], - "_active": false, + "_active": true, "_components": [ { - "__id__": 147 + "__id__": 175 } ], "_prefab": { - "__id__": 148 + "__id__": 176 }, "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, "_contentSize": { "__type__": "cc.Size", - "width": 88, - "height": 67 + "width": 250, + "height": 37.8 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5650,8 +6742,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - 90.19, + 87.828, + -27.08, 0, 0, 0, @@ -5675,12 +6767,56 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 174 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 30, + "_lineHeight": 30, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 3, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "f4xFwfW2pG7J0/0IHz1DZ+", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 146 + "__id__": 173 }, "_enabled": true, "_materials": [ @@ -5690,7 +6826,9 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_spriteFrame": null, + "_spriteFrame": { + "__uuid__": "6b34d49a-c29b-4650-99be-c6ff5f6817ae" + }, "_type": 0, "_sizeMode": 1, "_fillType": 0, @@ -5713,19 +6851,35 @@ "asset": { "__id__": 0 }, - "fileId": "bf55djC9tI6q/3VO0hCRJR", + "fileId": "fc0gRgOSZOcZ0ydGAfVLP4", "sync": false }, { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 166 }, - "fileId": "0aH5iShPpHSLEwmby23/KL", - "sync": false + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 45, + "_left": 0, + "_right": 0, + "_top": 0, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 100, + "_originalHeight": 100, + "_id": "" }, { "__type__": "cc.PrefabInfo", @@ -5735,32 +6889,32 @@ "asset": { "__id__": 0 }, - "fileId": "32nW2K1aZAv5d2qKYI+hLg", + "fileId": "34jdYg54pEyrnyUlzm7qOh", "sync": false }, { "__type__": "cc.Node", - "_name": "员工对话框", + "_name": "开始摆摊", "_objFlags": 0, "_parent": { "__id__": 1 }, "_children": [ { - "__id__": 152 - }, - { - "__id__": 158 + "__id__": 182 } ], "_active": false, "_components": [ { - "__id__": 164 + "__id__": 186 + }, + { + "__id__": 187 } ], "_prefab": { - "__id__": 165 + "__id__": 189 }, "_opacity": 255, "_color": { @@ -5772,8 +6926,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 750, - "height": 1334 + "width": 157, + "height": 66 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5785,15 +6939,15 @@ "ctor": "Float64Array", "array": [ 0, + -193.824, 0, 0, 0, 0, - 0, - 1, 1, - 1, - 1 + 1.5, + 1.5, + 0 ] }, "_eulerAngles": { @@ -5811,39 +6965,36 @@ }, { "__type__": "cc.Node", - "_name": "蒙版", + "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 151 + "__id__": 181 }, "_children": [], "_active": true, "_components": [ { - "__id__": 153 - }, - { - "__id__": 154 + "__id__": 183 }, { - "__id__": 155 + "__id__": 184 } ], "_prefab": { - "__id__": 157 + "__id__": 185 }, - "_opacity": 135, + "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 0, - "g": 0, + "r": 158, + "g": 78, "b": 0, "a": 255 }, "_contentSize": { "__type__": "cc.Size", - "width": 750, - "height": 1334 + "width": 102, + "height": 33.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -5855,7 +7006,7 @@ "ctor": "Float64Array", "array": [ 0, - 0, + 3, 0, 0, 0, @@ -5879,12 +7030,74 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 182 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "开始摆摊", + "_N$string": "开始摆摊", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 182 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_width": 1, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b2V4iGbv5J1Zp97tisy9XY", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 152 + "__id__": 181 }, "_enabled": true, "_materials": [ @@ -5895,10 +7108,10 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "a23235d1-15db-4b95-8439-a2e005bfff91" + "__uuid__": "d56f80fb-deaf-4a01-9703-798221ae258c" }, "_type": 0, - "_sizeMode": 0, + "_sizeMode": 1, "_fillType": 0, "_fillCenter": { "__type__": "cc.Vec2", @@ -5911,39 +7124,12 @@ "_atlas": null, "_id": "" }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 152 - }, - "_enabled": true, - "alignMode": 1, - "_target": null, - "_alignFlags": 45, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_verticalCenter": 0, - "_horizontalCenter": 0, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, - "_id": "" - }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 152 + "__id__": 181 }, "_enabled": true, "_normalMaterial": null, @@ -5952,13 +7138,13 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 156 + "__id__": 188 } ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, - "_N$transition": 0, - "transition": 0, + "_N$transition": 3, + "transition": 3, "_N$normalColor": { "__type__": "cc.Color", "r": 255, @@ -6012,10 +7198,12 @@ }, { "__type__": "cc.ClickEvent", - "target": null, + "target": { + "__id__": 1 + }, "component": "", - "_componentId": "", - "handler": "", + "_componentId": "78aa92gum1MDL6YWVymp3nP", + "handler": "onTouchStartBaiTan", "customEventData": "" }, { @@ -6026,29 +7214,25 @@ "asset": { "__id__": 0 }, - "fileId": "71p1OC/LlM1YOdZfVwqPSe", + "fileId": "00edPJbwFI5KsfnEQfM0vb", "sync": false }, { "__type__": "cc.Node", - "_name": "员工对话", + "_name": "guideParent", "_objFlags": 0, "_parent": { - "__id__": 151 + "__id__": 1 }, - "_children": [ - { - "__id__": 159 - } - ], + "_children": [], "_active": true, "_components": [ { - "__id__": 162 + "__id__": 191 } ], "_prefab": { - "__id__": 163 + "__id__": 192 }, "_opacity": 255, "_color": { @@ -6060,8 +7244,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 457, - "height": 189 + "width": 750, + "height": 1334 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6097,163 +7281,12 @@ "groupIndex": 0, "_id": "" }, - { - "__type__": "cc.Node", - "_name": "lab", - "_objFlags": 0, - "_parent": { - "__id__": 158 - }, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 160 - } - ], - "_prefab": { - "__id__": 161 - }, - "_opacity": 255, - "_color": { - "__type__": "cc.Color", - "r": 0, - "g": 0, - "b": 0, - "a": 255 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 250, - "height": 37.8 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_trs": { - "__type__": "TypedArray", - "ctor": "Float64Array", - "array": [ - 87.828, - -27.08, - 0, - 0, - 0, - 0, - 1, - 1, - 1, - 1 - ] - }, - "_eulerAngles": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_skewX": 0, - "_skewY": 0, - "_is3DNode": false, - "_groupIndex": 0, - "groupIndex": 0, - "_id": "" - }, - { - "__type__": "cc.Label", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 159 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_string": "Label", - "_N$string": "Label", - "_fontSize": 30, - "_lineHeight": 30, - "_enableWrapText": true, - "_N$file": null, - "_isSystemFontUsed": true, - "_spacingX": 0, - "_batchAsBitmap": false, - "_styleFlags": 1, - "_underlineHeight": 0, - "_N$horizontalAlign": 1, - "_N$verticalAlign": 1, - "_N$fontFamily": "Arial", - "_N$overflow": 3, - "_N$cacheMode": 0, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "f4xFwfW2pG7J0/0IHz1DZ+", - "sync": false - }, - { - "__type__": "cc.Sprite", - "_name": "", - "_objFlags": 0, - "node": { - "__id__": 158 - }, - "_enabled": true, - "_materials": [ - { - "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" - } - ], - "_srcBlendFactor": 770, - "_dstBlendFactor": 771, - "_spriteFrame": { - "__uuid__": "6b34d49a-c29b-4650-99be-c6ff5f6817ae" - }, - "_type": 0, - "_sizeMode": 1, - "_fillType": 0, - "_fillCenter": { - "__type__": "cc.Vec2", - "x": 0, - "y": 0 - }, - "_fillStart": 0, - "_fillRange": 0, - "_isTrimmedMode": true, - "_atlas": null, - "_id": "" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "fc0gRgOSZOcZ0ydGAfVLP4", - "sync": false - }, { "__type__": "cc.Widget", "_name": "", "_objFlags": 0, "node": { - "__id__": 151 + "__id__": 190 }, "_enabled": true, "alignMode": 1, @@ -6271,8 +7304,8 @@ "_isAbsBottom": true, "_isAbsHorizontalCenter": true, "_isAbsVerticalCenter": true, - "_originalWidth": 100, - "_originalHeight": 100, + "_originalWidth": 0, + "_originalHeight": 0, "_id": "" }, { @@ -6283,32 +7316,35 @@ "asset": { "__id__": 0 }, - "fileId": "34jdYg54pEyrnyUlzm7qOh", + "fileId": "c3C4twEHVHLpwjhnK66ha2", "sync": false }, { "__type__": "cc.Node", - "_name": "开始摆摊", + "_name": "跳过引导", "_objFlags": 0, "_parent": { "__id__": 1 }, "_children": [ { - "__id__": 167 + "__id__": 194 } ], "_active": false, "_components": [ { - "__id__": 171 + "__id__": 198 + }, + { + "__id__": 199 }, { - "__id__": 172 + "__id__": 200 } ], "_prefab": { - "__id__": 174 + "__id__": 202 }, "_opacity": 255, "_color": { @@ -6320,8 +7356,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 157, - "height": 66 + "width": 73, + "height": 76 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6332,16 +7368,16 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, - -193.824, + 295.015, + 483.403, 0, 0, 0, 0, 1, - 1.5, - 1.5, - 0 + 1, + 1, + 1 ] }, "_eulerAngles": { @@ -6362,33 +7398,33 @@ "_name": "New Label", "_objFlags": 0, "_parent": { - "__id__": 166 + "__id__": 193 }, "_children": [], "_active": true, "_components": [ { - "__id__": 168 + "__id__": 195 }, { - "__id__": 169 + "__id__": 196 } ], "_prefab": { - "__id__": 170 + "__id__": 197 }, "_opacity": 255, "_color": { "__type__": "cc.Color", - "r": 158, - "g": 78, - "b": 0, + "r": 255, + "g": 255, + "b": 255, "a": 255 }, "_contentSize": { "__type__": "cc.Size", - "width": 102, - "height": 33.5 + "width": 104, + "height": 35.5 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -6400,7 +7436,7 @@ "ctor": "Float64Array", "array": [ 0, - 3, + -47.791, 0, 0, 0, @@ -6429,7 +7465,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "_materials": [ @@ -6439,8 +7475,8 @@ ], "_srcBlendFactor": 770, "_dstBlendFactor": 771, - "_string": "开始摆摊", - "_N$string": "开始摆摊", + "_string": "跳过引导", + "_N$string": "跳过引导", "_fontSize": 25, "_lineHeight": 25, "_enableWrapText": true, @@ -6448,7 +7484,7 @@ "_isSystemFontUsed": true, "_spacingX": 0, "_batchAsBitmap": false, - "_styleFlags": 1, + "_styleFlags": 0, "_underlineHeight": 0, "_N$horizontalAlign": 1, "_N$verticalAlign": 1, @@ -6462,17 +7498,17 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 194 }, "_enabled": true, "_color": { "__type__": "cc.Color", - "r": 255, - "g": 255, - "b": 255, + "r": 0, + "g": 0, + "b": 0, "a": 255 }, - "_width": 1, + "_width": 2, "_id": "" }, { @@ -6483,7 +7519,7 @@ "asset": { "__id__": 0 }, - "fileId": "b2V4iGbv5J1Zp97tisy9XY", + "fileId": "5fmrqh2XtJF5eRp4uicJfh", "sync": false }, { @@ -6491,7 +7527,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 166 + "__id__": 193 }, "_enabled": true, "_materials": [ @@ -6502,7 +7538,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "d56f80fb-deaf-4a01-9703-798221ae258c" + "__uuid__": "0f6a3cae-8ecd-451f-be25-e0143467f45d" }, "_type": 0, "_sizeMode": 1, @@ -6518,12 +7554,39 @@ "_atlas": null, "_id": "" }, + { + "__type__": "cc.Widget", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 193 + }, + "_enabled": true, + "alignMode": 1, + "_target": null, + "_alignFlags": 33, + "_left": 0, + "_right": 43.485000000000014, + "_top": 145.59699999999998, + "_bottom": 0, + "_verticalCenter": 0, + "_horizontalCenter": 0, + "_isAbsLeft": true, + "_isAbsRight": true, + "_isAbsTop": true, + "_isAbsBottom": true, + "_isAbsHorizontalCenter": true, + "_isAbsVerticalCenter": true, + "_originalWidth": 0, + "_originalHeight": 0, + "_id": "" + }, { "__type__": "cc.Button", "_name": "", "_objFlags": 0, "node": { - "__id__": 166 + "__id__": 193 }, "_enabled": true, "_normalMaterial": null, @@ -6532,13 +7595,13 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 173 + "__id__": 201 } ], "_N$interactable": true, "_N$enableAutoGrayEffect": false, - "_N$transition": 3, - "transition": 3, + "_N$transition": 0, + "transition": 0, "_N$normalColor": { "__type__": "cc.Color", "r": 255, @@ -6597,7 +7660,7 @@ }, "component": "", "_componentId": "78aa92gum1MDL6YWVymp3nP", - "handler": "onTouchStartBaiTan", + "handler": "onTouchTiaoGuoYinDao", "customEventData": "" }, { @@ -6608,7 +7671,7 @@ "asset": { "__id__": 0 }, - "fileId": "00edPJbwFI5KsfnEQfM0vb", + "fileId": "97fOMMO7xDto3vbK358DO8", "sync": false }, { @@ -6690,19 +7753,19 @@ "__id__": 16 }, "fly_zaocan_parent": { - "__id__": 100 + "__id__": 115 }, "car": { "__id__": 14 }, "tiehe": { - "__id__": 93 + "__id__": 108 }, "m_bg": { "__id__": 7 }, "duihua": { - "__id__": 160 + "__id__": 175 }, "_id": "" }, diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc1.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc1.prefab index 71c5bf0f..648d10d9 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc1.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc1.prefab @@ -28,16 +28,19 @@ }, { "__id__": 17 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "d4C8g4+GBPDry5CN9aG/lE", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 386.224, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "89tL/E4tRJOoW8gQrI5Wdk", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc2.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc2.prefab index 315e6b4f..d024dda0 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc2.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc2.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "d3vXrbdvNCUKFtzO26FFQx", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 409.983, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "38pCDwIcpHHaDucAI+FV3z", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc3.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc3.prefab index 98bb113e..636bfad2 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc3.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc3.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "b2sVuuXQpHCZ2gM4pHBVtn", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 412.246, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "20vBpiK1lMaJ4u5+UVaLGi", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc4.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc4.prefab index 3753760e..0021ffe0 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc4.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc4.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "e06aY3+A1I84u64roQXCGN", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 424.544, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "0bwxnepZBAG4eXux15DABd", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc5.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc5.prefab index e10116af..9ab3bbe4 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc5.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc5.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "fa4GUzAW9IqahQTbIwjrkG", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 424.544, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "4bVGHcKl5Hqa4TOJjmElOD", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc6.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc6.prefab index cacd3fd7..6778fd77 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc6.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc6.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "21D8Em6pdENZs7JUbtHEby", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 457.682, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "22RosZu2xKYrTLstLQyOBO", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc7.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc7.prefab index 6465e247..2836810b 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc7.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc7.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "2clSt1DTpNJYi3IgJy17+I", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 439.084, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "e5Hx/ErJ1G/7z99BUdUNWL", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianNpc8.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianNpc8.prefab index 40fa564e..d73f2838 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianNpc8.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianNpc8.prefab @@ -28,16 +28,19 @@ }, { "__id__": 23 + }, + { + "__id__": 29 } ], "_active": true, "_components": [ { - "__id__": 29 + "__id__": 33 } ], "_prefab": { - "__id__": 30 + "__id__": 34 }, "_opacity": 255, "_color": { @@ -1079,6 +1082,135 @@ "fileId": "2eQTos6clGAJT3zfZDiie+", "sync": false }, + { + "__type__": "cc.Node", + "_name": "money", + "_objFlags": 0, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": false, + "_components": [ + { + "__id__": 30 + }, + { + "__id__": 31 + } + ], + "_prefab": { + "__id__": 32 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 67.1, + "height": 33.3 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 424.544, + 0, + 0, + 0, + 0, + 1, + 1, + 1, + 1 + ] + }, + "_eulerAngles": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_skewX": 0, + "_skewY": 0, + "_is3DNode": false, + "_groupIndex": 0, + "groupIndex": 0, + "_id": "" + }, + { + "__type__": "cc.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "Label", + "_N$string": "Label", + "_fontSize": 25, + "_lineHeight": 25, + "_enableWrapText": true, + "_N$file": null, + "_isSystemFontUsed": true, + "_spacingX": 0, + "_batchAsBitmap": false, + "_styleFlags": 1, + "_underlineHeight": 0, + "_N$horizontalAlign": 1, + "_N$verticalAlign": 1, + "_N$fontFamily": "Arial", + "_N$overflow": 0, + "_N$cacheMode": 0, + "_id": "" + }, + { + "__type__": "cc.LabelOutline", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 29 + }, + "_enabled": true, + "_color": { + "__type__": "cc.Color", + "r": 0, + "g": 0, + "b": 0, + "a": 255 + }, + "_width": 0.9, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "40yWRDoaZG17ssQD9jdMCj", + "sync": false + }, { "__type__": "ca6c550VU9ADK+mM1un4SHv", "_name": "", diff --git a/assets/ZaoCanDian/prefab/ZaoCanDianYeWu.prefab b/assets/ZaoCanDian/prefab/ZaoCanDianYeWu.prefab index 304902b3..30d82a8f 100644 --- a/assets/ZaoCanDian/prefab/ZaoCanDianYeWu.prefab +++ b/assets/ZaoCanDian/prefab/ZaoCanDianYeWu.prefab @@ -1755,8 +1755,8 @@ 0, 0, 1, - 1, - 1, + 1.4, + 1.4, 1 ] }, @@ -1813,8 +1813,8 @@ "__id__": 42 }, "_enabled": true, - "scaleStart": 1, - "scaleEnd": 1.1, + "scaleStart": 1.4, + "scaleEnd": 1.5, "time": 0.5, "_id": "" }, @@ -1940,7 +1940,7 @@ "ctor": "Float64Array", "array": [ 0, - 0.711, + -39.247, 0, 0, 0, @@ -2373,7 +2373,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "93616b08-4549-4225-9167-a98f0585de10" + "__uuid__": "c33b1e53-2b72-4532-853f-8060f5699972" }, "_type": 0, "_sizeMode": 1, diff --git a/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png b/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png new file mode 100644 index 00000000..e432d7ce Binary files /dev/null and b/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png differ diff --git a/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png.meta b/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png.meta new file mode 100644 index 00000000..c7d45db1 --- /dev/null +++ b/assets/ZaoCanDian/res/yewu/未解锁遮罩 (2).png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "9dfd4fdc-3018-438a-b042-954003e40ca6", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 128, + "height": 128, + "platformSettings": {}, + "subMetas": { + "未解锁遮罩 (2)": { + "ver": "1.0.6", + "uuid": "c33b1e53-2b72-4532-853f-8060f5699972", + "importer": "sprite-frame", + "rawTextureUuid": "9dfd4fdc-3018-438a-b042-954003e40ca6", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 128, + "height": 128, + "rawWidth": 128, + "rawHeight": 128, + "borderTop": 0, + "borderBottom": 0, + "borderLeft": 0, + "borderRight": 0, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/ZaoCanDian/sound/油锅/油炸.mp3 b/assets/ZaoCanDian/sound/油锅/油炸.mp3 index ab9ee005..a93aab0e 100644 Binary files a/assets/ZaoCanDian/sound/油锅/油炸.mp3 and b/assets/ZaoCanDian/sound/油锅/油炸.mp3 differ diff --git a/assets/ZaoCanDian/sound/油锅/油炸.mp3.meta b/assets/ZaoCanDian/sound/油锅/油炸.mp3.meta index 98a5f7ca..b0dd6fb0 100644 --- a/assets/ZaoCanDian/sound/油锅/油炸.mp3.meta +++ b/assets/ZaoCanDian/sound/油锅/油炸.mp3.meta @@ -3,6 +3,6 @@ "uuid": "ea4c3d5b-21d3-4c62-b311-155abc90f164", "importer": "audio-clip", "downloadMode": 0, - "duration": 3.056327, + "duration": 2.481633, "subMetas": {} } \ No newline at end of file diff --git a/assets/ZaoCanDian/sound/煎锅/煎东西.mp3 b/assets/ZaoCanDian/sound/煎锅/煎东西.mp3 index 36d5b4a7..7cd44bd7 100644 Binary files a/assets/ZaoCanDian/sound/煎锅/煎东西.mp3 and b/assets/ZaoCanDian/sound/煎锅/煎东西.mp3 differ diff --git a/assets/ZaoCanDian/sound/煎锅/煎东西.mp3.meta b/assets/ZaoCanDian/sound/煎锅/煎东西.mp3.meta index 6d219e75..ebbeaf28 100644 --- a/assets/ZaoCanDian/sound/煎锅/煎东西.mp3.meta +++ b/assets/ZaoCanDian/sound/煎锅/煎东西.mp3.meta @@ -3,6 +3,6 @@ "uuid": "a1f2f8b5-b924-45a4-abfb-94613e30b142", "importer": "audio-clip", "downloadMode": 0, - "duration": 3.578776, + "duration": 2.45551, "subMetas": {} } \ No newline at end of file diff --git a/assets/ZaoCanDian/sound/煮锅/煮东西.mp3 b/assets/ZaoCanDian/sound/煮锅/煮东西.mp3 index ab9ee005..ee95e78a 100644 Binary files a/assets/ZaoCanDian/sound/煮锅/煮东西.mp3 and b/assets/ZaoCanDian/sound/煮锅/煮东西.mp3 differ diff --git a/assets/ZaoCanDian/sound/煮锅/煮东西.mp3.meta b/assets/ZaoCanDian/sound/煮锅/煮东西.mp3.meta index 602cca8a..37a28e49 100644 --- a/assets/ZaoCanDian/sound/煮锅/煮东西.mp3.meta +++ b/assets/ZaoCanDian/sound/煮锅/煮东西.mp3.meta @@ -3,6 +3,6 @@ "uuid": "831cc5b4-adf7-4607-b338-5355abac8398", "importer": "audio-clip", "downloadMode": 0, - "duration": 3.056327, + "duration": 2.586122, "subMetas": {} } \ No newline at end of file diff --git a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 new file mode 100644 index 00000000..40ac2e6a Binary files /dev/null and b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3 differ diff --git a/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta new file mode 100644 index 00000000..70532f05 --- /dev/null +++ b/assets/ZaoCanDian/sound/豆浆桶/豆浆桶抛物线.mp3.meta @@ -0,0 +1,8 @@ +{ + "ver": "2.0.3", + "uuid": "5e2a5e67-8f06-47bc-b74c-03de299accd2", + "importer": "audio-clip", + "downloadMode": 0, + "duration": 2.377143, + "subMetas": {} +} \ No newline at end of file diff --git a/remotesound/DH/DH_3/sound/打开后女孩晕倒的场景背景音.mp3 b/remotesound/DH/DH_3/sound/打开后女孩晕倒的场景背景音.mp3 new file mode 100644 index 00000000..7a709348 Binary files /dev/null and b/remotesound/DH/DH_3/sound/打开后女孩晕倒的场景背景音.mp3 differ diff --git a/remotesound/GameStoryRes/sound/KaiChangGuanQia1Gai/你他妈敢对老子动手？.mp3 b/remotesound/GameStoryRes/sound/KaiChangGuanQia1Gai/你他妈敢对老子动手？.mp3 new file mode 100644 index 00000000..868e6fc3 Binary files /dev/null and b/remotesound/GameStoryRes/sound/KaiChangGuanQia1Gai/你他妈敢对老子动手？.mp3 differ diff --git a/remotesound/bgm/背景bgm.mp3 b/remotesound/bgm/背景bgm.mp3 new file mode 100644 index 00000000..6e0537cf Binary files /dev/null and b/remotesound/bgm/背景bgm.mp3 differ diff --git a/remotesound/effect/铁门打开.mp3 b/remotesound/effect/铁门打开.mp3 new file mode 100644 index 00000000..a05be212 Binary files /dev/null and b/remotesound/effect/铁门打开.mp3 differ