Test_Project_Cocos/JisolGame
1
0
Fork 0
mirror of https://gitee.com/jisol/jisol-game/ synced 2025-06-26 03:14:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

提交

Browse Source
This commit is contained in:
DESKTOP-5RP3AKU\Jisol 2024-01-09 04:33:21 +08:00
parent e8a1cb9362
commit a153d98cf1
29 changed files with 1337 additions and 2726 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

551
JisolGameCocos/assets/resources/prefab/ui/主页/锻造台/锻造台.prefab
View File

@ -25,26 +25,26 @@
"__id__": 68 "__id__": 68
}, },
{ {
"__id__": 85 "__id__": 89
}, },
{ {
"__id__": 102 "__id__": 106
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 119
},
{
"__id__": 121
},
{ {
"__id__": 123 "__id__": 123
},
{
"__id__": 125
},
{
"__id__": 127
} }
], ],
"_prefab": { "_prefab": {
"__id__": 125 "__id__": 129
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -1597,7 +1597,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "宠物", "_name": "锻造宠",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
@ -1611,22 +1611,19 @@
"_active": true, "_active": true,
"_components": [ "_components": [
{ {
"__id__": 77 "__id__": 83
}, },
{ {
"__id__": 79 "__id__": 85
},
{
"__id__": 81
} }
], ],
"_prefab": { "_prefab": {
"__id__": 84 "__id__": 88
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 251.589, "x": 256.96,
"y": -110.305, "y": -111.324,
"z": 0 "z": 0
}, },
"_lrot": { "_lrot": {
@ -1654,56 +1651,161 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "Label", "_objFlags": 0,
"_objFlags": 512,
"__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 68 "__id__": 68
}, },
"_children": [], "_prefab": {
"_active": true, "__id__": 70
"_components": [ },
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 69
},
"asset": {
"__uuid__": "c7577a1e-d03c-4b53-8670-089ccbfeb272",
"__expectedType__": "cc.Prefab"
},
"fileId": "13NgoTXGpMRapTmp+uDndV",
"instance": {
"__id__": 71
},
"targetOverrides": [
{ {
"__id__": 70 "__id__": 80
}, }
]
},
{
"__type__": "cc.PrefabInstance",
"fileId": "8e0mByIjhCL4XIPZB0LFHf",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{ {
"__id__": 72 "__id__": 72
}, },
{ {
"__id__": 74 "__id__": 74
},
{
"__id__": 76
},
{
"__id__": 78
} }
], ],
"_prefab": { "removedComponents": []
"__id__": 76 },
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 73
}, },
"_lpos": { "propertyPath": [
"_name"
],
"value": "选择宠物展示ICON"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"13NgoTXGpMRapTmp+uDndV"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 75
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 0
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"13NgoTXGpMRapTmp+uDndV"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 77
}, },
"_lrot": { "propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat", "__type__": "cc.Quat",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0, "z": 0,
"w": 1 "w": 1
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"13NgoTXGpMRapTmp+uDndV"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 79
}, },
"_lscale": { "propertyPath": [
"__type__": "cc.Vec3", "_euler"
"x": 1, ],
"y": 1, "value": {
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
"x": 0, "x": 0,
"y": 0, "y": 0,
"z": 0 "z": 0
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"13NgoTXGpMRapTmp+uDndV"
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": null,
"sourceInfo": null,
"propertyPath": [
"petIcon"
],
"target": {
"__id__": 81
}, },
"_id": "" "targetInfo": {
"__id__": 82
}
},
{
"__type__": "cc.Node",
"__editorExtras__": {}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a8v6Wyt6FBsbms2ouS3gEa"
]
}, },
{ {
"__type__": "cc.UITransform", "__type__": "cc.UITransform",
@ -1711,11 +1813,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 69 "__id__": 68
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 71 "__id__": 84
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -1731,164 +1833,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "95T/gOHudIuYgzZX23mI9T" "fileId": "725c4U2oFKm4YRU1ig4k1e"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 69
},
"_enabled": true,
"__prefab": {
"__id__": 73
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "+",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 110,
"_fontSize": 110,
"_fontFamily": "Arial",
"_lineHeight": 120,
"_overflow": 1,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "25QELCF/FD8qMBYhU8/Z1s"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 69
},
"_enabled": true,
"__prefab": {
"__id__": 75
},
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_width": 4,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "8aUomAsWxGGaxW3abAwyUb"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c4sQZI43VJk4G7lCYdQyx2",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 68
},
"_enabled": true,
"__prefab": {
"__id__": 78
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4fnyc7PKBKuIy7GIcCsux6"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 68
},
"_enabled": true,
"__prefab": {
"__id__": 80
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d0AUv0uTJIVaVL7fywKL0N"
}, },
{ {
"__type__": "cc.Button", "__type__": "cc.Button",
@ -1900,20 +1845,20 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 82 "__id__": 86
}, },
"clickEvents": [ "clickEvents": [
{ {
"__id__": 83 "__id__": 87
} }
], ],
"_interactable": true, "_interactable": true,
"_transition": 3, "_transition": 3,
"_normalColor": { "_normalColor": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 214, "r": 255,
"g": 214, "g": 255,
"b": 214, "b": 255,
"a": 255 "a": 255
}, },
"_hoverColor": { "_hoverColor": {
@ -1937,39 +1882,27 @@
"b": 124, "b": 124,
"a": 255 "a": 255
}, },
"_normalSprite": { "_normalSprite": null,
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941", "_hoverSprite": null,
"__expectedType__": "cc.SpriteFrame" "_pressedSprite": null,
}, "_disabledSprite": null,
"_hoverSprite": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_pressedSprite": {
"__uuid__": "544e49d6-3f05-4fa8-9a9e-091f98fc2ce8@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_disabledSprite": {
"__uuid__": "951249e0-9f16-456d-8b85-a6ca954da16b@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": null,
"__id__": 68
},
"_id": "" "_id": ""
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "2aCkgqRIxAUIIAeP9dHfxD" "fileId": "93KjTr2HxMo5mJZU3c9imz"
}, },
{ {
"__type__": "cc.ClickEvent", "__type__": "cc.ClickEvent",
"target": null, "target": {
"__id__": 1
},
"component": "", "component": "",
"_componentId": "", "_componentId": "9b2f1EJsLxM/JeOdoryoJsl",
"handler": "", "handler": "onClickForgingPet",
"customEventData": "" "customEventData": ""
}, },
{ {
@ -1980,7 +1913,7 @@
"asset": { "asset": {
"__id__": 0 "__id__": 0
}, },
"fileId": "13NgoTXGpMRapTmp+uDndV", "fileId": "4fSSyCTt9J47fFrJZFAXZS",
"instance": null, "instance": null,
"targetOverrides": null, "targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
@ -1995,23 +1928,23 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 86 "__id__": 90
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 94
},
{
"__id__": 96
},
{ {
"__id__": 98 "__id__": 98
},
{
"__id__": 100
},
{
"__id__": 102
} }
], ],
"_prefab": { "_prefab": {
"__id__": 101 "__id__": 105
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -2048,23 +1981,23 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 85 "__id__": 89
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 87
},
{
"__id__": 89
},
{ {
"__id__": 91 "__id__": 91
},
{
"__id__": 93
},
{
"__id__": 95
} }
], ],
"_prefab": { "_prefab": {
"__id__": 93 "__id__": 97
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -2101,11 +2034,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 86 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 88 "__id__": 92
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -2129,11 +2062,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 86 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 90 "__id__": 94
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -2174,11 +2107,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 86 "__id__": 90
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 92 "__id__": 96
}, },
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
@ -2213,11 +2146,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 85 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 95 "__id__": 99
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -2241,11 +2174,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 85 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 97 "__id__": 101
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -2286,15 +2219,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 85 "__id__": 89
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 99 "__id__": 103
}, },
"clickEvents": [ "clickEvents": [
{ {
"__id__": 100 "__id__": 104
} }
], ],
"_interactable": true, "_interactable": true,
@ -2346,7 +2279,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 85 "__id__": 89
}, },
"_id": "" "_id": ""
}, },
@ -2387,23 +2320,23 @@
}, },
"_children": [ "_children": [
{ {
"__id__": 103 "__id__": 107
} }
], ],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 111
},
{
"__id__": 113
},
{ {
"__id__": 115 "__id__": 115
},
{
"__id__": 117
},
{
"__id__": 119
} }
], ],
"_prefab": { "_prefab": {
"__id__": 118 "__id__": 122
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -2440,23 +2373,23 @@
"_objFlags": 512, "_objFlags": 512,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": { "_parent": {
"__id__": 102 "__id__": 106
}, },
"_children": [], "_children": [],
"_active": true, "_active": true,
"_components": [ "_components": [
{
"__id__": 104
},
{
"__id__": 106
},
{ {
"__id__": 108 "__id__": 108
},
{
"__id__": 110
},
{
"__id__": 112
} }
], ],
"_prefab": { "_prefab": {
"__id__": 110 "__id__": 114
}, },
"_lpos": { "_lpos": {
"__type__": "cc.Vec3", "__type__": "cc.Vec3",
@ -2493,11 +2426,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 103 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 105 "__id__": 109
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -2521,11 +2454,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 103 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 107 "__id__": 111
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -2566,11 +2499,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 103 "__id__": 107
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 109 "__id__": 113
}, },
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
@ -2605,11 +2538,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 102 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 112 "__id__": 116
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -2633,11 +2566,11 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 102 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 114 "__id__": 118
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -2678,15 +2611,15 @@
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"node": { "node": {
"__id__": 102 "__id__": 106
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 116 "__id__": 120
}, },
"clickEvents": [ "clickEvents": [
{ {
"__id__": 117 "__id__": 121
} }
], ],
"_interactable": true, "_interactable": true,
@ -2738,7 +2671,7 @@
"_duration": 0.1, "_duration": 0.1,
"_zoomScale": 1.2, "_zoomScale": 1.2,
"_target": { "_target": {
"__id__": 102 "__id__": 106
}, },
"_id": "" "_id": ""
}, },
@ -2777,7 +2710,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 120 "__id__": 124
}, },
"_contentSize": { "_contentSize": {
"__type__": "cc.Size", "__type__": "cc.Size",
@ -2805,7 +2738,7 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 122 "__id__": 126
}, },
"_customMaterial": null, "_customMaterial": null,
"_srcBlendFactor": 2, "_srcBlendFactor": 2,
@ -2850,8 +2783,9 @@
}, },
"_enabled": true, "_enabled": true,
"__prefab": { "__prefab": {
"__id__": 124 "__id__": 128
}, },
"petView": null,
"_id": "" "_id": ""
}, },
{ {
@ -2868,6 +2802,37 @@
}, },
"fileId": "bdtesuqqNGPpKG+sSNpvIP", "fileId": "bdtesuqqNGPpKG+sSNpvIP",
"instance": null, "instance": null,
"targetOverrides": null "targetOverrides": [
{
"__id__": 130
}
],
"nestedPrefabInstanceRoots": [
{
"__id__": 69
}
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 127
},
"sourceInfo": null,
"propertyPath": [
"petView"
],
"target": {
"__id__": 69
},
"targetInfo": {
"__id__": 131
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"85ruk0B3NFoqyJzn5uu35A"
]
} }
] ]

