diff --git a/assets/CommonRes/texture/namebg.png b/assets/CommonRes/texture/namebg.png new file mode 100644 index 00000000..f6067c9e Binary files /dev/null and b/assets/CommonRes/texture/namebg.png differ diff --git a/assets/CommonRes/texture/namebg.png.meta b/assets/CommonRes/texture/namebg.png.meta new file mode 100644 index 00000000..0935733d --- /dev/null +++ b/assets/CommonRes/texture/namebg.png.meta @@ -0,0 +1,38 @@ +{ + "ver": "2.3.7", + "uuid": "a0abc1b9-4fef-4ce9-805f-38b124174669", + "importer": "texture", + "type": "sprite", + "wrapMode": "clamp", + "filterMode": "bilinear", + "premultiplyAlpha": false, + "genMipmaps": false, + "packable": true, + "width": 40, + "height": 183, + "platformSettings": {}, + "subMetas": { + "namebg": { + "ver": "1.0.6", + "uuid": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4", + "importer": "sprite-frame", + "rawTextureUuid": "a0abc1b9-4fef-4ce9-805f-38b124174669", + "trimType": "auto", + "trimThreshold": 1, + "rotated": false, + "offsetX": 0, + "offsetY": 0, + "trimX": 0, + "trimY": 0, + "width": 40, + "height": 183, + "rawWidth": 40, + "rawHeight": 183, + "borderTop": 18, + "borderBottom": 118, + "borderLeft": 10, + "borderRight": 13, + "subMetas": {} + } + } +} \ No newline at end of file diff --git a/assets/DH/DH_1/res.meta b/assets/DH/DH_1/res.meta deleted file mode 100644 index 90b92077..00000000 --- a/assets/DH/DH_1/res.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "462c34e2-6a59-4359-8647-18ee46700ec3", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/DH/DH_1/spine.meta b/assets/DH/DH_1/spine.meta deleted file mode 100644 index c9ca12a9..00000000 --- a/assets/DH/DH_1/spine.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "bec96b5e-2604-4668-85c1-ccd410b31026", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/DH/DH_2/res.meta b/assets/DH/DH_2/res.meta deleted file mode 100644 index 5aac09bc..00000000 --- a/assets/DH/DH_2/res.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "b4279828-5853-4953-95c6-eabd110716bb", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/DH/DH_2/spine.meta b/assets/DH/DH_2/spine.meta deleted file mode 100644 index 15f79e4f..00000000 --- a/assets/DH/DH_2/spine.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "3f829cf3-6f0f-4460-8f2e-f18b777298d5", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/DH/DH_3/res.meta b/assets/DH/DH_3/res.meta deleted file mode 100644 index 040c5089..00000000 --- a/assets/DH/DH_3/res.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "fdbd12f8-359f-43a1-85d4-95f4e3e3aa15", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/DH/DH_3/spine.meta b/assets/DH/DH_3/spine.meta deleted file mode 100644 index 8611e8d4..00000000 --- a/assets/DH/DH_3/spine.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.3", - "uuid": "ef620713-70d4-44ea-9657-0f3501074b1d", - "importer": "folder", - "isBundle": false, - "bundleName": "", - "priority": 1, - "compressionType": {}, - "optimizeHotUpdate": {}, - "inlineSpriteFrames": {}, - "isRemoteBundle": {}, - "subMetas": {} -} \ No newline at end of file diff --git a/assets/GameRoomRes/Room1/prefab/Room1.prefab b/assets/GameRoomRes/Room1/prefab/Room1.prefab index 37272f18..938d9ff5 100644 --- a/assets/GameRoomRes/Room1/prefab/Room1.prefab +++ b/assets/GameRoomRes/Room1/prefab/Room1.prefab @@ -2025,8 +2025,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 302.346, - -475.221, + 244.98700000000002, + -549.451, 0, 0, 0, @@ -2094,9 +2094,9 @@ "_target": null, "_alignFlags": 36, "_left": 0, - "_right": 3.1539999999999964, + "_right": 60.51299999999998, "_top": 0, - "_bottom": 126.27899999999994, + "_bottom": 52.04899999999998, "_verticalCenter": 0, "_horizontalCenter": 0, "_isAbsLeft": true, diff --git a/assets/GameRoomRes/Room2/prefab/Room2.prefab b/assets/GameRoomRes/Room2/prefab/Room2.prefab index 9dd7b43a..89f25336 100644 --- a/assets/GameRoomRes/Room2/prefab/Room2.prefab +++ b/assets/GameRoomRes/Room2/prefab/Room2.prefab @@ -21,50 +21,53 @@ "__id__": 2 }, { - "__id__": 113 + "__id__": 119 }, { - "__id__": 125 + "__id__": 131 }, { - "__id__": 136 + "__id__": 142 }, { - "__id__": 139 + "__id__": 145 }, { - "__id__": 146 + "__id__": 152 }, { - "__id__": 153 + "__id__": 159 }, { - "__id__": 160 + "__id__": 166 }, { - "__id__": 174 + "__id__": 180 }, { - "__id__": 200 + "__id__": 206 }, { - "__id__": 218 + "__id__": 224 }, { - "__id__": 221 + "__id__": 227 } ], "_active": true, "_components": [ { - "__id__": 229 + "__id__": 235 + }, + { + "__id__": 236 }, { - "__id__": 230 + "__id__": 237 } ], "_prefab": { - "__id__": 231 + "__id__": 238 }, "_opacity": 255, "_color": { @@ -163,12 +166,6 @@ { "__id__": 42 }, - { - "__id__": 45 - }, - { - "__id__": 48 - }, { "__id__": 51 }, @@ -196,6 +193,9 @@ { "__id__": 75 }, + { + "__id__": 78 + }, { "__id__": 81 }, @@ -212,17 +212,20 @@ "__id__": 105 }, { - "__id__": 108 + "__id__": 111 + }, + { + "__id__": 114 } ], "_active": true, "_components": [ { - "__id__": 111 + "__id__": 117 } ], "_prefab": { - "__id__": 112 + "__id__": 118 }, "_opacity": 255, "_color": { @@ -1719,15 +1722,19 @@ "_parent": { "__id__": 2 }, - "_children": [], + "_children": [ + { + "__id__": 43 + } + ], "_active": false, "_components": [ { - "__id__": 43 + "__id__": 49 } ], "_prefab": { - "__id__": 44 + "__id__": 50 }, "_opacity": 255, "_color": { @@ -1739,8 +1746,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 39, - "height": 31 + "width": 148, + "height": 142 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1758,6 +1765,138 @@ 0, 0, 1, + 0.3, + 0.3, + 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 Node", + "_objFlags": 0, + "_parent": { + "__id__": 42 + }, + "_children": [ + { + "__id__": 44 + } + ], + "_active": true, + "_components": [ + { + "__id__": 47 + } + ], + "_prefab": { + "__id__": 48 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 100, + "height": 200 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + -24.7, + 3.9, + 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__": 43 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 45 + } + ], + "_prefab": { + "__id__": 46 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 148, + "height": 142 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 53.917, + -1.3, + 0, + 0, + 0, + 0, + 1, 1, 1, 1 @@ -1781,7 +1920,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 42 + "__id__": 44 }, "_enabled": true, "_materials": [ @@ -1808,6 +1947,78 @@ "_atlas": null, "_id": "" }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "5bCwUuKkpEe71GvDNB/jb3", + "sync": false + }, + { + "__type__": "cc.Mask", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 43 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_spriteFrame": null, + "_type": 0, + "_segments": 64, + "_N$alphaThreshold": 0.1, + "_N$inverted": false, + "_id": "" + }, + { + "__type__": "cc.PrefabInfo", + "root": { + "__id__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "b0bQbtVbdPpZypNf09Y98d", + "sync": false + }, + { + "__type__": "cc.Sprite", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 42 + }, + "_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": { @@ -1830,11 +2041,11 @@ "_active": false, "_components": [ { - "__id__": 46 + "__id__": 52 } ], "_prefab": { - "__id__": 47 + "__id__": 53 }, "_opacity": 255, "_color": { @@ -1846,8 +2057,8 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 74, - "height": 46 + "width": 148, + "height": 142 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1858,15 +2069,15 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 130.401, - 7.903, + 133.809, + 6.5, 0, 0, 0, 0, 1, - 1, - 1, + 0.3, + 0.3, 1 ] }, @@ -1888,7 +2099,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 45 + "__id__": 51 }, "_enabled": true, "_materials": [ @@ -1937,11 +2148,11 @@ "_active": false, "_components": [ { - "__id__": 49 + "__id__": 55 } ], "_prefab": { - "__id__": 50 + "__id__": 56 }, "_opacity": 255, "_color": { @@ -1995,7 +2206,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 48 + "__id__": 54 }, "_enabled": true, "_materials": [ @@ -2044,11 +2255,11 @@ "_active": false, "_components": [ { - "__id__": 52 + "__id__": 58 } ], "_prefab": { - "__id__": 53 + "__id__": 59 }, "_opacity": 255, "_color": { @@ -2102,7 +2313,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 51 + "__id__": 57 }, "_enabled": true, "_materials": [ @@ -2151,11 +2362,11 @@ "_active": true, "_components": [ { - "__id__": 55 + "__id__": 61 } ], "_prefab": { - "__id__": 56 + "__id__": 62 }, "_opacity": 255, "_color": { @@ -2209,7 +2420,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 54 + "__id__": 60 }, "_enabled": true, "_materials": [ @@ -2258,11 +2469,11 @@ "_active": false, "_components": [ { - "__id__": 58 + "__id__": 64 } ], "_prefab": { - "__id__": 59 + "__id__": 65 }, "_opacity": 255, "_color": { @@ -2316,11 +2527,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 57 + "__id__": 63 }, "_enabled": true, "emitTarget": { - "__id__": 57 + "__id__": 63 }, "isEmitTargetHide": true, "emitTimes": 1, @@ -2359,11 +2570,11 @@ "_active": false, "_components": [ { - "__id__": 61 + "__id__": 67 } ], "_prefab": { - "__id__": 62 + "__id__": 68 }, "_opacity": 255, "_color": { @@ -2417,7 +2628,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 60 + "__id__": 66 }, "_enabled": true, "_materials": [ @@ -2466,11 +2677,11 @@ "_active": false, "_components": [ { - "__id__": 64 + "__id__": 70 } ], "_prefab": { - "__id__": 65 + "__id__": 71 }, "_opacity": 255, "_color": { @@ -2524,7 +2735,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 63 + "__id__": 69 }, "_enabled": true, "_materials": [ @@ -2583,11 +2794,11 @@ "_active": false, "_components": [ { - "__id__": 67 + "__id__": 73 } ], "_prefab": { - "__id__": 68 + "__id__": 74 }, "_opacity": 255, "_color": { @@ -2641,7 +2852,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 72 }, "_enabled": true, "_materials": [ @@ -2690,11 +2901,11 @@ "_active": false, "_components": [ { - "__id__": 70 + "__id__": 76 } ], "_prefab": { - "__id__": 71 + "__id__": 77 }, "_opacity": 255, "_color": { @@ -2748,7 +2959,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 75 }, "_enabled": true, "_materials": [ @@ -2807,11 +3018,11 @@ "_active": false, "_components": [ { - "__id__": 73 + "__id__": 79 } ], "_prefab": { - "__id__": 74 + "__id__": 80 }, "_opacity": 255, "_color": { @@ -2865,7 +3076,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 72 + "__id__": 78 }, "_enabled": true, "_materials": [ @@ -2922,17 +3133,17 @@ }, "_children": [ { - "__id__": 76 + "__id__": 82 } ], "_active": false, "_components": [ { - "__id__": 79 + "__id__": 85 } ], "_prefab": { - "__id__": 80 + "__id__": 86 }, "_opacity": 255, "_color": { @@ -2986,17 +3197,17 @@ "_name": "引导效果", "_objFlags": 0, "_parent": { - "__id__": 75 + "__id__": 81 }, "_children": [], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 83 } ], "_prefab": { - "__id__": 78 + "__id__": 84 }, "_opacity": 255, "_color": { @@ -3050,7 +3261,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 82 }, "_enabled": true, "_materials": [ @@ -3103,11 +3314,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 81 }, "_enabled": true, "emitTarget": { - "__id__": 75 + "__id__": 81 }, "isEmitTargetHide": true, "emitTimes": 1, @@ -3144,17 +3355,17 @@ }, "_children": [ { - "__id__": 82 + "__id__": 88 } ], "_active": false, "_components": [ { - "__id__": 85 + "__id__": 91 } ], "_prefab": { - "__id__": 86 + "__id__": 92 }, "_opacity": 255, "_color": { @@ -3208,17 +3419,17 @@ "_name": "引导效果", "_objFlags": 0, "_parent": { - "__id__": 81 + "__id__": 87 }, "_children": [], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 89 } ], "_prefab": { - "__id__": 84 + "__id__": 90 }, "_opacity": 255, "_color": { @@ -3272,7 +3483,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 88 }, "_enabled": true, "_materials": [ @@ -3325,11 +3536,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 81 + "__id__": 87 }, "_enabled": true, "emitTarget": { - "__id__": 81 + "__id__": 87 }, "isEmitTargetHide": true, "emitTimes": 1, @@ -3366,17 +3577,17 @@ }, "_children": [ { - "__id__": 88 + "__id__": 94 } ], "_active": false, "_components": [ { - "__id__": 91 + "__id__": 97 } ], "_prefab": { - "__id__": 92 + "__id__": 98 }, "_opacity": 255, "_color": { @@ -3430,17 +3641,17 @@ "_name": "引导效果", "_objFlags": 0, "_parent": { - "__id__": 87 + "__id__": 93 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 95 } ], "_prefab": { - "__id__": 90 + "__id__": 96 }, "_opacity": 255, "_color": { @@ -3494,7 +3705,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 88 + "__id__": 94 }, "_enabled": true, "_materials": [ @@ -3547,17 +3758,17 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 87 + "__id__": 93 }, "_enabled": true, "emitTarget": { - "__id__": 87 + "__id__": 93 }, "isEmitTargetHide": true, "emitTimes": 1, "tiggerNodeArray": [ { - "__id__": 45 + "__id__": 51 } ], "hideTirNodeArray": [ @@ -3596,17 +3807,17 @@ }, "_children": [ { - "__id__": 94 + "__id__": 100 } ], "_active": false, "_components": [ { - "__id__": 97 + "__id__": 103 } ], "_prefab": { - "__id__": 98 + "__id__": 104 }, "_opacity": 255, "_color": { @@ -3660,17 +3871,17 @@ "_name": "引导效果", "_objFlags": 0, "_parent": { - "__id__": 93 + "__id__": 99 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 101 } ], "_prefab": { - "__id__": 96 + "__id__": 102 }, "_opacity": 255, "_color": { @@ -3724,7 +3935,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 94 + "__id__": 100 }, "_enabled": true, "_materials": [ @@ -3777,11 +3988,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 93 + "__id__": 99 }, "_enabled": true, "emitTarget": { - "__id__": 93 + "__id__": 99 }, "isEmitTargetHide": true, "emitTimes": 1, @@ -3818,17 +4029,17 @@ }, "_children": [ { - "__id__": 100 + "__id__": 106 } ], "_active": false, "_components": [ { - "__id__": 103 + "__id__": 109 } ], "_prefab": { - "__id__": 104 + "__id__": 110 }, "_opacity": 255, "_color": { @@ -3882,17 +4093,17 @@ "_name": "引导效果", "_objFlags": 0, "_parent": { - "__id__": 99 + "__id__": 105 }, "_children": [], "_active": true, "_components": [ { - "__id__": 101 + "__id__": 107 } ], "_prefab": { - "__id__": 102 + "__id__": 108 }, "_opacity": 255, "_color": { @@ -3946,7 +4157,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 100 + "__id__": 106 }, "_enabled": true, "_materials": [ @@ -3999,18 +4210,18 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 99 + "__id__": 105 }, "_enabled": true, "emitTarget": { - "__id__": 99 + "__id__": 105 }, "isEmitTargetHide": true, "emitTimes": 1, "tiggerNodeArray": [], "hideTirNodeArray": [ { - "__id__": 48 + "__id__": 54 } ], "allowEmitNode": null, @@ -4046,11 +4257,11 @@ "_active": false, "_components": [ { - "__id__": 106 + "__id__": 112 } ], "_prefab": { - "__id__": 107 + "__id__": 113 }, "_opacity": 255, "_color": { @@ -4104,7 +4315,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 105 + "__id__": 111 }, "_enabled": true, "_materials": [ @@ -4153,11 +4364,11 @@ "_active": false, "_components": [ { - "__id__": 109 + "__id__": 115 } ], "_prefab": { - "__id__": 110 + "__id__": 116 }, "_opacity": 255, "_color": { @@ -4211,7 +4422,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 108 + "__id__": 114 }, "_enabled": true, "_materials": [ @@ -4296,26 +4507,26 @@ }, "_children": [ { - "__id__": 114 + "__id__": 120 }, { - "__id__": 117 + "__id__": 123 } ], "_active": true, "_components": [ { - "__id__": 120 + "__id__": 126 }, { - "__id__": 121 + "__id__": 127 }, { - "__id__": 123 + "__id__": 129 } ], "_prefab": { - "__id__": 124 + "__id__": 130 }, "_opacity": 255, "_color": { @@ -4369,17 +4580,17 @@ "_name": "按钮交付", "_objFlags": 0, "_parent": { - "__id__": 113 + "__id__": 119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 115 + "__id__": 121 } ], "_prefab": { - "__id__": 116 + "__id__": 122 }, "_opacity": 255, "_color": { @@ -4433,7 +4644,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 114 + "__id__": 120 }, "_enabled": true, "_materials": [ @@ -4476,17 +4687,17 @@ "_name": "spFrame", "_objFlags": 0, "_parent": { - "__id__": 113 + "__id__": 119 }, "_children": [], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 124 } ], "_prefab": { - "__id__": 119 + "__id__": 125 }, "_opacity": 255, "_color": { @@ -4540,7 +4751,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 117 + "__id__": 123 }, "_enabled": true, "_materials": [ @@ -4581,7 +4792,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 119 }, "_enabled": true, "scaleStart": 1, @@ -4594,7 +4805,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 119 }, "_enabled": true, "_normalMaterial": null, @@ -4603,7 +4814,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 122 + "__id__": 128 } ], "_N$interactable": true, @@ -4664,7 +4875,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 113 + "__id__": 119 }, "component": "", "_componentId": "54ee4o6WohNCZVtTdmKJ9z8", @@ -4676,11 +4887,11 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 113 + "__id__": 119 }, "_enabled": true, "iconSpFrame": { - "__id__": 117 + "__id__": 123 }, "qiPaoStr": null, "goodIdTab": [ @@ -4708,23 +4919,23 @@ }, "_children": [ { - "__id__": 126 + "__id__": 132 }, { - "__id__": 129 + "__id__": 135 } ], "_active": false, "_components": [ { - "__id__": 132 + "__id__": 138 }, { - "__id__": 133 + "__id__": 139 } ], "_prefab": { - "__id__": 135 + "__id__": 141 }, "_opacity": 255, "_color": { @@ -4778,17 +4989,17 @@ "_name": "按钮交付", "_objFlags": 0, "_parent": { - "__id__": 125 + "__id__": 131 }, "_children": [], "_active": true, "_components": [ { - "__id__": 127 + "__id__": 133 } ], "_prefab": { - "__id__": 128 + "__id__": 134 }, "_opacity": 255, "_color": { @@ -4842,7 +5053,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 126 + "__id__": 132 }, "_enabled": true, "_materials": [ @@ -4885,17 +5096,17 @@ "_name": "spFrame", "_objFlags": 0, "_parent": { - "__id__": 125 + "__id__": 131 }, "_children": [], "_active": true, "_components": [ { - "__id__": 130 + "__id__": 136 } ], "_prefab": { - "__id__": 131 + "__id__": 137 }, "_opacity": 255, "_color": { @@ -4949,7 +5160,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 129 + "__id__": 135 }, "_enabled": true, "_materials": [ @@ -4992,7 +5203,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 131 }, "_enabled": true, "scaleStart": 1, @@ -5005,7 +5216,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 125 + "__id__": 131 }, "_enabled": true, "_normalMaterial": null, @@ -5014,7 +5225,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 134 + "__id__": 140 } ], "_N$interactable": true, @@ -5104,11 +5315,11 @@ "_active": false, "_components": [ { - "__id__": 137 + "__id__": 143 } ], "_prefab": { - "__id__": 138 + "__id__": 144 }, "_opacity": 255, "_color": { @@ -5162,7 +5373,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 136 + "__id__": 142 }, "_enabled": true, "_materials": [ @@ -5219,17 +5430,17 @@ }, "_children": [ { - "__id__": 140 + "__id__": 146 } ], "_active": false, "_components": [ { - "__id__": 143 + "__id__": 149 } ], "_prefab": { - "__id__": 145 + "__id__": 151 }, "_opacity": 255, "_color": { @@ -5283,17 +5494,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 139 + "__id__": 145 }, "_children": [], "_active": true, "_components": [ { - "__id__": 141 + "__id__": 147 } ], "_prefab": { - "__id__": 142 + "__id__": 148 }, "_opacity": 255, "_color": { @@ -5347,7 +5558,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 140 + "__id__": 146 }, "_enabled": true, "_materials": [ @@ -5400,7 +5611,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 139 + "__id__": 145 }, "_enabled": true, "_normalMaterial": null, @@ -5409,7 +5620,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 144 + "__id__": 150 } ], "_N$interactable": true, @@ -5497,17 +5708,17 @@ }, "_children": [ { - "__id__": 147 + "__id__": 153 } ], "_active": false, "_components": [ { - "__id__": 150 + "__id__": 156 } ], "_prefab": { - "__id__": 152 + "__id__": 158 }, "_opacity": 255, "_color": { @@ -5561,17 +5772,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 146 + "__id__": 152 }, "_children": [], "_active": true, "_components": [ { - "__id__": 148 + "__id__": 154 } ], "_prefab": { - "__id__": 149 + "__id__": 155 }, "_opacity": 255, "_color": { @@ -5625,7 +5836,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 147 + "__id__": 153 }, "_enabled": true, "_materials": [ @@ -5678,7 +5889,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 146 + "__id__": 152 }, "_enabled": true, "_normalMaterial": null, @@ -5687,7 +5898,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 151 + "__id__": 157 } ], "_N$interactable": true, @@ -5775,17 +5986,17 @@ }, "_children": [ { - "__id__": 154 + "__id__": 160 } ], "_active": false, "_components": [ { - "__id__": 157 + "__id__": 163 } ], "_prefab": { - "__id__": 159 + "__id__": 165 }, "_opacity": 255, "_color": { @@ -5839,17 +6050,17 @@ "_name": "按钮", "_objFlags": 0, "_parent": { - "__id__": 153 + "__id__": 159 }, "_children": [], "_active": true, "_components": [ { - "__id__": 155 + "__id__": 161 } ], "_prefab": { - "__id__": 156 + "__id__": 162 }, "_opacity": 255, "_color": { @@ -5903,7 +6114,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 154 + "__id__": 160 }, "_enabled": true, "_materials": [ @@ -5956,7 +6167,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 153 + "__id__": 159 }, "_enabled": true, "_normalMaterial": null, @@ -5965,7 +6176,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 158 + "__id__": 164 } ], "_N$interactable": true, @@ -6053,22 +6264,22 @@ }, "_children": [ { - "__id__": 161 + "__id__": 167 }, { - "__id__": 164 + "__id__": 170 }, { - "__id__": 167 + "__id__": 173 }, { - "__id__": 170 + "__id__": 176 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 173 + "__id__": 179 }, "_opacity": 255, "_color": { @@ -6122,17 +6333,17 @@ "_name": "声效0", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 166 }, "_children": [], "_active": false, "_components": [ { - "__id__": 162 + "__id__": 168 } ], "_prefab": { - "__id__": 163 + "__id__": 169 }, "_opacity": 255, "_color": { @@ -6186,7 +6397,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 161 + "__id__": 167 }, "_enabled": true, "_materials": [ @@ -6239,17 +6450,17 @@ "_name": "声效1", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 166 }, "_children": [], "_active": false, "_components": [ { - "__id__": 165 + "__id__": 171 } ], "_prefab": { - "__id__": 166 + "__id__": 172 }, "_opacity": 255, "_color": { @@ -6303,7 +6514,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 164 + "__id__": 170 }, "_enabled": true, "_materials": [ @@ -6356,17 +6567,17 @@ "_name": "声效2", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 166 }, "_children": [], "_active": false, "_components": [ { - "__id__": 168 + "__id__": 174 } ], "_prefab": { - "__id__": 169 + "__id__": 175 }, "_opacity": 255, "_color": { @@ -6420,7 +6631,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 167 + "__id__": 173 }, "_enabled": true, "_materials": [ @@ -6473,17 +6684,17 @@ "_name": "声效3", "_objFlags": 0, "_parent": { - "__id__": 160 + "__id__": 166 }, "_children": [], "_active": false, "_components": [ { - "__id__": 171 + "__id__": 177 } ], "_prefab": { - "__id__": 172 + "__id__": 178 }, "_opacity": 255, "_color": { @@ -6537,7 +6748,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 170 + "__id__": 176 }, "_enabled": true, "_materials": [ @@ -6604,9 +6815,6 @@ "__id__": 1 }, "_children": [ - { - "__id__": 175 - }, { "__id__": 181 }, @@ -6615,12 +6823,15 @@ }, { "__id__": 193 + }, + { + "__id__": 199 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 199 + "__id__": 205 }, "_opacity": 255, "_color": { @@ -6674,21 +6885,21 @@ "_name": "qiPao_0", "_objFlags": 0, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [ { - "__id__": 176 + "__id__": 182 } ], "_active": false, "_components": [ { - "__id__": 179 + "__id__": 185 } ], "_prefab": { - "__id__": 180 + "__id__": 186 }, "_opacity": 255, "_color": { @@ -6742,17 +6953,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 175 + "__id__": 181 }, "_children": [], "_active": true, "_components": [ { - "__id__": 177 + "__id__": 183 } ], "_prefab": { - "__id__": 178 + "__id__": 184 }, "_opacity": 255, "_color": { @@ -6806,7 +7017,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 176 + "__id__": 182 }, "_enabled": true, "_materials": [ @@ -6850,7 +7061,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 175 + "__id__": 181 }, "_enabled": true, "_materials": [ @@ -6893,21 +7104,21 @@ "_name": "qiPao_1", "_objFlags": 0, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [ { - "__id__": 182 + "__id__": 188 } ], "_active": false, "_components": [ { - "__id__": 185 + "__id__": 191 } ], "_prefab": { - "__id__": 186 + "__id__": 192 }, "_opacity": 255, "_color": { @@ -6961,17 +7172,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 181 + "__id__": 187 }, "_children": [], "_active": true, "_components": [ { - "__id__": 183 + "__id__": 189 } ], "_prefab": { - "__id__": 184 + "__id__": 190 }, "_opacity": 255, "_color": { @@ -7025,7 +7236,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 182 + "__id__": 188 }, "_enabled": true, "_materials": [ @@ -7069,7 +7280,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 181 + "__id__": 187 }, "_enabled": true, "_materials": [ @@ -7112,21 +7323,21 @@ "_name": "qiPao_2", "_objFlags": 0, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [ { - "__id__": 188 + "__id__": 194 } ], "_active": false, "_components": [ { - "__id__": 191 + "__id__": 197 } ], "_prefab": { - "__id__": 192 + "__id__": 198 }, "_opacity": 255, "_color": { @@ -7180,17 +7391,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 187 + "__id__": 193 }, "_children": [], "_active": true, "_components": [ { - "__id__": 189 + "__id__": 195 } ], "_prefab": { - "__id__": 190 + "__id__": 196 }, "_opacity": 255, "_color": { @@ -7244,7 +7455,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 188 + "__id__": 194 }, "_enabled": true, "_materials": [ @@ -7288,7 +7499,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 187 + "__id__": 193 }, "_enabled": true, "_materials": [ @@ -7331,21 +7542,21 @@ "_name": "qiPao_3", "_objFlags": 0, "_parent": { - "__id__": 174 + "__id__": 180 }, "_children": [ { - "__id__": 194 + "__id__": 200 } ], "_active": false, "_components": [ { - "__id__": 197 + "__id__": 203 } ], "_prefab": { - "__id__": 198 + "__id__": 204 }, "_opacity": 255, "_color": { @@ -7399,17 +7610,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 193 + "__id__": 199 }, "_children": [], "_active": true, "_components": [ { - "__id__": 195 + "__id__": 201 } ], "_prefab": { - "__id__": 196 + "__id__": 202 }, "_opacity": 255, "_color": { @@ -7463,7 +7674,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 194 + "__id__": 200 }, "_enabled": true, "_materials": [ @@ -7507,7 +7718,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 193 + "__id__": 199 }, "_enabled": true, "_materials": [ @@ -7565,20 +7776,20 @@ }, "_children": [ { - "__id__": 201 + "__id__": 207 }, { - "__id__": 210 + "__id__": 216 } ], "_active": true, "_components": [ { - "__id__": 216 + "__id__": 222 } ], "_prefab": { - "__id__": 217 + "__id__": 223 }, "_opacity": 255, "_color": { @@ -7632,24 +7843,24 @@ "_name": "diTu", "_objFlags": 0, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 202 + "__id__": 208 } ], "_active": false, "_components": [ { - "__id__": 206 + "__id__": 212 }, { - "__id__": 208 + "__id__": 214 } ], "_prefab": { - "__id__": 209 + "__id__": 215 }, "_opacity": 255, "_color": { @@ -7703,20 +7914,20 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 201 + "__id__": 207 }, "_children": [], "_active": true, "_components": [ { - "__id__": 203 + "__id__": 209 }, { - "__id__": 204 + "__id__": 210 } ], "_prefab": { - "__id__": 205 + "__id__": 211 }, "_opacity": 255, "_color": { @@ -7770,7 +7981,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "_materials": [ @@ -7803,7 +8014,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 202 + "__id__": 208 }, "_enabled": true, "_color": { @@ -7832,7 +8043,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "_normalMaterial": null, @@ -7841,7 +8052,7 @@ "zoomScale": 1.2, "clickEvents": [ { - "__id__": 207 + "__id__": 213 } ], "_N$interactable": true, @@ -7902,7 +8113,7 @@ { "__type__": "cc.ClickEvent", "target": { - "__id__": 200 + "__id__": 206 }, "component": "", "_componentId": "80d7bgwi4BEwLB3smYXVoys", @@ -7914,7 +8125,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 201 + "__id__": 207 }, "_enabled": true, "_materials": [ @@ -7967,21 +8178,21 @@ "_name": "textNode", "_objFlags": 0, "_parent": { - "__id__": 200 + "__id__": 206 }, "_children": [ { - "__id__": 211 + "__id__": 217 } ], "_active": false, "_components": [ { - "__id__": 214 + "__id__": 220 } ], "_prefab": { - "__id__": 215 + "__id__": 221 }, "_opacity": 255, "_color": { @@ -8035,17 +8246,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 210 + "__id__": 216 }, "_children": [], "_active": true, "_components": [ { - "__id__": 212 + "__id__": 218 } ], "_prefab": { - "__id__": 213 + "__id__": 219 }, "_opacity": 255, "_color": { @@ -8099,7 +8310,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 211 + "__id__": 217 }, "_enabled": true, "_materials": [ @@ -8143,7 +8354,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 210 + "__id__": 216 }, "_enabled": true, "_materials": [ @@ -8186,14 +8397,14 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 200 + "__id__": 206 }, "_enabled": true, "diTu": { - "__id__": 201 + "__id__": 207 }, "textNode": { - "__id__": 210 + "__id__": 216 }, "_id": "" }, @@ -8219,11 +8430,11 @@ "_active": false, "_components": [ { - "__id__": 219 + "__id__": 225 } ], "_prefab": { - "__id__": 220 + "__id__": 226 }, "_opacity": 255, "_color": { @@ -8277,7 +8488,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 218 + "__id__": 224 }, "_enabled": true, "_materials": [ @@ -8334,20 +8545,20 @@ }, "_children": [ { - "__id__": 222 + "__id__": 228 } ], "_active": true, "_components": [ { - "__id__": 225 + "__id__": 231 }, { - "__id__": 226 + "__id__": 232 } ], "_prefab": { - "__id__": 228 + "__id__": 234 }, "_opacity": 255, "_color": { @@ -8401,17 +8612,17 @@ "_name": "spine", "_objFlags": 0, "_parent": { - "__id__": 221 + "__id__": 227 }, "_children": [], "_active": true, "_components": [ { - "__id__": 223 + "__id__": 229 } ], "_prefab": { - "__id__": 224 + "__id__": 230 }, "_opacity": 255, "_color": { @@ -8465,7 +8676,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 222 + "__id__": 228 }, "_enabled": true, "_materials": [ @@ -8518,7 +8729,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 221 + "__id__": 227 }, "_enabled": true, "alignMode": 1, @@ -8545,7 +8756,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 221 + "__id__": 227 }, "_enabled": true, "_normalMaterial": null, @@ -8554,7 +8765,7 @@ "zoomScale": 1.1, "clickEvents": [ { - "__id__": 227 + "__id__": 233 } ], "_N$interactable": true, @@ -8670,6 +8881,16 @@ "_enabled": true, "_id": "" }, + { + "__type__": "01b77kAaMhGwYzF5HlMABbp", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 1 + }, + "_enabled": true, + "_id": "" + }, { "__type__": "cc.PrefabInfo", "root": { diff --git a/assets/GameRoomRes/Room2/texture/现金 1.png b/assets/GameRoomRes/Room2/texture/现金 1.png index a8331995..8a44700c 100644 Binary files a/assets/GameRoomRes/Room2/texture/现金 1.png and b/assets/GameRoomRes/Room2/texture/现金 1.png differ diff --git a/assets/GameRoomRes/Room2/texture/现金 1.png.meta b/assets/GameRoomRes/Room2/texture/现金 1.png.meta index 8464ce95..4330a549 100644 --- a/assets/GameRoomRes/Room2/texture/现金 1.png.meta +++ b/assets/GameRoomRes/Room2/texture/现金 1.png.meta @@ -8,8 +8,8 @@ "premultiplyAlpha": false, "genMipmaps": false, "packable": true, - "width": 39, - "height": 31, + "width": 200, + "height": 200, "platformSettings": {}, "subMetas": { "现金 1": { @@ -22,12 +22,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 39, - "height": 31, - "rawWidth": 39, - "rawHeight": 31, + "trimX": 26, + "trimY": 29, + "width": 148, + "height": 142, + "rawWidth": 200, + "rawHeight": 200, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/GameRoomRes/Room2/texture/现金.png b/assets/GameRoomRes/Room2/texture/现金.png index 4b8ee704..8a44700c 100644 Binary files a/assets/GameRoomRes/Room2/texture/现金.png and b/assets/GameRoomRes/Room2/texture/现金.png differ diff --git a/assets/GameRoomRes/Room2/texture/现金.png.meta b/assets/GameRoomRes/Room2/texture/现金.png.meta index ce05a75d..affb1afb 100644 --- a/assets/GameRoomRes/Room2/texture/现金.png.meta +++ b/assets/GameRoomRes/Room2/texture/现金.png.meta @@ -22,12 +22,12 @@ "rotated": false, "offsetX": 0, "offsetY": 0, - "trimX": 0, - "trimY": 0, - "width": 74, - "height": 46, - "rawWidth": 74, - "rawHeight": 46, + "trimX": 26, + "trimY": 29, + "width": 148, + "height": 142, + "rawWidth": 200, + "rawHeight": 200, "borderTop": 0, "borderBottom": 0, "borderLeft": 0, diff --git a/assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab b/assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab index d3bd8b5e..2e96c418 100644 --- a/assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab +++ b/assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab @@ -21,23 +21,23 @@ "__id__": 2 }, { - "__id__": 74 + "__id__": 83 } ], "_active": true, "_components": [ { - "__id__": 118 + "__id__": 127 }, { - "__id__": 119 + "__id__": 128 }, { - "__id__": 120 + "__id__": 129 } ], "_prefab": { - "__id__": 121 + "__id__": 130 }, "_opacity": 255, "_color": { @@ -104,7 +104,7 @@ "_active": true, "_components": [], "_prefab": { - "__id__": 73 + "__id__": 82 }, "_opacity": 255, "_color": { @@ -1081,16 +1081,16 @@ "__id__": 63 }, { - "__id__": 66 + "__id__": 69 }, { - "__id__": 69 + "__id__": 75 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 72 + "__id__": 81 }, "_opacity": 255, "_color": { @@ -2504,15 +2504,19 @@ "_parent": { "__id__": 26 }, - "_children": [], + "_children": [ + { + "__id__": 64 + } + ], "_active": true, "_components": [ { - "__id__": 64 + "__id__": 67 } ], "_prefab": { - "__id__": 65 + "__id__": 68 }, "_opacity": 255, "_color": { @@ -2561,6 +2565,114 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 63 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 65 + } + ], + "_prefab": { + "__id__": 66 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 20, + "height": 165.2 + }, + "_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.Label", + "_name": "", + "_objFlags": 0, + "node": { + "__id__": 64 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "男\n主\n·\n包\n子\n铺\n老\n板", + "_N$string": "男\n主\n·\n包\n子\n铺\n老\n板", + "_fontSize": 20, + "_lineHeight": 20, + "_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__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "135bBrDehBwqaCNx3q7Khw", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", @@ -2577,7 +2689,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "cd39adbd-aab3-4da4-8e8e-b227cc9a6828" + "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4" }, "_type": 0, "_sizeMode": 1, @@ -2611,15 +2723,19 @@ "_parent": { "__id__": 26 }, - "_children": [], + "_children": [ + { + "__id__": 70 + } + ], "_active": true, "_components": [ { - "__id__": 67 + "__id__": 73 } ], "_prefab": { - "__id__": 68 + "__id__": 74 }, "_opacity": 255, "_color": { @@ -2668,12 +2784,120 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 69 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 71 + } + ], + "_prefab": { + "__id__": 72 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 20, + "height": 105.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + 28.365, + 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__": 70 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "老\n婆\n·\n夏\n芸", + "_N$string": "老\n婆\n·\n夏\n芸", + "_fontSize": 20, + "_lineHeight": 20, + "_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__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "efUP8ymWdI5I2gtZiDWZom", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 66 + "__id__": 69 }, "_enabled": true, "_materials": [ @@ -2684,7 +2908,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "9689b5ce-82bf-4386-84f7-667a2452aa1e" + "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4" }, "_type": 0, "_sizeMode": 1, @@ -2718,15 +2942,19 @@ "_parent": { "__id__": 26 }, - "_children": [], + "_children": [ + { + "__id__": 76 + } + ], "_active": true, "_components": [ { - "__id__": 70 + "__id__": 79 } ], "_prefab": { - "__id__": 71 + "__id__": 80 }, "_opacity": 255, "_color": { @@ -2775,12 +3003,120 @@ "groupIndex": 0, "_id": "" }, + { + "__type__": "cc.Node", + "_name": "New Label", + "_objFlags": 0, + "_parent": { + "__id__": 75 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 77 + } + ], + "_prefab": { + "__id__": 78 + }, + "_opacity": 255, + "_color": { + "__type__": "cc.Color", + "r": 255, + "g": 255, + "b": 255, + "a": 255 + }, + "_contentSize": { + "__type__": "cc.Size", + "width": 20, + "height": 185.2 + }, + "_anchorPoint": { + "__type__": "cc.Vec2", + "x": 0.5, + "y": 0.5 + }, + "_trs": { + "__type__": "TypedArray", + "ctor": "Float64Array", + "array": [ + 0, + -14.304, + 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__": 76 + }, + "_enabled": true, + "_materials": [ + { + "__uuid__": "eca5d2f2-8ef6-41c2-bbe6-f9c79d09c432" + } + ], + "_srcBlendFactor": 770, + "_dstBlendFactor": 771, + "_string": "陈\n天\n霸\n·\n西\n餐\n厅\n老\n板", + "_N$string": "陈\n天\n霸\n·\n西\n餐\n厅\n老\n板", + "_fontSize": 20, + "_lineHeight": 20, + "_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__": 1 + }, + "asset": { + "__id__": 0 + }, + "fileId": "fdbwu9dElBmrE0aoyY0UIO", + "sync": false + }, { "__type__": "cc.Sprite", "_name": "", "_objFlags": 0, "node": { - "__id__": 69 + "__id__": 75 }, "_enabled": true, "_materials": [ @@ -2791,7 +3127,7 @@ "_srcBlendFactor": 770, "_dstBlendFactor": 771, "_spriteFrame": { - "__uuid__": "53bcad30-f256-440c-9729-2021b6c9cf64" + "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4" }, "_type": 0, "_sizeMode": 1, @@ -2849,31 +3185,31 @@ }, "_children": [ { - "__id__": 75 + "__id__": 84 }, { - "__id__": 81 + "__id__": 90 }, { - "__id__": 87 + "__id__": 96 }, { - "__id__": 93 + "__id__": 102 }, { - "__id__": 99 + "__id__": 108 }, { - "__id__": 105 + "__id__": 114 }, { - "__id__": 111 + "__id__": 120 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 117 + "__id__": 126 }, "_opacity": 255, "_color": { @@ -2927,21 +3263,21 @@ "_name": "qiPao_0", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 76 + "__id__": 85 } ], "_active": false, "_components": [ { - "__id__": 79 + "__id__": 88 } ], "_prefab": { - "__id__": 80 + "__id__": 89 }, "_opacity": 255, "_color": { @@ -2995,17 +3331,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 75 + "__id__": 84 }, "_children": [], "_active": true, "_components": [ { - "__id__": 77 + "__id__": 86 } ], "_prefab": { - "__id__": 78 + "__id__": 87 }, "_opacity": 255, "_color": { @@ -3059,7 +3395,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 76 + "__id__": 85 }, "_enabled": true, "_materials": [ @@ -3103,7 +3439,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 75 + "__id__": 84 }, "_enabled": true, "_materials": [ @@ -3146,21 +3482,21 @@ "_name": "qiPao_1", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 82 + "__id__": 91 } ], "_active": false, "_components": [ { - "__id__": 85 + "__id__": 94 } ], "_prefab": { - "__id__": 86 + "__id__": 95 }, "_opacity": 255, "_color": { @@ -3214,17 +3550,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 81 + "__id__": 90 }, "_children": [], "_active": true, "_components": [ { - "__id__": 83 + "__id__": 92 } ], "_prefab": { - "__id__": 84 + "__id__": 93 }, "_opacity": 255, "_color": { @@ -3278,7 +3614,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 82 + "__id__": 91 }, "_enabled": true, "_materials": [ @@ -3322,7 +3658,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 81 + "__id__": 90 }, "_enabled": true, "_materials": [ @@ -3365,21 +3701,21 @@ "_name": "qiPao_2", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 88 + "__id__": 97 } ], "_active": false, "_components": [ { - "__id__": 91 + "__id__": 100 } ], "_prefab": { - "__id__": 92 + "__id__": 101 }, "_opacity": 255, "_color": { @@ -3433,17 +3769,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 87 + "__id__": 96 }, "_children": [], "_active": true, "_components": [ { - "__id__": 89 + "__id__": 98 } ], "_prefab": { - "__id__": 90 + "__id__": 99 }, "_opacity": 255, "_color": { @@ -3497,7 +3833,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 88 + "__id__": 97 }, "_enabled": true, "_materials": [ @@ -3541,7 +3877,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 87 + "__id__": 96 }, "_enabled": true, "_materials": [ @@ -3584,21 +3920,21 @@ "_name": "qiPao_3", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 94 + "__id__": 103 } ], "_active": false, "_components": [ { - "__id__": 97 + "__id__": 106 } ], "_prefab": { - "__id__": 98 + "__id__": 107 }, "_opacity": 255, "_color": { @@ -3652,17 +3988,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 93 + "__id__": 102 }, "_children": [], "_active": true, "_components": [ { - "__id__": 95 + "__id__": 104 } ], "_prefab": { - "__id__": 96 + "__id__": 105 }, "_opacity": 255, "_color": { @@ -3716,7 +4052,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 94 + "__id__": 103 }, "_enabled": true, "_materials": [ @@ -3760,7 +4096,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 93 + "__id__": 102 }, "_enabled": true, "_materials": [ @@ -3803,21 +4139,21 @@ "_name": "qiPao_4", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 100 + "__id__": 109 } ], "_active": false, "_components": [ { - "__id__": 103 + "__id__": 112 } ], "_prefab": { - "__id__": 104 + "__id__": 113 }, "_opacity": 255, "_color": { @@ -3871,17 +4207,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 99 + "__id__": 108 }, "_children": [], "_active": true, "_components": [ { - "__id__": 101 + "__id__": 110 } ], "_prefab": { - "__id__": 102 + "__id__": 111 }, "_opacity": 255, "_color": { @@ -3935,7 +4271,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 100 + "__id__": 109 }, "_enabled": true, "_materials": [ @@ -3979,7 +4315,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 99 + "__id__": 108 }, "_enabled": true, "_materials": [ @@ -4022,21 +4358,21 @@ "_name": "qiPao_5", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 106 + "__id__": 115 } ], "_active": false, "_components": [ { - "__id__": 109 + "__id__": 118 } ], "_prefab": { - "__id__": 110 + "__id__": 119 }, "_opacity": 255, "_color": { @@ -4090,17 +4426,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 105 + "__id__": 114 }, "_children": [], "_active": true, "_components": [ { - "__id__": 107 + "__id__": 116 } ], "_prefab": { - "__id__": 108 + "__id__": 117 }, "_opacity": 255, "_color": { @@ -4154,7 +4490,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 106 + "__id__": 115 }, "_enabled": true, "_materials": [ @@ -4198,7 +4534,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 105 + "__id__": 114 }, "_enabled": true, "_materials": [ @@ -4241,21 +4577,21 @@ "_name": "qiPao_6", "_objFlags": 0, "_parent": { - "__id__": 74 + "__id__": 83 }, "_children": [ { - "__id__": 112 + "__id__": 121 } ], "_active": false, "_components": [ { - "__id__": 115 + "__id__": 124 } ], "_prefab": { - "__id__": 116 + "__id__": 125 }, "_opacity": 255, "_color": { @@ -4309,17 +4645,17 @@ "_name": "str", "_objFlags": 0, "_parent": { - "__id__": 111 + "__id__": 120 }, "_children": [], "_active": true, "_components": [ { - "__id__": 113 + "__id__": 122 } ], "_prefab": { - "__id__": 114 + "__id__": 123 }, "_opacity": 255, "_color": { @@ -4373,7 +4709,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 112 + "__id__": 121 }, "_enabled": true, "_materials": [ @@ -4417,7 +4753,7 @@ "_name": "", "_objFlags": 0, "node": { - "__id__": 111 + "__id__": 120 }, "_enabled": true, "_materials": [ diff --git a/assets/PeopleLevelUp/prefab/PeopleLevelUp.prefab b/assets/PeopleLevelUp/prefab/PeopleLevelUp.prefab index 0e59c2c5..c0592ea7 100644 --- a/assets/PeopleLevelUp/prefab/PeopleLevelUp.prefab +++ b/assets/PeopleLevelUp/prefab/PeopleLevelUp.prefab @@ -10045,7 +10045,7 @@ }, "_contentSize": { "__type__": "cc.Size", - "width": 54, + "width": 96, "height": 50 }, "_anchorPoint": { @@ -10121,8 +10121,8 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - -43.405, - 0, + 39.272, + 23.902, 0, 0, 0, @@ -10197,7 +10197,7 @@ "__id__": 292 }, "_children": [], - "_active": true, + "_active": false, "_components": [ { "__id__": 297 @@ -10231,7 +10231,7 @@ "__type__": "TypedArray", "ctor": "Float64Array", "array": [ - 0, + 21, 1.566, 0, 0, @@ -10325,10 +10325,10 @@ "node": { "__id__": 292 }, - "_enabled": true, + "_enabled": false, "_layoutSize": { "__type__": "cc.Size", - "width": 54, + "width": 96, "height": 50 }, "_resize": 1, diff --git a/assets/Scripts/GameMethodRes/shouhuoji/ShouHuoJiGai.ts b/assets/Scripts/GameMethodRes/shouhuoji/ShouHuoJiGai.ts index 1a675fdc..b87771b2 100644 --- a/assets/Scripts/GameMethodRes/shouhuoji/ShouHuoJiGai.ts +++ b/assets/Scripts/GameMethodRes/shouhuoji/ShouHuoJiGai.ts @@ -111,7 +111,7 @@ export default class ShouHuoJiGai extends GameBase { duiHuaInfo() { let strArr = [ '面具下的我,想深入了解吗?', - '振兴中餐,非你莫属!' + '小帅哥,需要点什么呢!' ] let str = this.node.getChildByName('qiPao').getChildByName('qiPao_0').getChildByName('str') let ren = this.node.getChildByName('商人') diff --git a/assets/Scripts/GameRoomRes/Room1/Room1.ts b/assets/Scripts/GameRoomRes/Room1/Room1.ts index 92d66105..1735a777 100644 --- a/assets/Scripts/GameRoomRes/Room1/Room1.ts +++ b/assets/Scripts/GameRoomRes/Room1/Room1.ts @@ -30,6 +30,9 @@ export default class Room1 extends cc.Component { PrefabManage.preloadPrefabByType(GameType.ChatList) PrefabManage.preloadPrefabByType(GameType.ChatDialog) }, 0.2) + EventMgr.onEvent_custom(ryw_Event.updateMainTask, () => { + this.updateMainTask() + }, this) } showChatBtnStatus() { let openBtnSpine = this.node.getChildByName('openBtnSpine') @@ -121,7 +124,10 @@ export default class Room1 extends cc.Component { } clickWXChat() { JuQingManager.openJuQingOrChat('WX') + } + updateMainTask() { + this.node.getChildByName('手机').active = false this.node.getChildByName('回家').active = true } diff --git a/assets/Scripts/GameRoomRes/Room2/Room2.ts b/assets/Scripts/GameRoomRes/Room2/Room2.ts index 2fcd44e6..22600058 100644 --- a/assets/Scripts/GameRoomRes/Room2/Room2.ts +++ b/assets/Scripts/GameRoomRes/Room2/Room2.ts @@ -273,6 +273,9 @@ export default class Room2 extends cc.Component { this.node.getChildByName('mainNode').getChildByName('牌匾 破旧').active = true this.node.getChildByName('mainNode').getChildByName('老婆鞋子').active = true this.node.getChildByName('mainNode').getChildByName('行李箱').active = true + + let chuMen = this.node.getChildByName('出门') + chuMen.active = false } if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401) { this.node.getChildByName('mainNode').getChildByName('老板').active = true this.node.getChildByName('mainNode').getChildByName('老婆').active = true @@ -296,6 +299,8 @@ export default class Room2 extends cc.Component { } else if (mainId == MainTaskIdEnum.MainTask_201) { this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true) + let chuMen = this.node.getChildByName('出门') + chuMen.active = false } else if (mainId == MainTaskIdEnum.MainTask_402) { this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true) diff --git a/assets/Scripts/Manager/LevelUpManager.ts b/assets/Scripts/Manager/LevelUpManager.ts index 8e7f22cb..9a26ed88 100644 --- a/assets/Scripts/Manager/LevelUpManager.ts +++ b/assets/Scripts/Manager/LevelUpManager.ts @@ -106,36 +106,36 @@ let jiesuoProConfig = [ // { level: 2300, pro: [] }, // { level: 3000, pro: [] }, - { level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] }, - { level: 150, pro: [{ isPic: false, name: '媱安' }] }, - { level: 200, pro: [{ isPic: false, name: '诗涵' }, { isPic: true, name: '油泼面', isShipu: true }, { isPic: true, name: '擀面杖', isShipu: false }] }, - { level: 300, pro: [{ isPic: false, name: '婉仪' }, { isPic: true, name: '海鲜面', isShipu: true }, { isPic: true, name: '砧板', isShipu: false }] }, - { level: 350, pro: [{ isPic: true, name: '馒头', isShipu: true }] }, - { level: 400, pro: [{ isPic: false, name: '诺依' }, { isPic: true, name: '烧麦', isShipu: true }, { isPic: true, name: '面锅', isShipu: false }] }, - { level: 450, pro: [{ isPic: true, name: '春卷', isShipu: true }] }, - { level: 500, pro: [{ isPic: false, name: '晴萱' }, { isPic: true, name: '龙须面', isShipu: true }, { isPic: true, name: '漏勺', isShipu: false }] }, - { level: 500, pro: [{ isPic: true, name: '百合酥', isShipu: true }] }, - { level: 600, pro: [{ isPic: false, name: '蕾蕾' }, { isPic: true, name: '鲜肉馄饨', isShipu: true }, { isPic: true, name: '汤勺', isShipu: false }] }, - { level: 650, pro: [{ isPic: true, name: '刀削面', isShipu: true }] }, - { level: 700, pro: [{ isPic: false, name: '水萌' }, { isPic: true, name: '猫耳朵', isShipu: true }, { isPic: true, name: '摆摊车', isShipu: false }] }, - { level: 750, pro: [{ isPic: true, name: '铜锣烧', isShipu: true }] }, - { level: 800, pro: [{ isPic: false, name: '可微' }, { isPic: true, name: '意面', isShipu: true }, { isPic: true, name: '调料盒', isShipu: false }] }, - { level: 850, pro: [{ isPic: true, name: '热干面', isShipu: true }] }, - { level: 900, pro: [{ isPic: false, name: '以南' }, { isPic: true, name: '三鲜饺子', isShipu: true }, { isPic: true, name: '长筷子', isShipu: false }] }, - { level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] }, - { level: 1000, pro: [{ isPic: false, name: '悦澄' }, { isPic: true, name: '龙须酥', isShipu: true }] }, - { level: 1050, pro: [{ isPic: true, name: '椒盐酥', isShipu: true }] }, - { level: 1100, pro: [{ isPic: false, name: '夏彤' }, { isPic: true, name: '杏仁酥', isShipu: true }] }, - { level: 1150, pro: [{ isPic: true, name: '灌汤包', isShipu: true }] }, - { level: 1200, pro: [{ isPic: false, name: '紫琳' }, { isPic: true, name: '多味茶酥', isShipu: true }, { isPic: true, name: '抹布', isShipu: false }] }, - { level: 1250, pro: [{ isPic: true, name: '金丝面', isShipu: true }] }, - { level: 1300, pro: [{ isPic: false, name: '羽婷' }, { isPic: true, name: '小笼包', isShipu: true }] }, - { level: 1350, pro: [{ isPic: true, name: '水晶饺子', isShipu: true }] }, - { level: 1400, pro: [{ isPic: false, name: '梵音' }, { isPic: true, name: '煎饺', isShipu: true }] }, - { level: 1450, pro: [{ isPic: true, name: '抄手', isShipu: true }] }, - { level: 1500, pro: [{ isPic: false, name: '诗锦' }, { isPic: true, name: '鲜花饼', isShipu: true }, { isPic: true, name: '煤气灶', isShipu: false }] }, - { level: 1800, pro: [{ isPic: true, name: '招牌', isShipu: false }] }, - { level: 2000, pro: [{ isPic: false, name: '绮罗' }] }, + // { level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] }, + // { level: 150, pro: [{ isPic: false, name: '媱安' }] }, + // { level: 200, pro: [{ isPic: false, name: '诗涵' }, { isPic: true, name: '油泼面', isShipu: true }, { isPic: true, name: '擀面杖', isShipu: false }] }, + // { level: 300, pro: [{ isPic: false, name: '婉仪' }, { isPic: true, name: '海鲜面', isShipu: true }, { isPic: true, name: '砧板', isShipu: false }] }, + // { level: 350, pro: [{ isPic: true, name: '馒头', isShipu: true }] }, + // { level: 400, pro: [{ isPic: false, name: '诺依' }, { isPic: true, name: '烧麦', isShipu: true }, { isPic: true, name: '面锅', isShipu: false }] }, + // { level: 450, pro: [{ isPic: true, name: '春卷', isShipu: true }] }, + // { level: 500, pro: [{ isPic: false, name: '晴萱' }, { isPic: true, name: '龙须面', isShipu: true }, { isPic: true, name: '漏勺', isShipu: false }] }, + // { level: 500, pro: [{ isPic: true, name: '百合酥', isShipu: true }] }, + // { level: 600, pro: [{ isPic: false, name: '蕾蕾' }, { isPic: true, name: '鲜肉馄饨', isShipu: true }, { isPic: true, name: '汤勺', isShipu: false }] }, + // { level: 650, pro: [{ isPic: true, name: '刀削面', isShipu: true }] }, + // { level: 700, pro: [{ isPic: false, name: '水萌' }, { isPic: true, name: '猫耳朵', isShipu: true }, { isPic: true, name: '摆摊车', isShipu: false }] }, + // { level: 750, pro: [{ isPic: true, name: '铜锣烧', isShipu: true }] }, + // { level: 800, pro: [{ isPic: false, name: '可微' }, { isPic: true, name: '意面', isShipu: true }, { isPic: true, name: '调料盒', isShipu: false }] }, + // { level: 850, pro: [{ isPic: true, name: '热干面', isShipu: true }] }, + // { level: 900, pro: [{ isPic: false, name: '以南' }, { isPic: true, name: '三鲜饺子', isShipu: true }, { isPic: true, name: '长筷子', isShipu: false }] }, + // { level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] }, + // { level: 1000, pro: [{ isPic: false, name: '悦澄' }, { isPic: true, name: '龙须酥', isShipu: true }] }, + // { level: 1050, pro: [{ isPic: true, name: '椒盐酥', isShipu: true }] }, + // { level: 1100, pro: [{ isPic: false, name: '夏彤' }, { isPic: true, name: '杏仁酥', isShipu: true }] }, + // { level: 1150, pro: [{ isPic: true, name: '灌汤包', isShipu: true }] }, + // { level: 1200, pro: [{ isPic: false, name: '紫琳' }, { isPic: true, name: '多味茶酥', isShipu: true }, { isPic: true, name: '抹布', isShipu: false }] }, + // { level: 1250, pro: [{ isPic: true, name: '金丝面', isShipu: true }] }, + // { level: 1300, pro: [{ isPic: false, name: '羽婷' }, { isPic: true, name: '小笼包', isShipu: true }] }, + // { level: 1350, pro: [{ isPic: true, name: '水晶饺子', isShipu: true }] }, + // { level: 1400, pro: [{ isPic: false, name: '梵音' }, { isPic: true, name: '煎饺', isShipu: true }] }, + // { level: 1450, pro: [{ isPic: true, name: '抄手', isShipu: true }] }, + // { level: 1500, pro: [{ isPic: false, name: '诗锦' }, { isPic: true, name: '鲜花饼', isShipu: true }, { isPic: true, name: '煤气灶', isShipu: false }] }, + // { level: 1800, pro: [{ isPic: true, name: '招牌', isShipu: false }] }, + // { level: 2000, pro: [{ isPic: false, name: '绮罗' }] }, ] diff --git a/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts b/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts index bab87451..d83d3106 100644 --- a/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts +++ b/assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts @@ -144,15 +144,15 @@ export default class PeopleLevelUpScript extends UiBase { //let clickInComeMoney = LevelUpManager.clickInComeMoney() let isMaxLevel = LevelUpManager.isPeopleLevelUpMax() let myMoney = UserManager.getCurMoney() - // if (myMoney - levelUpSpned >= 0) { - // this.redPoint.active = true - // this.adBtn.active = false - // this.adBtnLab.string = '升级' - // } else { - // this.redPoint.active = false - // this.adBtn.active = true - // this.adBtnLab.string = '升级+5' - // } + if (myMoney - levelUpSpned >= 0) { + // this.redPoint.active = true + this.adBtn.active = false + // this.adBtnLab.string = '升级' + } else { + // this.redPoint.active = false + this.adBtn.active = true + // this.adBtnLab.string = '升级+5' + } if (isMaxLevel) { this.shengjiBtn.active = false @@ -318,7 +318,8 @@ export default class PeopleLevelUpScript extends UiBase { User.setShowAdNum(User.getShowAdNum() + 1) Common5.ReportDY("inLevel", `任务${TaskManager.getCurUnLockMainTaskId()}-AD-升级界面升级`) // Common5.ReportDY("inLevel", "升级界面-AD-升级"); - let dataPro = LevelUpManager.peopleLevelUp(5) + // let dataPro = LevelUpManager.peopleLevelUp(5) + let dataPro = LevelUpManager.peopleLevelUp(1) if (dataPro) { PrefabManage.loadPrefabByType(GameType.JieSuoPro, null, (prefab) => { prefab.getComponent('JieSuoPro').setViewData(dataPro) diff --git a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts index f567791f..bf4c3871 100644 --- a/assets/Scripts/ZaoCanDian/ZaoCanDian.ts +++ b/assets/Scripts/ZaoCanDian/ZaoCanDian.ts @@ -83,7 +83,11 @@ export default class ZaoCanDian extends cc.Component { } } if (i == 3) { - this.setTanWeiSpine(i, `静止放${name}余${shengyuNum}`, shengyuNum) + if (shengyuNum == 3) { + this.setTanWeiSpine(i, `静止放${name}`, 3) + } else { + this.setTanWeiSpine(i, `静止放${name}余${shengyuNum}`, shengyuNum) + } } } @@ -148,7 +152,12 @@ export default class ZaoCanDian extends cc.Component { if (!_npc) { //没有一个npc需要这个早餐 //补货,少几个补几个 if (shengyuNum < 3) { - this.setTanWeiSpine(custom, `${zaoCanStr}余${shengyuNum}`, shengyuNum) + if (shengyuNum == 0) { + //手动补货,补全 + this.setTanWeiSpine(custom, zaoCanStr, 3) + }else{ + this.setTanWeiSpine(custom, `${zaoCanStr}余${shengyuNum}`, 3) + } } else { //所属物品摊位放大缩小 }