From 0feb7398b0eb5e8f6aae2aaccef02e8300e8e1d4 Mon Sep 17 00:00:00 2001 From: dgflash Date: Sat, 30 Apr 2022 20:12:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=E7=94=9F=E6=88=90=E6=8F=92=E4=BB=B6=E7=AC=AC=E4=B8=80?= =?UTF-8?q?=E6=9D=A1=E8=AE=B0=E5=BD=95=E6=9C=AA=E7=94=9F=E6=88=90=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- assets/main.scene | 2 +- assets/main.scene.meta | 6 +++-- .../resources/config/game/PromptWindow.json | 2 +- assets/resources/config/game/RoleJob.json | 2 +- assets/resources/config/game/RoleLevelUp.json | 2 +- .../game/common/table/TablePromptWindow.ts | 8 +++---- .../dist/ExcelToJson.js | 19 ++++++++-------- .../excel/PromptWindow.xlsx | Bin 9524 -> 9575 bytes .../src/ExcelToJson.ts | 21 +++++++++--------- 9 files changed, 32 insertions(+), 30 deletions(-) diff --git a/assets/main.scene b/assets/main.scene index 5440dea..f93b7ed 100644 --- a/assets/main.scene +++ b/assets/main.scene @@ -227,7 +227,7 @@ "_priority": 1073741824, "_fov": 45, "_fovAxis": 0, - "_orthoHeight": 435.75652173913045, + "_orthoHeight": 450.15468607825295, "_near": 1, "_far": 2000, "_color": { diff --git a/assets/main.scene.meta b/assets/main.scene.meta index 4aada67..82bb146 100644 --- a/assets/main.scene.meta +++ b/assets/main.scene.meta @@ -1,9 +1,11 @@ { "ver": "1.1.38", "importer": "scene", - "imported": false, + "imported": true, "uuid": "ba0b085f-f8d5-40b0-9964-2fd25728d707", - "files": [], + "files": [ + ".json" + ], "subMetas": {}, "userData": {} } diff --git a/assets/resources/config/game/PromptWindow.json b/assets/resources/config/game/PromptWindow.json index abb74c4..89d9c0c 100644 --- a/assets/resources/config/game/PromptWindow.json +++ b/assets/resources/config/game/PromptWindow.json @@ -1 +1 @@ -{"2":{"1":{"title":"断网提示","describe":"网络异常","array":{"a":1},"hp":2}}} \ No newline at end of file +{"1":{"2":{"3":{"title":"系统提示","describe":"服务器正在更新，请稍后!","array":{"a":1,"b":"abc"},"hp":1}}},"2":{"1":{"1":{"title":"断网提示","describe":"网络异常","array":{"a":1},"hp":2}}}} \ No newline at end of file diff --git a/assets/resources/config/game/RoleJob.json b/assets/resources/config/game/RoleJob.json index 1bbb859..ff92d30 100644 --- a/assets/resources/config/game/RoleJob.json +++ b/assets/resources/config/game/RoleJob.json @@ -1 +1 @@ -{"5":{"armsName":"刺客","weaponType":[10,11,12],"power":5,"agile":10},"9":{"armsName":"长弓手","weaponType":[5],"power":5,"agile":8}} \ No newline at end of file +{"1":{"armsName":"剑客","weaponType":[1],"power":8,"agile":2},"5":{"armsName":"刺客","weaponType":[10,11,12],"power":5,"agile":10},"9":{"armsName":"长弓手","weaponType":[5],"power":5,"agile":8}} \ No newline at end of file diff --git a/assets/resources/config/game/RoleLevelUp.json b/assets/resources/config/game/RoleLevelUp.json index 747c1a1..abf92ab 100644 --- a/assets/resources/config/game/RoleLevelUp.json +++ b/assets/resources/config/game/RoleLevelUp.json @@ -1 +1 @@ -{"2":{"needexp":10,"hp":6},"3":{"needexp":30,"hp":6},"4":{"needexp":70,"hp":7},"5":{"needexp":110,"hp":7},"6":{"needexp":170,"hp":8},"7":{"needexp":240,"hp":8},"8":{"needexp":320,"hp":9},"9":{"needexp":420,"hp":9},"10":{"needexp":520,"hp":10},"11":{"needexp":640,"hp":10},"12":{"needexp":770,"hp":11},"13":{"needexp":920,"hp":11},"14":{"needexp":1080,"hp":12},"15":{"needexp":1250,"hp":13},"16":{"needexp":1440,"hp":14},"17":{"needexp":1640,"hp":15},"18":{"needexp":1860,"hp":16},"19":{"needexp":2090,"hp":17},"20":{"needexp":2330,"hp":18},"21":{"needexp":2590,"hp":19},"22":{"needexp":2870,"hp":20},"23":{"needexp":3150,"hp":21},"24":{"needexp":3460,"hp":22},"25":{"needexp":3770,"hp":23},"26":{"needexp":4110,"hp":24},"27":{"needexp":4450,"hp":25},"28":{"needexp":4820,"hp":26},"29":{"needexp":5190,"hp":27},"30":{"needexp":5590,"hp":28},"31":{"needexp":5990,"hp":29},"32":{"needexp":6420,"hp":31},"33":{"needexp":6860,"hp":32},"34":{"needexp":7310,"hp":34},"35":{"needexp":7780,"hp":35},"36":{"needexp":8270,"hp":37},"37":{"needexp":8770,"hp":38},"38":{"needexp":9290,"hp":40},"39":{"needexp":9820,"hp":41},"40":{"needexp":10370,"hp":43},"41":{"needexp":10940,"hp":44},"42":{"needexp":11520,"hp":46},"43":{"needexp":12120,"hp":47},"44":{"needexp":12730,"hp":49},"45":{"needexp":13360,"hp":50},"46":{"needexp":14010,"hp":52},"47":{"needexp":14670,"hp":53},"48":{"needexp":15350,"hp":55},"49":{"needexp":16050,"hp":56},"50":{"needexp":16760,"hp":58},"51":{"needexp":17490,"hp":59},"52":{"needexp":18240,"hp":61},"53":{"needexp":19000,"hp":63},"54":{"needexp":19780,"hp":64},"55":{"needexp":20580,"hp":66},"56":{"needexp":21390,"hp":68},"57":{"needexp":22220,"hp":69},"58":{"needexp":23070,"hp":71},"59":{"needexp":23930,"hp":73},"60":{"needexp":24810,"hp":74},"61":{"needexp":25710,"hp":76},"62":{"needexp":26620,"hp":78},"63":{"needexp":27560,"hp":79},"64":{"needexp":28500,"hp":81},"65":{"needexp":29470,"hp":83},"66":{"needexp":30450,"hp":84},"67":{"needexp":31460,"hp":86},"68":{"needexp":32470,"hp":88},"69":{"needexp":33510,"hp":90},"70":{"needexp":34560,"hp":92},"71":{"needexp":35630,"hp":94},"72":{"needexp":36720,"hp":96},"73":{"needexp":37830,"hp":98},"74":{"needexp":38950,"hp":100},"75":{"needexp":40090,"hp":102},"76":{"needexp":41250,"hp":104},"77":{"needexp":42420,"hp":106},"78":{"needexp":43620,"hp":108},"79":{"needexp":44830,"hp":110},"80":{"needexp":46060,"hp":112},"81":{"needexp":47300,"hp":114},"82":{"needexp":48570,"hp":116},"83":{"needexp":49850,"hp":118},"84":{"needexp":51150,"hp":120},"85":{"needexp":52470,"hp":122},"86":{"needexp":53810,"hp":125},"87":{"needexp":55160,"hp":128},"88":{"needexp":56530,"hp":131},"89":{"needexp":57920,"hp":134},"90":{"needexp":59330,"hp":137},"91":{"needexp":60760,"hp":140},"92":{"needexp":62200,"hp":143},"93":{"needexp":63670,"hp":146},"94":{"needexp":65150,"hp":149},"95":{"needexp":66650,"hp":152},"96":{"needexp":68160,"hp":155},"97":{"needexp":69700,"hp":158},"98":{"needexp":71250,"hp":161},"99":{"needexp":72830,"hp":164},"100":{"needexp":74420,"hp":167}} \ No newline at end of file +{"1":{"needexp":0,"hp":5},"2":{"needexp":10,"hp":6},"3":{"needexp":30,"hp":6},"4":{"needexp":70,"hp":7},"5":{"needexp":110,"hp":7},"6":{"needexp":170,"hp":8},"7":{"needexp":240,"hp":8},"8":{"needexp":320,"hp":9},"9":{"needexp":420,"hp":9},"10":{"needexp":520,"hp":10},"11":{"needexp":640,"hp":10},"12":{"needexp":770,"hp":11},"13":{"needexp":920,"hp":11},"14":{"needexp":1080,"hp":12},"15":{"needexp":1250,"hp":13},"16":{"needexp":1440,"hp":14},"17":{"needexp":1640,"hp":15},"18":{"needexp":1860,"hp":16},"19":{"needexp":2090,"hp":17},"20":{"needexp":2330,"hp":18},"21":{"needexp":2590,"hp":19},"22":{"needexp":2870,"hp":20},"23":{"needexp":3150,"hp":21},"24":{"needexp":3460,"hp":22},"25":{"needexp":3770,"hp":23},"26":{"needexp":4110,"hp":24},"27":{"needexp":4450,"hp":25},"28":{"needexp":4820,"hp":26},"29":{"needexp":5190,"hp":27},"30":{"needexp":5590,"hp":28},"31":{"needexp":5990,"hp":29},"32":{"needexp":6420,"hp":31},"33":{"needexp":6860,"hp":32},"34":{"needexp":7310,"hp":34},"35":{"needexp":7780,"hp":35},"36":{"needexp":8270,"hp":37},"37":{"needexp":8770,"hp":38},"38":{"needexp":9290,"hp":40},"39":{"needexp":9820,"hp":41},"40":{"needexp":10370,"hp":43},"41":{"needexp":10940,"hp":44},"42":{"needexp":11520,"hp":46},"43":{"needexp":12120,"hp":47},"44":{"needexp":12730,"hp":49},"45":{"needexp":13360,"hp":50},"46":{"needexp":14010,"hp":52},"47":{"needexp":14670,"hp":53},"48":{"needexp":15350,"hp":55},"49":{"needexp":16050,"hp":56},"50":{"needexp":16760,"hp":58},"51":{"needexp":17490,"hp":59},"52":{"needexp":18240,"hp":61},"53":{"needexp":19000,"hp":63},"54":{"needexp":19780,"hp":64},"55":{"needexp":20580,"hp":66},"56":{"needexp":21390,"hp":68},"57":{"needexp":22220,"hp":69},"58":{"needexp":23070,"hp":71},"59":{"needexp":23930,"hp":73},"60":{"needexp":24810,"hp":74},"61":{"needexp":25710,"hp":76},"62":{"needexp":26620,"hp":78},"63":{"needexp":27560,"hp":79},"64":{"needexp":28500,"hp":81},"65":{"needexp":29470,"hp":83},"66":{"needexp":30450,"hp":84},"67":{"needexp":31460,"hp":86},"68":{"needexp":32470,"hp":88},"69":{"needexp":33510,"hp":90},"70":{"needexp":34560,"hp":92},"71":{"needexp":35630,"hp":94},"72":{"needexp":36720,"hp":96},"73":{"needexp":37830,"hp":98},"74":{"needexp":38950,"hp":100},"75":{"needexp":40090,"hp":102},"76":{"needexp":41250,"hp":104},"77":{"needexp":42420,"hp":106},"78":{"needexp":43620,"hp":108},"79":{"needexp":44830,"hp":110},"80":{"needexp":46060,"hp":112},"81":{"needexp":47300,"hp":114},"82":{"needexp":48570,"hp":116},"83":{"needexp":49850,"hp":118},"84":{"needexp":51150,"hp":120},"85":{"needexp":52470,"hp":122},"86":{"needexp":53810,"hp":125},"87":{"needexp":55160,"hp":128},"88":{"needexp":56530,"hp":131},"89":{"needexp":57920,"hp":134},"90":{"needexp":59330,"hp":137},"91":{"needexp":60760,"hp":140},"92":{"needexp":62200,"hp":143},"93":{"needexp":63670,"hp":146},"94":{"needexp":65150,"hp":149},"95":{"needexp":66650,"hp":152},"96":{"needexp":68160,"hp":155},"97":{"needexp":69700,"hp":158},"98":{"needexp":71250,"hp":161},"99":{"needexp":72830,"hp":164},"100":{"needexp":74420,"hp":167}} \ No newline at end of file diff --git a/assets/script/game/common/table/TablePromptWindow.ts b/assets/script/game/common/table/TablePromptWindow.ts index 30390c5..4d76ae0 100644 --- a/assets/script/game/common/table/TablePromptWindow.ts +++ b/assets/script/game/common/table/TablePromptWindow.ts @@ -6,13 +6,13 @@ export class TablePromptWindow { private data: any; - init(id: number, id_double: number) { + init(id: number, id1: number, id2: number) { var table = JsonUtil.get(TablePromptWindow.TableName); - this.data = table[id][id_double]; - this.id = id; this.id_double = id_double; + this.data = table[id][id1][id2]; + this.id = id; this.id1 = id1; this.id2 = id2; } - id: number = 0; id_double: number = 0; + id: number = 0; id1: number = 0; id2: number = 0; get title(): string { return this.data.title; diff --git a/extensions/oops-plugin-excel-to-json/dist/ExcelToJson.js b/extensions/oops-plugin-excel-to-json/dist/ExcelToJson.js index f9e5a80..516ac94 100644 --- a/extensions/oops-plugin-excel-to-json/dist/ExcelToJson.js +++ b/extensions/oops-plugin-excel-to-json/dist/ExcelToJson.js @@ -77,27 +77,28 @@ async function convert(src, dst, name, isClient) { } }); // 生成数据（多主键） - if (rowNumber > 6) { + if (rowNumber > 5) { let temp = null; for (var i = 0; i < primary.length; i++) { let k = primary[i]; let id = data[k]; delete data[k]; // 主键数据删除 - if (temp == null) { - if (i == primary.length - 1) { - r[id] = data; - } - else { - r[id] = {}; - temp = r[id]; - } + if (primary.length == 1) { + r[id] = data; } else { if (i == primary.length - 1) { temp[id] = data; } + else if (i == 0) { + if (r[id] == undefined) { + r[id] = {}; + } + temp = r[id]; + } else { temp[id] = {}; + temp = temp[id]; } } } diff --git a/extensions/oops-plugin-excel-to-json/excel/PromptWindow.xlsx b/extensions/oops-plugin-excel-to-json/excel/PromptWindow.xlsx index 96bfe6ac6bb4e6231f4c0d30d44f305fd25bcd91..3d422da49d6975cc6c25bfac535a726a54c64eba 100644 GIT binary patch delta 5115 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%0AXh)gTselyMxCs6$e#9yO5Jn=V+J<1Yc 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 6) { + if (rowNumber > 5) { let temp: any = null; for (var i = 0; i < primary.length; i++) { let k = primary[i]; let id = data[k]; delete data[k]; // 主键数据删除 - if (temp == null) { - if (i == primary.length - 1) { - r[id] = data; - } - else { - r[id] = {}; - temp = r[id]; - } + if (primary.length == 1) { + r[id] = data; } else { if (i == primary.length - 1) { temp[id] = data; } + else if (i == 0) { + if (r[id] == undefined) { + r[id] = {}; + } + temp = r[id]; + } else { temp[id] = {}; + temp = temp[id]; } } } @@ -111,7 +111,6 @@ async function convert(src: string, dst: string, name: string, isClient: boolean await fs.writeFileSync(dst, JSON.stringify(r)); // 生成客户端脚本 - if (isClient) createTs(name, types_client, r, primary); console.log(isClient ? "客户端数据" : "服务器数据", "生成成功", dst); }