4
JisolGameCocos/assets/resources/prefab/ui/宠物/宠物升星页面.prefab
View File

@ -1854,7 +1854,7 @@
"__id__": 77 "__id__": 77
}, },
"itemPrefab": { "itemPrefab": {
"__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"_id": "" "_id": ""
@ -2367,8 +2367,6 @@
"__id__": 0 "__id__": 0
}, },
"fileId": "55goghBf5GPogIe1/0pw20", "fileId": "55goghBf5GPogIe1/0pw20",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null "nestedPrefabInstanceRoots": null
}, },
{ {

2531
JisolGameCocos/assets/resources/prefab/ui/宠物/宠物单选页面.prefab
View File

File diff suppressed because it is too large Load Diff

6
JisolGameCocos/assets/resources/prefab/ui/宠物装备/弹出锻造装备页面.prefab
View File

@ -215,9 +215,9 @@
"_dstBlendFactor": 4, "_dstBlendFactor": 4,
"_color": { "_color": {
"__type__": "cc.Color", "__type__": "cc.Color",
"r": 85, "r": 255,
"g": 85, "g": 255,
"b": 85, "b": 255,
"a": 255 "a": 255
}, },
"_spriteFrame": { "_spriteFrame": {

2
JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/列表选择宠物ICON.prefab.meta
View File

@ -2,7 +2,7 @@
"ver": "1.1.49", "ver": "1.1.49",
"importer": "prefab", "importer": "prefab",
"imported": true, "imported": true,
"uuid": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", "uuid": "b4e0f464-dc9f-463d-a392-7cc192779285",
"files": [ "files": [
".json" ".json"
], ],

4
JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab → JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab
View File

@ -1,7 +1,7 @@
[ [
{ {
"__type__": "cc.Prefab", "__type__": "cc.Prefab",
"_name": "选择宠物ICON", "_name": "选中宠物ICON",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_native": "", "_native": "",
@ -13,7 +13,7 @@
}, },
{ {
"__type__": "cc.Node", "__type__": "cc.Node",
"_name": "选择宠物ICON", "_name": "选中宠物ICON",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
"_parent": null, "_parent": null,

2
JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物ICON.prefab.meta → JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选中宠物ICON.prefab.meta
View File

@ -8,6 +8,6 @@
], ],
"subMetas": {}, "subMetas": {},
"userData": { "userData": {
"syncNodeName": "选择宠物ICON" "syncNodeName": "选中宠物ICON"
} }
} }

687
JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab Normal file
View File

@ -0,0 +1,687 @@
[
{
"__type__": "cc.Prefab",
"_name": "选择宠物展示ICON",
"_objFlags": 0,
"__editorExtras__": {},
"_native": "",
"data": {
"__id__": 1
},
"optimizationPolicy": 0,
"persistent": false
},
{
"__type__": "cc.Node",
"_name": "选择宠物展示ICON",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": null,
"_children": [
{
"__id__": 2
},
{
"__id__": 14
}
],
"_active": true,
"_components": [
{
"__id__": 27
},
{
"__id__": 29
},
{
"__id__": 31
}
],
"_prefab": {
"__id__": 33
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 251.589,
"y": -110.305,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "没有宠物",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 3
}
],
"_active": true,
"_components": [
{
"__id__": 11
}
],
"_prefab": {
"__id__": 13
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_name": "label",
"_objFlags": 512,
"__editorExtras__": {},
"_parent": {
"__id__": 2
},
"_children": [],
"_active": true,
"_components": [
{
"__id__": 4
},
{
"__id__": 6
},
{
"__id__": 8
}
],
"_prefab": {
"__id__": 10
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
},
"_enabled": true,
"__prefab": {
"__id__": 5
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "95T/gOHudIuYgzZX23mI9T"
},
{
"__type__": "cc.Label",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
},
"_enabled": true,
"__prefab": {
"__id__": 7
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_string": "+",
"_horizontalAlign": 1,
"_verticalAlign": 1,
"_actualFontSize": 110,
"_fontSize": 110,
"_fontFamily": "Arial",
"_lineHeight": 120,
"_overflow": 1,
"_enableWrapText": false,
"_font": null,
"_isSystemFontUsed": true,
"_spacingX": 0,
"_isItalic": false,
"_isBold": true,
"_isUnderline": false,
"_underlineHeight": 2,
"_cacheMode": 0,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "25QELCF/FD8qMBYhU8/Z1s"
},
{
"__type__": "cc.LabelOutline",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 3
},
"_enabled": true,
"__prefab": {
"__id__": 9
},
"_color": {
"__type__": "cc.Color",
"r": 0,
"g": 0,
"b": 0,
"a": 255
},
"_width": 4,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "8aUomAsWxGGaxW3abAwyUb"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c4sQZI43VJk4G7lCYdQyx2",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 2
},
"_enabled": true,
"__prefab": {
"__id__": 12
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "51q/WpkgVKwICdmnLPZukc"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "4e9NnHbvBHj4+BDffpZS3a",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.Node",
"_name": "有宠物",
"_objFlags": 0,
"__editorExtras__": {},
"_parent": {
"__id__": 1
},
"_children": [
{
"__id__": 15
}
],
"_active": true,
"_components": [
{
"__id__": 24
}
],
"_prefab": {
"__id__": 26
},
"_lpos": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_lrot": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
},
"_lscale": {
"__type__": "cc.Vec3",
"x": 1,
"y": 1,
"z": 1
},
"_mobility": 0,
"_layer": 33554432,
"_euler": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
},
"_id": ""
},
{
"__type__": "cc.Node",
"_objFlags": 0,
"_parent": {
"__id__": 14
},
"_prefab": {
"__id__": 16
},
"__editorExtras__": {}
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 15
},
"asset": {
"__uuid__": "ef1f320e-328a-41c9-bfdc-ad17d402e14f",
"__expectedType__": "cc.Prefab"
},
"fileId": "02c3tqHwFAbp7zhkA22zq9",
"instance": {
"__id__": 17
},
"targetOverrides": null
},
{
"__type__": "cc.PrefabInstance",
"fileId": "464jxOMcNH2KEj3sfjyeZC",
"prefabRootNode": {
"__id__": 1
},
"mountedChildren": [],
"mountedComponents": [],
"propertyOverrides": [
{
"__id__": 18
},
{
"__id__": 20
},
{
"__id__": 21
},
{
"__id__": 22
},
{
"__id__": 23
}
],
"removedComponents": []
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 19
},
"propertyPath": [
"_name"
],
"value": "宠物ICON"
},
{
"__type__": "cc.TargetInfo",
"localID": [
"02c3tqHwFAbp7zhkA22zq9"
]
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 19
},
"propertyPath": [
"_lpos"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 19
},
"propertyPath": [
"_lrot"
],
"value": {
"__type__": "cc.Quat",
"x": 0,
"y": 0,
"z": 0,
"w": 1
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 19
},
"propertyPath": [
"_euler"
],
"value": {
"__type__": "cc.Vec3",
"x": 0,
"y": 0,
"z": 0
}
},
{
"__type__": "CCPropertyOverrideInfo",
"targetInfo": {
"__id__": 19
},
"propertyPath": [
"_active"
],
"value": true
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 14
},
"_enabled": true,
"__prefab": {
"__id__": 25
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "fbKN2dZNVBELD9SmfQOfTl"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "c1Zn5wu3JJOautOuf3eCzN",
"instance": null,
"targetOverrides": null,
"nestedPrefabInstanceRoots": null
},
{
"__type__": "cc.UITransform",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 28
},
"_contentSize": {
"__type__": "cc.Size",
"width": 100,
"height": 100
},
"_anchorPoint": {
"__type__": "cc.Vec2",
"x": 0.5,
"y": 0.5
},
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "4fnyc7PKBKuIy7GIcCsux6"
},
{
"__type__": "cc.Sprite",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 30
},
"_customMaterial": null,
"_srcBlendFactor": 2,
"_dstBlendFactor": 4,
"_color": {
"__type__": "cc.Color",
"r": 255,
"g": 255,
"b": 255,
"a": 255
},
"_spriteFrame": {
"__uuid__": "20835ba4-6145-4fbc-a58a-051ce700aa3e@f9941",
"__expectedType__": "cc.SpriteFrame"
},
"_type": 1,
"_fillType": 0,
"_sizeMode": 0,
"_fillCenter": {
"__type__": "cc.Vec2",
"x": 0,
"y": 0
},
"_fillStart": 0,
"_fillRange": 0,
"_isTrimmedMode": true,
"_useGrayscale": false,
"_atlas": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "d0AUv0uTJIVaVL7fywKL0N"
},
{
"__type__": "ad2c14Q5uZDoJlTgsqnp2Ty",
"_name": "",
"_objFlags": 0,
"__editorExtras__": {},
"node": {
"__id__": 1
},
"_enabled": true,
"__prefab": {
"__id__": 32
},
"noPet": {
"__id__": 2
},
"havePet": {
"__id__": 14
},
"petIcon": null,
"_id": ""
},
{
"__type__": "cc.CompPrefabInfo",
"fileId": "85ruk0B3NFoqyJzn5uu35A"
},
{
"__type__": "cc.PrefabInfo",
"root": {
"__id__": 1
},
"asset": {
"__id__": 0
},
"fileId": "13NgoTXGpMRapTmp+uDndV",
"instance": null,
"targetOverrides": [
{
"__id__": 34
}
],
"nestedPrefabInstanceRoots": [
{
"__id__": 15
}
]
},
{
"__type__": "cc.TargetOverrideInfo",
"source": {
"__id__": 31
},
"sourceInfo": null,
"propertyPath": [
"petIcon"
],
"target": {
"__id__": 15
},
"targetInfo": {
"__id__": 35
}
},
{
"__type__": "cc.TargetInfo",
"localID": [
"a8v6Wyt6FBsbms2ouS3gEa"
]
}
]

