yangqiwen 2 months ago
parent 85cd5257c6
commit 0dbc300b49
  1. BIN
      assets/CommonRes/texture/namebg.png
  2. 38
      assets/CommonRes/texture/namebg.png.meta
  3. 13
      assets/DH/DH_1/res.meta
  4. 13
      assets/DH/DH_1/spine.meta
  5. 13
      assets/DH/DH_2/res.meta
  6. 13
      assets/DH/DH_2/spine.meta
  7. 13
      assets/DH/DH_3/res.meta
  8. 13
      assets/DH/DH_3/spine.meta
  9. 8
      assets/GameRoomRes/Room1/prefab/Room1.prefab
  10. 803
      assets/GameRoomRes/Room2/prefab/Room2.prefab
  11. BIN
      assets/GameRoomRes/Room2/texture/现金 1.png
  12. 16
      assets/GameRoomRes/Room2/texture/现金 1.png.meta
  13. BIN
      assets/GameRoomRes/Room2/texture/现金.png
  14. 12
      assets/GameRoomRes/Room2/texture/现金.png.meta
  15. 524
      assets/GameStoryRes/KaiChangGuanQia1Gai/prefab/KaiChangGuanQia1Gai.prefab
  16. 14
      assets/PeopleLevelUp/prefab/PeopleLevelUp.prefab
  17. 2
      assets/Scripts/GameMethodRes/shouhuoji/ShouHuoJiGai.ts
  18. 6
      assets/Scripts/GameRoomRes/Room1/Room1.ts
  19. 5
      assets/Scripts/GameRoomRes/Room2/Room2.ts
  20. 60
      assets/Scripts/Manager/LevelUpManager.ts
  21. 21
      assets/Scripts/PeopleLevelUp/PeopleLevelUpScript.ts
  22. 13
      assets/Scripts/ZaoCanDian/ZaoCanDian.ts

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

@ -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": {}
}
}
}

@ -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": {}
}

@ -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": {}
}

@ -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": {}
}

@ -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": {}
}

@ -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": {}
}

@ -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": {}
}

@ -2025,8 +2025,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
302.346, 244.98700000000002,
-475.221, -549.451,
0, 0,
0, 0,
0, 0,
@ -2094,9 +2094,9 @@
"_target": null, "_target": null,
"_alignFlags": 36, "_alignFlags": 36,
"_left": 0, "_left": 0,
"_right": 3.1539999999999964, "_right": 60.51299999999998,
"_top": 0, "_top": 0,
"_bottom": 126.27899999999994, "_bottom": 52.04899999999998,
"_verticalCenter": 0, "_verticalCenter": 0,
"_horizontalCenter": 0, "_horizontalCenter": 0,
"_isAbsLeft": true, "_isAbsLeft": true,

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

