diff --git a/package.json b/package.json index c11412c..816fa89 100644 --- a/package.json +++ b/package.json @@ -15,33 +15,33 @@ }, "dependencies": { "@ant-design/icons-vue": "^6.1.0", - "ant-design-vue": "^3.2.13", - "axios": "^1.1.3", - "chart.js": "^4.0.1", + "ant-design-vue": "^3.2.15", + "axios": "^1.2.2", + "chart.js": "^4.1.1", "lodash": "^4.17.21", "lz-string": "^1.4.4", - "mutate-animate": "^1.0.0", - "vue": "^3.2.41" + "mutate-animate": "^1.0.2", + "vue": "^3.2.45" }, "devDependencies": { "@types/fontmin": "^0.9.0", "@types/fs-extra": "^9.0.13", - "@types/lodash": "^4.14.186", + "@types/lodash": "^4.14.191", "@types/lz-string": "^1.3.34", - "@types/node": "^18.11.7", - "@vitejs/plugin-legacy": "^2.3.0", + "@types/node": "^18.11.18", + "@vitejs/plugin-legacy": "^2.3.1", "@vitejs/plugin-vue": "^3.2.0", "@vitejs/plugin-vue-jsx": "^2.1.1", - "compressing": "^1.6.2", + "compressing": "^1.6.3", "fontmin": "^0.9.9", "form-data": "^4.0.0", "fs-extra": "^10.1.0", "less": "^4.1.3", - "terser": "^5.15.1", + "terser": "^5.16.1", "ts-node": "^10.9.1", - "typescript": "^4.6.4", - "unplugin-vue-components": "^0.22.9", - "vite": "^3.2.0", - "vue-tsc": "^1.0.9" + "typescript": "^4.9.4", + "unplugin-vue-components": "^0.22.12", + "vite": "^3.2.5", + "vue-tsc": "^1.0.22" } } \ No newline at end of file diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 59c9fa3..29cce2b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,61 +4,61 @@ specifiers: '@ant-design/icons-vue': ^6.1.0 '@types/fontmin': ^0.9.0 '@types/fs-extra': ^9.0.13 - '@types/lodash': ^4.14.186 + '@types/lodash': ^4.14.191 '@types/lz-string': ^1.3.34 - '@types/node': ^18.11.7 - '@vitejs/plugin-legacy': ^2.3.0 + '@types/node': ^18.11.18 + '@vitejs/plugin-legacy': ^2.3.1 '@vitejs/plugin-vue': ^3.2.0 '@vitejs/plugin-vue-jsx': ^2.1.1 - ant-design-vue: ^3.2.13 - axios: ^1.1.3 - chart.js: ^4.0.1 - compressing: ^1.6.2 + ant-design-vue: ^3.2.15 + axios: ^1.2.2 + chart.js: ^4.1.1 + compressing: ^1.6.3 fontmin: ^0.9.9 form-data: ^4.0.0 fs-extra: ^10.1.0 less: ^4.1.3 lodash: ^4.17.21 lz-string: ^1.4.4 - mutate-animate: ^1.0.0 - terser: ^5.15.1 + mutate-animate: ^1.0.2 + terser: ^5.16.1 ts-node: ^10.9.1 - typescript: ^4.6.4 - unplugin-vue-components: ^0.22.9 - vite: ^3.2.0 - vue: ^3.2.41 - vue-tsc: ^1.0.9 + typescript: ^4.9.4 + unplugin-vue-components: ^0.22.12 + vite: ^3.2.5 + vue: ^3.2.45 + vue-tsc: ^1.0.22 dependencies: '@ant-design/icons-vue': 6.1.0_vue@3.2.45 ant-design-vue: 3.2.15_vue@3.2.45 - axios: 1.1.3 - chart.js: 4.0.1 + axios: 1.2.2 + chart.js: 4.1.1 lodash: 4.17.21 lz-string: 1.4.4 - mutate-animate: 1.0.0 + mutate-animate: 1.0.2 vue: 3.2.45 devDependencies: '@types/fontmin': 0.9.0 '@types/fs-extra': 9.0.13 - '@types/lodash': 4.14.189 + '@types/lodash': 4.14.191 '@types/lz-string': 1.3.34 - '@types/node': 18.11.9 - '@vitejs/plugin-legacy': 2.3.1_terser@5.15.1+vite@3.2.4 - '@vitejs/plugin-vue': 3.2.0_vite@3.2.4+vue@3.2.45 - '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.4+vue@3.2.45 - compressing: 1.6.2 + '@types/node': 18.11.18 + '@vitejs/plugin-legacy': 2.3.1_terser@5.16.1+vite@3.2.5 + '@vitejs/plugin-vue': 3.2.0_vite@3.2.5+vue@3.2.45 + '@vitejs/plugin-vue-jsx': 2.1.1_vite@3.2.5+vue@3.2.45 + compressing: 1.6.3 fontmin: 0.9.9 form-data: 4.0.0 fs-extra: 10.1.0 less: 4.1.3 - terser: 5.15.1 - ts-node: 10.9.1_wup25etrarvlqkprac7h35hj7u - typescript: 4.9.3 - unplugin-vue-components: 0.22.9_vue@3.2.45 - vite: 3.2.4_sjdpriiyqai3ghwmd5e3ldppum - vue-tsc: 1.0.9_typescript@4.9.3 + terser: 5.16.1 + ts-node: 10.9.1_awa2wsr5thmg3i7jqycphctjfq + typescript: 4.9.4 + unplugin-vue-components: 0.22.12_vue@3.2.45 + vite: 3.2.5_25ccpcpgpj6lg6lpj5keiqybuq + vue-tsc: 1.0.22_typescript@4.9.4 packages: @@ -73,7 +73,7 @@ packages: /@ant-design/colors/6.0.0: resolution: {integrity: sha512-qAZRvPzfdWHtfameEGP2Qvuf838NhergR35o+EuVyB5XvSA98xod5r4utvi4TJ3ywmevm290g9nsCG5MryrdWQ==} dependencies: - '@ctrl/tinycolor': 3.4.1 + '@ctrl/tinycolor': 3.5.0 dev: false /@ant-design/icons-svg/4.2.1: @@ -90,8 +90,8 @@ packages: vue: 3.2.45 dev: false - /@antfu/utils/0.6.3: - resolution: {integrity: sha512-sEYpyyKUPOew9QsXZ8feRVMzW6DWLviwOl+/ap06UQW02A8Srbc95CPHVm4eUbiBzBgD46eyIT+przv//KSSlQ==} + /@antfu/utils/0.7.2: + resolution: {integrity: sha512-vy9fM3pIxZmX07dL+VX1aZe7ynZ+YyB0jY+jE6r3hOK6GNY2t6W8rzpFC4tgpbXUYABkFQwgJq2XYXlxbXAI0g==} dev: true /@babel/code-frame/7.18.6: @@ -101,39 +101,39 @@ packages: '@babel/highlight': 7.18.6 dev: true - /@babel/compat-data/7.20.1: - resolution: {integrity: sha512-EWZ4mE2diW3QALKvDMiXnbZpRvlj+nayZ112nK93SnhqOtpdsbVD4W+2tEoT3YNBAG9RBR0ISY758ZkOgsn6pQ==} + /@babel/compat-data/7.20.10: + resolution: {integrity: sha512-sEnuDPpOJR/fcafHMjpcpGN5M2jbUGUHwmuWKM/YdPzeEDJg8bgmbcWQFUfE32MQjti1koACvoPVsDe8Uq+idg==} engines: {node: '>=6.9.0'} dev: true - /@babel/core/7.20.2: - resolution: {integrity: sha512-w7DbG8DtMrJcFOi4VrLm+8QM4az8Mo+PuLBKLp2zrYRCow8W/f9xiXm5sN53C8HksCyDQwCKha9JiDoIyPjT2g==} + /@babel/core/7.20.12: + resolution: {integrity: sha512-XsMfHovsUYHFMdrIHkZphTN/2Hzzi78R08NuHfDBehym2VsPDL6Zn/JAD/JQdnRvbSsbQc4mVaU1m6JgtTEElg==} engines: {node: '>=6.9.0'} dependencies: '@ampproject/remapping': 2.2.0 '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.4 - '@babel/helper-compilation-targets': 7.20.0_@babel+core@7.20.2 - '@babel/helper-module-transforms': 7.20.2 - '@babel/helpers': 7.20.1 - '@babel/parser': 7.20.3 - '@babel/template': 7.18.10 - '@babel/traverse': 7.20.1 - '@babel/types': 7.20.2 + '@babel/generator': 7.20.7 + '@babel/helper-compilation-targets': 7.20.7_@babel+core@7.20.12 + '@babel/helper-module-transforms': 7.20.11 + '@babel/helpers': 7.20.7 + '@babel/parser': 7.20.7 + '@babel/template': 7.20.7 + '@babel/traverse': 7.20.12 + '@babel/types': 7.20.7 convert-source-map: 1.9.0 debug: 4.3.4 gensync: 1.0.0-beta.2 - json5: 2.2.1 + json5: 2.2.3 semver: 6.3.0 transitivePeerDependencies: - supports-color dev: true - /@babel/generator/7.20.4: - resolution: {integrity: sha512-luCf7yk/cm7yab6CAW1aiFnmEfBJplb/JojV56MYEK7ziWfGmFlTfmL9Ehwfy4gFhbjBfWO1wj7/TuSbVNEEtA==} + /@babel/generator/7.20.7: + resolution: {integrity: sha512-7wqMOJq8doJMZmP4ApXTzLxSr7+oO2jroJURrVEp6XShrQUObV8Tq/D0NCcoYg2uHqUrjzO0zwBjoYzelxK+sw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 '@jridgewell/gen-mapping': 0.3.2 jsesc: 2.5.2 dev: true @@ -142,35 +142,37 @@ packages: resolution: {integrity: sha512-duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true - /@babel/helper-compilation-targets/7.20.0_@babel+core@7.20.2: - resolution: {integrity: sha512-0jp//vDGp9e8hZzBc6N/KwA5ZK3Wsm/pfm4CrY7vzegkVxc65SgSn6wYOnwHe9Js9HRQ1YTCKLGPzDtaS3RoLQ==} + /@babel/helper-compilation-targets/7.20.7_@babel+core@7.20.12: + resolution: {integrity: sha512-4tGORmfQcrc+bvrjb5y3dG9Mx1IOZjsHqQVUz7XCNHO+iTmqxWnVg3KRygjGmpRLJGdQSKuvFinbIb0CnZwHAQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/compat-data': 7.20.1 - '@babel/core': 7.20.2 + '@babel/compat-data': 7.20.10 + '@babel/core': 7.20.12 '@babel/helper-validator-option': 7.18.6 browserslist: 4.21.4 + lru-cache: 5.1.1 semver: 6.3.0 dev: true - /@babel/helper-create-class-features-plugin/7.20.2_@babel+core@7.20.2: - resolution: {integrity: sha512-k22GoYRAHPYr9I+Gvy2ZQlAe5mGy8BqWst2wRt8cwIufWTxrsVshhIBvYNqC80N0GSFWTsqRVexOtfzlgOEDvA==} + /@babel/helper-create-class-features-plugin/7.20.12_@babel+core@7.20.12: + resolution: {integrity: sha512-9OunRkbT0JQcednL0UFvbfXpAsUXiGjUk0a7sN8fUXX7Mue79cUSMjHGDRRi/Vz9vYlpIhLV5fMD5dKoMhhsNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0 dependencies: - '@babel/core': 7.20.2 + '@babel/core': 7.20.12 '@babel/helper-annotate-as-pure': 7.18.6 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 - '@babel/helper-member-expression-to-functions': 7.18.9 + '@babel/helper-member-expression-to-functions': 7.20.7 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/helper-replace-supers': 7.19.1 + '@babel/helper-replace-supers': 7.20.7 + '@babel/helper-skip-transparent-expression-wrappers': 7.20.0 '@babel/helper-split-export-declaration': 7.18.6 transitivePeerDependencies: - supports-color @@ -185,33 +187,33 @@ packages: resolution: {integrity: sha512-WAwHBINyrpqywkUH0nTnNgI5ina5TFn85HKS0pbPDfxFfhyR/aNQEn4hGi1P1JyT//I0t4OgXUlofzWILRvS5w==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.18.10 - '@babel/types': 7.20.2 + '@babel/template': 7.20.7 + '@babel/types': 7.20.7 dev: true /@babel/helper-hoist-variables/7.18.6: resolution: {integrity: sha512-UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true - /@babel/helper-member-expression-to-functions/7.18.9: - resolution: {integrity: sha512-RxifAh2ZoVU67PyKIO4AMi1wTenGfMR/O/ae0CCRqwgBAt5v7xjdtRw7UoSbsreKrQn5t7r89eruK/9JjYHuDg==} + /@babel/helper-member-expression-to-functions/7.20.7: + resolution: {integrity: sha512-9J0CxJLq315fEdi4s7xK5TQaNYjZw+nDVpVqr1axNGKzdrdwYBD5b4uKv3n75aABG0rCCTK8Im8Ww7eYfMrZgw==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true /@babel/helper-module-imports/7.18.6: resolution: {integrity: sha512-0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true - /@babel/helper-module-transforms/7.20.2: - resolution: {integrity: sha512-zvBKyJXRbmK07XhMuujYoJ48B5yvvmM6+wcpv6Ivj4Yg6qO7NOZOSnvZN9CRl1zz1Z4cKf8YejmCMh8clOoOeA==} + /@babel/helper-module-transforms/7.20.11: + resolution: {integrity: sha512-uRy78kN4psmji1s2QtbtcCSaj/LILFDp0f/ymhpQH5QY3nljUZCaNWz9X1dEj/8MBdBEFECs7yRhKn8i7NjZgg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-environment-visitor': 7.18.9 @@ -219,9 +221,9 @@ packages: '@babel/helper-simple-access': 7.20.2 '@babel/helper-split-export-declaration': 7.18.6 '@babel/helper-validator-identifier': 7.19.1 - '@babel/template': 7.18.10 - '@babel/traverse': 7.20.1 - '@babel/types': 7.20.2 + '@babel/template': 7.20.7 + '@babel/traverse': 7.20.12 + '@babel/types': 7.20.7 transitivePeerDependencies: - supports-color dev: true @@ -230,7 +232,7 @@ packages: resolution: {integrity: sha512-HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true /@babel/helper-plugin-utils/7.20.2: @@ -238,15 +240,16 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helper-replace-supers/7.19.1: - resolution: {integrity: sha512-T7ahH7wV0Hfs46SFh5Jz3s0B6+o8g3c+7TMxu7xKfmHikg7EAZ3I2Qk9LFhjxXq8sL7UkP5JflezNwoZa8WvWw==} + /@babel/helper-replace-supers/7.20.7: + resolution: {integrity: sha512-vujDMtB6LVfNW13jhlCrp48QNslK6JXi7lQG736HVbHz/mbf4Dc7tIRh1Xf5C0rF7BP8iiSxGMCmY6Ci1ven3A==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-environment-visitor': 7.18.9 - '@babel/helper-member-expression-to-functions': 7.18.9 + '@babel/helper-member-expression-to-functions': 7.20.7 '@babel/helper-optimise-call-expression': 7.18.6 - '@babel/traverse': 7.20.1 - '@babel/types': 7.20.2 + '@babel/template': 7.20.7 + '@babel/traverse': 7.20.12 + '@babel/types': 7.20.7 transitivePeerDependencies: - supports-color dev: true @@ -255,14 +258,21 @@ packages: resolution: {integrity: sha512-+0woI/WPq59IrqDYbVGfshjT5Dmk/nnbdpcF8SnMhhXObpTq2KNBdLFRFrkVdbDOyUmHBCxzm5FHV1rACIkIbA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 + dev: true + + /@babel/helper-skip-transparent-expression-wrappers/7.20.0: + resolution: {integrity: sha512-5y1JYeNKfvnT8sZcK9DVRtpTbGiomYIHviSP3OQWmDPU3DeH4a1ZlT/N2lyQ5P8egjcRaT/Y9aNqUxK0WsnIIg==} + engines: {node: '>=6.9.0'} + dependencies: + '@babel/types': 7.20.7 dev: true /@babel/helper-split-export-declaration/7.18.6: resolution: {integrity: sha512-bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 dev: true /@babel/helper-string-parser/7.19.4: @@ -278,13 +288,13 @@ packages: engines: {node: '>=6.9.0'} dev: true - /@babel/helpers/7.20.1: - resolution: {integrity: sha512-J77mUVaDTUJFZ5BpP6mMn6OIl3rEWymk2ZxDBQJUG3P+PbmyMcF3bYWvz0ma69Af1oobDqT/iAsvzhB58xhQUg==} + /@babel/helpers/7.20.7: + resolution: {integrity: sha512-PBPjs5BppzsGaxHQCDKnZ6Gd9s6xl8bBCluz3vEInLGRJmnZan4F6BYCeqtyXqkk4W5IlPmjK4JlOuZkpJ3xZA==} engines: {node: '>=6.9.0'} dependencies: - '@babel/template': 7.18.10 - '@babel/traverse': 7.20.1 - '@babel/types': 7.20.2 + '@babel/template': 7.20.7 + '@babel/traverse': 7.20.12 + '@babel/types': 7.20.7 transitivePeerDependencies: - supports-color dev: true @@ -298,88 +308,88 @@ packages: js-tokens: 4.0.0 dev: true - /@babel/parser/7.20.3: - resolution: {integrity: sha512-OP/s5a94frIPXwjzEcv5S/tpQfc6XhxYUnmWpgdqMWGgYCuErA3SzozaRAMQgSZWKeTJxht9aWAkUY+0UzvOFg==} + /@babel/parser/7.20.7: + resolution: {integrity: sha512-T3Z9oHybU+0vZlY9CiDSJQTD5ZapcW18ZctFMi0MOAl/4BjFF4ul7NVSARLdbGO5vDqy9eQiGTV0LtKfvCYvcg==} engines: {node: '>=6.0.0'} hasBin: true dependencies: - '@babel/types': 7.20.2 + '@babel/types': 7.20.7 - /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.2: + /@babel/plugin-syntax-jsx/7.18.6_@babel+core@7.20.12: resolution: {integrity: sha512-6mmljtAedFGTWu2p/8WIORGwy+61PLgOMPOdazc7YoJ9ZCWUyFy3A6CpPkRKLKD1ToAesxX8KGEViAiLo9N+7Q==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.20.2 + '@babel/core': 7.20.12 '@babel/helper-plugin-utils': 7.20.2 dev: true - /@babel/plugin-syntax-typescript/7.20.0_@babel+core@7.20.2: + /@babel/plugin-syntax-typescript/7.20.0_@babel+core@7.20.12: resolution: {integrity: sha512-rd9TkG+u1CExzS4SM1BlMEhMXwFLKVjOAFFCDx9PbX5ycJWDoWMcwdJH9RhkPu1dOgn5TrxLot/Gx6lWFuAUNQ==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.20.2 + '@babel/core': 7.20.12 '@babel/helper-plugin-utils': 7.20.2 dev: true - /@babel/plugin-transform-typescript/7.20.2_@babel+core@7.20.2: - resolution: {integrity: sha512-jvS+ngBfrnTUBfOQq8NfGnSbF9BrqlR6hjJ2yVxMkmO5nL/cdifNbI30EfjRlN4g5wYWNnMPyj5Sa6R1pbLeag==} + /@babel/plugin-transform-typescript/7.20.7_@babel+core@7.20.12: + resolution: {integrity: sha512-m3wVKEvf6SoszD8pu4NZz3PvfKRCMgk6D6d0Qi9hNnlM5M6CFS92EgF4EiHVLKbU0r/r7ty1hg7NPZwE7WRbYw==} engines: {node: '>=6.9.0'} peerDependencies: '@babel/core': ^7.0.0-0 dependencies: - '@babel/core': 7.20.2 - '@babel/helper-create-class-features-plugin': 7.20.2_@babel+core@7.20.2 + '@babel/core': 7.20.12 + '@babel/helper-create-class-features-plugin': 7.20.12_@babel+core@7.20.12 '@babel/helper-plugin-utils': 7.20.2 - '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.2 + '@babel/plugin-syntax-typescript': 7.20.0_@babel+core@7.20.12 transitivePeerDependencies: - supports-color dev: true - /@babel/runtime/7.20.1: - resolution: {integrity: sha512-mrzLkl6U9YLF8qpqI7TB82PESyEGjm/0Ly91jG575eVxMMlb8fYfOXFZIJ8XfLrJZQbm7dlKry2bJmXBUEkdFg==} + /@babel/runtime/7.20.7: + resolution: {integrity: sha512-UF0tvkUtxwAgZ5W/KrkHf0Rn0fdnLDU9ScxBrEVNUprE/MzirjK4MJUX1/BVDv00Sv8cljtukVK1aky++X1SjQ==} engines: {node: '>=6.9.0'} dependencies: regenerator-runtime: 0.13.11 dev: false - /@babel/standalone/7.20.4: - resolution: {integrity: sha512-27bv4h47jbaFZ7+e7gT1VEo9PNL1ynxqUX6/BERLz1qxm/5gzpbcHX+47VnSeYHyEyGZkRznpSOd8zPBhiz6tw==} + /@babel/standalone/7.20.12: + resolution: {integrity: sha512-hK/X+m1il3w1tYS4H8LDaGCEdiT47SVqEXY8RiEAgou26BystipSU8ZL6EvBR6t5l7lTv0ilBiChXWblKJ5iUA==} engines: {node: '>=6.9.0'} dev: true - /@babel/template/7.18.10: - resolution: {integrity: sha512-TI+rCtooWHr3QJ27kJxfjutghu44DLnasDMwpDqCXVTal9RLp3RSYNh4NdBrRP2cQAoG9A8juOQl6P6oZG4JxA==} + /@babel/template/7.20.7: + resolution: {integrity: sha512-8SegXApWe6VoNw0r9JHpSteLKTpTiLZ4rMlGIm9JQ18KiCtyQiAMEazujAHrUS5flrcqYZa75ukev3P6QmUwUw==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/parser': 7.20.3 - '@babel/types': 7.20.2 + '@babel/parser': 7.20.7 + '@babel/types': 7.20.7 dev: true - /@babel/traverse/7.20.1: - resolution: {integrity: sha512-d3tN8fkVJwFLkHkBN479SOsw4DMZnz8cdbL/gvuDuzy3TS6Nfw80HuQqhw1pITbIruHyh7d1fMA47kWzmcUEGA==} + /@babel/traverse/7.20.12: + resolution: {integrity: sha512-MsIbFN0u+raeja38qboyF8TIT7K0BFzz/Yd/77ta4MsUsmP2RAnidIlwq7d5HFQrH/OZJecGV6B71C4zAgpoSQ==} engines: {node: '>=6.9.0'} dependencies: '@babel/code-frame': 7.18.6 - '@babel/generator': 7.20.4 + '@babel/generator': 7.20.7 '@babel/helper-environment-visitor': 7.18.9 '@babel/helper-function-name': 7.19.0 '@babel/helper-hoist-variables': 7.18.6 '@babel/helper-split-export-declaration': 7.18.6 - '@babel/parser': 7.20.3 - '@babel/types': 7.20.2 + '@babel/parser': 7.20.7 + '@babel/types': 7.20.7 debug: 4.3.4 globals: 11.12.0 transitivePeerDependencies: - supports-color dev: true - /@babel/types/7.20.2: - resolution: {integrity: sha512-FnnvsNWgZCr232sqtXggapvlkk/tuwR/qhGzcmxI0GXLCjmPYQPzio2FbdlWuY6y1sHFfQKk+rRbUZ9VStQMog==} + /@babel/types/7.20.7: + resolution: {integrity: sha512-69OnhBxSSgK0OzTJai4kyPDiKTIe3j+ctaHdIGVbRahTLAT7L3R9oeXHC2aVSuGYt3cVnoAMDmOCgJ2yaiLMvg==} engines: {node: '>=6.9.0'} dependencies: '@babel/helper-string-parser': 7.19.4 @@ -393,13 +403,13 @@ packages: '@jridgewell/trace-mapping': 0.3.9 dev: true - /@ctrl/tinycolor/3.4.1: - resolution: {integrity: sha512-ej5oVy6lykXsvieQtqZxCOaLT+xD4+QNarq78cIYISHmZXshCvROLudpQN3lfL8G0NL7plMSSK+zlyvCaIJ4Iw==} + /@ctrl/tinycolor/3.5.0: + resolution: {integrity: sha512-tlJpwF40DEQcfR/QF+wNMVyGMaO9FQp6Z1Wahj4Gk3CJQYHwA2xVG7iKDFdW6zuxZY9XWOpGcfNCTsX4McOsOg==} engines: {node: '>=10'} dev: false - /@esbuild/android-arm/0.15.14: - resolution: {integrity: sha512-+Rb20XXxRGisNu2WmNKk+scpanb7nL5yhuI1KR9wQFiC43ddPj/V1fmNyzlFC9bKiG4mYzxW7egtoHVcynr+OA==} + /@esbuild/android-arm/0.15.18: + resolution: {integrity: sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==} engines: {node: '>=12'} cpu: [arm] os: [android] @@ -407,8 +417,8 @@ packages: dev: true optional: true - /@esbuild/linux-loong64/0.15.14: - resolution: {integrity: sha512-eQi9rosGNVQFJyJWV0HCA5WZae/qWIQME7s8/j8DMvnylfBv62Pbu+zJ2eUDqNf2O4u3WB+OEXyfkpBoe194sg==} + /@esbuild/linux-loong64/0.15.18: + resolution: {integrity: sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==} engines: {node: '>=12'} cpu: [loong64] os: [linux] @@ -472,6 +482,10 @@ packages: '@jridgewell/sourcemap-codec': 1.4.14 dev: true + /@kurkle/color/0.3.1: + resolution: {integrity: sha512-hW0GwZj06z/ZFUW2Espl7toVDjghJN+EKqyXzPSV8NV89d5BYp5rRMBJoc+aUN0x5OXDMeRQHazejr2Xmqj2tw==} + dev: false + /@nodelib/fs.scandir/2.1.5: resolution: {integrity: sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==} engines: {node: '>= 8'} @@ -490,7 +504,7 @@ packages: engines: {node: '>= 8'} dependencies: '@nodelib/fs.scandir': 2.1.5 - fastq: 1.13.0 + fastq: 1.15.0 dev: true /@npmcli/fs/2.1.2: @@ -527,7 +541,7 @@ packages: /@simonwep/pickr/1.8.2: resolution: {integrity: sha512-/l5w8BIkrpP6n1xsetx9MWPWlU6OblN5YgZZphxan0Tq4BByTCETL6lyIeY8lagalS2Nbt4F2W034KHLIiunKA==} dependencies: - core-js: 3.26.1 + core-js: 3.27.1 nanopop: 2.2.0 dev: false @@ -559,17 +573,17 @@ packages: /@types/fontmin/0.9.0: resolution: {integrity: sha512-nWUcpO53EPPKUnkcQJRYyEbiojO/WXHFHOuo6GHWptaoVhFg036eB9z0OoecnhPj/1TWue0Ls5TlqSJLbRJRvg==} dependencies: - '@types/node': 18.11.9 + '@types/node': 18.11.18 dev: true /@types/fs-extra/9.0.13: resolution: {integrity: sha512-nEnwB++1u5lVDM2UI4c1+5R+FYaKfaAzS4OococimjVm3nQw3TuzH5UNsocrcTBbhnerblyHj4A49qXbIiZdpA==} dependencies: - '@types/node': 18.11.9 + '@types/node': 18.11.18 dev: true - /@types/lodash/4.14.189: - resolution: {integrity: sha512-kb9/98N6X8gyME9Cf7YaqIMvYGnBSWqEci6tiettE6iJWH1XdJz/PO8LB0GtLCG7x8dU3KWhZT+lA1a35127tA==} + /@types/lodash/4.14.191: + resolution: {integrity: sha512-BdZ5BCCvho3EIXw6wUCXHe7rS53AIDPLE+JzwgT+OsJk53oBfbSmZZ7CX4VaRoN78N+TJpFi9QPlfIVNmJYWxQ==} dev: true /@types/lz-string/1.3.34: @@ -580,109 +594,108 @@ packages: resolution: {integrity: sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==} dev: true - /@types/node/18.11.9: - resolution: {integrity: sha512-CRpX21/kGdzjOpFsZSkcrXMGIBWMGNIHXXBVFSH+ggkftxg+XYP20TESbh+zFvFj3EQOl5byk0HTRn1IL6hbqg==} + /@types/node/18.11.18: + resolution: {integrity: sha512-DHQpWGjyQKSHj3ebjFI/wRKcqQcdR+MoFBygntYOZytCqNfkd2ZC4ARDJ2DQqhjH5p85Nnd3jhUJIXrszFX/JA==} dev: true /@types/normalize-package-data/2.4.1: resolution: {integrity: sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==} dev: true - /@vitejs/plugin-legacy/2.3.1_terser@5.15.1+vite@3.2.4: + /@vitejs/plugin-legacy/2.3.1_terser@5.16.1+vite@3.2.5: resolution: {integrity: sha512-J5KaGBlSt2tEYPVjM/C8dA6DkRzkFkbPe+Xb4IX5G+XOV5OGbVAfkMjKywdrkO3gGynO8S98i71Lmsff4cWkCQ==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: terser: ^5.4.0 vite: ^3.0.0 dependencies: - '@babel/standalone': 7.20.4 - core-js: 3.26.1 + '@babel/standalone': 7.20.12 + core-js: 3.27.1 magic-string: 0.26.7 regenerator-runtime: 0.13.11 systemjs: 6.13.0 - terser: 5.15.1 - vite: 3.2.4_sjdpriiyqai3ghwmd5e3ldppum + terser: 5.16.1 + vite: 3.2.5_25ccpcpgpj6lg6lpj5keiqybuq dev: true - /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.4+vue@3.2.45: + /@vitejs/plugin-vue-jsx/2.1.1_vite@3.2.5+vue@3.2.45: resolution: {integrity: sha512-JgDhxstQlwnHBvZ1BSnU5mbmyQ14/t5JhREc6YH5kWyu2QdAAOsLF6xgHoIWarj8tddaiwFrNzLbWJPudpXKYA==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.0.0 dependencies: - '@babel/core': 7.20.2 - '@babel/plugin-transform-typescript': 7.20.2_@babel+core@7.20.2 - '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.20.2 - vite: 3.2.4_sjdpriiyqai3ghwmd5e3ldppum + '@babel/core': 7.20.12 + '@babel/plugin-transform-typescript': 7.20.7_@babel+core@7.20.12 + '@vue/babel-plugin-jsx': 1.1.1_@babel+core@7.20.12 + vite: 3.2.5_25ccpcpgpj6lg6lpj5keiqybuq vue: 3.2.45 transitivePeerDependencies: - supports-color dev: true - /@vitejs/plugin-vue/3.2.0_vite@3.2.4+vue@3.2.45: + /@vitejs/plugin-vue/3.2.0_vite@3.2.5+vue@3.2.45: resolution: {integrity: sha512-E0tnaL4fr+qkdCNxJ+Xd0yM31UwMkQje76fsDVBBUCoGOUPexu2VDUYHL8P4CwV+zMvWw6nlRw19OnRKmYAJpw==} engines: {node: ^14.18.0 || >=16.0.0} peerDependencies: vite: ^3.0.0 vue: ^3.2.25 dependencies: - vite: 3.2.4_sjdpriiyqai3ghwmd5e3ldppum + vite: 3.2.5_25ccpcpgpj6lg6lpj5keiqybuq vue: 3.2.45 dev: true - /@volar/language-core/1.0.9: - resolution: {integrity: sha512-5Fty3slLet6svXiJw2YxhYeo6c7wFdtILrql5bZymYLM+HbiZtJbryW1YnUEKAP7MO9Mbeh+TNH4Z0HFxHgIqw==} + /@volar/language-core/1.0.22: + resolution: {integrity: sha512-hiJeCOqxNdtG/04FRGLGI9H9DVz2l6cTqPDBzwqplHXAWfMxjzUaGUrn9sfTG7YMFNZUgK4EYxJnRfhqdtbSFQ==} dependencies: - '@volar/source-map': 1.0.9 - '@vue/reactivity': 3.2.45 + '@volar/source-map': 1.0.22 muggle-string: 0.1.0 dev: true - /@volar/source-map/1.0.9: - resolution: {integrity: sha512-fazB/vy5ZEJ3yKx4fabJyGNI3CBkdLkfEIRVu6+1P3VixK0Mn+eqyUIkLBrzGYaeFM3GybhCLCvsVdNz0Fu/CQ==} + /@volar/source-map/1.0.22: + resolution: {integrity: sha512-cv4gypHSP4MWVR82ed/+1IpI6794qAl0Q0+KJ+VGMVF8rVugsiF9QbyMCgjel9wNRsssQsazzsf6txOR9vHQiw==} dependencies: muggle-string: 0.1.0 dev: true - /@volar/typescript/1.0.9: - resolution: {integrity: sha512-dVziu+ShQUWuMukM6bvK2v2O446/gG6l1XkTh2vfkccw1IzjfbiP1TWQoNo1ipTfZOtu5YJGYAx+o5HNrGXWfQ==} + /@volar/typescript/1.0.22: + resolution: {integrity: sha512-VPyEicealSD4gqlE5/UQ1j3ietsO6Hfat40KtUEh/K+XEZ7h02b1KgFV64YEuBkBOaZ5hgvRW/WXKtQgXCl7Iw==} dependencies: - '@volar/language-core': 1.0.9 + '@volar/language-core': 1.0.22 dev: true - /@volar/vue-language-core/1.0.9: - resolution: {integrity: sha512-tofNoR8ShPFenHT1YVMuvoXtXWwoQE+fiXVqSmW0dSKZqEDjWQ3YeXSd0a6aqyKaIbvR7kWWGp34WbpQlwf9Ww==} + /@volar/vue-language-core/1.0.22: + resolution: {integrity: sha512-Ki0G/ZdBj2/GLw+/VVH3n9XR/JL6krMIth02EekFn6JV4PGN3mNxbvoh6lOPSDZLR6biOU5nJPnnjpKy8nuXhw==} dependencies: - '@volar/language-core': 1.0.9 - '@volar/source-map': 1.0.9 + '@volar/language-core': 1.0.22 + '@volar/source-map': 1.0.22 '@vue/compiler-dom': 3.2.45 '@vue/compiler-sfc': 3.2.45 '@vue/reactivity': 3.2.45 '@vue/shared': 3.2.45 - minimatch: 5.1.0 + minimatch: 5.1.2 vue-template-compiler: 2.7.14 dev: true - /@volar/vue-typescript/1.0.9: - resolution: {integrity: sha512-ZLe4y9YNbviACa7uAMCilzxA76gbbSlKfjspXBzk6fCobd8QCIig+VyDYcjANIlm2HhgSCX8jYTzhCKlegh4mw==} + /@volar/vue-typescript/1.0.22: + resolution: {integrity: sha512-2T1o5z86PAev31OMtVOv/qp4P3ZVl9ln/2KTmykQE8Fh4A5F+868MW4nf5J7XQ6RNyx7RH9LhzgjvbqJpAfiYw==} dependencies: - '@volar/typescript': 1.0.9 - '@volar/vue-language-core': 1.0.9 + '@volar/typescript': 1.0.22 + '@volar/vue-language-core': 1.0.22 dev: true /@vue/babel-helper-vue-transform-on/1.0.2: resolution: {integrity: sha512-hz4R8tS5jMn8lDq6iD+yWL6XNB699pGIVLk7WSJnn1dbpjaazsjZQkieJoRX6gW5zpYSCFqQ7jUquPNY65tQYA==} dev: true - /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.20.2: + /@vue/babel-plugin-jsx/1.1.1_@babel+core@7.20.12: resolution: {integrity: sha512-j2uVfZjnB5+zkcbc/zsOc0fSNGCMMjaEXP52wdwdIfn0qjFfEYpYZBFKFg+HHnQeJCVrjOeO0YxgaL7DMrym9w==} dependencies: '@babel/helper-module-imports': 7.18.6 - '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.2 - '@babel/template': 7.18.10 - '@babel/traverse': 7.20.1 - '@babel/types': 7.20.2 + '@babel/plugin-syntax-jsx': 7.18.6_@babel+core@7.20.12 + '@babel/template': 7.20.7 + '@babel/traverse': 7.20.12 + '@babel/types': 7.20.7 '@vue/babel-helper-vue-transform-on': 1.0.2 camelcase: 6.3.0 html-tags: 3.2.0 @@ -695,7 +708,7 @@ packages: /@vue/compiler-core/3.2.45: resolution: {integrity: sha512-rcMj7H+PYe5wBV3iYeUgbCglC+pbpN8hBLTJvRiK2eKQiWqu+fG9F+8sW99JdL4LQi7Re178UOxn09puSXvn4A==} dependencies: - '@babel/parser': 7.20.3 + '@babel/parser': 7.20.7 '@vue/shared': 3.2.45 estree-walker: 2.0.2 source-map: 0.6.1 @@ -709,7 +722,7 @@ packages: /@vue/compiler-sfc/3.2.45: resolution: {integrity: sha512-1jXDuWah1ggsnSAOGsec8cFjT/K6TMZ0sPL3o3d84Ft2AYZi2jWJgRMjw4iaK0rBfA89L5gw427H4n1RZQBu6Q==} dependencies: - '@babel/parser': 7.20.3 + '@babel/parser': 7.20.7 '@vue/compiler-core': 3.2.45 '@vue/compiler-dom': 3.2.45 '@vue/compiler-ssr': 3.2.45 @@ -717,7 +730,7 @@ packages: '@vue/shared': 3.2.45 estree-walker: 2.0.2 magic-string: 0.25.9 - postcss: 8.4.19 + postcss: 8.4.20 source-map: 0.6.1 /@vue/compiler-ssr/3.2.45: @@ -729,7 +742,7 @@ packages: /@vue/reactivity-transform/3.2.45: resolution: {integrity: sha512-BHVmzYAvM7vcU5WmuYqXpwaBHjsS8T63jlKGWVtHxAHIoMIlmaMyurUSEs1Zcg46M4AYT5MtB1U274/2aNzjJQ==} dependencies: - '@babel/parser': 7.20.3 + '@babel/parser': 7.20.7 '@vue/compiler-core': 3.2.45 '@vue/shared': 3.2.45 estree-walker: 2.0.2 @@ -833,26 +846,26 @@ packages: dependencies: '@ant-design/colors': 6.0.0 '@ant-design/icons-vue': 6.1.0_vue@3.2.45 - '@babel/runtime': 7.20.1 - '@ctrl/tinycolor': 3.4.1 + '@babel/runtime': 7.20.7 + '@ctrl/tinycolor': 3.5.0 '@simonwep/pickr': 1.8.2 array-tree-filter: 2.1.0 async-validator: 4.2.5 - dayjs: 1.11.6 + dayjs: 1.11.7 dom-align: 1.12.4 dom-scroll-into-view: 2.0.1 lodash: 4.17.21 lodash-es: 4.17.21 resize-observer-polyfill: 1.5.1 - scroll-into-view-if-needed: 2.2.29 + scroll-into-view-if-needed: 2.2.31 shallow-equal: 1.2.1 vue: 3.2.45 vue-types: 3.0.2_vue@3.2.45 warning: 4.0.3 dev: false - /anymatch/3.1.2: - resolution: {integrity: sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==} + /anymatch/3.1.3: + resolution: {integrity: sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==} engines: {node: '>= 8'} dependencies: normalize-path: 3.0.0 @@ -898,8 +911,8 @@ packages: /asynckit/0.4.0: resolution: {integrity: sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==} - /axios/1.1.3: - resolution: {integrity: sha512-00tXVRwKx/FZr/IDVFt4C+f9FYairX517WoGCL6dpOntqLkZofjhu43F/Xl44UOpqa+9sLFDrG/XAnFsUYgkDA==} + /axios/1.2.2: + resolution: {integrity: sha512-bz/J4gS2S3I7mpN/YZfGFTqhXTYzRho8Ay38w2otuuDR322KzFIWm/4W2K6gIwvWaws5n+mnb7D1lN9uD+QH6Q==} dependencies: follow-redirects: 1.15.2 form-data: 4.0.0 @@ -959,9 +972,9 @@ packages: engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} hasBin: true dependencies: - caniuse-lite: 1.0.30001431 + caniuse-lite: 1.0.30001441 electron-to-chromium: 1.4.284 - node-releases: 2.0.6 + node-releases: 2.0.8 update-browserslist-db: 1.0.10_browserslist@4.21.4 dev: true @@ -1021,7 +1034,7 @@ packages: glob: 8.0.3 infer-owner: 1.0.4 lru-cache: 7.14.1 - minipass: 3.3.4 + minipass: 3.3.6 minipass-collect: 1.0.2 minipass-flush: 1.0.5 minipass-pipeline: 1.2.4 @@ -1030,7 +1043,7 @@ packages: promise-inflight: 1.0.1 rimraf: 3.0.2 ssri: 9.0.1 - tar: 6.1.12 + tar: 6.1.13 unique-filename: 2.0.1 transitivePeerDependencies: - bluebird @@ -1058,8 +1071,8 @@ packages: engines: {node: '>=10'} dev: true - /caniuse-lite/1.0.30001431: - resolution: {integrity: sha512-zBUoFU0ZcxpvSt9IU66dXVT/3ctO1cy4y9cscs1szkPlcWb6pasYM144GqrUygUbT+k7cmUCW61cvskjcv0enQ==} + /caniuse-lite/1.0.30001441: + resolution: {integrity: sha512-OyxRR4Vof59I3yGWXws6i908EtGbMzVUi3ganaZQHmydk1iwDhRnvaPG2WaR0KcqrDFKrxVZHULT396LEPhXfg==} dev: true /chalk/2.4.2: @@ -1071,16 +1084,18 @@ packages: supports-color: 5.5.0 dev: true - /chart.js/4.0.1: - resolution: {integrity: sha512-5/8/9eBivwBZK81mKvmIwTb2Pmw4D/5h1RK9fBWZLLZ8mCJ+kfYNmV9rMrGoa5Hgy2/wVDBMLSUDudul2/9ihA==} + /chart.js/4.1.1: + resolution: {integrity: sha512-P0pCosNXp+LR8zO/QTkZKT6Hb7p0DPFtypEeVOf+6x06hX13NIb75R0DXUA4Ksx/+48chDQKtCCmRCviQRTqsA==} engines: {pnpm: ^7.0.0} + dependencies: + '@kurkle/color': 0.3.1 dev: false /chokidar/3.5.3: resolution: {integrity: sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==} engines: {node: '>= 8.10.0'} dependencies: - anymatch: 3.1.2 + anymatch: 3.1.3 braces: 3.0.2 glob-parent: 5.1.2 is-binary-path: 2.1.0 @@ -1167,8 +1182,8 @@ packages: resolution: {integrity: sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==} dev: true - /compressing/1.6.2: - resolution: {integrity: sha512-1HK+eK//Tx45n2kuVCl2ITDMZD2JkZAolOYyJrV260lUnq1rPt4d+6L6OvwRFLqAt5aR0vAtGGGiJNmTxqff/g==} + /compressing/1.6.3: + resolution: {integrity: sha512-BPkE937R8kXT1k55PgnVgMpCAs4Ws5ZgROx+qZEaYIi0tA4nvB9s5HAX/YH5suYp9njGGJOKEAOHhB3OQ5/IJA==} engines: {node: '>= 4.0.0'} dependencies: flushwritable: 1.0.0 @@ -1182,8 +1197,8 @@ packages: yazl: 2.5.1 dev: true - /compute-scroll-into-view/1.0.17: - resolution: {integrity: sha512-j4dx+Fb0URmzbwwMUrhqWM2BEWHdFGx+qZ9qqASHRPqvTYdqvWnHg0H1hIbcyLnvgnoNAVMlwkepyqM3DaIFUg==} + /compute-scroll-into-view/1.0.20: + resolution: {integrity: sha512-UCB0ioiyj8CRjtrvaceBLqqhZCVP+1B8+NWQhmdsm0VXOJtobBCf1dBQmebCCo34qZmUwZfIH2MZLqNHazrfjg==} dev: false /concat-map/0.0.1: @@ -1214,8 +1229,8 @@ packages: is-what: 3.14.1 dev: true - /core-js/3.26.1: - resolution: {integrity: sha512-21491RRQVzUn0GGM9Z1Jrpr6PNPxPi+Za8OM9q4tksTSnlbXXGKK1nXNg/QvwFYettXvSX6zWKCtHHfjN4puyA==} + /core-js/3.27.1: + resolution: {integrity: sha512-GutwJLBChfGCpwwhbYoqfv03LAfmiz7e7D/BNxzeMxwQf10GRSzqiOjx7AmtEk+heiD/JWmBuyBPgFtx0Sg1ww==} requiresBuild: true /core-util-is/1.0.3: @@ -1229,8 +1244,8 @@ packages: /csstype/2.6.21: resolution: {integrity: sha512-Z1PhmomIfypOpoMjRQB70jfvy/wxT50qW08YXO5lMIJkrdq4yOTR+AW7FqutScmB9NkLwxo+jU+kZLbofZZq/w==} - /dayjs/1.11.6: - resolution: {integrity: sha512-zZbY5giJAinCG+7AGaw0wIhNZ6J8AhWuSXKvuc1KAyMiRsvGQWqh4L+MomvhdAYjN+lqvVCMq1I41e3YHvXkyQ==} + /dayjs/1.11.7: + resolution: {integrity: sha512-+Yw9U6YO5TQohxLcIkrXBeY73WP3ejHWVvx8XCk3gxvQDCTEmS48ZrSZCKciI7Bhl/uCMyxYtE9UqRILmFphkQ==} dev: false /de-indent/1.0.2: @@ -1372,8 +1387,8 @@ packages: is-arrayish: 0.2.1 dev: true - /esbuild-android-64/0.15.14: - resolution: {integrity: sha512-HuilVIb4rk9abT4U6bcFdU35UHOzcWVGLSjEmC58OVr96q5UiRqzDtWjPlCMugjhgUGKEs8Zf4ueIvYbOStbIg==} + /esbuild-android-64/0.15.18: + resolution: {integrity: sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==} engines: {node: '>=12'} cpu: [x64] os: [android] @@ -1381,8 +1396,8 @@ packages: dev: true optional: true - /esbuild-android-arm64/0.15.14: - resolution: {integrity: sha512-/QnxRVxsR2Vtf3XottAHj7hENAMW2wCs6S+OZcAbc/8nlhbAL/bCQRCVD78VtI5mdwqWkVi3wMqM94kScQCgqg==} + /esbuild-android-arm64/0.15.18: + resolution: {integrity: sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==} engines: {node: '>=12'} cpu: [arm64] os: [android] @@ -1390,8 +1405,8 @@ packages: dev: true optional: true - /esbuild-darwin-64/0.15.14: - resolution: {integrity: sha512-ToNuf1uifu8hhwWvoZJGCdLIX/1zpo8cOGnT0XAhDQXiKOKYaotVNx7pOVB1f+wHoWwTLInrOmh3EmA7Fd+8Vg==} + /esbuild-darwin-64/0.15.18: + resolution: {integrity: sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==} engines: {node: '>=12'} cpu: [x64] os: [darwin] @@ -1399,8 +1414,8 @@ packages: dev: true optional: true - /esbuild-darwin-arm64/0.15.14: - resolution: {integrity: sha512-KgGP+y77GszfYJgceO0Wi/PiRtYo5y2Xo9rhBUpxTPaBgWDJ14gqYN0+NMbu+qC2fykxXaipHxN4Scaj9tUS1A==} + /esbuild-darwin-arm64/0.15.18: + resolution: {integrity: sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==} engines: {node: '>=12'} cpu: [arm64] os: [darwin] @@ -1408,8 +1423,8 @@ packages: dev: true optional: true - /esbuild-freebsd-64/0.15.14: - resolution: {integrity: sha512-xr0E2n5lyWw3uFSwwUXHc0EcaBDtsal/iIfLioflHdhAe10KSctV978Te7YsfnsMKzcoGeS366+tqbCXdqDHQA==} + /esbuild-freebsd-64/0.15.18: + resolution: {integrity: sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==} engines: {node: '>=12'} cpu: [x64] os: [freebsd] @@ -1417,8 +1432,8 @@ packages: dev: true optional: true - /esbuild-freebsd-arm64/0.15.14: - resolution: {integrity: sha512-8XH96sOQ4b1LhMlO10eEWOjEngmZ2oyw3pW4o8kvBcpF6pULr56eeYVP5radtgw54g3T8nKHDHYEI5AItvskZg==} + /esbuild-freebsd-arm64/0.15.18: + resolution: {integrity: sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==} engines: {node: '>=12'} cpu: [arm64] os: [freebsd] @@ -1426,8 +1441,8 @@ packages: dev: true optional: true - /esbuild-linux-32/0.15.14: - resolution: {integrity: sha512-6ssnvwaTAi8AzKN8By2V0nS+WF5jTP7SfuK6sStGnDP7MCJo/4zHgM9oE1eQTS2jPmo3D673rckuCzRlig+HMA==} + /esbuild-linux-32/0.15.18: + resolution: {integrity: sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==} engines: {node: '>=12'} cpu: [ia32] os: [linux] @@ -1435,8 +1450,8 @@ packages: dev: true optional: true - /esbuild-linux-64/0.15.14: - resolution: {integrity: sha512-ONySx3U0wAJOJuxGUlXBWxVKFVpWv88JEv0NZ6NlHknmDd1yCbf4AEdClSgLrqKQDXYywmw4gYDvdLsS6z0hcw==} + /esbuild-linux-64/0.15.18: + resolution: {integrity: sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==} engines: {node: '>=12'} cpu: [x64] os: [linux] @@ -1444,8 +1459,8 @@ packages: dev: true optional: true - /esbuild-linux-arm/0.15.14: - resolution: {integrity: sha512-D2LImAIV3QzL7lHURyCHBkycVFbKwkDb1XEUWan+2fb4qfW7qAeUtul7ZIcIwFKZgPcl+6gKZmvLgPSj26RQ2Q==} + /esbuild-linux-arm/0.15.18: + resolution: {integrity: sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==} engines: {node: '>=12'} cpu: [arm] os: [linux] @@ -1453,8 +1468,8 @@ packages: dev: true optional: true - /esbuild-linux-arm64/0.15.14: - resolution: {integrity: sha512-kle2Ov6a1e5AjlHlMQl1e+c4myGTeggrRzArQFmWp6O6JoqqB9hT+B28EW4tjFWgV/NxUq46pWYpgaWXsXRPAg==} + /esbuild-linux-arm64/0.15.18: + resolution: {integrity: sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==} engines: {node: '>=12'} cpu: [arm64] os: [linux] @@ -1462,8 +1477,8 @@ packages: dev: true optional: true - /esbuild-linux-mips64le/0.15.14: - resolution: {integrity: sha512-FVdMYIzOLXUq+OE7XYKesuEAqZhmAIV6qOoYahvUp93oXy0MOVTP370ECbPfGXXUdlvc0TNgkJa3YhEwyZ6MRA==} + /esbuild-linux-mips64le/0.15.18: + resolution: {integrity: sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==} engines: {node: '>=12'} cpu: [mips64el] os: [linux] @@ -1471,8 +1486,8 @@ packages: dev: true optional: true - /esbuild-linux-ppc64le/0.15.14: - resolution: {integrity: sha512-2NzH+iuzMDA+jjtPjuIz/OhRDf8tzbQ1tRZJI//aT25o1HKc0reMMXxKIYq/8nSHXiJSnYV4ODzTiv45s+h73w==} + /esbuild-linux-ppc64le/0.15.18: + resolution: {integrity: sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==} engines: {node: '>=12'} cpu: [ppc64] os: [linux] @@ -1480,8 +1495,8 @@ packages: dev: true optional: true - /esbuild-linux-riscv64/0.15.14: - resolution: {integrity: sha512-VqxvutZNlQxmUNS7Ac+aczttLEoHBJ9e3OYGqnULrfipRvG97qLrAv9EUY9iSrRKBqeEbSvS9bSfstZqwz0T4Q==} + /esbuild-linux-riscv64/0.15.18: + resolution: {integrity: sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==} engines: {node: '>=12'} cpu: [riscv64] os: [linux] @@ -1489,8 +1504,8 @@ packages: dev: true optional: true - /esbuild-linux-s390x/0.15.14: - resolution: {integrity: sha512-+KVHEUshX5n6VP6Vp/AKv9fZIl5kr2ph8EUFmQUJnDpHwcfTSn2AQgYYm0HTBR2Mr4d0Wlr0FxF/Cs5pbFgiOw==} + /esbuild-linux-s390x/0.15.18: + resolution: {integrity: sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==} engines: {node: '>=12'} cpu: [s390x] os: [linux] @@ -1498,8 +1513,8 @@ packages: dev: true optional: true - /esbuild-netbsd-64/0.15.14: - resolution: {integrity: sha512-6D/dr17piEgevIm1xJfZP2SjB9Z+g8ERhNnBdlZPBWZl+KSPUKLGF13AbvC+nzGh8IxOH2TyTIdRMvKMP0nEzQ==} + /esbuild-netbsd-64/0.15.18: + resolution: {integrity: sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==} engines: {node: '>=12'} cpu: [x64] os: [netbsd] @@ -1507,8 +1522,8 @@ packages: dev: true optional: true - /esbuild-openbsd-64/0.15.14: - resolution: {integrity: sha512-rREQBIlMibBetgr2E9Lywt2Qxv2ZdpmYahR4IUlAQ1Efv/A5gYdO0/VIN3iowDbCNTLxp0bb57Vf0LFcffD6kA==} + /esbuild-openbsd-64/0.15.18: + resolution: {integrity: sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==} engines: {node: '>=12'} cpu: [x64] os: [openbsd] @@ -1516,8 +1531,8 @@ packages: dev: true optional: true - /esbuild-sunos-64/0.15.14: - resolution: {integrity: sha512-DNVjSp/BY4IfwtdUAvWGIDaIjJXY5KI4uD82+15v6k/w7px9dnaDaJJ2R6Mu+KCgr5oklmFc0KjBjh311Gxl9Q==} + /esbuild-sunos-64/0.15.18: + resolution: {integrity: sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==} engines: {node: '>=12'} cpu: [x64] os: [sunos] @@ -1525,8 +1540,8 @@ packages: dev: true optional: true - /esbuild-windows-32/0.15.14: - resolution: {integrity: sha512-pHBWrcA+/oLgvViuG9FO3kNPO635gkoVrRQwe6ZY1S0jdET07xe2toUvQoJQ8KT3/OkxqUasIty5hpuKFLD+eg==} + /esbuild-windows-32/0.15.18: + resolution: {integrity: sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==} engines: {node: '>=12'} cpu: [ia32] os: [win32] @@ -1534,8 +1549,8 @@ packages: dev: true optional: true - /esbuild-windows-64/0.15.14: - resolution: {integrity: sha512-CszIGQVk/P8FOS5UgAH4hKc9zOaFo69fe+k1rqgBHx3CSK3Opyk5lwYriIamaWOVjBt7IwEP6NALz+tkVWdFog==} + /esbuild-windows-64/0.15.18: + resolution: {integrity: sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==} engines: {node: '>=12'} cpu: [x64] os: [win32] @@ -1543,8 +1558,8 @@ packages: dev: true optional: true - /esbuild-windows-arm64/0.15.14: - resolution: {integrity: sha512-KW9W4psdZceaS9A7Jsgl4WialOznSURvqX/oHZk3gOP7KbjtHLSsnmSvNdzagGJfxbAe30UVGXRe8q8nDsOSQw==} + /esbuild-windows-arm64/0.15.18: + resolution: {integrity: sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==} engines: {node: '>=12'} cpu: [arm64] os: [win32] @@ -1552,34 +1567,34 @@ packages: dev: true optional: true - /esbuild/0.15.14: - resolution: {integrity: sha512-pJN8j42fvWLFWwSMG4luuupl2Me7mxciUOsMegKvwCmhEbJ2covUdFnihxm0FMIBV+cbwbtMoHgMCCI+pj1btQ==} + /esbuild/0.15.18: + resolution: {integrity: sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==} engines: {node: '>=12'} hasBin: true requiresBuild: true optionalDependencies: - '@esbuild/android-arm': 0.15.14 - '@esbuild/linux-loong64': 0.15.14 - esbuild-android-64: 0.15.14 - esbuild-android-arm64: 0.15.14 - esbuild-darwin-64: 0.15.14 - esbuild-darwin-arm64: 0.15.14 - esbuild-freebsd-64: 0.15.14 - esbuild-freebsd-arm64: 0.15.14 - esbuild-linux-32: 0.15.14 - esbuild-linux-64: 0.15.14 - esbuild-linux-arm: 0.15.14 - esbuild-linux-arm64: 0.15.14 - esbuild-linux-mips64le: 0.15.14 - esbuild-linux-ppc64le: 0.15.14 - esbuild-linux-riscv64: 0.15.14 - esbuild-linux-s390x: 0.15.14 - esbuild-netbsd-64: 0.15.14 - esbuild-openbsd-64: 0.15.14 - esbuild-sunos-64: 0.15.14 - esbuild-windows-32: 0.15.14 - esbuild-windows-64: 0.15.14 - esbuild-windows-arm64: 0.15.14 + '@esbuild/android-arm': 0.15.18 + '@esbuild/linux-loong64': 0.15.18 + esbuild-android-64: 0.15.18 + esbuild-android-arm64: 0.15.18 + esbuild-darwin-64: 0.15.18 + esbuild-darwin-arm64: 0.15.18 + esbuild-freebsd-64: 0.15.18 + esbuild-freebsd-arm64: 0.15.18 + esbuild-linux-32: 0.15.18 + esbuild-linux-64: 0.15.18 + esbuild-linux-arm: 0.15.18 + esbuild-linux-arm64: 0.15.18 + esbuild-linux-mips64le: 0.15.18 + esbuild-linux-ppc64le: 0.15.18 + esbuild-linux-riscv64: 0.15.18 + esbuild-linux-s390x: 0.15.18 + esbuild-netbsd-64: 0.15.18 + esbuild-openbsd-64: 0.15.18 + esbuild-sunos-64: 0.15.18 + esbuild-windows-32: 0.15.18 + esbuild-windows-64: 0.15.18 + esbuild-windows-arm64: 0.15.18 dev: true /escalade/3.1.1: @@ -1617,8 +1632,8 @@ packages: strnum: 1.0.5 dev: true - /fastq/1.13.0: - resolution: {integrity: sha512-YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw==} + /fastq/1.15.0: + resolution: {integrity: sha512-wBrocU2LCXXa+lWBt8RoIRD89Fi8OdABODa/kEnyeyjS5aZO5/GNvI5sEINADqP/h8M29UHTHUb53sUu5Ihqdw==} dependencies: reusify: 1.0.4 dev: true @@ -1732,7 +1747,7 @@ packages: resolution: {integrity: sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==} engines: {node: '>= 8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true /fs-mkdirp-stream/1.0.0: @@ -1843,7 +1858,7 @@ packages: fs.realpath: 1.0.0 inflight: 1.0.6 inherits: 2.0.4 - minimatch: 5.1.0 + minimatch: 5.1.2 once: 1.4.0 dev: true @@ -2148,8 +2163,8 @@ packages: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} dev: true - /json5/2.2.1: - resolution: {integrity: sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA==} + /json5/2.2.3: + resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} engines: {node: '>=6'} hasBin: true dev: true @@ -2231,6 +2246,12 @@ packages: js-tokens: 4.0.0 dev: false + /lru-cache/5.1.1: + resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} + dependencies: + yallist: 3.1.1 + dev: true + /lru-cache/6.0.0: resolution: {integrity: sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==} engines: {node: '>=10'} @@ -2260,6 +2281,13 @@ packages: sourcemap-codec: 1.4.8 dev: true + /magic-string/0.27.0: + resolution: {integrity: sha512-8UnnX2PeRAPZuN12svgR9j7M1uWMovg/CEnIwIG0LFkXSJJe4PdfUGiTGl8V9bsBHFUtfVINcSyYxd7q+kx9fA==} + engines: {node: '>=12'} + dependencies: + '@jridgewell/sourcemap-codec': 1.4.14 + dev: true + /make-dir/2.1.0: resolution: {integrity: sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==} engines: {node: '>=6'} @@ -2285,7 +2313,7 @@ packages: https-proxy-agent: 5.0.1 is-lambda: 1.0.1 lru-cache: 7.14.1 - minipass: 3.3.4 + minipass: 3.3.6 minipass-collect: 1.0.2 minipass-fetch: 2.1.2 minipass-flush: 1.0.5 @@ -2369,8 +2397,8 @@ packages: brace-expansion: 1.1.11 dev: true - /minimatch/5.1.0: - resolution: {integrity: sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==} + /minimatch/5.1.2: + resolution: {integrity: sha512-bNH9mmM9qsJ2X4r2Nat1B//1dJVcn3+iBLa3IgqJ7EbGaDNepL9QSHOxN4ng33s52VMMhhIfgCYDk3C4ZmlDAg==} engines: {node: '>=10'} dependencies: brace-expansion: 2.0.1 @@ -2393,14 +2421,14 @@ packages: resolution: {integrity: sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==} engines: {node: '>= 8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true /minipass-fetch/2.1.2: resolution: {integrity: sha512-LT49Zi2/WMROHYoqGgdlQIZh8mLPZmOrN2NdJjMXxYe4nkN6FUyuPuOAOedNJDrx0IRGg9+4guZewtp8hE6TxA==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 minipass-sized: 1.0.3 minizlib: 2.1.2 optionalDependencies: @@ -2411,25 +2439,32 @@ packages: resolution: {integrity: sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==} engines: {node: '>= 8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true /minipass-pipeline/1.2.4: resolution: {integrity: sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==} engines: {node: '>=8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true /minipass-sized/1.0.3: resolution: {integrity: sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==} engines: {node: '>=8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true - /minipass/3.3.4: - resolution: {integrity: sha512-I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw==} + /minipass/3.3.6: + resolution: {integrity: sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==} + engines: {node: '>=8'} + dependencies: + yallist: 4.0.0 + dev: true + + /minipass/4.0.0: + resolution: {integrity: sha512-g2Uuh2jEKoht+zvO6vJqXmYpflPqzRBT+Th2h01DKh5z7wbY/AZ2gCQ78cP70YoHPyFdY30YBV5WxgLOEwOykw==} engines: {node: '>=8'} dependencies: yallist: 4.0.0 @@ -2439,7 +2474,7 @@ packages: resolution: {integrity: sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==} engines: {node: '>= 8'} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 yallist: 4.0.0 dev: true @@ -2468,8 +2503,8 @@ packages: resolution: {integrity: sha512-Tr1knR3d2mKvvWthlk7202rywKbiOm4rVFLsfAaSIhJ6dt9o47W4S+JMtWhd/PW9Wrdew2/S2fSvhz3E2gkfEg==} dev: true - /mutate-animate/1.0.0: - resolution: {integrity: sha512-Vt6zDunYjunQAJQ8mXTnamjbubWOM/hM0W+umvJKOvFP6klRAJPHO5R1XUKqEe2/mM9QM+aUfKb2q8Z0Ybwj/A==} + /mutate-animate/1.0.2: + resolution: {integrity: sha512-uWcaOOVORL1x4dQil3Bhm53XqfbHj0rbso1OCxp1VluUcUFbKZbEVsEOj++PIMHorXfGu9DMK5G9DZCQy5RMMw==} dev: false /nan/2.17.0: @@ -2504,9 +2539,9 @@ packages: engines: {node: '>= 0.6'} dev: true - /node-gyp/9.3.0: - resolution: {integrity: sha512-A6rJWfXFz7TQNjpldJ915WFb1LnhO4lIve3ANPbWreuEoLoKlFT3sxIepPBkLhM27crW8YmN+pjlgbasH6cH/Q==} - engines: {node: ^12.22 || ^14.13 || >=16} + /node-gyp/9.3.1: + resolution: {integrity: sha512-4Q16ZCqq3g8awk6UplT7AuxQ35XN4R/yf/+wSAwcBUAjg7l58RTactWaP8fIDTi0FzI7YcVLujwExakZlfWkXg==} + engines: {node: ^12.13 || ^14.13 || >=16} hasBin: true dependencies: env-paths: 2.2.1 @@ -2517,15 +2552,15 @@ packages: npmlog: 6.0.2 rimraf: 3.0.2 semver: 7.3.8 - tar: 6.1.12 + tar: 6.1.13 which: 2.0.2 transitivePeerDependencies: - bluebird - supports-color dev: true - /node-releases/2.0.6: - resolution: {integrity: sha512-PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg==} + /node-releases/2.0.8: + resolution: {integrity: sha512-dFSmB8fFHEH/s81Xi+Y/15DQY6VHW81nXRj86EMSL3lmuTmK1e+aT4wrFCkTbm+gSwkw4KpX+rT/pMM2c1mF+A==} dev: true /nopt/6.0.0: @@ -2678,8 +2713,8 @@ packages: dev: true optional: true - /postcss/8.4.19: - resolution: {integrity: sha512-h+pbPsyhlYj6N2ozBmHhHrs9DzGmbaarbLvWipMRO7RLS+v4onj26MPFXA5OBYFxyqYhUJK456SwDcY9H2/zsA==} + /postcss/8.4.20: + resolution: {integrity: sha512-6Q04AXR1212bXr5fh03u8aAwbLxAQNGQ/Q1LNa0VfOI06ZAlhPHtQvE4OIdpj4kLThXilalPnmDSOD65DcHt+g==} engines: {node: ^10 || ^12 || >=14} dependencies: nanoid: 3.3.4 @@ -2909,10 +2944,10 @@ packages: dev: true optional: true - /scroll-into-view-if-needed/2.2.29: - resolution: {integrity: sha512-hxpAR6AN+Gh53AdAimHM6C8oTN1ppwVZITihix+WqalywBeFcQ6LdQP5ABNl26nX8GTEL7VT+b8lKpdqq65wXg==} + /scroll-into-view-if-needed/2.2.31: + resolution: {integrity: sha512-dGCXy99wZQivjmjIqihaBQNjryrz5rueJY7eHfTdyWEiR4ttYpsajb14rn9s5d4DY4EcY6+4+U/maARBXJedkA==} dependencies: - compute-scroll-into-view: 1.0.17 + compute-scroll-into-view: 1.0.20 dev: false /semver/5.7.1: @@ -2987,6 +3022,7 @@ packages: /sourcemap-codec/1.4.8: resolution: {integrity: sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==} + deprecated: Please use @jridgewell/sourcemap-codec instead /spdx-correct/3.1.1: resolution: {integrity: sha512-cOYcUWwhCuHCXi49RhFRCyJEK3iPj1Ziz9DpViV3tbZOwXD49QzIN3MpOLJNxh2qwq2lJJZaKMVw9qNi4jTC0w==} @@ -3014,7 +3050,7 @@ packages: resolution: {integrity: sha512-o57Wcn66jMQvfHG1FlYbWeZWW/dHZhJXjpIcTfXldXEk5nz5lStPo3mK0OJQfGR3RbZUlbISexbljkJzuEj/8Q==} engines: {node: ^12.13.0 || ^14.15.0 || >=16.0.0} dependencies: - minipass: 3.3.4 + minipass: 3.3.6 dev: true /stream-combiner/0.2.2: @@ -3105,20 +3141,20 @@ packages: xtend: 4.0.2 dev: true - /tar/6.1.12: - resolution: {integrity: sha512-jU4TdemS31uABHd+Lt5WEYJuzn+TJTCBLljvIAHZOz6M9Os5pJ4dD+vRFLxPa/n3T0iEFzpi+0x1UfuDZYbRMw==} + /tar/6.1.13: + resolution: {integrity: sha512-jdIBIN6LTIe2jqzay/2vtYLlBHa3JF42ot3h1dW8Q0PaAG4v8rm0cvpVePtau5C6OKXGGcgO9q2AMNSWxiLqKw==} engines: {node: '>=10'} dependencies: chownr: 2.0.0 fs-minipass: 2.1.0 - minipass: 3.3.4 + minipass: 4.0.0 minizlib: 2.1.2 mkdirp: 1.0.4 yallist: 4.0.0 dev: true - /terser/5.15.1: - resolution: {integrity: sha512-K1faMUvpm/FBxjBXud0LWVAGxmvoPbZbfTCYbSgaaYQaIXI3/TdI7a7ZGA73Zrou6Q8Zmz3oeUTsp/dj+ag2Xw==} + /terser/5.16.1: + resolution: {integrity: sha512-xvQfyfA1ayT0qdK47zskQgRZeWLoOQ8JQ6mIgRGVNwZKdQMU+5FkCBjmv4QjcrTzyZquRw2FVtlJSRUmMKQslw==} engines: {node: '>=10'} hasBin: true dependencies: @@ -3187,7 +3223,7 @@ packages: engines: {node: '>=12'} dev: true - /ts-node/10.9.1_wup25etrarvlqkprac7h35hj7u: + /ts-node/10.9.1_awa2wsr5thmg3i7jqycphctjfq: resolution: {integrity: sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==} hasBin: true peerDependencies: @@ -3206,14 +3242,14 @@ packages: '@tsconfig/node12': 1.0.11 '@tsconfig/node14': 1.0.3 '@tsconfig/node16': 1.0.3 - '@types/node': 18.11.9 + '@types/node': 18.11.18 acorn: 8.8.1 acorn-walk: 8.2.0 arg: 4.1.3 create-require: 1.1.1 diff: 4.0.2 make-error: 1.3.6 - typescript: 4.9.3 + typescript: 4.9.4 v8-compile-cache-lib: 3.0.1 yn: 3.1.1 dev: true @@ -3231,7 +3267,7 @@ packages: bindings: 1.5.0 bufferstreams: 3.0.0 nan: 2.17.0 - node-gyp: 9.3.0 + node-gyp: 9.3.1 transitivePeerDependencies: - bluebird - supports-color @@ -3246,8 +3282,8 @@ packages: resolution: {integrity: sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA==} dev: true - /typescript/4.9.3: - resolution: {integrity: sha512-CIfGzTelbKNEnLpLdGFgdyKhG23CKdKgQPOBc+OUNrkJ2vr+KSzsSV5kq5iWhEQbok+quxgGzrAtGWCyU7tHnA==} + /typescript/4.9.4: + resolution: {integrity: sha512-Uz+dTXYzxXXbsFpM86Wh3dKCxrQqUcVMxwU54orwlJjOpO3ao8L7j5lH+dWfTwgCwIuM9GQ2kvVotzYJMXTBZg==} engines: {node: '>=4.2.0'} hasBin: true dev: true @@ -3283,8 +3319,8 @@ packages: engines: {node: '>= 10.0.0'} dev: true - /unplugin-vue-components/0.22.9_vue@3.2.45: - resolution: {integrity: sha512-qBvooq3EgpjtYicxeccRUGUBBQCCw9rJ0kHPZPOSJd8TBZViSv86vuKLTRDHPyjWtclwOIkVStZJfPdJFhYUMw==} + /unplugin-vue-components/0.22.12_vue@3.2.45: + resolution: {integrity: sha512-FxyzsuBvMCYPIk+8cgscGBQ345tvwVu+qY5IhE++eorkyvA4Z1TiD/HCiim+Kbqozl10i4K+z+NCa2WO2jexRA==} engines: {node: '>=14'} peerDependencies: '@babel/parser': ^7.15.8 @@ -3293,29 +3329,29 @@ packages: '@babel/parser': optional: true dependencies: - '@antfu/utils': 0.6.3 + '@antfu/utils': 0.7.2 '@rollup/pluginutils': 5.0.2 chokidar: 3.5.3 debug: 4.3.4 fast-glob: 3.2.12 local-pkg: 0.4.2 - magic-string: 0.26.7 - minimatch: 5.1.0 + magic-string: 0.27.0 + minimatch: 5.1.2 resolve: 1.22.1 - unplugin: 0.10.2 + unplugin: 1.0.1 vue: 3.2.45 transitivePeerDependencies: - rollup - supports-color dev: true - /unplugin/0.10.2: - resolution: {integrity: sha512-6rk7GUa4ICYjae5PrAllvcDeuT8pA9+j5J5EkxbMFaV+SalHhxZ7X2dohMzu6C3XzsMT+6jwR/+pwPNR3uK9MA==} + /unplugin/1.0.1: + resolution: {integrity: sha512-aqrHaVBWW1JVKBHmGo33T5TxeL0qWzfvjWokObHA9bYmN7eNDkwOxmLjhioHl9878qDFMAaT51XNroRyuz7WxA==} dependencies: acorn: 8.8.1 chokidar: 3.5.3 webpack-sources: 3.2.3 - webpack-virtual-modules: 0.4.6 + webpack-virtual-modules: 0.5.0 dev: true /update-browserslist-db/1.0.10_browserslist@4.21.4: @@ -3411,8 +3447,8 @@ packages: replace-ext: 1.0.1 dev: true - /vite/3.2.4_sjdpriiyqai3ghwmd5e3ldppum: - resolution: {integrity: sha512-Z2X6SRAffOUYTa+sLy3NQ7nlHFU100xwanq1WDwqaiFiCe+25zdxP1TfCS5ojPV2oDDcXudHIoPnI1Z/66B7Yw==} + /vite/3.2.5_25ccpcpgpj6lg6lpj5keiqybuq: + resolution: {integrity: sha512-4mVEpXpSOgrssFZAOmGIr85wPHKvaDAcXqxVxVRZhljkJOMZi1ibLibzjLHzJvcok8BMguLc7g1W6W/GqZbLdQ==} engines: {node: ^14.18.0 || >=16.0.0} hasBin: true peerDependencies: @@ -3436,13 +3472,13 @@ packages: terser: optional: true dependencies: - '@types/node': 18.11.9 - esbuild: 0.15.14 + '@types/node': 18.11.18 + esbuild: 0.15.18 less: 4.1.3 - postcss: 8.4.19 + postcss: 8.4.20 resolve: 1.22.1 rollup: 2.79.1 - terser: 5.15.1 + terser: 5.16.1 optionalDependencies: fsevents: 2.3.2 dev: true @@ -3454,15 +3490,15 @@ packages: he: 1.2.0 dev: true - /vue-tsc/1.0.9_typescript@4.9.3: - resolution: {integrity: sha512-vRmHD1K6DmBymNhoHjQy/aYKTRQNLGOu2/ESasChG9Vy113K6CdP0NlhR0bzgFJfv2eFB9Ez/9L5kIciUajBxQ==} + /vue-tsc/1.0.22_typescript@4.9.4: + resolution: {integrity: sha512-xSxwgWR3czhv7sLKHWu6lzj9Xq6AtsCURVL45AY4TLGFszv2L2YlMgygXvqslyCM5bz9cyoIKSaZnzHqHTHjzA==} hasBin: true peerDependencies: typescript: '*' dependencies: - '@volar/vue-language-core': 1.0.9 - '@volar/vue-typescript': 1.0.9 - typescript: 4.9.3 + '@volar/vue-language-core': 1.0.22 + '@volar/vue-typescript': 1.0.22 + typescript: 4.9.4 dev: true /vue-types/3.0.2_vue@3.2.45: @@ -3495,8 +3531,8 @@ packages: engines: {node: '>=10.13.0'} dev: true - /webpack-virtual-modules/0.4.6: - resolution: {integrity: sha512-5tyDlKLqPfMqjT3Q9TAqf2YqjwmnUleZwzJi1A5qXnlBCdj2AtOJ6wAWdglTIDOPgOiOrXeBeFcsQ8+aGQ6QbA==} + /webpack-virtual-modules/0.5.0: + resolution: {integrity: sha512-kyDivFZ7ZM0BVOUteVbDFhlRt7Ah/CSPwJdi8hBpkK7QLumUqdLtVfm/PX/hkcnrvr0i77fO5+TjZ94Pe+C9iw==} dev: true /which/2.0.2: @@ -3522,6 +3558,10 @@ packages: engines: {node: '>=0.4'} dev: true + /yallist/3.1.1: + resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} + dev: true + /yallist/4.0.0: resolution: {integrity: sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==} dev: true diff --git a/public/libs/actions.js b/public/libs/actions.js index 0598622..9f034c4 100644 --- a/public/libs/actions.js +++ b/public/libs/actions.js @@ -1495,7 +1495,8 @@ actions.prototype._clickViewMaps = function (x, y, px, py) { while ( index < core.floorIds.length && index != now && - core.status.maps[core.floorIds[index]].cannotViewMap + (core.status.maps[core.floorIds[index]].cannotViewMap || + core.status.maps[core.floorIds[index]].deleted) ) index++; if (index < core.floorIds.length) core.ui._drawViewMaps(index); @@ -1510,7 +1511,8 @@ actions.prototype._clickViewMaps = function (x, y, px, py) { while ( index >= 0 && index != now && - core.status.maps[core.floorIds[index]].cannotViewMap + (core.status.maps[core.floorIds[index]].cannotViewMap || + core.status.maps[core.floorIds[index]].deleted) ) index--; if (index >= 0) core.ui._drawViewMaps(index); diff --git a/public/libs/control.js b/public/libs/control.js index 6328058..8c392dd 100644 --- a/public/libs/control.js +++ b/public/libs/control.js @@ -1659,17 +1659,17 @@ control.prototype._updateDamage_extraDamage = function (floorId, onMap) { text: damage, px: 32 * x + 16, py: 32 * (y + 1) - 14, - color: '#ffaa33', + color: '#fa3', alpha: alpha }); } else { - // 检查捕捉 + // 电摇嘲讽 if (core.status.checkBlock.mockery[x + ',' + y]) { core.status.damage.extraData.push({ text: '嘲', px: 32 * x + 16, py: 32 * (y + 1) - 14, - color: '#ffaa33', + color: '#fd4', alpha: alpha }); } diff --git a/public/project/data.js b/public/project/data.js index 6340c7d..a009d61 100644 --- a/public/project/data.js +++ b/public/project/data.js @@ -39,7 +39,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = "MT27", "MT28", "MT29", - "MT30" + "MT30", + "MT31" ], "floorPartitions": [ [ @@ -618,8 +619,8 @@ var data_a1e2fb4a_e986_4524_b0da_9b7ba7c0874d = ] }, { - "need": "50000", - "title": "古人", + "need": "25000", + "title": "中级智人", "clear": true, "action": [] } diff --git a/public/project/enemys.js b/public/project/enemys.js index 34d99ff..ceb2b51 100644 --- a/public/project/enemys.js +++ b/public/project/enemys.js @@ -26,7 +26,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "goldSlime": {"name":"黄头怪","hp":1000,"atk":50,"def":50,"money":0,"exp":18,"point":0,"special":[2]}, "poisonSkeleton": {"name":"紫骷髅","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "poisonBat": {"name":"山间蝙蝠","hp":800,"atk":170,"def":50,"money":1,"exp":24,"point":0,"special":[5]}, - "skeletonPriest": {"name":"骷髅法师","hp":100,"atk":100,"def":0,"money":0,"exp":0,"point":0,"special":[18],"value":20}, + "skeletonPriest": {"name":"智慧骷髅","hp":4000,"atk":1200,"def":900,"money":1,"exp":75,"point":0,"special":[1,13],"value":20,"crit":500}, "skeletonKing": {"name":"骷髅王","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "evilHero": {"name":"迷失勇者","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "demonPriest": {"name":"魔神法师","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, @@ -68,11 +68,11 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "bowman": {"name":"猎人","hp":500,"atk":100,"def":50,"money":0,"exp":16,"point":0,"special":[24],"value":75}, "liteBowman": {"name":"山间猎手","hp":1200,"atk":200,"def":60,"money":1,"exp":27,"point":0,"special":[24]}, "crimsonZombie": {"name":"勇气之兽","hp":1800,"atk":2000,"def":-100,"money":1,"exp":35,"point":0,"special":[]}, - "watcherSlime": {"name":"邪眼史莱姆","hp":5000,"atk":900,"def":600,"money":1,"exp":50,"point":0,"special":[17]}, + "watcherSlime": {"name":"邪眼史莱姆","hp":5000,"atk":1200,"def":600,"money":1,"exp":50,"point":0,"special":[17]}, "mutantSlimeman": {"name":"变异史莱姆人","hp":350,"atk":70,"def":27,"money":0,"exp":13,"point":0,"special":[]}, "devilKnight": {"name":"恶灵骑士","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "grayPriest": {"name":"智慧法王","hp":3000,"atk":600,"def":250,"money":1,"exp":40,"point":0,"special":[13]}, - "greenGateKeeper": {"name":"卫兵队长","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "greenGateKeeper": {"name":"睿智雕像","hp":5000,"atk":1250,"def":900,"money":1,"exp":65,"point":0,"special":[1],"crit":1000}, "ghostSoldier": {"name":"山间骷髅","hp":750,"atk":180,"def":40,"money":0,"exp":18,"point":0,"special":[]}, "frostBat": {"name":"寒蝙蝠","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "blackKing": {"name":"黑衣魔王","hp":1000,"atk":500,"def":0,"money":1000,"exp":1000,"point":0,"special":[],"notBomb":true}, @@ -90,7 +90,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E375": {"name":"怪圣","hp":2000,"atk":270,"def":100,"money":1,"exp":33,"point":0,"special":[]}, "E498": {"name":"山间野兽","hp":1200,"atk":175,"def":60,"money":1,"exp":30,"point":0,"special":[7],"hungry":20}, "E499": {"name":"武装野兽","hp":1500,"atk":240,"def":100,"money":1,"exp":32,"point":0,"special":[7],"hungry":30}, - "E500": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E500": {"name":"智慧兽人","hp":4500,"atk":1200,"def":700,"money":1,"exp":55,"point":0,"special":[7],"hungry":30}, "E501": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E502": {"name":"普通史塔茹","hp":900,"atk":160,"def":55,"money":1,"exp":25,"point":0,"special":[8],"together":20}, "E503": {"name":"武装史塔茹","hp":1300,"atk":240,"def":110,"money":1,"exp":31,"point":0,"special":[8],"value":null,"crit":null,"together":25}, @@ -107,7 +107,7 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E520": {"name":"勇气之魂","hp":4000,"atk":1200,"def":200,"money":1,"exp":45,"point":0,"special":[1],"crit":500}, "E521": {"name":"勇气之箭","hp":2500,"atk":425,"def":250,"money":1,"exp":30,"point":0,"special":[1,12],"value":400,"crit":500}, "E522": {"name":"勇气骷髅","hp":2000,"atk":600,"def":200,"money":1,"exp":30,"point":0,"special":[]}, - "E523": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E523": {"name":"红色骷髅士兵","hp":3000,"atk":1000,"def":600,"money":1,"exp":50,"point":0,"special":[]}, "E524": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E525": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, "E536": {"name":"智慧法师","hp":2000,"atk":400,"def":200,"money":1,"exp":35,"point":0,"special":[13]}, @@ -124,7 +124,19 @@ var enemys_fcae963b_31c9_42b4_b48c_bb48d09f3f80 = "E556": {"name":"智慧之姆","hp":3000,"atk":800,"def":200,"money":1,"exp":45,"point":0,"special":[8],"together":20}, "E557": {"name":"智慧之神","hp":10000,"atk":2000,"def":800,"money":10,"exp":500,"point":0,"special":[]}, "E561": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E562": {"name":"嘲讽剑客","hp":2000,"atk":1500,"def":600,"money":1,"exp":50,"point":0,"special":[19]}, + "E562": {"name":"嘲讽剑客","hp":5000,"atk":1600,"def":500,"money":1,"exp":60,"point":0,"special":[19]}, "E563": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, - "E564": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]} + "E564": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E566": {"name":"智慧史莱姆","hp":6000,"atk":1200,"def":600,"money":1,"exp":50,"point":0,"special":[8],"together":25}, + "E567": {"name":"精明史莱姆","hp":5000,"atk":1200,"def":550,"money":0,"exp":0,"point":0,"special":[8],"together":30}, + "E568": {"name":"精明史莱姆","hp":5000,"atk":1500,"def":600,"money":1,"exp":60,"point":0,"special":[8],"together":30,"displayIdInBook":null}, + "E569": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E570": {"name":"粘液史莱姆","hp":3000,"atk":1000,"def":400,"money":1,"exp":45,"point":0,"special":[4,17]}, + "E571": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E572": {"name":"石化史莱姆","hp":4000,"atk":1200,"def":0,"money":1,"exp":60,"point":0,"special":[3]}, + "E573": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E576": {"name":"智慧守卫","hp":7500,"atk":2500,"def":1250,"money":10,"exp":500,"point":0,"special":[1],"crit":250}, + "E577": {"name":"智慧守护者","hp":15000,"atk":2500,"def":1200,"money":50,"exp":2500,"point":0,"special":[1],"crit":1000}, + "E578": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]}, + "E579": {"name":"新敌人","hp":0,"atk":0,"def":0,"money":0,"exp":0,"point":0,"special":[]} } \ No newline at end of file diff --git a/public/project/floors/MT0.js b/public/project/floors/MT0.js index ed9c3de..19596ea 100644 --- a/public/project/floors/MT0.js +++ b/public/project/floors/MT0.js @@ -46,7 +46,8 @@ main.floors.MT0= "8,13": [ "本塔有很多新的功能,所有的说明都详细地写在了前方的百科全书里面,里面包含所有的功能说明,不阅读可能会影响正常的游戏体验,请仔细阅读。", "例如你现在首先感受到的应该是状态栏的变动,你可以打开百科全书阅读状态栏相关内容。里面包含状态栏的功能说明与布局说明等。", - "注意百科全书中的内容非常基础详细,如果对魔塔有一定的了解,可以选择性地阅读。" + "注意百科全书中的内容非常基础详细,如果对魔塔有一定的了解,可以选择性地阅读。", + "打开百科全书的快捷键是H" ], "8,12": [ "该塔计分方式:生命+5000*黄钥匙+15000*蓝钥匙" diff --git a/public/project/floors/MT21.js b/public/project/floors/MT21.js index 6bc32fd..6cef70f 100644 --- a/public/project/floors/MT21.js +++ b/public/project/floors/MT21.js @@ -136,7 +136,12 @@ main.floors.MT21= "\t[初级智人]\b[up,hero]或许智慧结晶会告诉我答案吧。", { "type": "function", - "function": "function(){\ncore.showChapter('第二章 智慧')\n}" + "function": "function(){\ncore.showChapter('第二章 智慧');\ncore.removeMaps('tower1', 'tower7', true);\n}" + }, + { + "type": "setValue", + "name": "item:pickaxe", + "value": "0" } ], "false": [ diff --git a/public/project/floors/MT22.js b/public/project/floors/MT22.js index 8b929c9..9f563c6 100644 --- a/public/project/floors/MT22.js +++ b/public/project/floors/MT22.js @@ -29,10 +29,12 @@ main.floors.MT22= ], "3,9": [ "第二章的加点已开启,可以在技能树的前置技能下方选择", - "如果你玩过上个版本,直接跳到了本章,记得查看背包里面的各种道具,尤其是百科全书,同时注意左边是你来的方向,那里还有些怪物" + "注意学习是一个非常重要的技能,需要尽快点开", + "如果你玩过上个版本,直接跳到了本章,记得查看背包里面的各种道具,尤其是百科全书,同时注意左边是你来的方向,那里还有些怪物", + "从现在开始,跳跃技能不再消耗生命值" ], "7,9": [ - "对于电摇嘲讽的怪物,当一个点可以被多个怪物嘲讽时,会优先选择最靠左上角的怪物。其次,在进入嘲讽区域之前会自动存档" + "百科全书中已解锁第二章需要特别说明的怪物属性,你可以在百科全书中查看" ] }, "changeFloor": { @@ -42,6 +44,13 @@ main.floors.MT22= 0, 4 ] + }, + "9,0": { + "floorId": "MT24", + "loc": [ + 9, + 14 + ] } }, "beforeBattle": {}, @@ -54,7 +63,7 @@ main.floors.MT22= "map": [ [142,142,142,142,142,142,142,142,142, 91,143,143,143,143,143], [142,142,142,142,142,142,142,142,142, 0,143,143,143,143,143], - [142,142,482,482,492, 0, 0, 0, 0, 0,143,491,491,143,143], + [142,142,482,482,492, 0, 0, 0, 0, 0,143,491,484,143,143], [142,142,142,142,142, 0, 0, 0, 0, 0,143,143,494,143,143], [142,142,482,482,492, 0, 0,484, 0,441, 0, 0, 0, 0, 94], [142,142,142,142,142, 0, 0, 0, 0,143,143,143,143,143,143], diff --git a/public/project/floors/MT23.js b/public/project/floors/MT23.js index 4d351e4..384bdc8 100644 --- a/public/project/floors/MT23.js +++ b/public/project/floors/MT23.js @@ -16,7 +16,12 @@ main.floors.MT23= "firstArrive": [], "eachArrive": [], "parallelDo": "", - "events": {}, + "events": { + "1,3": [ + "请善用拥有电摇嘲讽属性的怪物", + "例如右边就可以利用电摇嘲讽把几个强怪后面的宝石暴露出来" + ] + }, "changeFloor": { "0,4": { "floorId": "MT22", @@ -24,6 +29,20 @@ main.floors.MT23= 14, 4 ] + }, + "12,0": { + "floorId": "MT26", + "loc": [ + 12, + 14 + ] + }, + "14,2": { + "floorId": "MT27", + "loc": [ + 0, + 2 + ] } }, "beforeBattle": {}, @@ -35,23 +54,37 @@ main.floors.MT23= "cannotMoveIn": {}, "map": [ [143,143,143,143,143,143,143,143,143,143,143,143, 91,143,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0,275, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 94], - [143, 0,562, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [ 92, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], - [143, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,143], + [143,376,381,523, 0, 0,570, 0, 34,378,143,381, 0,381,143], + [143,143,143,143,484,143,143,143,143, 0,520, 0,484, 0, 94], + [143,129,381,143, 0,143,390,484,143,566,143,143,143,545,143], + [ 92, 0, 0,523,403,143, 21,396,280, 0,403,482,492,482,143], + [143,484,381,143, 0,492,492,143,143,566,143,143,143,143,143], + [143,143,492,143,500,143,441,420,500, 0,378,403,484, 0,143], + [143,390,482,143,484,143,143,143,143,492,143,143,494,143,143], + [143, 0,403,275,376, 0,378,143,482,482,482,143, 34, 34,143], + [143,143,494,143,494,143,143,143,143,492,143,143,523,143,143], + [143,420,484,143, 21,420,492,390, 0,275, 0,519, 0,381,143], + [143, 0,441,143,484, 0,143,482,381,143, 33,143,143,518,143], + [143,280,143,143,143,562,143,143,143,143, 0,143,376, 0,143], + [143, 0,482, 0,482, 0,143, 34,441, 34,520,143, 33,403,143], [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143] ], "bgmap": [ - + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0,144,144,144,144,144,144, 0, 0,144, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0,144,144,144,144,144,144], + [ 0, 0, 0, 0,144, 0, 0, 0, 0,144, 0, 0, 0,144, 0], + [144,144,144,144,144, 0, 0, 0, 0,144,144,144,144,144, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144,144,144, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], "fgmap": [ diff --git a/public/project/floors/MT24.js b/public/project/floors/MT24.js index daed1a1..75bdb1a 100644 --- a/public/project/floors/MT24.js +++ b/public/project/floors/MT24.js @@ -1,45 +1,104 @@ main.floors.MT24= { -"floorId": "MT24", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT24", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": { + "8,13": [ + "当勇士被嘲讽时,水也能被撞碎,不要问我为什么(" + ] + }, + "changeFloor": { + "9,14": { + "floorId": "MT22", + "loc": [ + 9, + 0 + ] + }, + "5,0": { + "floorId": "MT25", + "loc": [ + 5, + 14 + ] + }, + "11,0": { + "floorId": "MT25", + "loc": [ + 11, + 14 + ] + }, + "14,5": { + "floorId": "MT26", + "loc": [ + 0, + 5 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [142,142,142,142,142, 91,142,142,142,142,142, 91,143,143,143], + [142,142,142,142,142,280,142, 0,275, 0,484,376, 0,143,143], + [142,142,441,237,484, 0,492, 0,143,143,500,143,492,143,143], + [142,142,390,142, 0,142,142, 0,143, 0,403,491,390, 0,143], + [142,142,396,142,500,376,484,518,143,143,494,143,143,143,143], + [142, 22,484,494,378,142,142, 0,143,520, 0,403,482, 0, 94], + [142,142,142,142,484,142,142,378,143, 0,143,143,492,143,143], + [142,142,484,142,518, 0,376,275,482, 0,500,376, 0,376,143], + [562,142,492,142,142,142,142, 0,143,143,143, 0,484, 0,143], + [142,142, 0, 0,403,484, 0,523,484,378,143,519,143,143,143], + [142,142,280,142,142,492,566,142,142, 0,143,378,484,381,143], + [142,142, 21,484,142,378, 0,142,142,570,143,143,520,143,143], + [142,142,430, 0,142,142,482,142,381, 0,381,492,403,403,143], + [142,142,142,142,142,142,142,142,129, 0,484,143,143,143,143], + [142,142,142,142,142,142,142,142,142, 93,143,143,143,143,143] ], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144,144,144,144,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0,144, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0,144, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0,144, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0,144,144,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144,144,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT25.js b/public/project/floors/MT25.js index 6b5448a..7fc54c0 100644 --- a/public/project/floors/MT25.js +++ b/public/project/floors/MT25.js @@ -1,45 +1,93 @@ main.floors.MT25= { -"floorId": "MT25", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT25", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "5,14": { + "floorId": "MT24", + "loc": [ + 5, + 0 + ] + }, + "11,14": { + "floorId": "MT24", + "loc": [ + 11, + 0 + ] + }, + "14,9": { + "floorId": "MT30", + "loc": [ + 0, + 9 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142, 23,142,142,142,142,142,142,142,142,142], + [142,142,142,142,482,441,482,142,142,142,142,142,142,142,142], + [142,142,142, 21,420,575,430, 21,142,142,142,142,142,142,142], + [142,142,142,142,482,491,482,142,142,142,142, 0,484, 0, 94], + [142,142,142,142,142, 22,142,142,142,142,142,566,143,143,143], + [142,142,142,142,142,576,142,142,142,142,142,430,566,420,143], + [142,142,142,142,142,497,142,142,142,142,142,142,142,566,143], + [142,142,142,142,142,572,142,142,142,142,142, 0,484, 0,143], + [142,142,142,142,142, 93,142,142,142,142,142, 93,143,143,143] ], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT26.js b/public/project/floors/MT26.js index feba81f..bc2bad1 100644 --- a/public/project/floors/MT26.js +++ b/public/project/floors/MT26.js @@ -1,45 +1,100 @@ main.floors.MT26= { -"floorId": "MT26", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT26", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "0,5": { + "floorId": "MT24", + "loc": [ + 14, + 5 + ] + }, + "12,14": { + "floorId": "MT23", + "loc": [ + 12, + 0 + ] + }, + "14,7": { + "floorId": "MT28", + "loc": [ + 0, + 7 + ] + }, + "11,0": { + "floorId": "MT30", + "loc": [ + 11, + 14 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [143,143,143,143,143,143,143,143,143,143,143, 91,143,143,143], + [143,441, 21,237, 0,143, 0,482,566, 0,143, 0,143,143,143], + [143,484,390,143, 0,143,378, 0,143, 0,566, 0,376,482,143], + [143,143,143,143,484,143,143,143,143,566,143,143,492,143,143], + [143, 0, 0,492, 0,143,482,403,376, 0,518, 0,482,396,143], + [ 92, 0,518,143, 0,520, 0,378,143,143,143,143,275, 0,143], + [143,143, 0,143,143,143,143,562,143,390,482,143, 0,143,143], + [143, 0,376,143, 0,143,482,482,143,482,403,500,403, 0, 94], + [143,500,143,143,482,143,143,143,143,492,143,143,519,143,143], + [143,468,482,143,441,492,430, 0,143,484,396,237,482, 0,143], + [143,482,468,494, 0,275,420,484,492,390,484,143, 0,482,143], + [143,143,143,143,566,143,572,143,143,494,143,143,143,523,143], + [143,390,482,500, 0,143,482, 0,566,381,482,143,378, 0,143], + [143,143,396,143, 0,566, 0,381,143, 0,381,570, 0,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143, 93,143,143] ], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0], + [ 0,144,144,144,144, 0,144,144,144,144,144,144,144, 0, 0], + [144,144, 0, 0,144,144,144, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT27.js b/public/project/floors/MT27.js index 89f6bb0..2b31baf 100644 --- a/public/project/floors/MT27.js +++ b/public/project/floors/MT27.js @@ -1,34 +1,66 @@ main.floors.MT27= { -"floorId": "MT27", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "floorId": "MT27", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "0,2": { + "floorId": "MT23", + "loc": [ + 14, + 2 + ] + }, + "4,0": { + "floorId": "MT28", + "loc": [ + 4, + 14 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [143,143,143,143, 91,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143, 0,143,143,420,143,143,143,143,143,143,143], + [ 92, 0, 0,482, 0,497,143,430,491,280,143,143,143,143,143], + [143,143,492,143,143,143,143,143,143, 0,143,143,143,143,143], + [143, 0, 0,492,491,492,390, 0,484, 0,143,143,143,143,143], + [143, 0,143,143,143,143, 0,143,143,143,143,143,143,143,143], + [143,441,143,390,482,143, 0,143,484,396,143,143,143,143,143], + [143, 33,500,482,396,143,403,568, 21,403,143,143,143,143,143], + [143,275,492,492,143,143,143,143,143,568,143,143,143,143,143], + [143, 33,237,482,396,494,484,390,396,484,143,143,143,143,143], + [143,441,143,390,482,143,143,143,237,143,143,143,143,143,143], + [143, 0,143,143,143,143,403,376,484,143,143,143,143,143,143], + [143,568,143,376,482,143,378,143,280,143,143,143,143,143,143], + [143, 0,568,378,381,562,492,143, 23,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143] +], + "bgmap": [ + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [144,144,144,144,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -42,4 +74,13 @@ main.floors.MT27= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT28.js b/public/project/floors/MT28.js index 41fb38c..a66944a 100644 --- a/public/project/floors/MT28.js +++ b/public/project/floors/MT28.js @@ -1,45 +1,135 @@ main.floors.MT28= { -"floorId": "MT28", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT28", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": { + "5,13": [ + "注意,如果用跳跃技能把怪物踢走,会导致机关门无法开启" + ] + }, + "changeFloor": { + "4,14": { + "floorId": "MT27", + "loc": [ + 4, + 0 + ] + }, + "0,7": { + "floorId": "MT26", + "loc": [ + 14, + 7 + ] + }, + "8,0": { + "floorId": "MT29", + "loc": [ + 8, + 14 + ] + } + }, + "beforeBattle": {}, + "afterBattle": { + "10,8": [ + { + "type": "setValue", + "name": "flag:door_MT28_11_9", + "operator": "+=", + "value": "1" + } + ], + "12,8": [ + { + "type": "setValue", + "name": "flag:door_MT28_11_9", + "operator": "+=", + "value": "1" + } + ] + }, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": { + "11,9": { + "0": { + "condition": "flag:door_MT28_11_9==2", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MT28_11_9", + "operator": "=", + "value": "null" + } + ] + } + } + }, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [143,143,143,143,143,143,143,143, 91,143,143,143,143,143,143], + [143,143,441,390,396,143, 0,500,491, 0,143,143,143,143,143], + [143,143,143,143,484,280, 0,143, 0, 21,143,143,143,143,143], + [143,482,390,143,143,143,494,143,566,143,143, 0,143,143,143], + [143,441,482,500, 0,484,390,566,420,566,396,482, 22,143,143], + [143,143,492,143,143,143,572,143,566,143,143,494,143,143,143], + [143,143, 0, 0,568,376,482,143, 0,482, 0, 0,143,143,143], + [ 92, 0,484, 0,143,441,378,492, 0,143,143,237,143,143,143], + [143,143,143,568,143,500,143,143,518,143,280,484,280,143,143], + [143,390,484,403,492, 0,403,378,482,143,143, 85,143,143,143], + [143,143,143,143,143,143,143,275,143,143,466,484,467,143,143], + [143,482,376,143, 0,482,376,403, 0,143,143, 23,143,143,143], + [143,520,143,143,518,143,143,143,143,143,143,143,143,143,143], + [143,378,482,519, 0,129,143,143,143,143,143,143,143,143,143], + [143,143,143,143, 93,143,143,143,143,143,143,143,143,143,143] ], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,144,144,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,144,144,144,144,144, 0, 0, 0, 0, 0, 0, 0, 0], + [144,144,144, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,144,144,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144,144,144,144, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT29.js b/public/project/floors/MT29.js index 37bd785..db6af59 100644 --- a/public/project/floors/MT29.js +++ b/public/project/floors/MT29.js @@ -1,33 +1,124 @@ main.floors.MT29= { -"floorId": "MT29", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + "floorId": "MT29", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [ + { + "type": "animate", + "name": "hand", + "loc": [ + 13, + 8 + ] + }, + { + "type": "animate", + "name": "hand", + "loc": [ + 13, + 8 + ] + }, + { + "type": "animate", + "name": "jianji", + "loc": [ + 13, + 8 + ] + }, + { + "type": "hide", + "loc": [ + [ + 13, + 8 + ] + ], + "remove": true, + "time": 500 + }, + { + "type": "jump", + "from": [ + 12, + 8 + ], + "dxy": [ + 5, + 0 + ], + "time": 500 + }, + "\t[初级智人]\b[up,hero]杰克?", + "\t[初级智人]\b[up,hero]他为什么会在这里?", + "\t[初级智人]\b[up,hero]奇怪,他好像在为我打通道路。", + "\t[初级智人]\b[up,hero]这些怪物这么强,他是怎么对付的?", + "\t[初级智人]\b[up,hero]而且好像在故意让我发现。", + "\t[初级智人]\b[up,hero]跟上去看看。" + ], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "0,9": { + "floorId": "MT30", + "loc": [ + 14, + 9 + ] + }, + "8,14": { + "floorId": "MT28", + "loc": [ + 8, + 0 + ] + }, + "14,8": { + "floorId": "MT31", + "loc": [ + 0, + 7 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [ 17, 17, 17, 17,143,143,143,143,143,143,143,143,143,143,143], + [ 17, 17, 17, 17,143,143,143,143,482,237,484,280, 0,390,143], + [ 17, 17, 17, 17,143,143,468,468,482,143,484,143,396,441,143], + [ 17, 17, 17, 17,143,143,143,492,143,143,562,143,492,143,143], + [ 17, 17, 17, 17,390, 0,143,482,143, 0,390,484,396, 0,143], + [ 17, 17, 17, 17,482,396,143,403,143,237,143,143,143,492,143], + [ 17, 17, 17, 17,280,143,143,390,403, 0,143,396,441,420,143], + [ 17, 17, 0,500, 0,376,143,143,568,143,143,143,143,572,143], + [ 17, 17, 0,143,482,482,143,376,482,568, 0,396,123,576, 94], + [ 92, 0, 0,143,378, 0,568, 0,378,143,390, 0,484, 0,143], + [143,500,143,143,143,492,143,143,143,143,143,492,143,143,143], + [143,484, 21,572,390, 0, 0, 0,237,143,484,562,491,491,143], + [143,390,396,494, 21,484,143,143,484,492,492,143,143,237,143], + [143,143,143,143,396, 0, 0,492, 0,280,390,403,484,396,143], + [143,143,143,143,143,143,143,143, 93,143,143,143,143,143,143] +], + "bgmap": [ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -35,6 +126,28 @@ main.floors.MT29= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,144,144,144,144, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0,144, 0, 0,144, 0, 0,144,144,144,144,144,144,144], + [144,144,144, 0, 0,144,144,144,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,144,144,144,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + [142,142,142,142,142,142,142,142,142,142,142,142, 0, 0, 0], + [142,142,142,142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142,142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142,142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142,142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [142,142, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], @@ -42,4 +155,7 @@ main.floors.MT29= [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] ], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT30.js b/public/project/floors/MT30.js index 6712ea3..9d1a485 100644 --- a/public/project/floors/MT30.js +++ b/public/project/floors/MT30.js @@ -1,45 +1,93 @@ main.floors.MT30= { -"floorId": "MT30", -"title": "智慧小径", -"name": "智慧小径", -"width": 15, -"height": 15, -"canFlyTo": true, -"canFlyFrom": true, -"canUseQuickShop": true, -"cannotViewMap": false, -"images": [], -"ratio": 2, -"defaultGround": "grass", -"bgm": "road.mp3", -"firstArrive": [], -"eachArrive": [], -"parallelDo": "", -"events": {}, -"changeFloor": {}, -"beforeBattle": {}, -"afterBattle": {}, -"afterGetItem": {}, -"afterOpenDoor": {}, -"autoEvent": {}, -"cannotMove": {}, -"cannotMoveIn": {}, -"map": [ - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], - [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] + "floorId": "MT30", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "14,9": { + "floorId": "MT29", + "loc": [ + 0, + 9 + ] + }, + "0,9": { + "floorId": "MT25", + "loc": [ + 14, + 9 + ] + }, + "11,14": { + "floorId": "MT26", + "loc": [ + 11, + 0 + ] + } + }, + "beforeBattle": {}, + "afterBattle": {}, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": {}, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,142,142,142,142,142,142,142,142,142,142,142,142], + [142,142,142,482,568, 0,390,142,396,142,142,142,142,142,142], + [142,142,390,403,142,484, 0,568,482, 0,403, 0,142,142,142], + [142,142,142,142,142,566, 17,143, 17, 17, 17,500,142,142,142], + [ 92, 0, 0, 0,572,482,482,143, 34,378,376, 34,237,482, 94], + [143,143,143,143,492,143,143,143,143,143,566,143,143,482,143], + [143,487,430,143,403,143,420,441, 21,143,403,403,143,396,143], + [143,280,143,143,562,143,143,280,143,143,143,566,143,403,143], + [143, 34, 34,376,403,378, 34, 34,143,482,492, 0,143,390,143], + [143,143,143,143,143,143,143,143,143,143,143, 93,143,143,143] ], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0,144,144,144,144,144,144,144, 0, 0, 0], + [ 0, 0, 0, 0, 0,144,142,142,142,142,142,144, 0, 0, 0], + [144,144,144,144,144,144, 0, 0, 0, 0,144,144,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,144, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] } \ No newline at end of file diff --git a/public/project/floors/MT31.js b/public/project/floors/MT31.js new file mode 100644 index 0000000..0f5f174 --- /dev/null +++ b/public/project/floors/MT31.js @@ -0,0 +1,191 @@ +main.floors.MT31= +{ + "floorId": "MT31", + "title": "智慧小径", + "name": "智慧小径", + "width": 15, + "height": 15, + "canFlyTo": true, + "canFlyFrom": true, + "canUseQuickShop": true, + "cannotViewMap": false, + "images": [], + "ratio": 2, + "defaultGround": "grass", + "bgm": "road.mp3", + "firstArrive": [ + "\t[初级智人]\b[up,hero]杰克,你为什么在这?", + "\t[杰克,thief]\b[up,4,7]哟,咱好久不见了,我只是来这里寻找点东西。", + "\t[初级智人]\b[up,hero]这里怪物这么强,你怎么能打败他?", + "\t[杰克,thief]\b[up,4,7]我有我的特殊办法。", + "\t[初级智人]\b[up,hero]那些...绿色宝石吗?", + "\t[杰克,thief]\b[up,4,7]绿色宝石?我没见过那东西。", + "\t[初级智人]\b[up,hero]那是什么办法呢?", + "\t[杰克,thief]\b[up,4,7]这个你就不用操心了。", + "\t[杰克,thief]\b[up,4,7]对了,有人让我给你说一句话。", + "\t[杰克,thief]\b[up,4,7]时间会诉说真相,而历史不会。", + "\t[杰克,thief]\b[up,4,7]即使历史是真实的。", + "\t[初级智人]\b[up,hero]什么意思?", + "\t[杰克,thief]\b[up,4,7]我也不清楚,不过我先走了,你慢慢理解。", + { + "type": "jump", + "from": [ + 4, + 7 + ], + "dxy": [ + 15, + 0 + ], + "time": 500 + }, + "\t[初级智人]\b[up,hero]...", + "\t[初级智人]\b[up,hero]时间会诉说真相,而历史不会...", + "\t[初级智人]\b[up,hero]能相信的只有时间,而历史能被篡改吗...", + "\t[初级智人]\b[up,hero]历史是真实的,又为何不会诉说真相呢...", + "\t[初级智人]\b[up,hero]完全不能理解。" + ], + "eachArrive": [], + "parallelDo": "", + "events": {}, + "changeFloor": { + "0,7": { + "floorId": "MT29", + "loc": [ + 14, + 8 + ] + } + }, + "beforeBattle": {}, + "afterBattle": { + "10,7": [ + "\t[智慧守护者,E577]\b[up,10,7]智慧!终于有人可以得到这些智慧了!", + "\t[智慧守护者,E577]\b[up,10,7]终于要迎来结束战争的那一天了!", + "\t[智慧守护者,E577]\b[up,10,7]我的任务终于完成了!!", + "\t[低级智人]\b[up,hero]什么结束战争,什么完成任务?", + { + "type": "setBlock", + "number": "I476", + "time": 1000 + }, + "\t[低级智人]\b[up,hero]哎,没问到啊...", + "\t[低级智人]\b[up,hero]战争,又是什么意思呢?", + "\t[低级智人]\b[up,hero]之前智慧之神也提过战争,但是我还没问我们就打起来了。", + "\t[低级智人]\b[up,hero]之后应该就知道了。", + { + "type": "function", + "function": "function(){\ncore.getNextItem()\n}" + }, + { + "type": "sleep", + "time": 1000 + }, + "\t[低级智人]\b[up,hero]!!!", + "\t[低级智人]\b[up,hero]这种感觉!", + "\t[低级智人]\b[up,hero]感觉前所未有的东西涌入了大脑。", + "\t[低级智人]\b[up,hero]这就是智慧吗。", + "\t[低级智人]\b[up,hero]原来如此。", + "\t[低级智人]\b[up,hero]原来,智慧是这个意思。", + "\t[低级智人]\b[up,hero]我明白了,我全都明白了。", + "\t[低级智人]\b[up,hero]智慧,真的可以掌握万物。", + { + "type": "setValue", + "name": "flag:door_MT31_7_6", + "operator": "+=", + "value": "1" + } + ] + }, + "afterGetItem": {}, + "afterOpenDoor": {}, + "autoEvent": { + "7,5": { + "0": { + "condition": "flag:door_MT31_7_6==1", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MT31_7_6", + "operator": "=", + "value": "null" + } + ] + }, + "1": null + }, + "7,9": { + "0": { + "condition": "flag:door_MT31_7_6==1", + "currentFloor": true, + "priority": 0, + "delayExecute": false, + "multiExecute": false, + "data": [ + { + "type": "openDoor" + }, + { + "type": "setValue", + "name": "flag:door_MT31_7_6", + "operator": "=", + "value": "null" + } + ] + }, + "1": null + } + }, + "cannotMove": {}, + "cannotMoveIn": {}, + "map": [ + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143, 0, 0, 0, 0,143,491,491,468,468,466,466,143,143], + [143,143, 0,491,491, 0,143, 85,143,143,143,143,143,143,143], + [143,143, 0, 0, 0, 0,143, 0, 0, 0, 0, 0, 0,143,143], + [ 92, 0, 0, 23,123, 0,497, 0, 0, 0,577, 0, 0, 0, 0], + [143,143, 0, 0, 0, 0,143, 0, 0, 0, 0, 0, 0,143,143], + [143,143, 0,491,491, 0,143, 85,143,143,143,143,143,143,143], + [143,143, 0, 0, 0, 0,143,491,491,468,468,467,467,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143], + [143,143,143,143,143,143,143,143,143,143,143,143,143,143,143] +], + "bgmap": [ + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [144,144,144,144,144,144,144,144,144,144,144,144,144,144,144], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0], + [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0] +], + "fgmap": [ + +], + "bg2map": [ + +], + "fg2map": [ + +] +} \ No newline at end of file diff --git a/public/project/floors/MT6.js b/public/project/floors/MT6.js index 805f874..0bf9665 100644 --- a/public/project/floors/MT6.js +++ b/public/project/floors/MT6.js @@ -99,6 +99,9 @@ main.floors.MT6= "name": "animateSpeed", "value": 277.7778 } + ], + "5,5": [ + "你可以在百科全书中查看第一章中需要特别说明的怪物特技" ] }, "changeFloor": { @@ -151,7 +154,7 @@ main.floors.MT6= [30064,30060,30118,30066, 0, 0, 0, 20, 29, 34, 20, 0, 20, 20, 20], [30072,30073,30126,30074, 0, 0, 32, 20, 20, 20, 20, 31, 0, 31, 20], [ 20, 0, 0, 0, 29, 0, 0, 20, 0, 0,204, 0, 31, 0, 20], - [ 20, 0, 0, 0, 0, 0, 29,267, 0, 0, 20,276, 20, 20, 20], + [ 20, 0, 0, 0, 0,129, 29,267, 0, 0, 20,276, 20, 20, 20], [ 20, 0, 0, 0, 0, 0, 20, 20, 20, 29, 20, 0, 0, 0, 20], [30060,30112,30113,30114,30065,30066, 0, 34, 0, 0, 20, 29, 20,368, 94], [30073,30112,30113,30114,30073,30074, 20, 20, 20,209, 0, 34, 0, 0, 20], diff --git a/public/project/floors/tower1.js b/public/project/floors/tower1.js index 8cef113..801b57e 100644 --- a/public/project/floors/tower1.js +++ b/public/project/floors/tower1.js @@ -14,7 +14,8 @@ main.floors.tower1= "defaultGround": "T526", "bgm": "tower.mp3", "firstArrive": [ - "\t[野蛮人]\b[up,hero]这里,便是智慧之塔了" + "\t[野蛮人]\b[up,hero]这里,便是智慧之塔了", + "注意破墙镐在本区结束后会全部删除,请在本区域全部用完" ], "eachArrive": [], "parallelDo": "", @@ -145,6 +146,16 @@ main.floors.tower1= "type": "function", "function": "function(){\nconsole.trace()\n}" } + ], + "7,14": [ + { + "type": "changeFloor", + "floorId": "MT20", + "loc": [ + 7, + 8 + ] + } ] }, "afterBattle": {}, @@ -216,13 +227,6 @@ main.floors.tower1= ], "cannotMoveIn": {}, "changeFloor": { - "7,14": { - "floorId": "MT20", - "loc": [ - 7, - 8 - ] - }, "0,7": { "floorId": "tower6", "loc": [ diff --git a/public/project/functions.js b/public/project/functions.js index 0b4392a..b136f72 100644 --- a/public/project/functions.js +++ b/public/project/functions.js @@ -709,10 +709,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { [ 19, '电摇嘲讽', - '当勇士移动到怪物同行或同列时,勇士会直接冲向怪物,撞碎路上的所有地形和门,拾取路上的道具,与路上的怪物以及该怪物战斗', + '当勇士移动到怪物同行或同列时,勇士会直接冲向怪物,撞碎路上的所有地形和门,拾取路上的道具,与路上的怪物战斗' + + ',最后与该怪物战斗', '#ff6666' ], - [20, '无敌', '勇士无法打败怪物,除非拥有十字架', '#aaaaaa'], + [20, '荆棘', '勇士无法打败怪物,除非拥有十字架', '#aaaaaa'], [ 21, '退化', @@ -809,10 +810,11 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { var mon_money = core.getEnemyValue(enemy, 'money', x, y, floorId), mon_exp = core.getEnemyValue(enemy, 'exp', x, y, floorId), mon_point = core.getEnemyValue(enemy, 'point', x, y, floorId); - // 坚固 - if (core.hasSpecial(mon_special, 3) && mon_def < hero_atk - 1) { - mon_def = hero_atk - 1; - } + + if (typeof enemy === 'number') + core.getBlockByNumber(enemy).event.id; + if (typeof enemy === 'string') enemy = core.material.enemys[enemy]; + // 饥渴 if (core.hasSpecial(mon_special, 7)) mon_atk += (hero_atk * (enemy.hungry || 0)) / 100; @@ -822,6 +824,20 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { mon_atk += core.getFlag('inte_' + floorId, 0); } + if (flags.blade && flags.bladeOn) { + hero_atk *= 1 + core.getSkillLevel(2) / 10; + hero_def *= 1 - core.getSkillLevel(2) / 10; + } + if (flags.shield && flags.shieldOn) { + hero_atk *= 1 - core.getSkillLevel(10) / 10; + hero_def *= 1 + core.getSkillLevel(10) / 10; + } + + // 坚固 + if (core.hasSpecial(mon_special, 3) && mon_def < hero_atk - 1) { + mon_def = hero_atk - 1; + } + var guards = []; // 光环和支援检查 @@ -845,13 +861,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { if (!block.disable) { // 获得该图块的ID var id = block.event.id, - enemy = core.material.enemys[id]; + e = core.material.enemys[id]; var dx = Math.abs(block.x - x), dy = Math.abs(block.y - y); // 检查【支援】技能,数字26 if ( - enemy && - core.hasSpecial(enemy.special, 26) && + e && + core.hasSpecial(e.special, 26) && // 检查支援条件,坐标存在,距离为1,且不能是自己 // 其他类型的支援怪,比如十字之类的话.... 看着做是一样的 x != null && @@ -865,9 +881,9 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { } // 抱团 if ( - enemy && + e && core.hasSpecial(mon_special, 8) && - core.hasSpecial(enemy.special, 8) && + core.hasSpecial(e.special, 8) && !(dx == 0 && dy == 0) && dx < 3 && dy < 3 @@ -929,16 +945,6 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { // 后面三个参数主要是可以在光环等效果上可以适用 floorId = floorId || core.status.floorId; - // 怪物的各项数据 - // 对坚固模仿等处理扔到了脚本编辑-getEnemyInfo之中 - const enemyInfo = core.enemys.getEnemyInfo( - enemy, - hero, - x, - y, - floorId - ); - function getDamage() { let hero_hp = core.getRealStatusOrDefault(hero, 'hp'), hero_atk = core.getRealStatusOrDefault(hero, 'atk'), @@ -950,6 +956,16 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { origin_hero_atk = core.getStatusOrDefault(hero, 'atk'), origin_hero_def = core.getStatusOrDefault(hero, 'def'); + // 怪物的各项数据 + // 对坚固模仿等处理扔到了脚本编辑-getEnemyInfo之中 + const enemyInfo = core.enemys.getEnemyInfo( + enemy, + hero, + x, + y, + floorId + ); + let mon_hp = enemyInfo.hp, mon_atk = enemyInfo.atk, mon_def = enemyInfo.def, @@ -1100,7 +1116,10 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { let damageInfo = null; let damage = Infinity; - const skills = [['bladeOn', 'blade']]; + const skills = [ + ['bladeOn', 'blade'], + ['shieldOn', 'shield'] + ]; damageInfo = getDamage(); if (damageInfo) damage = damageInfo.damage; @@ -1198,7 +1217,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { core.ui._drawStatistics(); break; case 72: // H:打开帮助页面 - core.ui._drawHelp(); + core.useItem('I560', true); break; case 77: // M:快速标记 const [x, y] = flags.mouseLoc; @@ -1287,7 +1306,7 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { // 要存档的内容 var data = { floorId: core.status.floorId, - hero: core.clone(core.status.hero), + hero: core.clone(core.status.hero, name => name !== 'chase'), hard: core.status.hard, maps: core.clone(core.maps.saveMap()), route: core.encodeRoute(core.status.route), @@ -1620,13 +1639,13 @@ var functions_d6ad677b_427a_4623_b50f_a445a3b0ef8a = { // 电摇嘲讽 if (enemy && core.hasSpecial(enemy.special, 19)) { for (let nx = 0; nx < width; nx++) { - if (!core.noPass(nx, y)) { + if (!core.noPass(nx, y, floorId)) { mockery[`${nx},${y}`] ??= []; mockery[`${nx},${y}`].push([x, y]); } } for (let ny = 0; ny < height; ny++) { - if (!core.noPass(x, ny)) { + if (!core.noPass(x, ny, floorId)) { mockery[`${x},${ny}`] ??= []; mockery[`${x},${ny}`].push([x, y]); } diff --git a/public/project/icons.js b/public/project/icons.js index 09f42a5..f3a13af 100644 --- a/public/project/icons.js +++ b/public/project/icons.js @@ -331,7 +331,19 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "E561": 119, "E562": 120, "E563": 121, - "E564": 122 + "E564": 122, + "E566": 123, + "E567": 124, + "E568": 125, + "E569": 126, + "E570": 127, + "E571": 128, + "E572": 129, + "E573": 130, + "E576": 131, + "E577": 132, + "E578": 133, + "E579": 134 }, "enemy48": { "angel": 0, @@ -521,7 +533,10 @@ var icons_4665ee12_3a1f_44a4_bea3_0fccba634dc1 = "I491": 94, "I558": 95, "I559": 96, - "I560": 97 + "I560": 97, + "I565": 98, + "I574": 99, + "I575": 100 }, "autotile": { "autotile": 0, diff --git a/public/project/items.js b/public/project/items.js index 1978445..7605b54 100644 --- a/public/project/items.js +++ b/public/project/items.js @@ -855,7 +855,7 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "name": "大绿宝石", "text": ",护盾+${core.values.greenGem}", "itemEffect": "core.status.hero.mdef += 80 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)", - "itemEffectTip": ",智慧+${80 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)", + "itemEffectTip": ",智慧+${80 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)}", "useItemEffect": "core.status.hero.mdef += core.values.greenGem", "canUseItemEffect": "true" }, @@ -925,7 +925,12 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = }, "I420": { "cls": "items", - "name": "新物品" + "name": "超大红宝石", + "text": "攻击+${core.values.redGem}", + "itemEffect": "core.status.hero.atk += 8 * core.status.thisMap.ratio", + "itemEffectTip": ",攻击+${8 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.atk += core.values.redGem", + "canUseItemEffect": "true" }, "I421": { "cls": "items", @@ -965,7 +970,12 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = }, "I430": { "cls": "items", - "name": "新物品" + "name": "超大蓝宝石", + "text": ",防御+${core.values.blueGem}", + "itemEffect": "core.status.hero.def += 8 * core.status.thisMap.ratio", + "itemEffectTip": ",防御+${8 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.def += core.values.blueGem", + "canUseItemEffect": "true" }, "I431": { "cls": "items", @@ -1114,15 +1124,30 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = }, "I466": { "cls": "items", - "name": "新物品" + "name": "璀璨红宝石", + "text": "攻击+${core.values.redGem}", + "itemEffect": "core.status.hero.atk += 16 * core.status.thisMap.ratio", + "itemEffectTip": ",攻击+${16 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.atk += core.values.redGem", + "canUseItemEffect": "true" }, "I467": { "cls": "items", - "name": "新物品" + "name": "璀璨蓝宝石", + "text": ",防御+${core.values.blueGem}", + "itemEffect": "core.status.hero.def += 16 * core.status.thisMap.ratio", + "itemEffectTip": ",防御+${16 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.def += core.values.blueGem", + "canUseItemEffect": "true" }, "I468": { "cls": "items", - "name": "新物品" + "name": "璀璨绿宝石", + "text": ",护盾+${core.values.greenGem}", + "itemEffect": "core.status.hero.mdef += 320 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)", + "itemEffectTip": ",智慧+${320 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)}", + "useItemEffect": "core.status.hero.mdef += core.values.greenGem", + "canUseItemEffect": "true" }, "I469": { "cls": "items", @@ -1130,15 +1155,30 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = }, "I470": { "cls": "items", - "name": "新物品" + "name": "新物品", + "text": "攻击+${core.values.redGem}", + "itemEffect": "core.status.hero.atk += 32 * core.status.thisMap.ratio", + "itemEffectTip": ",攻击+${32 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.atk += core.values.redGem", + "canUseItemEffect": "true" }, "I471": { "cls": "items", - "name": "新物品" + "name": "新物品", + "text": ",防御+${core.values.blueGem}", + "itemEffect": "core.status.hero.def += 32 * core.status.thisMap.ratio", + "itemEffectTip": ",防御+${32 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.def += core.values.blueGem", + "canUseItemEffect": "true" }, "I472": { "cls": "items", - "name": "新物品" + "name": "新物品", + "text": ",防御+${core.values.blueGem}", + "itemEffect": "core.status.hero.def += 8 * core.status.thisMap.ratio", + "itemEffectTip": ",防御+${8 * core.status.thisMap.ratio}", + "useItemEffect": "core.status.hero.def += core.values.blueGem", + "canUseItemEffect": "true" }, "I473": { "cls": "items", @@ -1154,7 +1194,12 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = }, "I476": { "cls": "items", - "name": "新物品" + "name": "史诗绿宝石", + "text": ",护盾+${core.values.greenGem}", + "itemEffect": "core.status.hero.mdef += 1280 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)", + "itemEffectTip": ",智慧+${1280 * core.status.thisMap.ratio / core.getFlag(\"hard\") * (core.getSkillLevel(11) / 20 + 1)}", + "useItemEffect": "core.status.hero.mdef += core.values.greenGem", + "canUseItemEffect": "true" }, "I477": { "cls": "items", @@ -1256,5 +1301,30 @@ var items_296f5d02_12fd_4166_a7c1_b5e830c9ee3a = "canUseItemEffect": "true", "text": "一个包含游戏中所有功能详细说明的百科全书,可以查看游戏中所有的功能", "useItemEffect": "if (!core.isReplaying()) core.plugin.descOpened.value = true;" + }, + "I565": { + "cls": "constants", + "name": "学习", + "canUseItemEffect": "true", + "text": "可以学习怪物的技能,学习后持续${core.getSkillLevel(11) * 3 + 2}场战斗" + }, + "I574": { + "cls": "items", + "name": "新物品", + "canUseItemEffect": "true" + }, + "I575": { + "cls": "equips", + "name": "智慧之靴", + "canUseItemEffect": "true", + "text": "用智慧制作出的靴子,穿上后增加10%的攻击力和10%的防御", + "equip": { + "type": "鞋子", + "value": {}, + "percentage": { + "def": 10, + "atk": 10 + } + } } } \ No newline at end of file diff --git a/public/project/maps.js b/public/project/maps.js index caa9982..e552ef1 100644 --- a/public/project/maps.js +++ b/public/project/maps.js @@ -489,6 +489,21 @@ var maps_90f36752_8815_4be8_b32b_d7fad1d0542e = "562": {"cls":"enemys","id":"E562"}, "563": {"cls":"enemys","id":"E563"}, "564": {"cls":"enemys","id":"E564"}, + "565": {"cls":"items","id":"I565"}, + "566": {"cls":"enemys","id":"E566"}, + "567": {"cls":"enemys","id":"E567"}, + "568": {"cls":"enemys","id":"E568"}, + "569": {"cls":"enemys","id":"E569"}, + "570": {"cls":"enemys","id":"E570"}, + "571": {"cls":"enemys","id":"E571"}, + "572": {"cls":"enemys","id":"E572"}, + "573": {"cls":"enemys","id":"E573"}, + "574": {"cls":"items","id":"I574"}, + "575": {"cls":"items","id":"I575"}, + "576": {"cls":"enemys","id":"E576"}, + "577": {"cls":"enemys","id":"E577"}, + "578": {"cls":"enemys","id":"E578"}, + "579": {"cls":"enemys","id":"E579"}, "20037": {"cls":"tileset","id":"X20037","cannotOut":["up","left"],"cannotIn":["up","left"]}, "20038": {"cls":"tileset","id":"X20038","cannotOut":["up"],"cannotIn":["up"]}, "20039": {"cls":"tileset","id":"X20039","cannotOut":["up","right"],"cannotIn":["up","right"]}, diff --git a/public/project/materials/enemys.png b/public/project/materials/enemys.png index 0c154e6..11356b3 100644 Binary files a/public/project/materials/enemys.png and b/public/project/materials/enemys.png differ diff --git a/public/project/materials/items.png b/public/project/materials/items.png index 833e4ed..9d2b217 100644 Binary files a/public/project/materials/items.png and b/public/project/materials/items.png differ diff --git a/public/project/plugins.js b/public/project/plugins.js index e870b6d..e86adfa 100644 --- a/public/project/plugins.js +++ b/public/project/plugins.js @@ -531,7 +531,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { // 删除楼层 // core.removeMaps("MT1", "MT300") 删除MT1~MT300之间的全部层 // core.removeMaps("MT10") 只删除MT10层 - this.removeMaps = function (fromId, toId) { + this.removeMaps = function (fromId, toId, force) { toId = toId || fromId; var fromIndex = core.floorIds.indexOf(fromId), toIndex = core.floorIds.indexOf(toId); @@ -540,6 +540,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { flags.__removed__ = flags.__removed__ || []; flags.__disabled__ = flags.__disabled__ || {}; flags.__leaveLoc__ = flags.__leaveLoc__ || {}; + flags.__forceDelete__ ??= {}; for (var i = fromIndex; i <= toIndex; ++i) { var floorId = core.floorIds[i]; if (core.status.maps[floorId].deleted) continue; @@ -557,6 +558,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { core.status.maps[floorId].canFlyTo = false; core.status.maps[floorId].canFlyFrom = false; core.status.maps[floorId].cannotViewMap = true; + if (force) { + core.status.maps[floorId].forceDelete = true; + flags.__forceDelete__[floorId] = true; + } } }; @@ -572,6 +577,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { for (var i = fromIndex; i <= toIndex; ++i) { var floorId = core.floorIds[i]; if (!core.status.maps[floorId].deleted) continue; + if ( + core.status.maps[floorId].forceDelete || + flags.__forceDelete__[floorId] + ) + continue; flags.__removed__ = flags.__removed__.filter(f => { return f != floorId; }); @@ -1442,7 +1452,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { const item = core.material.items[id]; if (item.cls === 'equips') { // 装备也显示 - const diff = item.equip.value ?? {}; + const diff = core.clone(item.equip.value ?? {}); const per = item.equip.percentage ?? {}; for (const name in per) { diff[name + 'per'] = per[name].toString() + '%'; @@ -1530,10 +1540,18 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { 'X20076' ] }; + + const jumpIgnoreFloor = ['MT31']; // 跳跃 this.jumpSkill = function () { if (core.status.floorId.startsWith('tower')) return core.drawTip('当无法使用该技能'); + if ( + jumpIgnoreFloor.includes(core.status.floorId) || + flags.onChase + ) { + return core.drawTip('当前楼层无法使用该技能'); + } if (!flags.skill2) return; if (!flags['jump_' + core.status.floorId]) flags['jump_' + core.status.floorId] = 0; @@ -1600,7 +1618,7 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { true ); if (!toLoc) return; - core.status.hero.hp -= 200 * flags.hard; + if (flags.chapter <= 1) core.status.hero.hp -= 200 * flags.hard; core.updateStatusBar(); flags['jump_' + core.status.floorId]++; if (core.status.hero.hp <= 0) { @@ -3433,6 +3451,11 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { this._moveHero_moving(); }; + /** + * 电摇嘲讽 + * @param {LocString} loc + * @param {boolean} force + */ function checkMockery(loc, force) { if (core.status.lockControl && !force) return; const mockery = core.status.checkBlock.mockery[loc]; @@ -3471,6 +3494,10 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { remove: true, time: 0 }, + { + type: 'function', + function: `function() { core.removeGlobalAnimate(${x}, ${y}) }` + }, { type: 'animate', name: 'hand', @@ -3546,6 +3573,12 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { * @param {string} data */ async function reloadFloor(data) { + // 如果被砍层了直接忽略 + if ( + core.status.maps[data].deleted || + core.status.maps[data].forceDelete + ) + return; // 首先重新加载main.floors对应的楼层 await import(`/project/floors/${data}.js?v=${Date.now()}`); // 然后写入core.floors并解析 @@ -3907,6 +3940,20 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { const skill = parseInt(name.slice(6)); core.upgradeSkill(skill); }); + + core.registerReplayAction('study', name => { + if (!name.startsWith('study:')) return false; + const [num, x, y] = name + .slice(6) + .split(',') + .map(v => parseInt(v)); + if (!core.canStudySkill(num)) return false; + const id = core.getBlockId(x, y); + const enemy = core.getEnemyInfo(id, void 0, x, y); + if (!enemy.special.includes(num)) return false; + core.studySkill(enemy, num); + return true; + }); }, skillTree: function () { /** @@ -4086,7 +4133,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { { index: 13, title: '治愈', - desc: ['每级使血瓶的加血量增加2%'], + desc: [ + '使主角能够更好地回复生命,每级使血瓶的加血量增加2%' + ], consume: 'level > 5 ? 100 * level ** 2 : 250 * level + 1250', front: [[10, 3]], @@ -4205,6 +4254,9 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { case 10: // 铸剑为盾 core.setFlag('shieldOn', true); break; + case 11: // 学习 + core.setItem('I565', 1); + break; } const consume = core.getSkillConsume(skill); core.status.hero.mdef -= consume; @@ -4469,5 +4521,74 @@ var plugins_bb40132b_638b_4a9f_b028_d3fe47acc8d1 = { core.status[name + 'maps'][floorId] = arr; return arr; }; + }, + study: function () { + // 负责勇士技能:学习 + const values = { + 1: ['crit'], + 6: ['n'], + 7: ['hungry'], + 8: ['togrther'], + 10: ['courage'], + 11: ['charge'] + }; + + const cannotStudy = [9, 12, 14, 15, 24]; + + this.canStudySkill = function (number) { + core.status.hero.special ??= { num: [] }; + if (core.status.hero.special.num.length >= 1) { + return false; + } + if (cannotStudy.includes(number)) return false; + return true; + }; + + this.studySkill = function (enemy, number) { + core.status.hero.special ??= { num: [], last: [] }; + const s = core.status.hero.special; + const specials = core.getSpecials(); + let special = specials[number - 1][1]; + if (special instanceof Function) special = special(enemy); + if (!this.canStudySkill(number)) { + if (!main.replayChecking) { + core.tip('error', `无法学习${special}`); + } + return; + } + s.num.push(number); + s.last.push(core.getSkillLevel(11) * 3 + 2); + const value = values[number] ?? []; + for (const key of value) { + s[key] = enemy[key]; + } + }; + + this.forgetStudiedSkill = function (num, i) { + const s = core.status.hero.special; + const index = i !== void 0 && i !== null ? i : s.num.indexOf(num); + if (index === -1) return; + s.num.splice(index, 1); + s.last.splice(index, 1); + const value = values[number] ?? []; + for (const key of value) { + delete s[key]; + } + }; + + this.declineStudiedSkill = function () { + const s = core.status.hero.special; + s.last = s.last.map(v => v - 1); + }; + + this.checkStudiedSkill = function () { + const s = core.status.hero.special; + for (let i = 0; i < s.last.length; i++) { + if (s.last[i] <= 0) { + this.forgetStudiedSkill(void 0, i); + i--; + } + } + }; } }; diff --git a/src/data/desc.json b/src/data/desc.json index 5fedfb8..87b0983 100644 --- a/src/data/desc.json +++ b/src/data/desc.json @@ -180,7 +180,9 @@ "
", "M:快速标记怪物", "
", - "J:打开技能树" + "J:打开技能树", + "
", + "H:打开百科全书" ] }, "extraAttr": { @@ -340,7 +342,7 @@ "楼传界面打开时会有一个0.6秒的动画,如果不想要可以在开头捡的系统设置里面关闭。(默认关闭)", "
", "
", - "本塔的楼层传送器是一个集分区、小地图、楼层传送于一体的多功能楼传。", + "本塔的楼层传送器是一个集分区、小地图、楼层传送、浏览地图于一体的多功能楼传。", "下面是楼传的具体说明:", "
", "
", @@ -403,5 +405,38 @@ "注意,技能在点开之后是无法取消的,因此,加点时请慎重加点。注意,部分技能是必点技能,这些技能会在技能说明中明确指出,", "这些技能一般需要尽早点出。" ] + }, + "special1": { + "text": "第一章怪物特技", + "condition": "flags.chapter > 0", + "desc": [ + "这里会展示第一章的怪物中需要特别说明的怪物特技。", + "
", + "
", + "1. 坚固:", + "在本塔中,额外攻击可以对坚固怪造成额外伤害。", + "
", + "
", + "2. 绝对防御:", + "该怪物一般可以用于刷血。该怪物可以使你每回合对怪物造成的伤害恰好为1,导致战斗回合数很高,因此可以刷血。", + "
", + "
", + "3. 致命一击、勇气之刃、勇气冲锋:", + "造成的伤害为怪物每回合对勇士的伤害的一定倍数,而非攻击提高一定倍数。" + ] + }, + "special2": { + "text": "第二章怪物特技", + "condition": "flags.chapter > 1", + "desc": [ + "这里会展示第二章的怪物中需要特别说明的怪物特技。", + "
", + "
", + "1. 电摇嘲讽:", + "该特技会撞碎路上的所有地形和门,不需要消耗钥匙,拾取路上的所有道具,与路上的怪物战斗,最后与该怪物战斗。", + "如果怪物所在位置可以被嘲讽,那么勇士会被继续嘲讽。如果在被嘲讽的路上可以被其他怪物嘲讽,则不会触发。", + "如果一个点可以被多个怪物嘲讽,那么会优先选择最靠左上角的怪物。", + "在被嘲讽之前会自动存档。" + ] } } \ No newline at end of file diff --git a/src/data/skill.json b/src/data/skill.json index 149df80..4df2a5a 100644 --- a/src/data/skill.json +++ b/src/data/skill.json @@ -23,7 +23,10 @@ "desc": [ "快捷键2,消耗200点生命值,困难消耗400点,一个地图只能使用3次,", "如果前方为可通行的地面,则不能使用该技能,如果前方为怪物,则将怪物移至勇士视线上第一个不能通行的方块后", - "如果前方为障碍物,则直接跳到该障碍物的后方。" + "如果前方为障碍物,则直接跳到该障碍物的后方。", + "
", + "
", + "进入第二章后不再消耗生命值。" ] }, "shield": { diff --git a/src/panel/enemyCritical.vue b/src/panel/enemyCritical.vue index eaecddd..1aefe94 100644 --- a/src/panel/enemyCritical.vue +++ b/src/panel/enemyCritical.vue @@ -63,10 +63,10 @@ > {{ - nowDamage[0] < 0 && nowDamage[1] === '???' ? '=>' : '' + nowDamage[0] < 0 && !has(enemy.damage) ? '=>' : '' }}{{ - nowDamage[0] < 0 && nowDamage[1] === '???' + nowDamage[0] < 0 && !has(enemy.damage) ? format(-nowDamage[0]) : format(nowDamage[0]) }} { const value = (equip.value[v] ?? 0) + - core.status.hero[v] * (equip.percentage[v] ?? 0); + Math.floor( + (core.status.hero[v] * (equip.percentage[v] ?? 0)) / 100 + ); return ( @@ -71,7 +73,9 @@ export function getNowStatus(nowEquip?: Equip, onCol: boolean = false) { let add = 0; if (has(nowEquip)) { add += nowEquip.value[v] ?? 0; - const per = nowEquip.percentage[v] * core.getStatus(v); + const per = Math.floor( + (nowEquip.percentage[v] * core.getStatus(v)) / 100 + ); add += isNaN(per) ? 0 : per; } if (onCol) add = -add; diff --git a/src/plugin/ui/fly.ts b/src/plugin/ui/fly.ts index 84af182..a2049c8 100644 --- a/src/plugin/ui/fly.ts +++ b/src/plugin/ui/fly.ts @@ -44,7 +44,7 @@ export function splitArea() { if (used.includes(id) || core.status.maps[id].deleted) continue; const data = getMapData(id, true); used.push(...data.maps); - if (data.maps.length > 0) { + if (data.maps.length > 1) { const title = core.status.maps[id].title; area[title] = data.maps; } diff --git a/src/source/cls.d.ts b/src/source/cls.d.ts index abb45e3..3fedb84 100644 --- a/src/source/cls.d.ts +++ b/src/source/cls.d.ts @@ -488,6 +488,21 @@ interface IdToCls { E562: 'enemys'; E563: 'enemys'; E564: 'enemys'; + I565: 'items'; + E566: 'enemys'; + E567: 'enemys'; + E568: 'enemys'; + E569: 'enemys'; + E570: 'enemys'; + E571: 'enemys'; + E572: 'enemys'; + E573: 'enemys'; + I574: 'items'; + I575: 'items'; + E576: 'enemys'; + E577: 'enemys'; + E578: 'enemys'; + E579: 'enemys'; X20037: 'tileset'; X20038: 'tileset'; X20039: 'tileset'; diff --git a/src/source/data.d.ts b/src/source/data.d.ts index d14ee37..a1ce4d2 100644 --- a/src/source/data.d.ts +++ b/src/source/data.d.ts @@ -38,6 +38,7 @@ type FloorIds = | 'MT28' | 'MT29' | 'MT30' + | 'MT31' type ImageIds = | 'IQ.png' diff --git a/src/source/items.d.ts b/src/source/items.d.ts index c0b673e..6bbde91 100644 --- a/src/source/items.d.ts +++ b/src/source/items.d.ts @@ -181,4 +181,7 @@ interface ItemDeclaration { I558: 'constants'; I559: 'constants'; I560: 'constants'; + I565: 'constants'; + I574: 'items'; + I575: 'equips'; } \ No newline at end of file diff --git a/src/source/maps.d.ts b/src/source/maps.d.ts index c0c4e07..6cd6fbd 100644 --- a/src/source/maps.d.ts +++ b/src/source/maps.d.ts @@ -488,6 +488,21 @@ interface IdToNumber { E562: 562; E563: 563; E564: 564; + I565: 565; + E566: 566; + E567: 567; + E568: 568; + E569: 569; + E570: 570; + E571: 571; + E572: 572; + E573: 573; + I574: 574; + I575: 575; + E576: 576; + E577: 577; + E578: 578; + E579: 579; X20037: 20037; X20038: 20038; X20039: 20039; @@ -1010,6 +1025,21 @@ interface NumberToId { 562: 'E562'; 563: 'E563'; 564: 'E564'; + 565: 'I565'; + 566: 'E566'; + 567: 'E567'; + 568: 'E568'; + 569: 'E569'; + 570: 'E570'; + 571: 'E571'; + 572: 'E572'; + 573: 'E573'; + 574: 'I574'; + 575: 'I575'; + 576: 'E576'; + 577: 'E577'; + 578: 'E578'; + 579: 'E579'; 20037: 'X20037'; 20038: 'X20038'; 20039: 'X20039'; diff --git a/src/types/map.d.ts b/src/types/map.d.ts index 95c8e8d..beefa76 100644 --- a/src/types/map.d.ts +++ b/src/types/map.d.ts @@ -197,6 +197,11 @@ interface Floor extends FloorBase { * 是否被砍层 */ deleted?: boolean; + + /** + * 是否被强制砍层 + */ + forceDelete?: boolean; } interface ResolvedFloor extends FloorBase { diff --git a/src/types/plugin.d.ts b/src/types/plugin.d.ts index 9912074..fad67c4 100644 --- a/src/types/plugin.d.ts +++ b/src/types/plugin.d.ts @@ -279,6 +279,15 @@ interface MiniMap { splitArea(): void; } +interface Study { + /** + * 学习一个怪物技能 + * @param enemy 被学习的怪物 + * @param num 技能的索引 + */ + studySkill(enemy: Enemy, num: number): void; +} + type Chapter = 'chapter1' | 'chapter2'; interface Skill { diff --git a/src/types/status.d.ts b/src/types/status.d.ts index 4d79f2e..6a748f9 100644 --- a/src/types/status.d.ts +++ b/src/types/status.d.ts @@ -960,4 +960,13 @@ interface HeroStatus { items: { [P in Exclude]: Record, number>; }; + + /** + * 勇士学习的特技 + */ + special: { + num: []; + last: []; + [k: string]: any; + }; } diff --git a/src/ui/chapter.vue b/src/ui/chapter.vue index 70c0dfe..36e2db3 100644 --- a/src/ui/chapter.vue +++ b/src/ui/chapter.vue @@ -106,7 +106,7 @@ onMounted(async () => { .time(3000) .absolute() .apply('line', w + 10) - .mode(hyper('sin', 'in')) + .mode(hyper('sin', 'out')) .time(1000) .apply('rect', h / 2) .mode(hyper('tan', 'center')) diff --git a/src/ui/fly.vue b/src/ui/fly.vue index c62d8b7..8cefc2a 100644 --- a/src/ui/fly.vue +++ b/src/ui/fly.vue @@ -440,11 +440,12 @@ function changeFloorByDelta(delta: number) { if (to < 0) to = 0; if (to >= core.floorIds.length) to = core.floorIds.length - 1; const floor = core.status.maps[core.floorIds[to]]; - if (floor.deleted) { + if (floor.deleted || floor.forceDelete) { while (to !== now) { - to -= Math.sign(delta); + to += Math.sign(delta); const floor = core.status.maps[core.floorIds[to]]; - if (!floor.deleted) break; + if (!floor.deleted && !floor.forceDelete) break; + if (to < 0 || to >= core.floorIds.length) break; } } nowFloor.value = core.floorIds[to]; diff --git a/src/ui/statusBar.vue b/src/ui/statusBar.vue index e4b77e1..b7ced59 100644 --- a/src/ui/statusBar.vue +++ b/src/ui/statusBar.vue @@ -92,7 +92,7 @@ 技能树 @@ -100,7 +100,15 @@ 查看技能 + +
+ 查看技能
@@ -136,6 +144,7 @@ const skill = ref('无'); const up = ref(0); const spring = ref(); const skillOpened = ref(core.getFlag('chapter', 0) > 0); +const studyOpened = ref(core.getSkillLevel(11) > 0); /** * 要展示的勇士属性 */ @@ -181,22 +190,22 @@ function update() { spring.value = 50 - flags.springCount; } skillOpened.value = core.getFlag('chapter', 0) > 0; + studyOpened.value = core.getSkillLevel(11) > 0; } -function openSkillTree(e: MouseEvent) { - e.stopPropagation(); +function openSkillTree() { core.useItem('skill1'); } -function openSkill(e: MouseEvent) { - e.stopPropagation(); +function openSkill() { core.useItem('cross'); } -function viewMap(e: MouseEvent) { - e.stopPropagation(); +function viewMap() { core.ui._drawViewMaps(); } + +function openStudy() {}