13
JisolGameCocos/assets/resources/prefab/ui/常用预制体/宠物/icon/选择宠物展示ICON.prefab.meta Normal file
View File

@ -0,0 +1,13 @@
{
"ver": "1.1.49",
"importer": "prefab",
"imported": true,
"uuid": "c7577a1e-d03c-4b53-8670-089ccbfeb272",
"files": [
".json"
],
"subMetas": {},
"userData": {
"syncNodeName": "选择宠物展示ICON"
}
}

6
JisolGameCocos/assets/resources/prefab/ui/模式/PVP/PVP匹配页面.prefab
View File

@ -914,7 +914,7 @@
"__id__": 1 "__id__": 1
}, },
"component": "", "component": "",
"_componentId": "9979dVt91REw44px2Tq6wqv", "_componentId": "d8c6c8BHmpMQ7nX1S4gqOwW",
"handler": "onClickCancel", "handler": "onClickCancel",
"customEventData": "" "customEventData": ""
}, },
@ -996,7 +996,7 @@
"fileId": "582zBz6m5DKqmkTkiS/LE0" "fileId": "582zBz6m5DKqmkTkiS/LE0"
}, },
{ {
"__type__": "9979dVt91REw44px2Tq6wqv", "__type__": "d8c6c8BHmpMQ7nX1S4gqOwW",
"_name": "", "_name": "",
"_objFlags": 0, "_objFlags": 0,
"__editorExtras__": {}, "__editorExtras__": {},
@ -1017,7 +1017,7 @@
}, },
{ {
"__type__": "cc.CompPrefabInfo", "__type__": "cc.CompPrefabInfo",
"fileId": "0cGxVTaIRJGYvyxR3n0dcU" "fileId": "fdR16QBsBCWKrYOQqkElcD"
}, },
{ {
"__type__": "cc.PrefabInfo", "__type__": "cc.PrefabInfo",

2
JisolGameCocos/assets/resources/prefab/ui/阵法/阵法选择页面.prefab
View File

@ -1958,7 +1958,7 @@
"__id__": 83 "__id__": 83
}, },
"itemPrefab": { "itemPrefab": {
"__uuid__": "fc8eb7b6-f756-49f4-9102-ac3cca3a20ae", "__uuid__": "b4e0f464-dc9f-463d-a392-7cc192779285",
"__expectedType__": "cc.Prefab" "__expectedType__": "cc.Prefab"
}, },
"_id": "" "_id": ""

