From 75cc583a4410eea7f48f052ce02b9b67aa85e42b Mon Sep 17 00:00:00 2001 From: xlj <543978819@qq.com> Date: Tue, 12 Aug 2025 16:08:58 +0800 Subject: [PATCH] update --- DataTables/Datas/__enums__.xlsx | Bin 9768 -> 9959 bytes DataTables/Datas/__tables__.xlsx | Bin 9609 -> 9653 bytes DataTables/Datas/girls.xlsx | Bin 0 -> 10558 bytes DataTables/output/tbgirls.json | 12 ++ assets/Scenes/MainScene.scene | 110 ++++++++++---- .../Scripts/chat18x/manager/ConfigManager.ts | 35 ++++- assets/Scripts/schema/schema.ts | 134 ++++++++++++++++++ assets/bundles/Chat18x/LubanCfg.meta | 9 -- assets/bundles/DataTable/Music.json | 2 - assets/bundles/DataTable/Music.json.meta | 11 -- assets/bundles/DataTable/Sound.json | 5 - assets/bundles/DataTable/Sound.json.meta | 11 -- assets/bundles/DataTable/commonGlobal.json | 4 - .../bundles/DataTable/commonGlobal.json.meta | 11 -- .../DataTable}/demo_tbitem.bin | 0 .../DataTable}/demo_tbitem.bin.meta | 2 +- .../DataTable}/demo_tbreward.bin | 0 .../DataTable}/demo_tbreward.bin.meta | 2 +- assets/bundles/DataTable/tbgirls.bin | Bin 0 -> 32 bytes assets/bundles/DataTable/tbgirls.bin.meta | 12 ++ assets/resources/test.meta | 9 -- gen_client.bat | 2 +- 22 files changed, 276 insertions(+), 95 deletions(-) create mode 100644 DataTables/Datas/girls.xlsx create mode 100644 DataTables/output/tbgirls.json delete mode 100644 assets/bundles/Chat18x/LubanCfg.meta delete mode 100644 assets/bundles/DataTable/Music.json delete mode 100644 assets/bundles/DataTable/Music.json.meta delete mode 100644 assets/bundles/DataTable/Sound.json delete mode 100644 assets/bundles/DataTable/Sound.json.meta delete mode 100644 assets/bundles/DataTable/commonGlobal.json delete mode 100644 assets/bundles/DataTable/commonGlobal.json.meta rename assets/{resources/test => bundles/DataTable}/demo_tbitem.bin (100%) rename assets/{resources/test => bundles/DataTable}/demo_tbitem.bin.meta (74%) rename assets/{resources/test => bundles/DataTable}/demo_tbreward.bin (100%) rename assets/{resources/test => bundles/DataTable}/demo_tbreward.bin.meta (74%) create mode 100644 assets/bundles/DataTable/tbgirls.bin create mode 100644 assets/bundles/DataTable/tbgirls.bin.meta delete mode 100644 assets/resources/test.meta diff --git a/DataTables/Datas/__enums__.xlsx b/DataTables/Datas/__enums__.xlsx index a00569881286d599833d5111d19ae590e70f0549..69439db6658dd85b90730bd4f87dee643cbe2ddf 100644 GIT binary patch literal 9959 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 a!Tv7%P?CG{^UsP2DV;)q$n{e_;{FGC-9)kg literal 9768 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 MJB%EaAOHOJf9-~MF8}}l diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index e2d7a261e67fde18ba8f1051863ea7121f437e3c..11befc16fe1392042a4e2e5c336a3c4d2eda157f 100644 GIT binary patch delta 2646 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 UPhJdglRyVa0M0py{ORBS02yvQCIA2c literal 0 HcmV?d00001 diff --git a/DataTables/output/tbgirls.json b/DataTables/output/tbgirls.json new file mode 100644 index 00000000..f6c3cf9a --- /dev/null +++ b/DataTables/output/tbgirls.json @@ -0,0 +1,12 @@ +[ + { + "id": 10001, + "name": "Anaya Kapoor", + "age": "29", + "category": 0, + "tag": [ + "Hot,Horny" + ], + "priceType": 0 + } +] \ No newline at end of file diff --git a/assets/Scenes/MainScene.scene b/assets/Scenes/MainScene.scene index de6104d2..fa7543c2 100644 --- a/assets/Scenes/MainScene.scene +++ b/assets/Scenes/MainScene.scene @@ -18,12 +18,15 @@ "_children": [ { "__id__": 2 + }, + { + "__id__": 32 } ], "_active": true, "_components": [], "_prefab": { - "__id__": 32 + "__id__": 34 }, "_lpos": { "__type__": "cc.Vec3", @@ -54,7 +57,7 @@ }, "autoReleaseAssets": false, "_globals": { - "__id__": 33 + "__id__": 35 }, "_id": "1a23cd3e-e487-4fd1-a415-346c2087464d" }, @@ -98,8 +101,8 @@ "_prefab": null, "_lpos": { "__type__": "cc.Vec3", - "x": 196.5, - "y": 426.00000000000006, + "x": 583.5, + "y": 1266, "z": 0 }, "_lrot": { @@ -580,8 +583,8 @@ "__prefab": null, "_alignFlags": 45, "_target": null, - "_left": 361, - "_right": 361, + "_left": 359.5, + "_right": 359.5, "_top": 978, "_bottom": 978, "_horizontalCenter": 0, @@ -663,8 +666,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 393, - "height": 852.0000000000001 + "width": 1167, + "height": 2532 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -789,8 +792,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 393, - "height": 852.0000000000001 + "width": 1167, + "height": 2532 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -889,8 +892,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 393, - "height": 852.0000000000001 + "width": 1167, + "height": 2532 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -941,8 +944,8 @@ "__prefab": null, "_contentSize": { "__type__": "cc.Size", - "width": 393, - "height": 852.0000000000001 + "width": 1167, + "height": 2532 }, "_anchorPoint": { "__type__": "cc.Vec2", @@ -1018,6 +1021,63 @@ }, "_id": "98EWBIubZPlZT+LFQb4IYI" }, + { + "__type__": "cc.Node", + "_name": "ConfigManager", + "_objFlags": 0, + "__editorExtras__": {}, + "_parent": { + "__id__": 1 + }, + "_children": [], + "_active": true, + "_components": [ + { + "__id__": 33 + } + ], + "_prefab": null, + "_lpos": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_lrot": { + "__type__": "cc.Quat", + "x": 0, + "y": 0, + "z": 0, + "w": 1 + }, + "_lscale": { + "__type__": "cc.Vec3", + "x": 1, + "y": 1, + "z": 1 + }, + "_mobility": 0, + "_layer": 1073741824, + "_euler": { + "__type__": "cc.Vec3", + "x": 0, + "y": 0, + "z": 0 + }, + "_id": "67ZXnZeExFXIu59phK6Xjz" + }, + { + "__type__": "fbd43WrI4tK6KXuGCPuxhSR", + "_name": "", + "_objFlags": 0, + "__editorExtras__": {}, + "node": { + "__id__": 32 + }, + "_enabled": true, + "__prefab": null, + "_id": "57vDjH7bVD4JDeqZChrdP3" + }, { "__type__": "cc.PrefabInfo", "root": null, @@ -1029,29 +1089,29 @@ { "__type__": "cc.SceneGlobals", "ambient": { - "__id__": 34 - }, - "shadows": { - "__id__": 35 - }, - "_skybox": { "__id__": 36 }, - "fog": { + "shadows": { "__id__": 37 }, - "octree": { + "_skybox": { "__id__": 38 }, - "skin": { + "fog": { "__id__": 39 }, - "lightProbeInfo": { + "octree": { "__id__": 40 }, - "postSettings": { + "skin": { "__id__": 41 }, + "lightProbeInfo": { + "__id__": 42 + }, + "postSettings": { + "__id__": 43 + }, "bakedWithStationaryMainLight": false, "bakedWithHighpLightmap": false }, diff --git a/assets/Scripts/chat18x/manager/ConfigManager.ts b/assets/Scripts/chat18x/manager/ConfigManager.ts index 6f3c5082..4d4a8c47 100644 --- a/assets/Scripts/chat18x/manager/ConfigManager.ts +++ b/assets/Scripts/chat18x/manager/ConfigManager.ts @@ -1,4 +1,11 @@ -import { _decorator, resources, BufferAsset, Component } from "cc"; +import { + _decorator, + resources, + BufferAsset, + Component, + assetManager, + AssetManager, +} from "cc"; import * as cfg from "../../schema/schema"; import ByteBuf from "db://assets/Scripts/luban/ByteBuf"; @@ -22,9 +29,27 @@ export default class ConfigManager extends Component { let promises: Promise[] = []; for (let curFileName of ConfigManager.jsonFileNames) { let promise = new Promise((resolve, reject) => { - resources.load("test/" + curFileName, BufferAsset, (err, data) => { - resolve(data); - }); + let bundle = assetManager.getBundle("DataTable"); + if (bundle) { + bundle.load(curFileName, BufferAsset, (err, data) => { + resolve(data); + }); + } else { + assetManager.loadBundle( + "DataTable", + (err: Error, _bundle: AssetManager.Bundle) => { + if (err) { + console.log(err); + reject && reject(err); + return; + } else { + _bundle.load(curFileName, BufferAsset, (err, data) => { + resolve(data); + }); + } + } + ); + } }); promise.then((data: BufferAsset) => { if (data) { @@ -41,7 +66,7 @@ export default class ConfigManager extends Component { Promise.all(promises).then((values) => { console.log("静态配置加载完成"); ConfigManager.tables = new cfg.Tables(this.getFileData); - for (let item of ConfigManager.tables.Tbitem.getDataList()) { + for (let item of ConfigManager.tables.TbGirls.getDataList()) { console.log(item); } }); diff --git a/assets/Scripts/schema/schema.ts b/assets/Scripts/schema/schema.ts index 33bcdef9..17e7d6f8 100644 --- a/assets/Scripts/schema/schema.ts +++ b/assets/Scripts/schema/schema.ts @@ -10,6 +10,52 @@ import ByteBuf from '../luban/ByteBuf' + +export enum Category { + /** + * 熟女 + */ + shunv = 0, + /** + * 18岁 + */ + eighteen = 1, + /** + * 辣妈 + */ + lama = 2, + /** + * 捆绑 + */ + kunbang = 3, + /** + * 公众野战 + */ + publicfight = 4, + /** + * 卡通 + */ + cartoon = 5, +} + + + +export enum PriceType { + /** + * 免费 + */ + free = 0, + /** + * 试用 + */ + first_time_free = 1, + /** + * 收费 + */ + pay = 2, +} + + @@ -91,6 +137,56 @@ export class Reward { +export class Girls { + + constructor(_buf_: ByteBuf) { + this.id = _buf_.readInt() + this.name = _buf_.readString() + this.age = _buf_.readString() + this.category = _buf_.readInt() + { let n = Math.min(_buf_.readSize(), _buf_.size); this.tag = []; for(let i = 0 ; i < n ; i++) { let _e0 ;_e0 = _buf_.readString(); this.tag.push(_e0);}} + this.priceType = _buf_.readInt() + } + + /** + * id + */ + readonly id: number + /** + * 名称 + */ + readonly name: string + /** + * 年龄 + */ + readonly age: string + /** + * 分类 + */ + readonly category: Category + /** + * 标签 + */ + readonly tag: string[] + /** + * 付费类型 + */ + readonly priceType: PriceType + + resolve(tables:Tables) { + + + + + + + } +} + + + + + export class vector2 { constructor(_buf_: ByteBuf) { @@ -193,6 +289,39 @@ export class TbReward { } + +export class TbGirls { + private _dataMap: Map + private _dataList: Girls[] + constructor(_buf_: ByteBuf) { + this._dataMap = new Map() + this._dataList = [] + for(let n = _buf_.readInt(); n > 0; n--) { + let _v: Girls + _v = new Girls(_buf_) + this._dataList.push(_v) + this._dataMap.set(_v.id, _v) + } + } + + getDataMap(): Map { return this._dataMap; } + getDataList(): Girls[] { return this._dataList; } + + get(key: number): Girls | undefined { + return this._dataMap.get(key); + } + + resolve(tables:Tables) { + for(let data of this._dataList) + { + data.resolve(tables) + } + } + +} + + + export namespace demo { export class Tbitem { private _dataMap: Map @@ -232,21 +361,26 @@ type ByteBufLoader = (file: string) => ByteBuf export class Tables { private _TbReward: demo.TbReward get TbReward(): demo.TbReward { return this._TbReward;} + private _TbGirls: TbGirls + get TbGirls(): TbGirls { return this._TbGirls;} private _Tbitem: demo.Tbitem get Tbitem(): demo.Tbitem { return this._Tbitem;} static getTableNames(): string[] { let names: string[] = []; names.push('demo_tbreward'); + names.push('tbgirls'); names.push('demo_tbitem'); return names; } constructor(loader: ByteBufLoader) { this._TbReward = new demo.TbReward(loader('demo_tbreward')) + this._TbGirls = new TbGirls(loader('tbgirls')) this._Tbitem = new demo.Tbitem(loader('demo_tbitem')) this._TbReward.resolve(this) + this._TbGirls.resolve(this) this._Tbitem.resolve(this) } } diff --git a/assets/bundles/Chat18x/LubanCfg.meta b/assets/bundles/Chat18x/LubanCfg.meta deleted file mode 100644 index 02828a1c..00000000 --- a/assets/bundles/Chat18x/LubanCfg.meta +++ /dev/null @@ -1,9 +0,0 @@ -{ - "ver": "1.2.0", - "importer": "directory", - "imported": true, - "uuid": "47f49576-c2c9-44fd-a97b-757a0bde9e65", - "files": [], - "subMetas": {}, - "userData": {} -} diff --git a/assets/bundles/DataTable/Music.json b/assets/bundles/DataTable/Music.json deleted file mode 100644 index 791226b5..00000000 --- a/assets/bundles/DataTable/Music.json +++ /dev/null @@ -1,2 +0,0 @@ -[{"id":1,"AssetName":"music_interface"}, -{"id":2,"AssetName":"music_game"}] \ No newline at end of file diff --git a/assets/bundles/DataTable/Music.json.meta b/assets/bundles/DataTable/Music.json.meta deleted file mode 100644 index f0d28565..00000000 --- a/assets/bundles/DataTable/Music.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "2.0.1", - "importer": "json", - "imported": true, - "uuid": "0394e147-cf8c-4177-ae8e-509324c5b83f", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/bundles/DataTable/Sound.json b/assets/bundles/DataTable/Sound.json deleted file mode 100644 index 47f356e1..00000000 --- a/assets/bundles/DataTable/Sound.json +++ /dev/null @@ -1,5 +0,0 @@ -[{"id":10000,"AssetName":"click","Priority":0,"Loop":0,"Volume":1,"SpatialBlend":0,"MaxDistance":100,"MinInterval":0}, -{"id":10001,"AssetName":"defeat","Priority":0,"Loop":0,"Volume":1,"SpatialBlend":0,"MaxDistance":100,"MinInterval":0}, -{"id":10002,"AssetName":"startgame","Priority":0,"Loop":0,"Volume":1,"SpatialBlend":0,"MaxDistance":100,"MinInterval":0}, -{"id":10003,"AssetName":"success","Priority":0,"Loop":0,"Volume":1,"SpatialBlend":0,"MaxDistance":100,"MinInterval":0} -] \ No newline at end of file diff --git a/assets/bundles/DataTable/Sound.json.meta b/assets/bundles/DataTable/Sound.json.meta deleted file mode 100644 index 23c4b19f..00000000 --- a/assets/bundles/DataTable/Sound.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "2.0.1", - "importer": "json", - "imported": true, - "uuid": "23b3db89-f554-4f2e-9a97-a82f504572a8", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/bundles/DataTable/commonGlobal.json b/assets/bundles/DataTable/commonGlobal.json deleted file mode 100644 index 9f1d009b..00000000 --- a/assets/bundles/DataTable/commonGlobal.json +++ /dev/null @@ -1,4 +0,0 @@ -[ - { "id": 1, "type": 0, "value": 8, "para": "" }, - { "id": 100, "type": 0, "value": 10, "para": "" } -] diff --git a/assets/bundles/DataTable/commonGlobal.json.meta b/assets/bundles/DataTable/commonGlobal.json.meta deleted file mode 100644 index a63d9c55..00000000 --- a/assets/bundles/DataTable/commonGlobal.json.meta +++ /dev/null @@ -1,11 +0,0 @@ -{ - "ver": "2.0.1", - "importer": "json", - "imported": true, - "uuid": "ce1d5a04-5bdb-46a4-a347-b41027b9ada2", - "files": [ - ".json" - ], - "subMetas": {}, - "userData": {} -} diff --git a/assets/resources/test/demo_tbitem.bin b/assets/bundles/DataTable/demo_tbitem.bin similarity index 100% rename from assets/resources/test/demo_tbitem.bin rename to assets/bundles/DataTable/demo_tbitem.bin diff --git a/assets/resources/test/demo_tbitem.bin.meta b/assets/bundles/DataTable/demo_tbitem.bin.meta similarity index 74% rename from assets/resources/test/demo_tbitem.bin.meta rename to assets/bundles/DataTable/demo_tbitem.bin.meta index f0a35562..2328ee7b 100644 --- a/assets/resources/test/demo_tbitem.bin.meta +++ b/assets/bundles/DataTable/demo_tbitem.bin.meta @@ -2,7 +2,7 @@ "ver": "1.0.3", "importer": "buffer", "imported": true, - "uuid": "b6344d4c-c476-4680-baab-fc0ad7e822c3", + "uuid": "63fbd1bd-9cb1-4fa3-aca9-15b259a9c421", "files": [ ".bin", ".json" diff --git a/assets/resources/test/demo_tbreward.bin b/assets/bundles/DataTable/demo_tbreward.bin similarity index 100% rename from assets/resources/test/demo_tbreward.bin rename to assets/bundles/DataTable/demo_tbreward.bin diff --git a/assets/resources/test/demo_tbreward.bin.meta b/assets/bundles/DataTable/demo_tbreward.bin.meta similarity index 74% rename from assets/resources/test/demo_tbreward.bin.meta rename to assets/bundles/DataTable/demo_tbreward.bin.meta index aad7c97f..b8ec9c0f 100644 --- a/assets/resources/test/demo_tbreward.bin.meta +++ b/assets/bundles/DataTable/demo_tbreward.bin.meta @@ -2,7 +2,7 @@ "ver": "1.0.3", "importer": "buffer", "imported": true, - "uuid": "f4e901c8-045b-48b6-9dbd-a8e66e836316", + "uuid": "22867eec-f2ee-4997-b2b4-b277af84b625", "files": [ ".bin", ".json" diff --git a/assets/bundles/DataTable/tbgirls.bin b/assets/bundles/DataTable/tbgirls.bin new file mode 100644 index 0000000000000000000000000000000000000000..30cc4783212565914829ea894d408a98bc0c901f GIT binary patch literal 32 ncmZQvF397Umspvo;GI~IpI^jeWXZtD>5*Te