From 3caf3546f4d8a8039f99d6906b6dbcdd0caa03d2 Mon Sep 17 00:00:00 2001 From: dgflash Date: Tue, 9 Aug 2022 16:07:34 +0800 Subject: [PATCH] =?UTF-8?q?oops-plugin-excel-to-json=E6=8F=92=E4=BB=B6?= =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=9C=80=E6=96=B0=E7=89=88=E6=9C=ACoops-fram?= =?UTF-8?q?ework=E7=9B=AE=E5=BD=95=E7=BB=93=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 5 ++++- assets/main.scene | 2 +- assets/resources/config/game/RoleJob.json.meta | 2 +- .../resources/config/game/RoleLevelUp.json.meta | 2 +- .../script/game/common/table/TablePromptWindow.ts | 15 +++------------ .../game/common/table/TablePromptWindow.ts.meta | 2 +- assets/script/game/common/table/TableRoleJob.ts | 6 ------ .../script/game/common/table/TableRoleJob.ts.meta | 2 +- .../script/game/common/table/TableRoleLevelUp.ts | 10 ++-------- .../game/common/table/TableRoleLevelUp.ts.meta | 2 +- .../v2/packages/oops-plugin-excel-to-json.json | 6 +++--- 11 files changed, 18 insertions(+), 36 deletions(-) diff --git a/README.md b/README.md index fdecfab..d8b01c1 100644 --- a/README.md +++ b/README.md @@ -103,4 +103,7 @@ Oops Framework 基于 Cocos Creato 3.x 开发的一款游戏框架 - [新手引导模块 oops-guide](https://store.cocos.com/app/detail/3653) - [联机游戏框架 oops-mgobe](https://store.cocos.com/app/detail/3574) - [开源框架 oops-framework gitee](https://gitee.com/dgflash/oops-framework) -- [开源框架 oops-framework github](https://github.com/dgflash/oops-framework) \ No newline at end of file +- [开源框架 oops-framework github](https://github.com/dgflash/oops-framework) + +### 开发维护不易，如果对您有帮助，希望给与支持 +![您对作者的支持](http://dgflash.gitee.io/oops-full-stack-web/doc/support.jpg) diff --git a/assets/main.scene b/assets/main.scene index f4030c5..24d4c31 100644 --- a/assets/main.scene +++ b/assets/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 375, + "_orthoHeight": 417.5365344467641, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/resources/config/game/RoleJob.json.meta b/assets/resources/config/game/RoleJob.json.meta index 93cce22..da29e23 100644 --- a/assets/resources/config/game/RoleJob.json.meta +++ b/assets/resources/config/game/RoleJob.json.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "json", "imported": true, - "uuid": "eb411176-ba54-4d62-86db-4cc4035d1540", + "uuid": "ff18f0c9-550b-4e48-aca8-d37fe1d2b510", "files": [ ".json" ], diff --git a/assets/resources/config/game/RoleLevelUp.json.meta b/assets/resources/config/game/RoleLevelUp.json.meta index 5583a89..9e2ace3 100644 --- a/assets/resources/config/game/RoleLevelUp.json.meta +++ b/assets/resources/config/game/RoleLevelUp.json.meta @@ -2,7 +2,7 @@ "ver": "1.0.0", "importer": "json", "imported": true, - "uuid": "358eb9a8-5c38-47d1-ab37-2ce2a50e6d6c", + "uuid": "11a2f047-e929-4f50-8df1-d31311013e88", "files": [ ".json" ], diff --git a/assets/script/game/common/table/TablePromptWindow.ts b/assets/script/game/common/table/TablePromptWindow.ts index 0c3c92a..345f7ef 100644 --- a/assets/script/game/common/table/TablePromptWindow.ts +++ b/assets/script/game/common/table/TablePromptWindow.ts @@ -1,9 +1,3 @@ -/* - * @Author: dgflash - * @Date: 2022-06-02 09:38:48 - * @LastEditors: dgflash - * @LastEditTime: 2022-08-02 14:26:35 - */ import { JsonUtil } from "../../../../../extensions/oops-plugin-framework/assets/core/utils/JsonUtil"; @@ -15,14 +9,10 @@ export class TablePromptWindow { init(id: number, id1: number, id2: number) { var table = JsonUtil.get(TablePromptWindow.TableName); this.data = table[id][id1][id2]; - this.id = id; - this.id1 = id1; - this.id2 = id2; + this.id = id; this.id1 = id1; this.id2 = id2; } - id: number = 0; - id1: number = 0; - id2: number = 0; + id: number = 0; id1: number = 0; id2: number = 0; get title(): string { return this.data.title; @@ -37,3 +27,4 @@ export class TablePromptWindow { return this.data.hp; } } + \ No newline at end of file diff --git a/assets/script/game/common/table/TablePromptWindow.ts.meta b/assets/script/game/common/table/TablePromptWindow.ts.meta index 2026970..296bee2 100644 --- a/assets/script/game/common/table/TablePromptWindow.ts.meta +++ b/assets/script/game/common/table/TablePromptWindow.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "1e3d7b9a-9e7e-4c46-8900-2f6c142e6f72", + "uuid": "0e0091bc-db56-4a18-8669-334ddff61370", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/common/table/TableRoleJob.ts b/assets/script/game/common/table/TableRoleJob.ts index 7222d85..5a28315 100644 --- a/assets/script/game/common/table/TableRoleJob.ts +++ b/assets/script/game/common/table/TableRoleJob.ts @@ -1,9 +1,3 @@ -/* - * @Author: dgflash - * @Date: 2022-06-02 09:38:48 - * @LastEditors: dgflash - * @LastEditTime: 2022-06-14 17:53:26 - */ import { JsonUtil } from "../../../../../extensions/oops-plugin-framework/assets/core/utils/JsonUtil"; diff --git a/assets/script/game/common/table/TableRoleJob.ts.meta b/assets/script/game/common/table/TableRoleJob.ts.meta index d086263..f3fa27a 100644 --- a/assets/script/game/common/table/TableRoleJob.ts.meta +++ b/assets/script/game/common/table/TableRoleJob.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "fdd6be75-ecd4-4494-b6a8-8840861bc221", + "uuid": "45753233-f907-41fd-952a-f40d7e31396b", "files": [], "subMetas": {}, "userData": {} diff --git a/assets/script/game/common/table/TableRoleLevelUp.ts b/assets/script/game/common/table/TableRoleLevelUp.ts index e47b411..2780d70 100644 --- a/assets/script/game/common/table/TableRoleLevelUp.ts +++ b/assets/script/game/common/table/TableRoleLevelUp.ts @@ -1,9 +1,3 @@ -/* - * @Author: dgflash - * @Date: 2022-06-02 09:38:48 - * @LastEditors: dgflash - * @LastEditTime: 2022-06-14 17:55:36 - */ import { JsonUtil } from "../../../../../extensions/oops-plugin-framework/assets/core/utils/JsonUtil"; @@ -20,10 +14,10 @@ export class TableRoleLevelUp { id: number = 0; - get needexp(): number { + get needexp(): string { return this.data.needexp; } - get hp(): number { + get hp(): string { return this.data.hp; } } diff --git a/assets/script/game/common/table/TableRoleLevelUp.ts.meta b/assets/script/game/common/table/TableRoleLevelUp.ts.meta index ee2889c..b29e805 100644 --- a/assets/script/game/common/table/TableRoleLevelUp.ts.meta +++ b/assets/script/game/common/table/TableRoleLevelUp.ts.meta @@ -2,7 +2,7 @@ "ver": "4.0.23", "importer": "typescript", "imported": true, - "uuid": "71d7b81c-9b43-4424-987f-ab00d6154f0e", + "uuid": "f71b8a82-d129-4e56-80ab-16c0ba1ca8a8", "files": [], "subMetas": {}, "userData": {} diff --git a/settings/v2/packages/oops-plugin-excel-to-json.json b/settings/v2/packages/oops-plugin-excel-to-json.json index 7cf26c9..9e82113 100644 --- a/settings/v2/packages/oops-plugin-excel-to-json.json +++ b/settings/v2/packages/oops-plugin-excel-to-json.json @@ -1,6 +1,6 @@ { "__version__": "1.0.0", - "PathJson": "D:\\gitee\\oops-framework\\assets\\resources\\config\\game", - "PathExcel": "D:\\gitee\\oops-framework\\extensions\\oops-plugin-excel-to-json\\excel", - "PathTs": "D:\\gitee\\oops-framework\\assets\\script\\game\\common\\table" + "PathJson": "../../../assets/resources/config/game/", + "PathExcel": "../excel/", + "PathTs": "../../../assets/script/game/common/table/" }