8
JisolGameCocos/assets/script/App.ts
View File

@ -28,12 +28,12 @@ import AppAction from "./AppAction";
import { Asset } from "cc"; import { Asset } from "cc";
import { Component } from "cc"; import { Component } from "cc";
// let APIPath = `http://localhost:8080` let APIPath = `http://localhost:8080`
// let WsPath = `ws://localhost:8080/websocket` let WsPath = `ws://localhost:8080/websocket`
// let APIPath = `http://192.168.1.23:8080` // let APIPath = `http://192.168.1.23:8080`
// let WsPath = `ws://192.168.1.23:8080/websocket` // let WsPath = `ws://192.168.1.23:8080/websocket`
let APIPath = `http://192.168.0.119:8080` // let APIPath = `http://192.168.0.119:8080`
let WsPath = `ws://192.168.0.119:8080/websocket` // let WsPath = `ws://192.168.0.119:8080/websocket`
// let APIPath = `https://api.pet.jisol.cn` // let APIPath = `https://api.pet.jisol.cn`
// let WsPath = `wss://api.pet.jisol.cn/websocket` // let WsPath = `wss://api.pet.jisol.cn/websocket`

5
JisolGameCocos/assets/script/action/PVPAction.ts
View File

@ -38,13 +38,14 @@ export default class PVPAction extends BaseAction {
//PVP开始等待 //PVP开始等待
onModePVPStartWait(){ onModePVPStartWait(){
console.log("onModePVPStartWait");
//PVP 匹配页面 //PVP 匹配页面
if(GBattleModeManager.getIns().current != BattleMode.PVP) app.layer.Open(GUI.PVPModeMatchView);
app.layer.Open(GUI.PVPModeMatchView);
} }
//PVP结束等待 //PVP结束等待
onModePVPEndWait(){ onModePVPEndWait(){
console.log("onModePVPEndWait");
//PVP 匹配页面 //PVP 匹配页面
app.layer.Close(GUI.PVPModeMatchView); app.layer.Close(GUI.PVPModeMatchView);
} }

2
JisolGameCocos/assets/script/battle/base/attack/GAttackParabolicBangRemote.ts
View File

@ -40,8 +40,6 @@ export default class GAttackParabolicBangRemote implements GAttackBase{
return; return;
} }
console.log(role.spine,bone);
let bullet = GAttackBullet.create(GButtleDefault,{ let bullet = GAttackBullet.create(GButtleDefault,{
image:image, image:image,
scale:scale, scale:scale,

2
JisolGameCocos/assets/script/consts/API.ts
View File

@ -157,7 +157,7 @@ export const API = {
PetEquipAll: async () => RData(await app.api.get(`/game/equip/all`),false) as PetEquip[], //获取全部装备 PetEquipAll: async () => RData(await app.api.get(`/game/equip/all`),false) as PetEquip[], //获取全部装备
PetEquipForging: async () => RData(await app.api.get(`/game/equip/forging`),true) as PetEquip, //锻造装备 PetEquipForging: async () => RData(await app.api.get(`/game/equip/forging`),true) as PetEquip, //锻造装备
PetEquipForgingInfo: async () => RData(await app.api.get(`/game/equip/forging/info`),true) as EquipForgingBench, //锻造台 PetEquipForgingInfo: async () => RData(await app.api.get(`/game/equip/forging/info`),true) as EquipForgingBench, //锻造台
PetEquipForgingPetId: async (petId) => RData(await app.api.get(`/game/equip/forging/petId/${petId}`),true) as EquipForgingBench, //设置锻造宠 PetEquipForgingPetId: async (petId) => RData(await app.api.post(`/game/equip/forging/petId/${petId}`),true) as EquipForgingBench, //设置锻造宠
} }

17
JisolGameCocos/assets/script/data/PetEquipData.ts
View File

@ -1,7 +1,13 @@
import { app } from "../App";
import { API, EquipForgingBench, PetEquip } from "../consts/API"; import { API, EquipForgingBench, PetEquip } from "../consts/API";
import BaseData from "./BaseData"; import BaseData from "./BaseData";
import PlayerPetData from "./PlayerPetData"; import PlayerPetData from "./PlayerPetData";
export enum PetEquipDataEnum{
//更新锻造数据
UPDATE_FORGING_INFO = "PetEquipDataEnum_UPDATE_FORGING_INFO"
}
//宠物装备数据类 //宠物装备数据类
export default class PetEquipData extends BaseData{ export default class PetEquipData extends BaseData{
@ -20,14 +26,21 @@ export default class PetEquipData extends BaseData{
this.info = await API.PetEquipForgingInfo(); this.info = await API.PetEquipForgingInfo();
} }
//更新锻造数据
onUpdateInfo(info:EquipForgingBench){
this.info = info;
app.event.emit(PetEquipDataEnum.UPDATE_FORGING_INFO);
}
//锻造 //锻造
async forging(){ async forging(){
await API.PetEquipForging(); return await API.PetEquipForging();
} }
//设置锻造宠 //设置锻造宠
async setForgingPetId(petId:number){ async setForgingPetId(petId:number){
await API.PetEquipForgingPetId(petId); this.onUpdateInfo(await API.PetEquipForgingPetId(petId));
} }
} }

34
JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts Normal file
View File

@ -0,0 +1,34 @@
import { _decorator, Component, Node } from 'cc';
import { PetIcon } from './PetIcon';
import { PlayerPetOV } from '../../../consts/API';
const { ccclass, property } = _decorator;
@ccclass('PetIconSelectShow')
export class PetIconSelectShow extends Component {
//没有宠物的节点
@property(Node)
noPet:Node;
//有宠物的节点
@property(Node)
havePet:Node;
//宠物节点
@property(PetIcon)
petIcon:PetIcon;
set(info:PlayerPetOV){
if(info){
this.noPet.active = false;
this.havePet.active = true;
this.petIcon.set(info);
}else{
this.noPet.active = true;
this.havePet.active = false;
}
}
}

2
JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts.meta → JisolGameCocos/assets/script/ui/Consts/Pet/PetIconSelectShow.ts.meta
View File

@ -2,7 +2,7 @@
"ver": "4.0.23", "ver": "4.0.23",
"importer": "typescript", "importer": "typescript",
"imported": true, "imported": true,
"uuid": "9979d56d-f754-44c3-8e29-c764eaeb0aaf", "uuid": "ad2c1e10-e6e6-43a0-9953-82caa7a764f2",
"files": [], "files": [],
"subMetas": {}, "subMetas": {},
"userData": {} "userData": {}

44
JisolGameCocos/assets/script/ui/Home/ForgingBench/MainForgingBench.ts
View File

@ -1,7 +1,10 @@
import { _decorator, Component, Node } from 'cc'; import { _decorator, Component, Node } from 'cc';
import PetEquipData from '../../../data/PetEquipData'; import PetEquipData, { PetEquipDataEnum } from '../../../data/PetEquipData';
import { app } from '../../../App'; import { app } from '../../../App';
import { GUI } from '../../UIConfig'; import { GUI } from '../../UIConfig';
import { API, PlayerPetOV } from '../../../consts/API';
import { PetIconSelectShow } from '../../Consts/Pet/PetIconSelectShow';
import PlayerPetData from '../../../data/PlayerPetData';
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
@ -9,19 +12,52 @@ const { ccclass, property } = _decorator;
@ccclass('MainForgingBench') @ccclass('MainForgingBench')
export class MainForgingBench extends Component { export class MainForgingBench extends Component {
//锻造宠
@property(PetIconSelectShow)
petView:PetIconSelectShow;
onLoad(){
this.onUpdateView();
//监听锻造数据
app.event.on(PetEquipDataEnum.UPDATE_FORGING_INFO,this.onUpdateForging,this);
}
protected onDestroy(): void {
app.event.off(PetEquipDataEnum.UPDATE_FORGING_INFO,this.onUpdateForging,this);
}
onUpdateView(){
this.onUpdateForging();
}
//刷新锻造数据
onUpdateForging(){
this.petView.set(PlayerPetData.getIns().petIdQueryPetInfo(PetEquipData.getIns().info.forgingPetId));
}
//点击锻造 //点击锻造
async onClickForging(){ async onClickForging(){
if(!PetEquipData.getIns().isForgingBenchPet){ if(!PetEquipData.getIns().isForgingBenchPet){
app.layer.Open(GUI.Tips,{text:"请选择锻造宠"}); app.layer.Open(GUI.Tips,{text:"请选择锻造宠"});
return; return;
} }
PetEquipData.getIns().forging(); let equip = await PetEquipData.getIns().forging();
app.layer.Open(GUI.PetEquipForgingPopupView); equip && app.layer.Open(GUI.PetEquipForgingPopupView,equip);
} }
//点击锻造宠 //点击锻造宠
async onClickForgingPet(){ async onClickForgingPet(){
app.layer.Open(GUI.PetRadioView); let info:PlayerPetOV = await (new Promise(resolve => {
app.layer.Open(GUI.PetRadioView,{resolve});
}))
if(!info) return;
//设置锻造宠
await PetEquipData.getIns().setForgingPetId(info.petId);
} }
} }

5
JisolGameCocos/assets/script/ui/Mode/PVP/PVPMatchView.ts → JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts
View File

@ -9,8 +9,8 @@ const { ccclass, property } = _decorator;
/** /**
* 游戏匹配页面 * 游戏匹配页面
*/ */
@ccclass('PVPMatchView') @ccclass('PVPModeMatchView')
export class PVPMatchView extends JNGLayerBase { export class PVPModeMatchView extends JNGLayerBase {
@property(Node) @property(Node)
content:Node; content:Node;
@ -24,7 +24,6 @@ export class PVPMatchView extends JNGLayerBase {
.to(.5,{scale:v3(1,1,1)}) .to(.5,{scale:v3(1,1,1)})
) )
.start(); .start();
} }
//取消匹配 //取消匹配

9
JisolGameCocos/assets/script/ui/Mode/PVP/PVPModeMatchView.ts.meta Normal file
View File

@ -0,0 +1,9 @@
{
"ver": "4.0.23",
"importer": "typescript",
"imported": true,
"uuid": "d8c6cf01-1e6a-4c43-b9d7-d52e20a8ec16",
"files": [],
"subMetas": {},
"userData": {}
}

78
JisolGameCocos/assets/script/ui/Pet/PetRadioView.ts
View File

@ -1,11 +1,89 @@
import { _decorator, Component, Node } from 'cc'; import { _decorator, Component, Node } from 'cc';
import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase';
import JNScrollView from '../../../../extensions/ngame/assets/ngame/util/components/scrollview/JNScrollView';
import { PetOV, PlayerPetOVSelect } from '../VO/PetOV';
import PlayerPetData from '../../data/PlayerPetData';
import { NodeEventType } from 'cc';
import { PetIconSelectScroll } from '../Consts/Pet/PetIconSelectScroll';
import { PlayerPetOV } from '../../consts/API';
import { app } from '../../App';
import { GUI } from '../UIConfig';
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
export interface PetRadioViewArgs{
isHaveSelect:boolean, //是否必须选择
resolve?:(value:PlayerPetOV) => {},
}
//宠物单选页面 //宠物单选页面
@ccclass('PetRadioView') @ccclass('PetRadioView')
export class PetRadioView extends JNLayerBase { export class PetRadioView extends JNLayerBase {
data:PetRadioViewArgs;
@property(JNScrollView)
views:JNScrollView; //宠物列表
index:number = -1;
onJNLoad(data?: PetRadioViewArgs): void {
data = data || {isHaveSelect:false};
this.isClickMaskeClose = !data.isHaveSelect;
this.data = data;
super.onJNLoad();
this.onUpdateView();
}
onUpdateView(){
//当前需要升星的宠物并且未上阵 并且排除自己
let pets = PetOV.PlayerPetOVSelects( PlayerPetData.getIns().getData() );
this.views.refreshData(pets);
//向子节点添加点击事件
this.views.addItemEvent(NodeEventType.TOUCH_START,this.onClickItem.bind(this));
}
//刷新选择
onUpdateSelect(){
//刷新
this.views.getItems<PetIconSelectScroll>().forEach((item) => {
let data = item.data as PlayerPetOVSelect;
item.select.isSelect = data.isSelect;
})
}
//点击Item
onClickItem(index:number){
this.index = index;
let pets = this.views.getData<PlayerPetOVSelect>();
pets.forEach(item => item.isSelect = false);
pets[index].isSelect = !pets[index].isSelect;
this.onUpdateSelect();
}
//选择宠物
onClickSelect(){
let pets = this.views.getData<PlayerPetOVSelect>();
if(!(pets[this.index])){
this.data.resolve && this.data.resolve(null)
if(this.data.isHaveSelect) {
app.layer.Open(GUI.Tips,{text:"请选择宠物"});
return;
}
}else{
this.data.resolve && this.data.resolve(pets[this.index]);
}
app.layer.CloseNode(this.node);
}
} }

19
JisolGameCocos/assets/script/ui/PetEquip/PetEquipForgingPopupView.ts
View File

@ -1,10 +1,27 @@
import { _decorator, Component, Node } from 'cc'; import { _decorator, Component, Node } from 'cc';
import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase'; import JNLayerBase from '../../../../extensions/ngame/assets/ngame/ui/base/JNLayerBase';
import { Sprite } from 'cc';
import { PetEquip } from '../../consts/API';
import { resources } from 'cc';
import { SpriteFrame } from 'cc';
const { ccclass, property } = _decorator; const { ccclass, property } = _decorator;
//锻造宠物装备页面 //弹出锻造装备页面
@ccclass('PetEquipForgingPopupView') @ccclass('PetEquipForgingPopupView')
export class PetEquipForgingPopupView extends JNLayerBase { export class PetEquipForgingPopupView extends JNLayerBase {
//装备展示
@property(Sprite)
icon:Sprite;
onJNLoad(info:PetEquip){
resources.load(`icon/宠物装备/${info.equipCfgId}`,SpriteFrame,(error,data) => {
this.icon.spriteFrame = data;
})
}
} }

2
JisolGameCocos/extensions/ngame

@ -1 +1 @@
Subproject commit 4f23e1e1b8301a2a1cc65fb45cbc50dcb3225c92 Subproject commit e16595d14ead88524bf2b5bce49cd74d82b5decb

1
JisolGameServer/Main/src/main/java/cn/jisol/game/JGameApplication.java
View File

@ -5,6 +5,7 @@ import org.mybatis.spring.annotation.MapperScan;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.annotation.EnableAspectJAutoProxy;
import org.springframework.retry.annotation.EnableRetry; import org.springframework.retry.annotation.EnableRetry;
@EnableRetry @EnableRetry

9
JisolGameServer/Main/src/main/java/cn/jisol/game/controller/exception/ResourceInitException.java Normal file
View File

@ -0,0 +1,9 @@
package cn.jisol.game.controller.exception;
public class ResourceInitException extends RuntimeException{
public ResourceInitException() {
}
public ResourceInitException(String message) {
super(message);
}
}

1
JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerEquipController.java
View File

@ -6,6 +6,7 @@ import cfg.TB.TbGRoleEquipType;
import cfg.TbGEntity.TAttributeValue; import cfg.TbGEntity.TAttributeValue;
import cn.hutool.core.util.RandomUtil; import cn.hutool.core.util.RandomUtil;
import cn.jisol.game.controller.argsresolver.CurrentPlayer; import cn.jisol.game.controller.argsresolver.CurrentPlayer;
import cn.jisol.game.controller.exception.ResourceNotException;
import cn.jisol.game.data.ResourceId; import cn.jisol.game.data.ResourceId;
import cn.jisol.game.data.TD; import cn.jisol.game.data.TD;
import cn.jisol.game.entity.data.GAttribute; import cn.jisol.game.entity.data.GAttribute;

1
JisolGameServer/Main/src/main/java/cn/jisol/game/controller/game/GPlayerPetController.java
View File

@ -3,6 +3,7 @@ package cn.jisol.game.controller.game;
import cfg.TB.TbGRoleUpLevel; import cfg.TB.TbGRoleUpLevel;
import cfg.TbGEntity.TResource; import cfg.TbGEntity.TResource;
import cn.jisol.game.controller.argsresolver.CurrentPlayer; import cn.jisol.game.controller.argsresolver.CurrentPlayer;
import cn.jisol.game.controller.exception.ResourceNotException;
import cn.jisol.game.data.TD; import cn.jisol.game.data.TD;
import cn.jisol.game.entity.table.Player; import cn.jisol.game.entity.table.Player;
import cn.jisol.game.entity.table.PlayerPet; import cn.jisol.game.entity.table.PlayerPet;

16
JisolGameServer/Main/src/main/java/cn/jisol/game/service/impl/ResourceServiceImpl.java
View File

@ -1,15 +1,20 @@
package cn.jisol.game.service.impl; package cn.jisol.game.service.impl;
import cn.jisol.game.controller.exception.ResourceInitException;
import cn.jisol.game.controller.exception.ResourceNotException; import cn.jisol.game.controller.exception.ResourceNotException;
import cn.jisol.game.entity.table.Resource; import cn.jisol.game.entity.table.Resource;
import cn.jisol.game.mapper.ResourceMapper; import cn.jisol.game.mapper.ResourceMapper;
import cn.jisol.game.service.ResourceService; import cn.jisol.game.service.ResourceService;
import cn.jisol.ngame.util.spring.SpringBeanUtils;
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springframework.aop.framework.AopContext;
import org.springframework.retry.RetryException; import org.springframework.retry.RetryException;
import org.springframework.retry.annotation.Retryable; import org.springframework.retry.annotation.Retryable;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Propagation;
import org.springframework.transaction.annotation.Transactional;
import java.util.Objects; import java.util.Objects;
@ -23,7 +28,6 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
* @return * @return
*/ */
@Override @Override
@Retryable(RetryException.class)
public Resource addResourceValue(Long playerId, int type, Long value) { public Resource addResourceValue(Long playerId, int type, Long value) {
@ -49,10 +53,14 @@ public class ResourceServiceImpl extends ServiceImpl<ResourceMapper, Resource> i
if(!update){ if(!update){
if(Objects.isNull(res)){ if(Objects.isNull(res)){
//没有资源信息 创建初始资源
res = this.initResource(playerId,type);
//并且重试 //并且重试
throw new RetryException(""); if(value > 0){
//没有资源信息 创建初始资源
res = this.initResource(playerId,type);
this.addResourceValue(playerId,type,value);
}else{
throw new ResourceNotException("资源不够");
}
}else{ }else{
//更新失败 材料不够 //更新失败 材料不够
throw new ResourceNotException("资源不够"); throw new ResourceNotException("资源不够");