@ -8,8 +8,8 @@
"premultiplyAlpha": false, "premultiplyAlpha": false,
"genMipmaps": false, "genMipmaps": false,
"packable": true, "packable": true,
"width": 39, "width": 200,
"height": 31, "height": 200,
"platformSettings": {}, "platformSettings": {},
"subMetas": { "subMetas": {
"现金 1": { "现金 1": {
@ -22,12 +22,12 @@
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 26,
"trimY": 0, "trimY": 29,
"width": 39, "width": 148,
"height": 31, "height": 142,
"rawWidth": 39, "rawWidth": 200,
"rawHeight": 31, "rawHeight": 200,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 8.2 KiB

@ -22,12 +22,12 @@
"rotated": false, "rotated": false,
"offsetX": 0, "offsetX": 0,
"offsetY": 0, "offsetY": 0,
"trimX": 0, "trimX": 26,
"trimY": 0, "trimY": 29,
"width": 74, "width": 148,
"height": 46, "height": 142,
"rawWidth": 74, "rawWidth": 200,
"rawHeight": 46, "rawHeight": 200,
"borderTop": 0, "borderTop": 0,
"borderBottom": 0, "borderBottom": 0,
"borderLeft": 0, "borderLeft": 0,

@ -21,23 +21,23 @@
"__id__": 2 "__id__": 2
}, },
{ {
"__id__": 74 "__id__": 83
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 118 "__id__": 127
}, },
{ {
"__id__": 119 "__id__": 128
}, },
{ {
"__id__": 120 "__id__": 129
} }
], ],
"_prefab": { "_prefab": {
"__id__": 121 "__id__": 130
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -104,7 +104,7 @@
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 73 "__id__": 82
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -1081,16 +1081,16 @@
"__id__": 63 "__id__": 63
}, },
{ {
"__id__": 66 "__id__": 69
}, },
{ {
"__id__": 69 "__id__": 75
} }
], ],
"_active": true, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 72 "__id__": 81
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2504,15 +2504,19 @@
"_parent": { "_parent": {
"__id__": 26 "__id__": 26
}, },
"_children": [], "_children": [
{
"__id__": 64
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 64 "__id__": 67
} }
], ],
"_prefab": { "_prefab": {
"__id__": 65 "__id__": 68
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2561,6 +2565,114 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "" "_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", "__type__": "cc.Sprite",
"_name": "", "_name": "",
@ -2577,7 +2689,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "cd39adbd-aab3-4da4-8e8e-b227cc9a6828" "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
@ -2611,15 +2723,19 @@
"_parent": { "_parent": {
"__id__": 26 "__id__": 26
}, },
"_children": [], "_children": [
{
"__id__": 70
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 67 "__id__": 73
} }
], ],
"_prefab": { "_prefab": {
"__id__": 68 "__id__": 74
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2668,12 +2784,120 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "" "_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", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 66 "__id__": 69
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -2684,7 +2908,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "9689b5ce-82bf-4386-84f7-667a2452aa1e" "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
@ -2718,15 +2942,19 @@
"_parent": { "_parent": {
"__id__": 26 "__id__": 26
}, },
"_children": [], "_children": [
{
"__id__": 76
}
],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 70 "__id__": 79
} }
], ],
"_prefab": { "_prefab": {
"__id__": 71 "__id__": 80
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2775,12 +3003,120 @@
"groupIndex": 0, "groupIndex": 0,
"_id": "" "_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", "__type__": "cc.Sprite",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 69 "__id__": 75
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -2791,7 +3127,7 @@
"_srcBlendFactor": 770, "_srcBlendFactor": 770,
"_dstBlendFactor": 771, "_dstBlendFactor": 771,
"_spriteFrame": { "_spriteFrame": {
"__uuid__": "53bcad30-f256-440c-9729-2021b6c9cf64" "__uuid__": "a8d4eb1e-66d0-4ecf-ab90-5d64bf6b8ec4"
}, },
"_type": 0, "_type": 0,
"_sizeMode": 1, "_sizeMode": 1,
@ -2849,31 +3185,31 @@
}, },
"_children": [ "_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, "_active": true,
"_components": [], "_components": [],
"_prefab": { "_prefab": {
"__id__": 117 "__id__": 126
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2927,21 +3263,21 @@
"_name": "qiPao_0", "_name": "qiPao_0",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 76 "__id__": 85
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 79 "__id__": 88
} }
], ],
"_prefab": { "_prefab": {
"__id__": 80 "__id__": 89
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -2995,17 +3331,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 75 "__id__": 84
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 86
} }
], ],
"_prefab": { "_prefab": {
"__id__": 78 "__id__": 87
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3059,7 +3395,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 76 "__id__": 85
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3103,7 +3439,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 75 "__id__": 84
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3146,21 +3482,21 @@
"_name": "qiPao_1", "_name": "qiPao_1",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 82 "__id__": 91
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 85 "__id__": 94
} }
], ],
"_prefab": { "_prefab": {
"__id__": 86 "__id__": 95
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3214,17 +3550,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 81 "__id__": 90
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 83 "__id__": 92
} }
], ],
"_prefab": { "_prefab": {
"__id__": 84 "__id__": 93
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3278,7 +3614,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 82 "__id__": 91
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3322,7 +3658,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 81 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3365,21 +3701,21 @@
"_name": "qiPao_2", "_name": "qiPao_2",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 88 "__id__": 97
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 91 "__id__": 100
} }
], ],
"_prefab": { "_prefab": {
"__id__": 92 "__id__": 101
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3433,17 +3769,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 87 "__id__": 96
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 89 "__id__": 98
} }
], ],
"_prefab": { "_prefab": {
"__id__": 90 "__id__": 99
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3497,7 +3833,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 88 "__id__": 97
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3541,7 +3877,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 87 "__id__": 96
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3584,21 +3920,21 @@
"_name": "qiPao_3", "_name": "qiPao_3",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 94 "__id__": 103
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 97 "__id__": 106
} }
], ],
"_prefab": { "_prefab": {
"__id__": 98 "__id__": 107
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3652,17 +3988,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 93 "__id__": 102
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 95 "__id__": 104
} }
], ],
"_prefab": { "_prefab": {
"__id__": 96 "__id__": 105
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3716,7 +4052,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 94 "__id__": 103
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3760,7 +4096,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 93 "__id__": 102
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3803,21 +4139,21 @@
"_name": "qiPao_4", "_name": "qiPao_4",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 100 "__id__": 109
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 103 "__id__": 112
} }
], ],
"_prefab": { "_prefab": {
"__id__": 104 "__id__": 113
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3871,17 +4207,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 99 "__id__": 108
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 101 "__id__": 110
} }
], ],
"_prefab": { "_prefab": {
"__id__": 102 "__id__": 111
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -3935,7 +4271,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 100 "__id__": 109
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -3979,7 +4315,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 99 "__id__": 108
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -4022,21 +4358,21 @@
"_name": "qiPao_5", "_name": "qiPao_5",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 106 "__id__": 115
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 109 "__id__": 118
} }
], ],
"_prefab": { "_prefab": {
"__id__": 110 "__id__": 119
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -4090,17 +4426,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 105 "__id__": 114
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 107 "__id__": 116
} }
], ],
"_prefab": { "_prefab": {
"__id__": 108 "__id__": 117
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -4154,7 +4490,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 106 "__id__": 115
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -4198,7 +4534,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 105 "__id__": 114
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -4241,21 +4577,21 @@
"_name": "qiPao_6", "_name": "qiPao_6",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 74 "__id__": 83
}, },
"_children": [ "_children": [
{ {
"__id__": 112 "__id__": 121
} }
], ],
"_active": false, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 115 "__id__": 124
} }
], ],
"_prefab": { "_prefab": {
"__id__": 116 "__id__": 125
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -4309,17 +4645,17 @@
"_name": "str", "_name": "str",
"_objFlags": 0, "_objFlags": 0,
"_parent": { "_parent": {
"__id__": 111 "__id__": 120
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 113 "__id__": 122
} }
], ],
"_prefab": { "_prefab": {
"__id__": 114 "__id__": 123
}, },
"_opacity": 255, "_opacity": 255,
"_color": { "_color": {
@ -4373,7 +4709,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 112 "__id__": 121
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [
@ -4417,7 +4753,7 @@
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"node": { "node": {
"__id__": 111 "__id__": 120
}, },
"_enabled": true, "_enabled": true,
"_materials": [ "_materials": [

@ -10045,7 +10045,7 @@
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 54, "width": 96,
"height": 50 "height": 50
}, },
"_anchorPoint": { "_anchorPoint": {
@ -10121,8 +10121,8 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
-43.405, 39.272,
0, 23.902,
0, 0,
0, 0,
0, 0,
@ -10197,7 +10197,7 @@
"__id__": 292 "__id__": 292
}, },
"_children": [], "_children": [],
"_active": true, "_active": false,
"_components": [ "_components": [
{ {
"__id__": 297 "__id__": 297
@ -10231,7 +10231,7 @@
"__type__": "TypedArray", "__type__": "TypedArray",
"ctor": "Float64Array", "ctor": "Float64Array",
"array": [ "array": [
0, 21,
1.566, 1.566,
0, 0,
0, 0,
@ -10325,10 +10325,10 @@
"node": { "node": {
"__id__": 292 "__id__": 292
}, },
"_enabled": true, "_enabled": false,
"_layoutSize": { "_layoutSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
"width": 54, "width": 96,
"height": 50 "height": 50
}, },
"_resize": 1, "_resize": 1,

@ -111,7 +111,7 @@ export default class ShouHuoJiGai extends GameBase {
duiHuaInfo() { duiHuaInfo() {
let strArr = [ let strArr = [
'面具下的我,想深入了解吗?', '面具下的我,想深入了解吗?',
'振兴中餐,非你莫属!' '小帅哥,需要点什么呢!'
] ]
let str = this.node.getChildByName('qiPao').getChildByName('qiPao_0').getChildByName('str') let str = this.node.getChildByName('qiPao').getChildByName('qiPao_0').getChildByName('str')
let ren = this.node.getChildByName('商人') let ren = this.node.getChildByName('商人')

@ -30,6 +30,9 @@ export default class Room1 extends cc.Component {
PrefabManage.preloadPrefabByType(GameType.ChatList) PrefabManage.preloadPrefabByType(GameType.ChatList)
PrefabManage.preloadPrefabByType(GameType.ChatDialog) PrefabManage.preloadPrefabByType(GameType.ChatDialog)
}, 0.2) }, 0.2)
EventMgr.onEvent_custom(ryw_Event.updateMainTask, () => {
this.updateMainTask()
}, this)
} }
showChatBtnStatus() { showChatBtnStatus() {
let openBtnSpine = this.node.getChildByName('openBtnSpine') let openBtnSpine = this.node.getChildByName('openBtnSpine')
@ -121,7 +124,10 @@ export default class Room1 extends cc.Component {
} }
clickWXChat() { clickWXChat() {
JuQingManager.openJuQingOrChat('WX') JuQingManager.openJuQingOrChat('WX')
}
updateMainTask() {
this.node.getChildByName('手机').active = false
this.node.getChildByName('回家').active = true this.node.getChildByName('回家').active = true
} }

@ -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 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) { } if (mainId == MainTaskIdEnum.MainTask_303 || mainId == MainTaskIdEnum.MainTask_401) {
this.node.getChildByName('mainNode').getChildByName('老板').active = true this.node.getChildByName('mainNode').getChildByName('老板').active = true
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) { } else if (mainId == MainTaskIdEnum.MainTask_201) {
this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').active = true
this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', 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) { } else if (mainId == MainTaskIdEnum.MainTask_402) {
this.node.getChildByName('mainNode').getChildByName('女儿站').active = true this.node.getChildByName('mainNode').getChildByName('女儿站').active = true
this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true) this.node.getChildByName('mainNode').getChildByName('女儿站').getComponent(sp.Skeleton).setAnimation(0, '女儿哭泣', true)

@ -106,36 +106,36 @@ let jiesuoProConfig = [
// { level: 2300, pro: [] }, // { level: 2300, pro: [] },
// { level: 3000, pro: [] }, // { level: 3000, pro: [] },
{ level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] }, // { level: 100, pro: [{ isPic: false, name: '云欣' }, { isPic: true, name: '牛肉拉面', isShipu: true }] },
{ level: 150, pro: [{ isPic: false, name: '媱安' }] }, // { level: 150, pro: [{ isPic: false, name: '媱安' }] },
{ level: 200, pro: [{ isPic: false, name: '诗涵' }, { isPic: true, name: '油泼面', isShipu: true }, { isPic: true, name: '擀面杖', isShipu: false }] }, // { 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: 300, pro: [{ isPic: false, name: '婉仪' }, { isPic: true, name: '海鲜面', isShipu: true }, { isPic: true, name: '砧板', isShipu: false }] },
{ level: 350, pro: [{ isPic: true, name: '馒头', isShipu: true }] }, // { 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: 400, pro: [{ isPic: false, name: '诺依' }, { isPic: true, name: '烧麦', isShipu: true }, { isPic: true, name: '面锅', isShipu: false }] },
{ level: 450, pro: [{ isPic: true, name: '春卷', isShipu: true }] }, // { 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: false, name: '晴萱' }, { isPic: true, name: '龙须面', isShipu: true }, { isPic: true, name: '漏勺', isShipu: false }] },
{ level: 500, pro: [{ isPic: true, name: '百合酥', isShipu: true }] }, // { 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: 600, pro: [{ isPic: false, name: '蕾蕾' }, { isPic: true, name: '鲜肉馄饨', isShipu: true }, { isPic: true, name: '汤勺', isShipu: false }] },
{ level: 650, pro: [{ isPic: true, name: '刀削面', isShipu: true }] }, // { 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: 700, pro: [{ isPic: false, name: '水萌' }, { isPic: true, name: '猫耳朵', isShipu: true }, { isPic: true, name: '摆摊车', isShipu: false }] },
{ level: 750, pro: [{ isPic: true, name: '铜锣烧', isShipu: true }] }, // { 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: 800, pro: [{ isPic: false, name: '可微' }, { isPic: true, name: '意面', isShipu: true }, { isPic: true, name: '调料盒', isShipu: false }] },
{ level: 850, pro: [{ isPic: true, name: '热干面', isShipu: true }] }, // { 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: 900, pro: [{ isPic: false, name: '以南' }, { isPic: true, name: '三鲜饺子', isShipu: true }, { isPic: true, name: '长筷子', isShipu: false }] },
{ level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] }, // { level: 950, pro: [{ isPic: true, name: '栗子酥', isShipu: true }] },
{ level: 1000, pro: [{ isPic: false, name: '悦澄' }, { 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: 1050, pro: [{ isPic: true, name: '椒盐酥', isShipu: true }] },
{ level: 1100, pro: [{ isPic: false, name: '夏彤' }, { 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: 1150, pro: [{ isPic: true, name: '灌汤包', isShipu: true }] },
{ level: 1200, pro: [{ isPic: false, name: '紫琳' }, { isPic: true, name: '多味茶酥', isShipu: true }, { isPic: true, name: '抹布', isShipu: false }] }, // { 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: 1250, pro: [{ isPic: true, name: '金丝面', isShipu: true }] },
{ level: 1300, pro: [{ isPic: false, name: '羽婷' }, { 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: 1350, pro: [{ isPic: true, name: '水晶饺子', isShipu: true }] },
{ level: 1400, pro: [{ isPic: false, name: '梵音' }, { 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: 1450, pro: [{ isPic: true, name: '抄手', isShipu: true }] },
{ level: 1500, pro: [{ isPic: false, name: '诗锦' }, { isPic: true, name: '鲜花饼', isShipu: true }, { isPic: true, name: '煤气灶', isShipu: false }] }, // { 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: 1800, pro: [{ isPic: true, name: '招牌', isShipu: false }] },
{ level: 2000, pro: [{ isPic: false, name: '绮罗' }] }, // { level: 2000, pro: [{ isPic: false, name: '绮罗' }] },
] ]

@ -144,15 +144,15 @@ export default class PeopleLevelUpScript extends UiBase {
//let clickInComeMoney = LevelUpManager.clickInComeMoney() //let clickInComeMoney = LevelUpManager.clickInComeMoney()
let isMaxLevel = LevelUpManager.isPeopleLevelUpMax() let isMaxLevel = LevelUpManager.isPeopleLevelUpMax()
let myMoney = UserManager.getCurMoney() let myMoney = UserManager.getCurMoney()
// if (myMoney - levelUpSpned >= 0) { if (myMoney - levelUpSpned >= 0) {
// this.redPoint.active = true // this.redPoint.active = true
// this.adBtn.active = false this.adBtn.active = false
// this.adBtnLab.string = '升级' // this.adBtnLab.string = '升级'
// } else { } else {
// this.redPoint.active = false // this.redPoint.active = false
// this.adBtn.active = true this.adBtn.active = true
// this.adBtnLab.string = '升级+5' // this.adBtnLab.string = '升级+5'
// } }
if (isMaxLevel) { if (isMaxLevel) {
this.shengjiBtn.active = false this.shengjiBtn.active = false
@ -318,7 +318,8 @@ export default class PeopleLevelUpScript extends UiBase {
User.setShowAdNum(User.getShowAdNum() + 1) User.setShowAdNum(User.getShowAdNum() + 1)
Common5.ReportDY("inLevel", `任务${TaskManager.getCurUnLockMainTaskId()}-AD-升级界面升级`) Common5.ReportDY("inLevel", `任务${TaskManager.getCurUnLockMainTaskId()}-AD-升级界面升级`)
// Common5.ReportDY("inLevel", "升级界面-AD-升级"); // Common5.ReportDY("inLevel", "升级界面-AD-升级");
let dataPro = LevelUpManager.peopleLevelUp(5) // let dataPro = LevelUpManager.peopleLevelUp(5)
let dataPro = LevelUpManager.peopleLevelUp(1)
if (dataPro) { if (dataPro) {
PrefabManage.loadPrefabByType(GameType.JieSuoPro, null, (prefab) => { PrefabManage.loadPrefabByType(GameType.JieSuoPro, null, (prefab) => {
prefab.getComponent('JieSuoPro').setViewData(dataPro) prefab.getComponent('JieSuoPro').setViewData(dataPro)

@ -83,7 +83,11 @@ export default class ZaoCanDian extends cc.Component {
} }
} }
if (i == 3) { 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 (!_npc) { //没有一个npc需要这个早餐
//补货,少几个补几个 //补货,少几个补几个
if (shengyuNum < 3) { 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 { } else {
//所属物品摊位放大缩小 //所属物品摊位放大缩小
} }

Loading…
Cancel
Save