diff --git a/assets/resources/gui/element/mission.prefab b/assets/resources/gui/element/mission.prefab index 7f44fcc9..1106de91 100644 --- a/assets/resources/gui/element/mission.prefab +++ b/assets/resources/gui/element/mission.prefab @@ -16174,7 +16174,7 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 31, + "_actualFontSize": 25, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 35, @@ -20131,7 +20131,7 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 31, + "_actualFontSize": 25, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 35, @@ -24085,7 +24085,7 @@ "_string": "名称", "_horizontalAlign": 1, "_verticalAlign": 1, - "_actualFontSize": 31, + "_actualFontSize": 25, "_fontSize": 30, "_fontFamily": "Arial", "_lineHeight": 35, diff --git a/assets/resources/gui/element/mskills.prefab b/assets/resources/gui/element/mskills.prefab deleted file mode 100644 index d6b58c66..00000000 --- a/assets/resources/gui/element/mskills.prefab +++ /dev/null @@ -1,204 +0,0 @@ -[ - { - "__type__": "cc.Prefab", - "_name": "mskills", - "_objFlags": 0, - "__editorExtras__": {}, - "_native": "", - "data": { - "__id__": 1 - }, - "optimizationPolicy": 0, - "persistent": false - }, - { - "__type__": "cc.Node", - "_name": "mskills", - "_objFlags": 0, - "__editorExtras__": {}, - "_parent": null, - "_children": [], - "_active": true, - "_components": [ - { - "__id__": 2 - }, - { - "__id__": 4 - }, - { - "__id__": 6 - }, - { - "__id__": 8 - } - ], - "_prefab": { - "__id__": 10 - }, - "_lpos": { - "__type__": "cc.Vec3", - "x": -160, - "y": 350, - "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": 1, - "_euler": { - "__type__": "cc.Vec3", - "x": 0, - "y": 0, - "z": 0 - }, - "_id": "" - }, - { - "__type__": "cc.UITransform", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 3 - }, - "_contentSize": { - "__type__": "cc.Size", - "width": 400, - "height": 100 - }, - "_anchorPoint": { - "__type__": "cc.Vec2", - "x": 0.5, - "y": 0.5 - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "4dNsDtN3ZGiZ+om9xELLFQ" - }, - { - "__type__": "cc.Widget", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 5 - }, - "_alignFlags": 10, - "_target": null, - "_left": 0, - "_right": 0, - "_top": 0, - "_bottom": 0, - "_horizontalCenter": 0, - "_verticalCenter": 350, - "_isAbsLeft": true, - "_isAbsRight": true, - "_isAbsTop": true, - "_isAbsBottom": true, - "_isAbsHorizontalCenter": true, - "_isAbsVerticalCenter": true, - "_originalWidth": 0, - "_originalHeight": 0, - "_alignMode": 2, - "_lockFlags": 0, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "baKsIzXktAyqqNBZKVQXO+" - }, - { - "__type__": "68387wnH45AVo6Nco+pXtG5", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 7 - }, - "skill_box": { - "__uuid__": "d19cde30-f5d0-47de-a0d5-3a272b696343", - "__expectedType__": "cc.Prefab" - }, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "d4AyZdLXNB07iSaFvEU6BB" - }, - { - "__type__": "cc.Layout", - "_name": "", - "_objFlags": 0, - "__editorExtras__": {}, - "node": { - "__id__": 1 - }, - "_enabled": true, - "__prefab": { - "__id__": 9 - }, - "_resizeMode": 0, - "_layoutType": 1, - "_cellSize": { - "__type__": "cc.Size", - "width": 40, - "height": 40 - }, - "_startAxis": 0, - "_paddingLeft": 10, - "_paddingRight": 0, - "_paddingTop": 0, - "_paddingBottom": 0, - "_spacingX": 10, - "_spacingY": 0, - "_verticalDirection": 1, - "_horizontalDirection": 0, - "_constraint": 0, - "_constraintNum": 2, - "_affectedByScale": false, - "_isAlign": false, - "_id": "" - }, - { - "__type__": "cc.CompPrefabInfo", - "fileId": "786tQWlIxKHLEpV0oUK9dj" - }, - { - "__type__": "cc.PrefabInfo", - "root": { - "__id__": 1 - }, - "asset": { - "__id__": 0 - }, - "fileId": "5622mxbS1PNqMFP0FH5Mir", - "instance": null, - "targetOverrides": null - } -] \ No newline at end of file diff --git a/assets/resources/gui/element/mskills.prefab.meta b/assets/resources/gui/element/mskills.prefab.meta deleted file mode 100644 index 9a60bada..00000000 --- a/assets/resources/gui/element/mskills.prefab.meta +++ /dev/null @@ -1,13 +0,0 @@ -{ - "ver": "1.1.50", - "importer": "prefab", - "imported": true, - "uuid": "0f2aeee0-d590-4c36-9f20-a93b058d5b91", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": { - "syncNodeName": "mskills" - } -} diff --git a/assets/script/game/map/MissSkillsComp.ts b/assets/script/game/map/MissSkillsComp.ts index 37c3161c..366ff81d 100644 --- a/assets/script/game/map/MissSkillsComp.ts +++ b/assets/script/game/map/MissSkillsComp.ts @@ -63,16 +63,16 @@ export class MissSkillsComp extends CCComp { * 第 2 行 y=320:x = -320, -240, -160, -80, 0 */ private slots: SkillBoxSlot[] = [ - { x: -320, y: 200, used: false, node: null }, - { x: -240, y: 200, used: false, node: null }, - { x: -160, y: 200, used: false, node: null }, - { x: -80, y: 200, used: false, node: null }, - { x: 0, y: 200, used: false, node: null }, - { x: -320, y: 300, used: false, node: null }, - { x: -240, y: 300, used: false, node: null }, - { x: -160, y: 300, used: false, node: null }, - { x: -80, y: 300, used: false, node: null }, - { x: 0, y: 300, used: false, node: null }, + { x: -310, y: 200, used: false, node: null }, + { x: -220, y: 200, used: false, node: null }, + { x: -130, y: 200, used: false, node: null }, + { x: -40, y: 200, used: false, node: null }, + { x: 50, y: 200, used: false, node: null }, + { x: -310, y: 300, used: false, node: null }, + { x: -220, y: 300, used: false, node: null }, + { x: -130, y: 300, used: false, node: null }, + { x: -40, y: 300, used: false, node: null }, + { x: 50, y: 300, used: false, node: null }, ]; /** 注册事件监听 */