diff --git a/DataTables/Datas/__beans__.xlsx b/DataTables/Datas/__beans__.xlsx index 157593a2..86a07228 100644 Binary files a/DataTables/Datas/__beans__.xlsx and b/DataTables/Datas/__beans__.xlsx differ diff --git a/DataTables/Datas/__tables__.xlsx b/DataTables/Datas/__tables__.xlsx index 2187ed7c..305fd983 100644 Binary files a/DataTables/Datas/__tables__.xlsx and b/DataTables/Datas/__tables__.xlsx differ diff --git a/DataTables/Datas/战斗/模式/无尽模式/OnHook地图.xlsx b/DataTables/Datas/战斗/模式/无尽模式/OnHook地图.xlsx new file mode 100644 index 00000000..2d3f8533 Binary files /dev/null and b/DataTables/Datas/战斗/模式/无尽模式/OnHook地图.xlsx differ diff --git a/DataTables/Datas/战斗/模式/无尽模式/OnHook宠物出售金额表.xlsx b/DataTables/Datas/战斗/模式/无尽模式/OnHook宠物出售金额表.xlsx new file mode 100644 index 00000000..50a21aa6 Binary files /dev/null and b/DataTables/Datas/战斗/模式/无尽模式/OnHook宠物出售金额表.xlsx differ diff --git a/DataTables/Datas/战斗/模式/无尽模式/OnHook概率.xlsx b/DataTables/Datas/战斗/模式/无尽模式/OnHook概率.xlsx new file mode 100644 index 00000000..9868255e Binary files /dev/null and b/DataTables/Datas/战斗/模式/无尽模式/OnHook概率.xlsx differ diff --git a/DataTables/Datas/战斗/模式/OnHook模式的全局表.xlsx b/DataTables/Datas/战斗/模式/无尽模式/OnHook模式的全局表.xlsx similarity index 100% rename from DataTables/Datas/战斗/模式/OnHook模式的全局表.xlsx rename to DataTables/Datas/战斗/模式/无尽模式/OnHook模式的全局表.xlsx diff --git a/DataTables/Datas/战斗/模式/无尽模式/冒险岛地图.xlsx b/DataTables/Datas/战斗/模式/无尽模式/冒险岛地图.xlsx new file mode 100644 index 00000000..1fdd8cf6 Binary files /dev/null and b/DataTables/Datas/战斗/模式/无尽模式/冒险岛地图.xlsx differ diff --git a/JisolGameCocos/assets/resources/config/data/schema.ts b/JisolGameCocos/assets/resources/config/data/schema.ts index accbba91..a2f12c0e 100644 --- a/JisolGameCocos/assets/resources/config/data/schema.ts +++ b/JisolGameCocos/assets/resources/config/data/schema.ts @@ -531,6 +531,120 @@ export class TbGRoleBaseAttribute { } +export namespace TB { +export class TbGOnHookMaps { + + constructor(_json_: any) { + if (_json_.id === undefined) { throw new Error() } + this.id = _json_.id + if (_json_.name === undefined) { throw new Error() } + this.name = _json_.name + if (_json_.mapId === undefined) { throw new Error() } + this.mapId = _json_.mapId + if (_json_.petIds === undefined) { throw new Error() } + { this.petIds = []; for(let _ele of _json_.petIds) { let _e; _e = _ele; this.petIds.push(_e);}} + if (_json_.sign === undefined) { throw new Error() } + this.sign = _json_.sign + if (_json_.introduce === undefined) { throw new Error() } + this.introduce = _json_.introduce + } + + /** + * id + */ + readonly id: number + /** + * 地图名称 + */ + readonly name: string + /** + * 地图场景Id + */ + readonly mapId: number + /** + * 地图上的宠物列表 + */ + readonly petIds: number[] + /** + * 地图标识(一般是地图的类名) + */ + readonly sign: string + /** + * 地图介绍 + */ + readonly introduce: string + + resolve(tables:Tables) + { + } +} + +} + + +export namespace TB { +export class TbGOnHookMap1 { + + constructor(_json_: any) { + if (_json_.id === undefined) { throw new Error() } + this.id = _json_.id + if (_json_.data === undefined) { throw new Error() } + this.data = new TbGEntity.TOnHookLevel(_json_.data) + } + + /** + * id + */ + readonly id: number + /** + * 关卡等级 + */ + readonly data: TbGEntity.TOnHookLevel + + resolve(tables:Tables) + { + } +} + +} + + +export namespace TbGEntity { +/** + * 无限模式关卡信息 + */ +export class TOnHookLevel { + + constructor(_json_: any) { + if (_json_.level === undefined) { throw new Error() } + this.level = _json_.level + if (_json_.petLevel === undefined) { throw new Error() } + this.petLevel = _json_.petLevel + if (_json_.oddsId === undefined) { throw new Error() } + this.oddsId = _json_.oddsId + } + + /** + * 关卡等级 + */ + readonly level: number + /** + * 宠物等级 + */ + readonly petLevel: number + /** + * 概率Id + */ + readonly oddsId: number + + resolve(tables:Tables) + { + } +} + +} + + export class TbGGlobal{ @@ -949,6 +1063,70 @@ export class TbGRoleBaseAttribute{ +export class TbGOnHookMaps{ + private _dataMap: Map + private _dataList: TB.TbGOnHookMaps[] + constructor(_json_: any) { + this._dataMap = new Map() + this._dataList = [] + for(var _json2_ of _json_) { + let _v: TB.TbGOnHookMaps + _v = new TB.TbGOnHookMaps(_json2_) + this._dataList.push(_v) + this._dataMap.set(_v.id, _v) + } + } + + getDataMap(): Map { return this._dataMap; } + getDataList(): TB.TbGOnHookMaps[] { return this._dataList; } + + get(key: number): TB.TbGOnHookMaps | undefined { return this._dataMap.get(key); } + + resolve(tables:Tables) + { + for(let data of this._dataList) + { + data.resolve(tables) + } + } + +} + + + + +export class TbGOnHookMap1{ + private _dataMap: Map + private _dataList: TB.TbGOnHookMap1[] + constructor(_json_: any) { + this._dataMap = new Map() + this._dataList = [] + for(var _json2_ of _json_) { + let _v: TB.TbGOnHookMap1 + _v = new TB.TbGOnHookMap1(_json2_) + this._dataList.push(_v) + this._dataMap.set(_v.id, _v) + } + } + + getDataMap(): Map { return this._dataMap; } + getDataList(): TB.TbGOnHookMap1[] { return this._dataList; } + + get(key: number): TB.TbGOnHookMap1 | undefined { return this._dataMap.get(key); } + + resolve(tables:Tables) + { + for(let data of this._dataList) + { + data.resolve(tables) + } + } + +} + + + + type JsonLoader = (file: string) => any export class Tables { @@ -978,6 +1156,10 @@ export class Tables { get TbGAttribute(): TbGAttribute { return this._TbGAttribute;} private _TbGRoleBaseAttribute: TbGRoleBaseAttribute get TbGRoleBaseAttribute(): TbGRoleBaseAttribute { return this._TbGRoleBaseAttribute;} + private _TbGOnHookMaps: TbGOnHookMaps + get TbGOnHookMaps(): TbGOnHookMaps { return this._TbGOnHookMaps;} + private _TbGOnHookMap1: TbGOnHookMap1 + get TbGOnHookMap1(): TbGOnHookMap1 { return this._TbGOnHookMap1;} constructor(loader: JsonLoader) { this._TbGGlobal = new TbGGlobal(loader('tbgglobal')) @@ -993,6 +1175,8 @@ export class Tables { this._TbSServerInfo = new TbSServerInfo(loader('tbsserverinfo')) this._TbGAttribute = new TbGAttribute(loader('tbgattribute')) this._TbGRoleBaseAttribute = new TbGRoleBaseAttribute(loader('tbgrolebaseattribute')) + this._TbGOnHookMaps = new TbGOnHookMaps(loader('tbgonhookmaps')) + this._TbGOnHookMap1 = new TbGOnHookMap1(loader('tbgonhookmap1')) this._TbGGlobal.resolve(this) this._TbGRole.resolve(this) @@ -1007,5 +1191,7 @@ export class Tables { this._TbSServerInfo.resolve(this) this._TbGAttribute.resolve(this) this._TbGRoleBaseAttribute.resolve(this) + this._TbGOnHookMaps.resolve(this) + this._TbGOnHookMap1.resolve(this) } } diff --git a/JisolGameCocos/assets/resources/config/json/tbgonhookmap1.json b/JisolGameCocos/assets/resources/config/json/tbgonhookmap1.json new file mode 100644 index 00000000..a47d8de6 --- /dev/null +++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmap1.json @@ -0,0 +1,10 @@ +[ + { + "id": 1, + "data": { + "level": 1, + "petLevel": 1, + "oddsId": 1 + } + } +] \ No newline at end of file diff --git a/JisolGameCocos/assets/resources/config/json/tbgonhookmaps.json b/JisolGameCocos/assets/resources/config/json/tbgonhookmaps.json new file mode 100644 index 00000000..1a866b22 --- /dev/null +++ b/JisolGameCocos/assets/resources/config/json/tbgonhookmaps.json @@ -0,0 +1,14 @@ +[ + { + "id": 120001, + "name": "冒险岛", + "mapId": 60001, + "petIds": [ + 10001, + 10002, + 10003 + ], + "sign": "", + "introduce": "新手地图在这里可以遇到可爱的宠物哦~" + } +] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMap1.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMap1.java new file mode 100644 index 00000000..8ed9611e --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMap1.java @@ -0,0 +1,49 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg.TB; + +import luban.*; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + + +public final class TbGOnHookMap1 extends AbstractBean { + public TbGOnHookMap1(JsonObject _buf) { + id = _buf.get("id").getAsInt(); + data = cfg.TbGEntity.TOnHookLevel.deserialize(_buf.get("data").getAsJsonObject()); + } + + public static TbGOnHookMap1 deserialize(JsonObject _buf) { + return new cfg.TB.TbGOnHookMap1(_buf); + } + + /** + * id + */ + public final int id; + /** + * 关卡等级 + */ + public final cfg.TbGEntity.TOnHookLevel data; + + public static final int __ID__ = 1197577712; + + @Override + public int getTypeId() { return __ID__; } + + @Override + public String toString() { + return "{ " + + "(format_field_name __code_style field.name):" + id + "," + + "(format_field_name __code_style field.name):" + data + "," + + "}"; + } +} + diff --git a/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMaps.java b/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMaps.java new file mode 100644 index 00000000..f88530d9 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cfg/TB/TbGOnHookMaps.java @@ -0,0 +1,73 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg.TB; + +import luban.*; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + + +public final class TbGOnHookMaps extends AbstractBean { + public TbGOnHookMaps(JsonObject _buf) { + id = _buf.get("id").getAsInt(); + name = _buf.get("name").getAsString(); + mapId = _buf.get("mapId").getAsInt(); + { com.google.gson.JsonArray _json0_ = _buf.get("petIds").getAsJsonArray(); int __n0 = _json0_.size(); petIds = new int[__n0]; int __index0=0; for(JsonElement __e0 : _json0_) { int __v0; __v0 = __e0.getAsInt(); petIds[__index0++] = __v0; } } + sign = _buf.get("sign").getAsString(); + introduce = _buf.get("introduce").getAsString(); + } + + public static TbGOnHookMaps deserialize(JsonObject _buf) { + return new cfg.TB.TbGOnHookMaps(_buf); + } + + /** + * id + */ + public final int id; + /** + * 地图名称 + */ + public final String name; + /** + * 地图场景Id + */ + public final int mapId; + /** + * 地图上的宠物列表 + */ + public final int[] petIds; + /** + * 地图标识(一般是地图的类名) + */ + public final String sign; + /** + * 地图介绍 + */ + public final String introduce; + + public static final int __ID__ = 1197577778; + + @Override + public int getTypeId() { return __ID__; } + + @Override + public String toString() { + return "{ " + + "(format_field_name __code_style field.name):" + id + "," + + "(format_field_name __code_style field.name):" + name + "," + + "(format_field_name __code_style field.name):" + mapId + "," + + "(format_field_name __code_style field.name):" + petIds + "," + + "(format_field_name __code_style field.name):" + sign + "," + + "(format_field_name __code_style field.name):" + introduce + "," + + "}"; + } +} + diff --git a/JisolGameServer/Main/src/main/java/cfg/Tables.java b/JisolGameServer/Main/src/main/java/cfg/Tables.java index 2c4769fa..ec1f89fd 100644 --- a/JisolGameServer/Main/src/main/java/cfg/Tables.java +++ b/JisolGameServer/Main/src/main/java/cfg/Tables.java @@ -45,6 +45,10 @@ public final class Tables public cfg.TbGAttribute getTbGAttribute() { return _tbgattribute; } private final cfg.TbGRoleBaseAttribute _tbgrolebaseattribute; public cfg.TbGRoleBaseAttribute getTbGRoleBaseAttribute() { return _tbgrolebaseattribute; } + private final cfg.TbGOnHookMaps _tbgonhookmaps; + public cfg.TbGOnHookMaps getTbGOnHookMaps() { return _tbgonhookmaps; } + private final cfg.TbGOnHookMap1 _tbgonhookmap1; + public cfg.TbGOnHookMap1 getTbGOnHookMap1() { return _tbgonhookmap1; } public Tables(IJsonLoader loader) throws java.io.IOException { _tbgglobal = new cfg.TbGGlobal(loader.load("tbgglobal")); @@ -60,6 +64,8 @@ public final class Tables _tbsserverinfo = new cfg.TbSServerInfo(loader.load("tbsserverinfo")); _tbgattribute = new cfg.TbGAttribute(loader.load("tbgattribute")); _tbgrolebaseattribute = new cfg.TbGRoleBaseAttribute(loader.load("tbgrolebaseattribute")); + _tbgonhookmaps = new cfg.TbGOnHookMaps(loader.load("tbgonhookmaps")); + _tbgonhookmap1 = new cfg.TbGOnHookMap1(loader.load("tbgonhookmap1")); } } diff --git a/JisolGameServer/Main/src/main/java/cfg/TbGEntity/TOnHookLevel.java b/JisolGameServer/Main/src/main/java/cfg/TbGEntity/TOnHookLevel.java new file mode 100644 index 00000000..84a8ac51 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cfg/TbGEntity/TOnHookLevel.java @@ -0,0 +1,58 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg.TbGEntity; + +import luban.*; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; + + +/** + * 无限模式关卡信息 + */ +public final class TOnHookLevel extends AbstractBean { + public TOnHookLevel(JsonObject _buf) { + level = _buf.get("level").getAsInt(); + petLevel = _buf.get("petLevel").getAsInt(); + oddsId = _buf.get("oddsId").getAsInt(); + } + + public static TOnHookLevel deserialize(JsonObject _buf) { + return new cfg.TbGEntity.TOnHookLevel(_buf); + } + + /** + * 关卡等级 + */ + public final int level; + /** + * 宠物等级 + */ + public final int petLevel; + /** + * 概率Id + */ + public final int oddsId; + + public static final int __ID__ = 1503395840; + + @Override + public int getTypeId() { return __ID__; } + + @Override + public String toString() { + return "{ " + + "(format_field_name __code_style field.name):" + level + "," + + "(format_field_name __code_style field.name):" + petLevel + "," + + "(format_field_name __code_style field.name):" + oddsId + "," + + "}"; + } +} + diff --git a/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMap1.java b/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMap1.java new file mode 100644 index 00000000..edabc1af --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMap1.java @@ -0,0 +1,37 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg; + +import luban.*; +import com.google.gson.JsonElement; + + +public final class TbGOnHookMap1 { + private final java.util.HashMap _dataMap; + private final java.util.ArrayList _dataList; + + public TbGOnHookMap1(JsonElement _buf) { + _dataMap = new java.util.HashMap(); + _dataList = new java.util.ArrayList(); + + for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) { + cfg.TB.TbGOnHookMap1 _v; + _v = cfg.TB.TbGOnHookMap1.deserialize(_e_.getAsJsonObject()); + _dataList.add(_v); + _dataMap.put(_v.id, _v); + } + } + + public java.util.HashMap getDataMap() { return _dataMap; } + public java.util.ArrayList getDataList() { return _dataList; } + + public cfg.TB.TbGOnHookMap1 get(int key) { return _dataMap.get(key); } + +} diff --git a/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMaps.java b/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMaps.java new file mode 100644 index 00000000..70134ad4 --- /dev/null +++ b/JisolGameServer/Main/src/main/java/cfg/TbGOnHookMaps.java @@ -0,0 +1,37 @@ + +//------------------------------------------------------------------------------ +// +// This code was generated by a tool. +// Changes to this file may cause incorrect behavior and will be lost if +// the code is regenerated. +// +//------------------------------------------------------------------------------ + +package cfg; + +import luban.*; +import com.google.gson.JsonElement; + + +public final class TbGOnHookMaps { + private final java.util.HashMap _dataMap; + private final java.util.ArrayList _dataList; + + public TbGOnHookMaps(JsonElement _buf) { + _dataMap = new java.util.HashMap(); + _dataList = new java.util.ArrayList(); + + for (com.google.gson.JsonElement _e_ : _buf.getAsJsonArray()) { + cfg.TB.TbGOnHookMaps _v; + _v = cfg.TB.TbGOnHookMaps.deserialize(_e_.getAsJsonObject()); + _dataList.add(_v); + _dataMap.put(_v.id, _v); + } + } + + public java.util.HashMap getDataMap() { return _dataMap; } + public java.util.ArrayList getDataList() { return _dataList; } + + public cfg.TB.TbGOnHookMaps get(int key) { return _dataMap.get(key); } + +} diff --git a/JisolGameServer/Main/src/main/resources/json/tbgonhookmap1.json b/JisolGameServer/Main/src/main/resources/json/tbgonhookmap1.json new file mode 100644 index 00000000..a47d8de6 --- /dev/null +++ b/JisolGameServer/Main/src/main/resources/json/tbgonhookmap1.json @@ -0,0 +1,10 @@ +[ + { + "id": 1, + "data": { + "level": 1, + "petLevel": 1, + "oddsId": 1 + } + } +] \ No newline at end of file diff --git a/JisolGameServer/Main/src/main/resources/json/tbgonhookmaps.json b/JisolGameServer/Main/src/main/resources/json/tbgonhookmaps.json new file mode 100644 index 00000000..1a866b22 --- /dev/null +++ b/JisolGameServer/Main/src/main/resources/json/tbgonhookmaps.json @@ -0,0 +1,14 @@ +[ + { + "id": 120001, + "name": "冒险岛", + "mapId": 60001, + "petIds": [ + 10001, + 10002, + 10003 + ], + "sign": "", + "introduce": "新手地图在这里可以遇到可爱的宠物哦~" + } +] \ No newline at end of file