From d7fbfe3dd644f564b238af7a45e26fcdc8555785 Mon Sep 17 00:00:00 2001
From: meixiongfeng <766881921@qq.com>
Date: Fri, 12 Aug 2022 18:53:51 +0800
Subject: [PATCH] =?UTF-8?q?=E9=85=8D=E7=BD=AE=E8=A1=A8=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
bin/json/LocalizeConfig_CN.json | 118 +-
bin/json/LocalizeConfig_EN.json | 310 ++--
bin/json/LocalizeConfig_TW.json | 112 ++
bin/json/game_chatsystem.json | 8 +-
bin/json/game_com.json | 368 ++---
bin/json/game_drawcard.json | 1348 +++++++++++++++--
bin/json/game_equipsuit.json | 34 +-
bin/json/game_extservers.json | 7 +
bin/json/game_global.json | 368 ++---
bin/json/game_hero.json | 16 +-
bin/json/game_heroawaken.json | 206 ++-
bin/json/game_initial.json | 120 ++
bin/json/game_item.json | 138 +-
bin/json/game_language.json | 327 ++--
bin/json/game_opencond.json | 60 +-
bin/json/game_skill.json | 248 ++-
bin/json/game_skillafteratk.json | 599 +++++++-
bin/json/game_skillatk.json | 248 ++-
bin/json/game_stroy.json | 176 ++-
modules/chat/configure.go | 30 +-
modules/comp_configure.go | 40 +-
modules/core.go | 2 +-
modules/equipment/api_equip.go | 4 +-
modules/equipment/api_upgrade.go | 4 +-
modules/equipment/configure.go | 38 +-
modules/equipment/modelEquipment.go | 16 +-
modules/friend/module.go | 28 +-
modules/game/fight/logic/FightAfterSkill.go | 4 +-
modules/gateway/configure_comp.go | 6 +-
modules/gm/api_cmd.go | 2 +-
modules/hero/api_awaken.go | 2 +-
modules/hero/api_drawCard.go | 239 ++-
modules/hero/api_strengthenUpStar.go | 16 +-
modules/hero/configure_comp.go | 226 ++-
modules/hero/model_hero.go | 43 +-
modules/items/api_sellItem.go | 6 +-
modules/items/api_useItem.go | 18 +-
modules/items/configure.go | 28 +-
modules/items/core.go | 2 +-
modules/items/modelitems.go | 4 +-
modules/mail/api_getAttachment.go | 8 +-
modules/mainline/api_challenge.go | 4 +-
modules/mainline/comp_configure.go | 32 +-
modules/modulebase.go | 6 +-
modules/pagoda/comp_configure.go | 20 +-
modules/shop/api_buy.go | 14 +-
modules/shop/api_getlist.go | 8 +-
modules/shop/configure.go | 30 +-
modules/shop/core.go | 4 +-
modules/task/config.go | 30 +-
modules/user/api_create.go | 2 +-
modules/user/api_modifyname.go | 2 +-
modules/user/api_res.go | 4 +-
pb/comm.pb.go | 2 +-
pb/hero_db.pb.go | 14 +-
sys/configure/bright/serialization/ByteBuf.go | 31 +-
sys/configure/bright/serialization/Vector2.go | 10 +
sys/configure/bright/serialization/Vector3.go | 11 +
sys/configure/bright/serialization/Vector4.go | 12 +
.../bright/serialization/marshal_test.go | 38 +-
sys/configure/structs/ALocalizeConfig.go | 37 +-
.../Localize.LocalizeConfig_CNCategory.go | 24 +-
.../Localize.LocalizeConfig_ENCategory.go | 24 +-
.../Localize.LocalizeConfig_TWCategory.go | 24 +-
sys/configure/structs/LocalizeConfig_CN.go | 26 +-
sys/configure/structs/LocalizeConfig_EN.go | 26 +-
sys/configure/structs/LocalizeConfig_TW.go | 26 +-
sys/configure/structs/Tables.go | 265 ++--
sys/configure/structs/game.ChildSkills.go | 20 +-
sys/configure/structs/game.Figure.go | 20 +-
sys/configure/structs/game.activeReward.go | 24 +-
.../structs/game.activeRewardData.go | 28 +-
sys/configure/structs/game.atn.go | 20 +-
sys/configure/structs/game.basepool.go | 39 +
sys/configure/structs/game.chatChannel.go | 24 +-
sys/configure/structs/game.chatChannelCom.go | 24 +-
.../structs/game.chatChannelComData.go | 20 +-
sys/configure/structs/game.chatChannelData.go | 20 +-
sys/configure/structs/game.chatServerGroup.go | 24 +-
.../structs/game.chatServerGroupData.go | 20 +-
sys/configure/structs/game.chatSystem.go | 24 +-
sys/configure/structs/game.chatSystemData.go | 20 +-
sys/configure/structs/game.coin.go | 24 +-
sys/configure/structs/game.coinData.go | 20 +-
sys/configure/structs/game.com.go | 26 +-
sys/configure/structs/game.comAtn.go | 24 +-
sys/configure/structs/game.comAtnData.go | 28 +-
sys/configure/structs/game.comData.go | 197 ++-
sys/configure/structs/game.drawCard.go | 24 +-
sys/configure/structs/game.drawCardData.go | 30 +-
sys/configure/structs/game.drawCom.go | 42 -
sys/configure/structs/game.drawComData.go | 27 -
sys/configure/structs/game.drawCost.go | 42 -
sys/configure/structs/game.drawCostData.go | 37 -
sys/configure/structs/game.equip.go | 24 +-
.../structs/game.equipAttrlibrary.go | 24 +-
.../structs/game.equipAttrlibraryData.go | 20 +-
sys/configure/structs/game.equipColor.go | 32 +-
sys/configure/structs/game.equipColorData.go | 20 +-
sys/configure/structs/game.equipData.go | 28 +-
sys/configure/structs/game.equipIntensify.go | 24 +-
.../structs/game.equipIntensifyData.go | 28 +-
sys/configure/structs/game.equipPos.go | 24 +-
sys/configure/structs/game.equipPosData.go | 20 +-
sys/configure/structs/game.equipSuit.go | 24 +-
sys/configure/structs/game.equipSuitData.go | 20 +-
sys/configure/structs/game.extservers.go | 26 +-
sys/configure/structs/game.extserversData.go | 22 +-
sys/configure/structs/game.facemod.go | 24 +-
sys/configure/structs/game.facemodData.go | 28 +-
sys/configure/structs/game.global.go | 26 +-
sys/configure/structs/game.globalData.go | 197 ++-
sys/configure/structs/game.hero.go | 24 +-
sys/configure/structs/game.heroAwaken.go | 24 +-
sys/configure/structs/game.heroAwakenData.go | 28 +-
sys/configure/structs/game.heroData.go | 406 +++--
sys/configure/structs/game.heroExp.go | 24 +-
sys/configure/structs/game.heroExpData.go | 20 +-
sys/configure/structs/game.heroLevelgrow.go | 24 +-
.../structs/game.heroLevelgrowData.go | 20 +-
sys/configure/structs/game.heroLevelup.go | 24 +-
sys/configure/structs/game.heroLevelupData.go | 28 +-
sys/configure/structs/game.heroMethod.go | 24 +-
sys/configure/structs/game.heroMethodData.go | 20 +-
sys/configure/structs/game.heroResonance.go | 24 +-
.../structs/game.heroResonanceData.go | 44 +-
sys/configure/structs/game.heroSkillLevel.go | 24 +-
.../structs/game.heroSkillLevelData.go | 20 +-
sys/configure/structs/game.heroStargrow.go | 24 +-
.../structs/game.heroStargrowData.go | 20 +-
sys/configure/structs/game.heroStarup.go | 24 +-
sys/configure/structs/game.heroStarupData.go | 20 +-
sys/configure/structs/game.initial.go | 24 +-
sys/configure/structs/game.initialData.go | 28 +-
sys/configure/structs/game.item.go | 24 +-
sys/configure/structs/game.itemData.go | 43 +-
sys/configure/structs/game.language.go | 26 +-
sys/configure/structs/game.languageData.go | 22 +-
sys/configure/structs/game.mainlineChapter.go | 24 +-
.../structs/game.mainlineChapterData.go | 28 +-
sys/configure/structs/game.mainlineEasy.go | 24 +-
.../structs/game.mainlineEasyData.go | 28 +-
sys/configure/structs/game.mainlineHard.go | 24 +-
.../structs/game.mainlineHardData.go | 28 +-
.../structs/game.mainlinePurgatory.go | 24 +-
.../structs/game.mainlinePurgatoryData.go | 28 +-
sys/configure/structs/game.model.go | 24 +-
sys/configure/structs/game.modelData.go | 20 +-
sys/configure/structs/game.monster.go | 24 +-
sys/configure/structs/game.monsterData.go | 20 +-
sys/configure/structs/game.msgDistrib.go | 24 +-
sys/configure/structs/game.msgDistribData.go | 20 +-
sys/configure/structs/game.opencond.go | 24 +-
sys/configure/structs/game.opencondData.go | 20 +-
sys/configure/structs/game.pagoda.go | 24 +-
sys/configure/structs/game.pagodaData.go | 28 +-
.../structs/game.pagodaSeasonReward.go | 24 +-
.../structs/game.pagodaSeasonRewardData.go | 28 +-
.../structs/game.pagodaTaskReward.go | 24 +-
.../structs/game.pagodaTaskRewardData.go | 28 +-
sys/configure/structs/game.playerlv.go | 24 +-
sys/configure/structs/game.playerlvData.go | 20 +-
sys/configure/structs/game.plot.go | 24 +-
sys/configure/structs/game.plotData.go | 20 +-
sys/configure/structs/game.propsgroup.go | 24 +-
sys/configure/structs/game.propsgroupData.go | 28 +-
sys/configure/structs/game.shop.go | 24 +-
sys/configure/structs/game.shopData.go | 36 +-
sys/configure/structs/game.shopitem.go | 24 +-
sys/configure/structs/game.shopitemData.go | 36 +-
sys/configure/structs/game.skill.go | 24 +-
sys/configure/structs/game.skillAfteratk.go | 24 +-
.../structs/game.skillAfteratkData.go | 20 +-
sys/configure/structs/game.skillAtk.go | 24 +-
sys/configure/structs/game.skillAtkData.go | 28 +-
sys/configure/structs/game.skillBuff.go | 24 +-
sys/configure/structs/game.skillBuffData.go | 20 +-
sys/configure/structs/game.skillData.go | 28 +-
sys/configure/structs/game.skillPassive.go | 24 +-
.../structs/game.skillPassiveData.go | 20 +-
sys/configure/structs/game.stroy.go | 24 +-
sys/configure/structs/game.stroyData.go | 50 +-
.../structs/game.taskActiveReward.go | 24 +-
.../structs/game.taskActiveRewardData.go | 28 +-
sys/configure/structs/game.taskRound.go | 24 +-
sys/configure/structs/game.taskRoundData.go | 28 +-
sys/configure/structs/game.ui.go | 24 +-
sys/configure/structs/game.uiData.go | 20 +-
188 files changed, 6978 insertions(+), 3075 deletions(-)
create mode 100644 sys/configure/bright/serialization/Vector2.go
create mode 100644 sys/configure/bright/serialization/Vector3.go
create mode 100644 sys/configure/bright/serialization/Vector4.go
create mode 100644 sys/configure/structs/game.basepool.go
delete mode 100644 sys/configure/structs/game.drawCom.go
delete mode 100644 sys/configure/structs/game.drawComData.go
delete mode 100644 sys/configure/structs/game.drawCost.go
delete mode 100644 sys/configure/structs/game.drawCostData.go
diff --git a/bin/json/LocalizeConfig_CN.json b/bin/json/LocalizeConfig_CN.json
index 498617422..c3e146b04 100644
--- a/bin/json/LocalizeConfig_CN.json
+++ b/bin/json/LocalizeConfig_CN.json
@@ -1801,7 +1801,7 @@
},
{
"key": "equip_13215",
- "text_cn": "暴击率\u002B20%"
+ "text_cn": "暴击率+20%"
},
{
"key": "equip_13216",
@@ -3023,6 +3023,10 @@
"key": "skillname_125004311",
"text_cn": "波比3技能"
},
+ {
+ "key": "skillname_925004211",
+ "text_cn": "波比2技能"
+ },
{
"key": "skillname_135002011",
"text_cn": "希卡普队长技"
@@ -3043,6 +3047,26 @@
"key": "skillname_935002321",
"text_cn": "希卡普3技能"
},
+ {
+ "key": "skillname_124003011",
+ "text_cn": "睡神队长技"
+ },
+ {
+ "key": "skillname_124003111",
+ "text_cn": "睡神1技能"
+ },
+ {
+ "key": "skillname_124003211",
+ "text_cn": "睡神2技能"
+ },
+ {
+ "key": "skillname_124003311",
+ "text_cn": "睡神3技能"
+ },
+ {
+ "key": "skillname_924003411",
+ "text_cn": "睡神2技能"
+ },
{
"key": "skill_1250040111",
"text_cn": "队长技：我方全体效果抵抗增加40%"
@@ -3183,6 +3207,70 @@
"key": "skill_9350023216",
"text_cn": "冷却时间减少1回合"
},
+ {
+ "key": "skill_1240030111",
+ "text_cn": "队长技：我方全体效果抵抗增加40%"
+ },
+ {
+ "key": "skill_1240031111",
+ "text_cn": "一技能：睡神沙人对敌方1个目标造成攻击力110%的伤害，并有70%的概率附加1回合【睡眠】状态。"
+ },
+ {
+ "key": "skill_1240031112",
+ "text_cn": "等级2 伤害提升至100%"
+ },
+ {
+ "key": "skill_1240031113",
+ "text_cn": "等级3 效果触发几率提升至60%"
+ },
+ {
+ "key": "skill_1240031114",
+ "text_cn": "等级4 伤害提升至110%"
+ },
+ {
+ "key": "skill_1240031115",
+ "text_cn": "等级5 效果触发几率提升至70%"
+ },
+ {
+ "key": "skill_1240032111",
+ "text_cn": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】。"
+ },
+ {
+ "key": "skill_1240032112",
+ "text_cn": "冷却时间减少1回合"
+ },
+ {
+ "key": "skill_1240033111",
+ "text_cn": "三技能：睡神沙人对敌方全体造成攻击力80%的伤害，使敌方目标各减少30%行动值，并有100%概率附加1回合【睡眠】状态。"
+ },
+ {
+ "key": "skill_1240033112",
+ "text_cn": "等级2 降低的行动值提升至25%"
+ },
+ {
+ "key": "skill_1240033113",
+ "text_cn": "等级3 效果触发几率提升至90%"
+ },
+ {
+ "key": "skill_1240033114",
+ "text_cn": "等级4 降低的行动值提升至30%"
+ },
+ {
+ "key": "skill_1240033115",
+ "text_cn": "等级5 效果触发几率提升至100%"
+ },
+ {
+ "key": "skill_1240033116",
+ "text_cn": "等级6 冷却时间减少1回合"
+ },
+ {
+ "key": "skill_9240034111",
+ "text_cn": "二技能：睡神沙人为我方全体各净化1个减益状态，并附加2回合【速度提升】和1回合【防御提升】状态。"
+ },
+ {
+ "key": "skill_9240034112",
+ "text_cn": "冷却时间减少1回合"
+ },
{
"key": "skill_190011000",
"text_cn": "我方全体防御增加30%"
@@ -3891,6 +3979,30 @@
"key": "num_1018",
"text_cn": "戈伯铁匠铺"
},
+ {
+ "key": "num_1019",
+ "text_cn": "聊天"
+ },
+ {
+ "key": "num_1020",
+ "text_cn": "世界"
+ },
+ {
+ "key": "num_1021",
+ "text_cn": "公会"
+ },
+ {
+ "key": "num_1022",
+ "text_cn": "私聊"
+ },
+ {
+ "key": "num_1023",
+ "text_cn": "跨服"
+ },
+ {
+ "key": "num_1024",
+ "text_cn": "系统"
+ },
{
"key": "opencond_name_10001",
"text_cn": "背包"
@@ -3949,7 +4061,7 @@
},
{
"key": "hero_help_10005",
- "text_cn": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。\u003Cbr/\u003E英雄达到等级上限后，需要通过升星进一步提升等级。\u003Cbr/\u003E升星后英雄的属性将得到提升。\u003Cbr/\u003E升星精灵是英雄升星的优质素材"
+ "text_cn": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。
英雄达到等级上限后，需要通过升星进一步提升等级。
升星后英雄的属性将得到提升。
升星精灵是英雄升星的优质素材"
},
{
"key": "hero_help_10006",
@@ -3957,6 +4069,6 @@
},
{
"key": "hero_help_10007",
- "text_cn": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。\u003Cbr/\u003E如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
+ "text_cn": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。
如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
}
]
\ No newline at end of file
diff --git a/bin/json/LocalizeConfig_EN.json b/bin/json/LocalizeConfig_EN.json
index bbff36c56..eda601765 100644
--- a/bin/json/LocalizeConfig_EN.json
+++ b/bin/json/LocalizeConfig_EN.json
@@ -413,11 +413,11 @@
},
{
"key": "hero_51002",
- "text_en": "Erret\u0027s No. 1 (new)"
+ "text_en": "Erret's No. 1 (new)"
},
{
"key": "hero_51003",
- "text_en": "Erret\u0027s No. 2 (new)"
+ "text_en": "Erret's No. 2 (new)"
},
{
"key": "hero_51004",
@@ -441,7 +441,7 @@
},
{
"key": "hero_51009",
- "text_en": "Captain Chantal du Bois\u0027s No. 4 (new)"
+ "text_en": "Captain Chantal du Bois's No. 4 (new)"
},
{
"key": "hero_51010",
@@ -525,7 +525,7 @@
},
{
"key": "hero_55010",
- "text_en": "Mr. Piranha\u0027s handsome batch"
+ "text_en": "Mr. Piranha's handsome batch"
},
{
"key": "hero_55011",
@@ -533,7 +533,7 @@
},
{
"key": "hero_55012",
- "text_en": "Lord Farquad\u0027s handsome batch"
+ "text_en": "Lord Farquad's handsome batch"
},
{
"key": "hero_55013",
@@ -561,11 +561,11 @@
},
{
"key": "hero_55019",
- "text_en": "Blanche\u0027s handsome batch"
+ "text_en": "Blanche's handsome batch"
},
{
"key": "hero_55020",
- "text_en": "Prince Grist\u0027s handsome batch"
+ "text_en": "Prince Grist's handsome batch"
},
{
"key": "hero_55021",
@@ -589,7 +589,7 @@
},
{
"key": "hero_55026",
- "text_en": "Captain Smack\u0027s handsome batch"
+ "text_en": "Captain Smack's handsome batch"
},
{
"key": "hero_55027",
@@ -625,7 +625,7 @@
},
{
"key": "hero_55035",
- "text_en": "Kyle\u0027s group"
+ "text_en": "Kyle's group"
},
{
"key": "hero_55036",
@@ -641,11 +641,11 @@
},
{
"key": "hero_55039",
- "text_en": "Po\u0027s personality is easy-going, innocent, active, playful, and childish, but it is these qualities that give him the potential to become a \u0022Dragon Hero\u0022. Maybe heroes are not necessarily perfect, but they must be kind!"
+ "text_en": "Po's personality is easy-going, innocent, active, playful, and childish, but it is these qualities that give him the potential to become a \"Dragon Hero\". Maybe heroes are not necessarily perfect, but they must be kind!"
},
{
"key": "hero_55040",
- "text_en": "Mr. Wolfe\u0027s handsome batch"
+ "text_en": "Mr. Wolfe's handsome batch"
},
{
"key": "hero_55041",
@@ -669,7 +669,7 @@
},
{
"key": "hero_55046",
- "text_en": "Prue Granger\u0027s handsome batch"
+ "text_en": "Prue Granger's handsome batch"
},
{
"key": "hero_55047",
@@ -697,7 +697,7 @@
},
{
"key": "hero_55053",
- "text_en": "Walter Strickler\u0027s handsome batch"
+ "text_en": "Walter Strickler's handsome batch"
},
{
"key": "hero_55054",
@@ -705,11 +705,11 @@
},
{
"key": "hero_55055",
- "text_en": "Fiona\u0027s handsome batch"
+ "text_en": "Fiona's handsome batch"
},
{
"key": "hero_55056",
- "text_en": "Huffnut\u0027s handsome batch"
+ "text_en": "Huffnut's handsome batch"
},
{
"key": "hero_55057",
@@ -733,11 +733,11 @@
},
{
"key": "hero_55062",
- "text_en": "Mr. Ping\u0027s handsome group"
+ "text_en": "Mr. Ping's handsome group"
},
{
"key": "hero_55063",
- "text_en": "Abigail Stone\u0027s handsome batch"
+ "text_en": "Abigail Stone's handsome batch"
},
{
"key": "hero_55064",
@@ -753,11 +753,11 @@
},
{
"key": "hero_55067",
- "text_en": "Commander Vahir\u0027s handsome group"
+ "text_en": "Commander Vahir's handsome group"
},
{
"key": "hero_55068",
- "text_en": "Bridget\u0027s handsome batch"
+ "text_en": "Bridget's handsome batch"
},
{
"key": "hero_55069",
@@ -797,7 +797,7 @@
},
{
"key": "hero_55078",
- "text_en": "Guy\u0027s group"
+ "text_en": "Guy's group"
},
{
"key": "hero_55079",
@@ -1801,7 +1801,7 @@
},
{
"key": "equip_13215",
- "text_en": "Critical strike rate \u002B20%"
+ "text_en": "Critical strike rate +20%"
},
{
"key": "equip_13216",
@@ -2149,279 +2149,279 @@
},
{
"key": "mainline_desc_10002",
- "text_en": "Don\u0027t look at the peaceful and prosperous scene of the \u0022Peace Valley\u0022 where A Bao is located, it is actually a feng shui treasure land of Crouching Tiger Hidden Dragon. Not to mention that the five masters of kung fu are all sitting here, and there is even a master-level master living here in seclusion."
+ "text_en": "Don't look at the peaceful and prosperous scene of the \"Peace Valley\" where A Bao is located, it is actually a feng shui treasure land of Crouching Tiger Hidden Dragon. Not to mention that the five masters of kung fu are all sitting here, and there is even a master-level master living here in seclusion."
},
{
"key": "mainline_desc_10003",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10004",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10005",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10006",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10007",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10008",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10009",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10010",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10011",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10012",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10013",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10014",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10015",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10016",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10017",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10018",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10019",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10020",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10021",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10022",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10023",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10024",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10025",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10026",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10027",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10028",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10029",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10030",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10031",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10032",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10033",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10034",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10035",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10036",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10037",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10038",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10039",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10040",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10041",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10042",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10043",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10044",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10045",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10046",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10047",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10048",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10049",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10050",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10051",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10052",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10053",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10054",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10055",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10056",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10057",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10058",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10059",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10060",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10061",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10062",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10063",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10064",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10065",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10066",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10067",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10068",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10069",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_desc_10070",
- "text_en": "However, the winner of a special martial arts competition has to represent the \u0022Peace Valley\u0022 to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
+ "text_en": "However, the winner of a special martial arts competition has to represent the \"Peace Valley\" to drive out the evil dragon forever. A Bao, who knows nothing, has gone through a series of misunderstandings and won the election. Stunned everyone."
},
{
"key": "mainline_text_10001",
@@ -3023,6 +3023,10 @@
"key": "skillname_125004311",
"text_en": ""
},
+ {
+ "key": "skillname_925004211",
+ "text_en": ""
+ },
{
"key": "skillname_135002011",
"text_en": ""
@@ -3043,6 +3047,26 @@
"key": "skillname_935002321",
"text_en": ""
},
+ {
+ "key": "skillname_124003011",
+ "text_en": ""
+ },
+ {
+ "key": "skillname_124003111",
+ "text_en": ""
+ },
+ {
+ "key": "skillname_124003211",
+ "text_en": ""
+ },
+ {
+ "key": "skillname_124003311",
+ "text_en": ""
+ },
+ {
+ "key": "skillname_924003411",
+ "text_en": ""
+ },
{
"key": "skill_1250040111",
"text_en": ""
@@ -3183,9 +3207,73 @@
"key": "skill_9350023216",
"text_en": ""
},
+ {
+ "key": "skill_1240030111",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240031111",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240031112",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240031113",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240031114",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240031115",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240032111",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240032112",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033111",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033112",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033113",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033114",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033115",
+ "text_en": ""
+ },
+ {
+ "key": "skill_1240033116",
+ "text_en": ""
+ },
+ {
+ "key": "skill_9240034111",
+ "text_en": ""
+ },
+ {
+ "key": "skill_9240034112",
+ "text_en": ""
+ },
{
"key": "skill_190011000",
- "text_en": "Increases all allies\u0027 defense by 30%"
+ "text_en": "Increases all allies' defense by 30%"
},
{
"key": "skill_190012000",
@@ -3193,7 +3281,7 @@
},
{
"key": "skill_190013000",
- "text_en": "After each round, Po will enter the [Xuan Yu] state, which lasts for 1 round. At the beginning of his new round, he will deal damage equal to 110% of his defense to all enemies. During the period of [Xuan Yu], every time you receive an attack, you will get 1 layer of [Xuan Yu\u0027s Blessing], but when you are in an immobile state, the [Xuan Yu] state will be released. When any of your own active skills hits the enemy and triggers a critical strike, the cooldown of this skill is reduced for 1 turn"
+ "text_en": "After each round, Po will enter the [Xuan Yu] state, which lasts for 1 round. At the beginning of his new round, he will deal damage equal to 110% of his defense to all enemies. During the period of [Xuan Yu], every time you receive an attack, you will get 1 layer of [Xuan Yu's Blessing], but when you are in an immobile state, the [Xuan Yu] state will be released. When any of your own active skills hits the enemy and triggers a critical strike, the cooldown of this skill is reduced for 1 turn"
},
{
"key": "skill_190014000",
@@ -3209,7 +3297,7 @@
},
{
"key": "skill_190017000",
- "text_en": "Poppy clears all allies\u0027 debuffs, and evenly distributes the percentage of allies\u0027 health, adding 2 rounds of [Attack Boost] to all allies"
+ "text_en": "Poppy clears all allies' debuffs, and evenly distributes the percentage of allies' health, adding 2 rounds of [Attack Boost] to all allies"
},
{
"key": "skill_190018000",
@@ -3645,7 +3733,7 @@
},
{
"key": "itemdesc_10011",
- "text_en": "The hands don\u0027t move, maybe someone can fix it."
+ "text_en": "The hands don't move, maybe someone can fix it."
},
{
"key": "itemdesc_10012",
@@ -3721,7 +3809,7 @@
},
{
"key": "itemname_10014",
- "text_en": "Adventurer\u0027s Medal"
+ "text_en": "Adventurer's Medal"
},
{
"key": "itemname_10015",
@@ -3753,7 +3841,7 @@
},
{
"key": "skillname_190011000",
- "text_en": "Captain Po\u0027s skills"
+ "text_en": "Captain Po's skills"
},
{
"key": "skillname_190012000",
@@ -3769,7 +3857,7 @@
},
{
"key": "skillname_190014000",
- "text_en": "Captain Poppy\u0027s skills"
+ "text_en": "Captain Poppy's skills"
},
{
"key": "skillname_190016000",
@@ -3891,6 +3979,30 @@
"key": "num_1018",
"text_en": "GOBER BACKSMITH SHOP"
},
+ {
+ "key": "num_1019",
+ "text_en": "chat"
+ },
+ {
+ "key": "num_1020",
+ "text_en": "World"
+ },
+ {
+ "key": "num_1021",
+ "text_en": "Guild"
+ },
+ {
+ "key": "num_1022",
+ "text_en": "Private"
+ },
+ {
+ "key": "num_1023",
+ "text_en": "Public"
+ },
+ {
+ "key": "num_1024",
+ "text_en": "System"
+ },
{
"key": "opencond_name_10001",
"text_en": "INVENTORY"
@@ -3949,7 +4061,7 @@
},
{
"key": "hero_help_10005",
- "text_en": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。\u003Cbr/\u003E英雄达到等级上限后，需要通过升星进一步提升等级。\u003Cbr/\u003E升星后英雄的属性将得到提升。\u003Cbr/\u003E升星精灵是英雄升星的优质素材"
+ "text_en": "不同星级的英雄有不同的等级上限，3星为30级，4星为40级,5星为50级，6星为60级。
英雄达到等级上限后，需要通过升星进一步提升等级。
升星后英雄的属性将得到提升。
升星精灵是英雄升星的优质素材"
},
{
"key": "hero_help_10006",
@@ -3957,6 +4069,6 @@
},
{
"key": "hero_help_10007",
- "text_en": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。\u003Cbr/\u003E如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
+ "text_en": "使用稀有/史诗/传说品质的技能精灵可以提升对应品质英雄的技能等级，技能升级时将随机选择还可以继续升级的技能。
如果英雄的所有技能等级满级，将不能再使用技能精灵提升等级"
}
]
\ No newline at end of file
diff --git a/bin/json/LocalizeConfig_TW.json b/bin/json/LocalizeConfig_TW.json
index bdce1feb3..7a84c4420 100644
--- a/bin/json/LocalizeConfig_TW.json
+++ b/bin/json/LocalizeConfig_TW.json
@@ -3023,6 +3023,10 @@
"key": "skillname_125004311",
"text_tw": ""
},
+ {
+ "key": "skillname_925004211",
+ "text_tw": ""
+ },
{
"key": "skillname_135002011",
"text_tw": ""
@@ -3043,6 +3047,26 @@
"key": "skillname_935002321",
"text_tw": ""
},
+ {
+ "key": "skillname_124003011",
+ "text_tw": ""
+ },
+ {
+ "key": "skillname_124003111",
+ "text_tw": ""
+ },
+ {
+ "key": "skillname_124003211",
+ "text_tw": ""
+ },
+ {
+ "key": "skillname_124003311",
+ "text_tw": ""
+ },
+ {
+ "key": "skillname_924003411",
+ "text_tw": ""
+ },
{
"key": "skill_1250040111",
"text_tw": ""
@@ -3183,6 +3207,70 @@
"key": "skill_9350023216",
"text_tw": ""
},
+ {
+ "key": "skill_1240030111",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240031111",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240031112",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240031113",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240031114",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240031115",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240032111",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240032112",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033111",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033112",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033113",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033114",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033115",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_1240033116",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_9240034111",
+ "text_tw": ""
+ },
+ {
+ "key": "skill_9240034112",
+ "text_tw": ""
+ },
{
"key": "skill_190011000",
"text_tw": ""
@@ -3891,6 +3979,30 @@
"key": "num_1018",
"text_tw": ""
},
+ {
+ "key": "num_1019",
+ "text_tw": ""
+ },
+ {
+ "key": "num_1020",
+ "text_tw": ""
+ },
+ {
+ "key": "num_1021",
+ "text_tw": ""
+ },
+ {
+ "key": "num_1022",
+ "text_tw": ""
+ },
+ {
+ "key": "num_1023",
+ "text_tw": ""
+ },
+ {
+ "key": "num_1024",
+ "text_tw": ""
+ },
{
"key": "opencond_name_10001",
"text_tw": ""
diff --git a/bin/json/game_chatsystem.json b/bin/json/game_chatsystem.json
index 71828e6ca..c20104caa 100644
--- a/bin/json/game_chatsystem.json
+++ b/bin/json/game_chatsystem.json
@@ -57,7 +57,7 @@
"type": 2,
"title": "【传闻】",
"close": "#ffc73f",
- "test": "[name]经过不懈努力，将[item]强化到了\u002B[data]！",
+ "test": "[name]经过不懈努力，将[item]强化到了+[data]！",
"data": 12,
"week": [],
"time_h": 0,
@@ -68,7 +68,7 @@
"type": 2,
"title": "【传闻】",
"close": "#ffc73f",
- "test": "[name]经过不懈努力，将[item]强化到了\u002B[data]！",
+ "test": "[name]经过不懈努力，将[item]强化到了+[data]！",
"data": 13,
"week": [],
"time_h": 0,
@@ -79,7 +79,7 @@
"type": 2,
"title": "【传闻】",
"close": "#ffc73f",
- "test": "[name]经过不懈努力，将[item]强化到了\u002B[data]！",
+ "test": "[name]经过不懈努力，将[item]强化到了+[data]！",
"data": 14,
"week": [],
"time_h": 0,
@@ -90,7 +90,7 @@
"type": 2,
"title": "【传闻】",
"close": "#ffc73f",
- "test": "[name]经过不懈努力，将[item]强化到了\u002B[data]！",
+ "test": "[name]经过不懈努力，将[item]强化到了+[data]！",
"data": 15,
"week": [],
"time_h": 0,
diff --git a/bin/json/game_com.json b/bin/json/game_com.json
index ff4f68e83..00f11b087 100644
--- a/bin/json/game_com.json
+++ b/bin/json/game_com.json
@@ -1,262 +1,114 @@
[
{
- "index": "max_getreward",
- "var": "10002,99",
- "intr": "领取/赠送奖励"
- },
- {
- "index": "max_char",
- "var": "100",
- "intr": "聊天最大输入字符数量"
- },
- {
- "index": "task_reset",
- "var": "8",
- "intr": "日/周常任务刷新时间，8点"
- },
- {
- "index": "init_gold",
- "var": "100000",
- "intr": "初始金币"
- },
- {
- "index": "init_hero",
- "var": "15001,25001",
- "intr": "初始英雄"
- },
- {
- "index": "cameramin",
- "var": "0,0,0",
- "intr": "镜头坐标最小值"
- },
- {
- "index": "cameramax",
- "var": "-1.53,1.1,-8",
- "intr": "镜头坐标最大值"
- },
- {
- "index": "heroshownum",
- "var": "2",
- "intr": "播放开场动作角色数量"
- },
- {
- "index": "equipsuitsum",
- "var": "4,4,4,4,2,2",
- "intr": "装备位置对应数量"
- },
- {
- "index": "friend_maxnum",
- "var": "50",
- "intr": "最大好友数量"
- },
- {
- "index": "friend_minnum",
- "var": "0",
- "intr": "最少好友数量"
- },
- {
- "index": "friend_maxgetnum",
- "var": "20",
- "intr": "每日最大获赠的友情点数量"
- },
- {
- "index": "friend_maxsendnum",
- "var": "50",
- "intr": "每日最大可送出的友情点数量"
- },
- {
- "index": "friend_date",
- "var": "7",
- "intr": "申请记录保留时间/天"
- },
- {
- "index": "friend_recordtime",
- "var": "7",
- "intr": "助战记录保留时间/天"
- },
- {
- "index": "friend_black",
- "var": "50",
- "intr": "最大黑名单数"
- },
- {
- "index": "channel_cd_world",
- "var": "5",
- "intr": "世界频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_guild",
- "var": "3",
- "intr": "公会频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_private",
- "var": "3",
- "intr": "私聊频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_public",
- "var": "15",
- "intr": "跨服频道发言间隔CD（秒）"
- },
- {
- "index": "channel_lock_icon",
- "var": "200",
- "intr": "输入框最大字数为value"
- },
- {
- "index": "max_word",
- "var": "200",
- "intr": "输入框最大字数为value"
- },
- {
- "index": "max_chat",
- "var": "99",
- "intr": "最大保存条数为value"
- },
- {
- "index": "max_object",
- "var": "50",
- "intr": "最大私聊对象数为value"
- },
- {
- "index": "load_chat",
- "var": "10",
- "intr": "加入或切换跨服频道时，请求最近value条历史消息"
- },
- {
- "index": "channel_allocation_max",
- "var": "2000",
- "intr": "频道大于value人时不再继续分配"
- },
- {
- "index": "channel_switching_max",
- "var": "3000",
- "intr": "频道大于value人时不再接受手动切换到该频道"
- },
- {
- "index": "draw_toplimit",
- "var": "9999",
- "intr": "每日抽卡次数上限"
- },
- {
- "index": "10draw_star4_max",
- "var": "8",
- "intr": "10连抽最大4星数量"
- },
- {
- "index": "10draw_star5_max",
- "var": "2",
- "intr": "10连抽最大5星数量"
- },
- {
- "index": "draw_floor_star4",
- "var": "20",
- "intr": "连续20次不出4星英雄则替换第20次结果为4星英雄"
- },
- {
- "index": "draw_floor_star5",
- "var": "100",
- "intr": "连续100次不出5星英雄则替换第100次结果为5星英雄"
- },
- {
- "index": "duplicate_removal",
- "var": "1",
- "intr": "抽到5星英雄时，需要与上次获得的5星英雄不一样，填1启用，填0关闭"
- },
- {
- "index": "base_pool_cost",
- "var": "item,10001,1",
- "intr": "普通卡池每次抽卡消耗的道具"
- },
- {
- "index": "camp1_pool_cost",
- "var": "item,10002,1",
- "intr": "阵营1每次抽卡消耗的道具"
- },
- {
- "index": "camp2_pool_cost",
- "var": "item,10003,1",
- "intr": "阵营2每次抽卡消耗的道具"
- },
- {
- "index": "camp3_pool_cost",
- "var": "item,10004,1",
- "intr": "阵营3每次抽卡消耗的道具"
- },
- {
- "index": "camp4_pool_cost",
- "var": "item,10005,1",
- "intr": "阵营4每次抽卡消耗的道具"
- },
- {
- "index": "camp1_pool1",
- "var": "camp1_pool",
- "intr": "阵营1抽卡调用奖池base_pool1"
- },
- {
- "index": "camp2_pool1",
- "var": "camp2_pool",
- "intr": "阵营2抽卡调用奖池base_pool2"
- },
- {
- "index": "camp3_pool1",
- "var": "camp3_pool",
- "intr": "阵营3抽卡调用奖池base_pool3"
- },
- {
- "index": "camp4_pool1",
- "var": "camp4_pool",
- "intr": "阵营4抽卡调用奖池base_pool4"
- },
- {
- "index": "base_pool1",
- "var": "1-60-base_pool1",
- "intr": "1-60次普通抽卡调用奖池base_pool1"
- },
- {
- "index": "base_pool2",
- "var": "61-200-base_pool2",
- "intr": "61-200次普通抽卡调用奖池base_pool2"
- },
- {
- "index": "base_pool3",
- "var": "201-1000-base_pool3",
- "intr": "201-1000次普通抽卡调用奖池base_pool3"
- },
- {
- "index": "base_pool4",
- "var": "1000-99999999-base_pool4",
- "intr": "1000-99999999次普通抽卡调用奖池base_pool4"
- },
- {
- "index": "base_pool_star3",
- "var": "9000",
- "intr": "普通奖池3星权重"
- },
- {
- "index": "base_pool_star4",
- "var": "900",
- "intr": "普通奖池4星权重"
- },
- {
- "index": "base_pool_star5",
- "var": "100",
- "intr": "普通奖池5星权重"
- },
- {
- "index": "camp_pool_star3",
- "var": "9000",
- "intr": "阵营奖池3星权重"
- },
- {
- "index": "camp_pool_star4",
- "var": "900",
- "intr": "阵营奖池4星权重"
- },
- {
- "index": "camp_pool_star5",
- "var": "100",
- "intr": "阵营奖池5星权重"
+ "max_char": 100,
+ "task_reset": 8,
+ "init_gold": 100000,
+ "init_hero": [
+ 15001,
+ 25001
+ ],
+ "cameramin": [
+ 0,
+ 0,
+ 0
+ ],
+ "max_getreward": [
+ 10002,
+ 99
+ ],
+ "cameramax": [
+ -1.53,
+ 1.1,
+ -8
+ ],
+ "heroshownum": 2,
+ "equipsuitsum": [
+ 4,
+ 4,
+ 4,
+ 4,
+ 2,
+ 2
+ ],
+ "friend_maxnum": 50,
+ "friend_minnum": 0,
+ "friend_maxgetnum": 20,
+ "friend_maxsendnum": 50,
+ "friend_date": 7,
+ "friend_recordtime": 7,
+ "friend_black": 50,
+ "channel_cd_world": 5,
+ "channel_cd_guild": 3,
+ "channel_cd_private": 3,
+ "channel_cd_public": 15,
+ "channel_lock_icon": 200,
+ "max_word": 200,
+ "max_chat": 99,
+ "max_object": 50,
+ "load_chat": 10,
+ "channel_allocation_max": 2000,
+ "channel_switching_max": 3000,
+ "draw_toplimit": 9999,
+ "draw10_star4_max": 8,
+ "draw10_star5_max": 2,
+ "draw_floor_star4": 20,
+ "draw_floor_star5": 100,
+ "duplicate_removal": 1,
+ "base_pool_cost": {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ "camp1_pool_cost": {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ "camp2_pool_cost": {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ "camp3_pool_cost": {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ },
+ "camp4_pool_cost": {
+ "a": "item",
+ "t": "10005",
+ "n": 1
+ },
+ "camp1_pool1": "camp1_pool",
+ "camp2_pool1": "camp2_pool",
+ "camp3_pool1": "camp3_pool",
+ "camp4_pool1": "camp4_pool",
+ "base_pool1": {
+ "s": 1,
+ "e": 60,
+ "p": "base_pool1"
+ },
+ "base_pool2": {
+ "s": 61,
+ "e": 200,
+ "p": "base_pool2"
+ },
+ "base_pool3": {
+ "s": 201,
+ "e": 1000,
+ "p": "base_pool3"
+ },
+ "base_pool4": {
+ "s": 1000,
+ "e": 99999999,
+ "p": "base_pool4"
+ },
+ "base_pool_star3": 9000,
+ "base_pool_star4": 900,
+ "base_pool_star5": 100,
+ "camp_pool_star3": 9000,
+ "camp_pool_star4": 900,
+ "camp_pool_star5": 100,
+ "gourmet": 500
}
]
\ No newline at end of file
diff --git a/bin/json/game_drawcard.json b/bin/json/game_drawcard.json
index 409d4b3d2..f7d221931 100644
--- a/bin/json/game_drawcard.json
+++ b/bin/json/game_drawcard.json
@@ -1,302 +1,1442 @@
[
{
"key": 1,
- "id": "13001",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 1,
+ "id": "10001",
"weight": 1000
},
{
"key": 2,
- "id": "13002",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 1,
+ "id": "10002",
"weight": 1000
},
{
"key": 3,
- "id": "13003",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 1,
+ "id": "10003",
"weight": 1000
},
{
"key": 4,
- "id": "13004",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 2,
+ "id": "10004",
"weight": 1000
},
{
"key": 5,
- "id": "13005",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 2,
+ "id": "10005",
"weight": 1000
},
{
"key": 6,
- "id": "14001",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 2,
+ "id": "10006",
"weight": 1000
},
{
"key": 7,
- "id": "14002",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 3,
+ "id": "10007",
"weight": 1000
},
{
"key": 8,
- "id": "14003",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 3,
+ "id": "10008",
"weight": 1000
},
{
"key": 9,
- "id": "14004",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 3,
+ "id": "10009",
"weight": 1000
},
{
"key": 10,
- "id": "14005",
- "type_id": 1,
- "weight": 1000
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 3,
+ "race": 4,
+ "id": "10010",
+ "weight": 200
},
{
"key": 11,
- "id": "14006",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 1,
+ "id": "10011",
"weight": 1000
},
{
"key": 12,
- "id": "14007",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 1,
+ "id": "10012",
"weight": 1000
},
{
"key": 13,
- "id": "15001",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 1,
+ "id": "10013",
"weight": 1000
},
{
"key": 14,
- "id": "15002",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 2,
+ "id": "10014",
"weight": 1000
},
{
"key": 15,
- "id": "15003",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 2,
+ "id": "10015",
"weight": 1000
},
{
"key": 16,
- "id": "15004",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 2,
+ "id": "10016",
"weight": 1000
},
{
"key": 17,
- "id": "23001",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 3,
+ "id": "10017",
"weight": 1000
},
{
"key": 18,
- "id": "23002",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 3,
+ "id": "10018",
"weight": 1000
},
{
"key": 19,
- "id": "23003",
- "type_id": 1,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 3,
+ "id": "10019",
"weight": 1000
},
{
"key": 20,
- "id": "23004",
- "type_id": 1,
- "weight": 1000
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 4,
+ "race": 4,
+ "id": "10020",
+ "weight": 200
},
{
"key": 21,
- "id": "24001",
- "type_id": 2,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 1,
+ "id": "10021",
"weight": 1000
},
{
"key": 22,
- "id": "24002",
- "type_id": 2,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 1,
+ "id": "10022",
"weight": 1000
},
{
"key": 23,
- "id": "24003",
- "type_id": 11,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 1,
+ "id": "10023",
"weight": 1000
},
{
"key": 24,
- "id": "24004",
- "type_id": 11,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 2,
+ "id": "10024",
"weight": 1000
},
{
"key": 25,
- "id": "24005",
- "type_id": 11,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 2,
+ "id": "10025",
"weight": 1000
},
{
"key": 26,
- "id": "24006",
- "type_id": 11,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 2,
+ "id": "10026",
"weight": 1000
},
{
"key": 27,
- "id": "10005",
- "type_id": 11,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 3,
+ "id": "10027",
"weight": 1000
},
{
"key": 28,
- "id": "10001",
- "type_id": 12,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 3,
+ "id": "10028",
"weight": 1000
},
{
"key": 29,
- "id": "10002",
- "type_id": 12,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 3,
+ "id": "10029",
"weight": 1000
},
{
"key": 30,
- "id": "10006",
- "type_id": 21,
- "weight": 1000
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool1",
+ "star": 5,
+ "race": 4,
+ "id": "10030",
+ "weight": 200
},
{
"key": 31,
- "id": "10007",
- "type_id": 21,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 1,
+ "id": "10001",
"weight": 1000
},
{
"key": 32,
- "id": "10008",
- "type_id": 21,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 1,
+ "id": "10002",
"weight": 1000
},
{
"key": 33,
- "id": "10009",
- "type_id": 21,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 1,
+ "id": "10003",
"weight": 1000
},
{
"key": 34,
- "id": "10010",
- "type_id": 21,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 2,
+ "id": "10004",
"weight": 1000
},
{
"key": 35,
- "id": "10006",
- "type_id": 22,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 2,
+ "id": "10005",
"weight": 1000
},
{
"key": 36,
- "id": "10007",
- "type_id": 22,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 2,
+ "id": "10006",
"weight": 1000
},
{
"key": 37,
- "id": "100011",
- "type_id": 31,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 3,
+ "id": "10007",
"weight": 1000
},
{
"key": 38,
- "id": "100012",
- "type_id": 31,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 3,
+ "id": "10008",
"weight": 1000
},
{
"key": 39,
- "id": "100013",
- "type_id": 31,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 3,
+ "id": "10009",
"weight": 1000
},
{
"key": 40,
- "id": "100014",
- "type_id": 31,
- "weight": 1000
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 3,
+ "race": 4,
+ "id": "10010",
+ "weight": 200
},
{
"key": 41,
- "id": "100015",
- "type_id": 31,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 1,
+ "id": "10011",
"weight": 1000
},
{
"key": 42,
- "id": "100011",
- "type_id": 32,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 1,
+ "id": "10012",
"weight": 1000
},
{
"key": 43,
- "id": "100012",
- "type_id": 32,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 1,
+ "id": "10013",
"weight": 1000
},
{
"key": 44,
- "id": "100016",
- "type_id": 41,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 2,
+ "id": "10014",
"weight": 1000
},
{
"key": 45,
- "id": "100017",
- "type_id": 41,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 2,
+ "id": "10015",
"weight": 1000
},
{
"key": 46,
- "id": "100018",
- "type_id": 41,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 2,
+ "id": "10016",
"weight": 1000
},
{
"key": 47,
- "id": "100019",
- "type_id": 41,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 3,
+ "id": "10017",
"weight": 1000
},
{
"key": 48,
- "id": "100020",
- "type_id": 41,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 3,
+ "id": "10018",
"weight": 1000
},
{
"key": 49,
- "id": "100016",
- "type_id": 42,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 3,
+ "id": "10019",
"weight": 1000
},
{
"key": 50,
- "id": "100017",
- "type_id": 42,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 4,
+ "race": 4,
+ "id": "10020",
+ "weight": 200
+ },
+ {
+ "key": 51,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 1,
+ "id": "10021",
"weight": 1000
+ },
+ {
+ "key": 52,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 1,
+ "id": "10022",
+ "weight": 1000
+ },
+ {
+ "key": 53,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 1,
+ "id": "10023",
+ "weight": 1000
+ },
+ {
+ "key": 54,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 2,
+ "id": "10024",
+ "weight": 1000
+ },
+ {
+ "key": 55,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 2,
+ "id": "10025",
+ "weight": 1000
+ },
+ {
+ "key": 56,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 2,
+ "id": "10026",
+ "weight": 1000
+ },
+ {
+ "key": 57,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 3,
+ "id": "10027",
+ "weight": 1000
+ },
+ {
+ "key": 58,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 3,
+ "id": "10028",
+ "weight": 1000
+ },
+ {
+ "key": 59,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 3,
+ "id": "10029",
+ "weight": 1000
+ },
+ {
+ "key": 60,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool2",
+ "star": 5,
+ "race": 4,
+ "id": "10030",
+ "weight": 200
+ },
+ {
+ "key": 61,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 1,
+ "id": "10001",
+ "weight": 1000
+ },
+ {
+ "key": 62,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 1,
+ "id": "10002",
+ "weight": 1000
+ },
+ {
+ "key": 63,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 1,
+ "id": "10003",
+ "weight": 1000
+ },
+ {
+ "key": 64,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 2,
+ "id": "10004",
+ "weight": 1000
+ },
+ {
+ "key": 65,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 2,
+ "id": "10005",
+ "weight": 1000
+ },
+ {
+ "key": 66,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 2,
+ "id": "10006",
+ "weight": 1000
+ },
+ {
+ "key": 67,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 3,
+ "id": "10007",
+ "weight": 1000
+ },
+ {
+ "key": 68,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 3,
+ "id": "10008",
+ "weight": 1000
+ },
+ {
+ "key": 69,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 3,
+ "id": "10009",
+ "weight": 1000
+ },
+ {
+ "key": 70,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 3,
+ "race": 4,
+ "id": "10010",
+ "weight": 200
+ },
+ {
+ "key": 71,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 1,
+ "id": "10011",
+ "weight": 1000
+ },
+ {
+ "key": 72,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 1,
+ "id": "10012",
+ "weight": 1000
+ },
+ {
+ "key": 73,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 1,
+ "id": "10013",
+ "weight": 1000
+ },
+ {
+ "key": 74,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 2,
+ "id": "10014",
+ "weight": 1000
+ },
+ {
+ "key": 75,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 2,
+ "id": "10015",
+ "weight": 1000
+ },
+ {
+ "key": 76,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 2,
+ "id": "10016",
+ "weight": 1000
+ },
+ {
+ "key": 77,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 3,
+ "id": "10017",
+ "weight": 1000
+ },
+ {
+ "key": 78,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 3,
+ "id": "10018",
+ "weight": 1000
+ },
+ {
+ "key": 79,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 3,
+ "id": "10019",
+ "weight": 1000
+ },
+ {
+ "key": 80,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 4,
+ "race": 4,
+ "id": "10020",
+ "weight": 200
+ },
+ {
+ "key": 81,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 1,
+ "id": "10021",
+ "weight": 1000
+ },
+ {
+ "key": 82,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 1,
+ "id": "10022",
+ "weight": 1000
+ },
+ {
+ "key": 83,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 1,
+ "id": "10023",
+ "weight": 1000
+ },
+ {
+ "key": 84,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 2,
+ "id": "10024",
+ "weight": 1000
+ },
+ {
+ "key": 85,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 2,
+ "id": "10025",
+ "weight": 1000
+ },
+ {
+ "key": 86,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 2,
+ "id": "10026",
+ "weight": 1000
+ },
+ {
+ "key": 87,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 3,
+ "id": "10027",
+ "weight": 1000
+ },
+ {
+ "key": 88,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 3,
+ "id": "10028",
+ "weight": 1000
+ },
+ {
+ "key": 89,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 3,
+ "id": "10029",
+ "weight": 1000
+ },
+ {
+ "key": 90,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool3",
+ "star": 5,
+ "race": 4,
+ "id": "10030",
+ "weight": 200
+ },
+ {
+ "key": 91,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 1,
+ "id": "10001",
+ "weight": 1000
+ },
+ {
+ "key": 92,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 1,
+ "id": "10002",
+ "weight": 1000
+ },
+ {
+ "key": 93,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 1,
+ "id": "10003",
+ "weight": 1000
+ },
+ {
+ "key": 94,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 2,
+ "id": "10004",
+ "weight": 1000
+ },
+ {
+ "key": 95,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 2,
+ "id": "10005",
+ "weight": 1000
+ },
+ {
+ "key": 96,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 2,
+ "id": "10006",
+ "weight": 1000
+ },
+ {
+ "key": 97,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 3,
+ "id": "10007",
+ "weight": 1000
+ },
+ {
+ "key": 98,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 3,
+ "id": "10008",
+ "weight": 1000
+ },
+ {
+ "key": 99,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 3,
+ "id": "10009",
+ "weight": 1000
+ },
+ {
+ "key": 100,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 3,
+ "race": 4,
+ "id": "10010",
+ "weight": 200
+ },
+ {
+ "key": 101,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 1,
+ "id": "10011",
+ "weight": 1000
+ },
+ {
+ "key": 102,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 1,
+ "id": "10012",
+ "weight": 1000
+ },
+ {
+ "key": 103,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 1,
+ "id": "10013",
+ "weight": 1000
+ },
+ {
+ "key": 104,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 2,
+ "id": "10014",
+ "weight": 1000
+ },
+ {
+ "key": 105,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 2,
+ "id": "10015",
+ "weight": 1000
+ },
+ {
+ "key": 106,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 2,
+ "id": "10016",
+ "weight": 1000
+ },
+ {
+ "key": 107,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 3,
+ "id": "10017",
+ "weight": 1000
+ },
+ {
+ "key": 108,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 3,
+ "id": "10018",
+ "weight": 1000
+ },
+ {
+ "key": 109,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 3,
+ "id": "10019",
+ "weight": 1000
+ },
+ {
+ "key": 110,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 4,
+ "race": 4,
+ "id": "10020",
+ "weight": 200
+ },
+ {
+ "key": 111,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 1,
+ "id": "10021",
+ "weight": 1000
+ },
+ {
+ "key": 112,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 1,
+ "id": "10022",
+ "weight": 1000
+ },
+ {
+ "key": 113,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 1,
+ "id": "10023",
+ "weight": 1000
+ },
+ {
+ "key": 114,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 2,
+ "id": "10024",
+ "weight": 1000
+ },
+ {
+ "key": 115,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 2,
+ "id": "10025",
+ "weight": 1000
+ },
+ {
+ "key": 116,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 2,
+ "id": "10026",
+ "weight": 1000
+ },
+ {
+ "key": 117,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 3,
+ "id": "10027",
+ "weight": 1000
+ },
+ {
+ "key": 118,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 3,
+ "id": "10028",
+ "weight": 1000
+ },
+ {
+ "key": 119,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 3,
+ "id": "10029",
+ "weight": 1000
+ },
+ {
+ "key": 120,
+ "recruitment_type": 1,
+ "card_pool_type": "base_pool4",
+ "star": 5,
+ "race": 4,
+ "id": "10030",
+ "weight": 200
+ },
+ {
+ "key": 121,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 3,
+ "race": 1,
+ "id": "10001",
+ "weight": 1000
+ },
+ {
+ "key": 122,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 3,
+ "race": 1,
+ "id": "10002",
+ "weight": 1000
+ },
+ {
+ "key": 123,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 3,
+ "race": 1,
+ "id": "10003",
+ "weight": 1000
+ },
+ {
+ "key": 124,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "race": 1,
+ "id": "10004",
+ "weight": 1000
+ },
+ {
+ "key": 125,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "race": 1,
+ "id": "10005",
+ "weight": 1000
+ },
+ {
+ "key": 126,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 4,
+ "race": 1,
+ "id": "10006",
+ "weight": 1000
+ },
+ {
+ "key": 127,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "10007",
+ "weight": 1000
+ },
+ {
+ "key": 128,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "10008",
+ "weight": 1000
+ },
+ {
+ "key": 129,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "10009",
+ "weight": 1000
+ },
+ {
+ "key": 130,
+ "recruitment_type": 2,
+ "card_pool_type": "camp1_pool",
+ "star": 5,
+ "race": 1,
+ "id": "10010",
+ "weight": 200
+ },
+ {
+ "key": 131,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 3,
+ "race": 2,
+ "id": "10011",
+ "weight": 1000
+ },
+ {
+ "key": 132,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 3,
+ "race": 2,
+ "id": "10012",
+ "weight": 1000
+ },
+ {
+ "key": 133,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 3,
+ "race": 2,
+ "id": "10013",
+ "weight": 1000
+ },
+ {
+ "key": 134,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "10014",
+ "weight": 1000
+ },
+ {
+ "key": 135,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "10015",
+ "weight": 1000
+ },
+ {
+ "key": 136,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 4,
+ "race": 2,
+ "id": "10016",
+ "weight": 1000
+ },
+ {
+ "key": 137,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "10017",
+ "weight": 1000
+ },
+ {
+ "key": 138,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "10018",
+ "weight": 1000
+ },
+ {
+ "key": 139,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "10019",
+ "weight": 1000
+ },
+ {
+ "key": 140,
+ "recruitment_type": 2,
+ "card_pool_type": "camp2_pool",
+ "star": 5,
+ "race": 2,
+ "id": "10020",
+ "weight": 200
+ },
+ {
+ "key": 141,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "10021",
+ "weight": 1000
+ },
+ {
+ "key": 142,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "10022",
+ "weight": 1000
+ },
+ {
+ "key": 143,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 3,
+ "race": 3,
+ "id": "10023",
+ "weight": 1000
+ },
+ {
+ "key": 144,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "10024",
+ "weight": 1000
+ },
+ {
+ "key": 145,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "10025",
+ "weight": 1000
+ },
+ {
+ "key": 146,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 4,
+ "race": 3,
+ "id": "10026",
+ "weight": 1000
+ },
+ {
+ "key": 147,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "10027",
+ "weight": 1000
+ },
+ {
+ "key": 148,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "10028",
+ "weight": 1000
+ },
+ {
+ "key": 149,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "10029",
+ "weight": 1000
+ },
+ {
+ "key": 150,
+ "recruitment_type": 2,
+ "card_pool_type": "camp3_pool",
+ "star": 5,
+ "race": 3,
+ "id": "10030",
+ "weight": 200
+ },
+ {
+ "key": 151,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "10031",
+ "weight": 200
+ },
+ {
+ "key": 152,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "10032",
+ "weight": 200
+ },
+ {
+ "key": 153,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 3,
+ "race": 4,
+ "id": "10033",
+ "weight": 200
+ },
+ {
+ "key": 154,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "10034",
+ "weight": 200
+ },
+ {
+ "key": 155,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "10035",
+ "weight": 200
+ },
+ {
+ "key": 156,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 4,
+ "race": 4,
+ "id": "10036",
+ "weight": 200
+ },
+ {
+ "key": 157,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "10037",
+ "weight": 200
+ },
+ {
+ "key": 158,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "10038",
+ "weight": 200
+ },
+ {
+ "key": 159,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "10039",
+ "weight": 200
+ },
+ {
+ "key": 160,
+ "recruitment_type": 2,
+ "card_pool_type": "camp4_pool",
+ "star": 5,
+ "race": 4,
+ "id": "10040",
+ "weight": 200
}
]
\ No newline at end of file
diff --git a/bin/json/game_equipsuit.json b/bin/json/game_equipsuit.json
index aaad266ea..e8c8364df 100644
--- a/bin/json/game_equipsuit.json
+++ b/bin/json/game_equipsuit.json
@@ -9,7 +9,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -22,7 +22,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -35,7 +35,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -48,7 +48,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -61,7 +61,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -74,7 +74,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -87,7 +87,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -100,7 +100,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -113,7 +113,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -126,7 +126,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -139,7 +139,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -152,7 +152,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -165,7 +165,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -178,7 +178,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -191,7 +191,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -204,7 +204,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
},
{
@@ -217,7 +217,7 @@
},
"skillintr": {
"key": "equip_13215",
- "text": "暴击率\u002B20%"
+ "text": "暴击率+20%"
}
}
]
\ No newline at end of file
diff --git a/bin/json/game_extservers.json b/bin/json/game_extservers.json
index 7b7ed56d2..679d03863 100644
--- a/bin/json/game_extservers.json
+++ b/bin/json/game_extservers.json
@@ -1,5 +1,6 @@
[
{
+ "index": 1,
"name": {
"key": "server_10001",
"text": "本地测试服"
@@ -9,6 +10,7 @@
"sid": "df01"
},
{
+ "index": 2,
"name": {
"key": "server_10003",
"text": "和平谷"
@@ -18,6 +20,7 @@
"sid": ""
},
{
+ "index": 3,
"name": {
"key": "debug_server_01",
"text": "lw"
@@ -27,6 +30,7 @@
"sid": "dfli01"
},
{
+ "index": 4,
"name": {
"key": "debug_server_02",
"text": "mxf"
@@ -36,6 +40,7 @@
"sid": "dfmxf"
},
{
+ "index": 5,
"name": {
"key": "server_10004",
"text": "凤凰城"
@@ -45,6 +50,7 @@
"sid": ""
},
{
+ "index": 6,
"name": {
"key": "server_10005",
"text": "翡翠宫"
@@ -54,6 +60,7 @@
"sid": ""
},
{
+ "index": 7,
"name": {
"key": "server_10006",
"text": "乌鸦岭"
diff --git a/bin/json/game_global.json b/bin/json/game_global.json
index ff4f68e83..00f11b087 100644
--- a/bin/json/game_global.json
+++ b/bin/json/game_global.json
@@ -1,262 +1,114 @@
[
{
- "index": "max_getreward",
- "var": "10002,99",
- "intr": "领取/赠送奖励"
- },
- {
- "index": "max_char",
- "var": "100",
- "intr": "聊天最大输入字符数量"
- },
- {
- "index": "task_reset",
- "var": "8",
- "intr": "日/周常任务刷新时间，8点"
- },
- {
- "index": "init_gold",
- "var": "100000",
- "intr": "初始金币"
- },
- {
- "index": "init_hero",
- "var": "15001,25001",
- "intr": "初始英雄"
- },
- {
- "index": "cameramin",
- "var": "0,0,0",
- "intr": "镜头坐标最小值"
- },
- {
- "index": "cameramax",
- "var": "-1.53,1.1,-8",
- "intr": "镜头坐标最大值"
- },
- {
- "index": "heroshownum",
- "var": "2",
- "intr": "播放开场动作角色数量"
- },
- {
- "index": "equipsuitsum",
- "var": "4,4,4,4,2,2",
- "intr": "装备位置对应数量"
- },
- {
- "index": "friend_maxnum",
- "var": "50",
- "intr": "最大好友数量"
- },
- {
- "index": "friend_minnum",
- "var": "0",
- "intr": "最少好友数量"
- },
- {
- "index": "friend_maxgetnum",
- "var": "20",
- "intr": "每日最大获赠的友情点数量"
- },
- {
- "index": "friend_maxsendnum",
- "var": "50",
- "intr": "每日最大可送出的友情点数量"
- },
- {
- "index": "friend_date",
- "var": "7",
- "intr": "申请记录保留时间/天"
- },
- {
- "index": "friend_recordtime",
- "var": "7",
- "intr": "助战记录保留时间/天"
- },
- {
- "index": "friend_black",
- "var": "50",
- "intr": "最大黑名单数"
- },
- {
- "index": "channel_cd_world",
- "var": "5",
- "intr": "世界频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_guild",
- "var": "3",
- "intr": "公会频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_private",
- "var": "3",
- "intr": "私聊频道发言间隔CD（秒）"
- },
- {
- "index": "channel_cd_public",
- "var": "15",
- "intr": "跨服频道发言间隔CD（秒）"
- },
- {
- "index": "channel_lock_icon",
- "var": "200",
- "intr": "输入框最大字数为value"
- },
- {
- "index": "max_word",
- "var": "200",
- "intr": "输入框最大字数为value"
- },
- {
- "index": "max_chat",
- "var": "99",
- "intr": "最大保存条数为value"
- },
- {
- "index": "max_object",
- "var": "50",
- "intr": "最大私聊对象数为value"
- },
- {
- "index": "load_chat",
- "var": "10",
- "intr": "加入或切换跨服频道时，请求最近value条历史消息"
- },
- {
- "index": "channel_allocation_max",
- "var": "2000",
- "intr": "频道大于value人时不再继续分配"
- },
- {
- "index": "channel_switching_max",
- "var": "3000",
- "intr": "频道大于value人时不再接受手动切换到该频道"
- },
- {
- "index": "draw_toplimit",
- "var": "9999",
- "intr": "每日抽卡次数上限"
- },
- {
- "index": "10draw_star4_max",
- "var": "8",
- "intr": "10连抽最大4星数量"
- },
- {
- "index": "10draw_star5_max",
- "var": "2",
- "intr": "10连抽最大5星数量"
- },
- {
- "index": "draw_floor_star4",
- "var": "20",
- "intr": "连续20次不出4星英雄则替换第20次结果为4星英雄"
- },
- {
- "index": "draw_floor_star5",
- "var": "100",
- "intr": "连续100次不出5星英雄则替换第100次结果为5星英雄"
- },
- {
- "index": "duplicate_removal",
- "var": "1",
- "intr": "抽到5星英雄时，需要与上次获得的5星英雄不一样，填1启用，填0关闭"
- },
- {
- "index": "base_pool_cost",
- "var": "item,10001,1",
- "intr": "普通卡池每次抽卡消耗的道具"
- },
- {
- "index": "camp1_pool_cost",
- "var": "item,10002,1",
- "intr": "阵营1每次抽卡消耗的道具"
- },
- {
- "index": "camp2_pool_cost",
- "var": "item,10003,1",
- "intr": "阵营2每次抽卡消耗的道具"
- },
- {
- "index": "camp3_pool_cost",
- "var": "item,10004,1",
- "intr": "阵营3每次抽卡消耗的道具"
- },
- {
- "index": "camp4_pool_cost",
- "var": "item,10005,1",
- "intr": "阵营4每次抽卡消耗的道具"
- },
- {
- "index": "camp1_pool1",
- "var": "camp1_pool",
- "intr": "阵营1抽卡调用奖池base_pool1"
- },
- {
- "index": "camp2_pool1",
- "var": "camp2_pool",
- "intr": "阵营2抽卡调用奖池base_pool2"
- },
- {
- "index": "camp3_pool1",
- "var": "camp3_pool",
- "intr": "阵营3抽卡调用奖池base_pool3"
- },
- {
- "index": "camp4_pool1",
- "var": "camp4_pool",
- "intr": "阵营4抽卡调用奖池base_pool4"
- },
- {
- "index": "base_pool1",
- "var": "1-60-base_pool1",
- "intr": "1-60次普通抽卡调用奖池base_pool1"
- },
- {
- "index": "base_pool2",
- "var": "61-200-base_pool2",
- "intr": "61-200次普通抽卡调用奖池base_pool2"
- },
- {
- "index": "base_pool3",
- "var": "201-1000-base_pool3",
- "intr": "201-1000次普通抽卡调用奖池base_pool3"
- },
- {
- "index": "base_pool4",
- "var": "1000-99999999-base_pool4",
- "intr": "1000-99999999次普通抽卡调用奖池base_pool4"
- },
- {
- "index": "base_pool_star3",
- "var": "9000",
- "intr": "普通奖池3星权重"
- },
- {
- "index": "base_pool_star4",
- "var": "900",
- "intr": "普通奖池4星权重"
- },
- {
- "index": "base_pool_star5",
- "var": "100",
- "intr": "普通奖池5星权重"
- },
- {
- "index": "camp_pool_star3",
- "var": "9000",
- "intr": "阵营奖池3星权重"
- },
- {
- "index": "camp_pool_star4",
- "var": "900",
- "intr": "阵营奖池4星权重"
- },
- {
- "index": "camp_pool_star5",
- "var": "100",
- "intr": "阵营奖池5星权重"
+ "max_char": 100,
+ "task_reset": 8,
+ "init_gold": 100000,
+ "init_hero": [
+ 15001,
+ 25001
+ ],
+ "cameramin": [
+ 0,
+ 0,
+ 0
+ ],
+ "max_getreward": [
+ 10002,
+ 99
+ ],
+ "cameramax": [
+ -1.53,
+ 1.1,
+ -8
+ ],
+ "heroshownum": 2,
+ "equipsuitsum": [
+ 4,
+ 4,
+ 4,
+ 4,
+ 2,
+ 2
+ ],
+ "friend_maxnum": 50,
+ "friend_minnum": 0,
+ "friend_maxgetnum": 20,
+ "friend_maxsendnum": 50,
+ "friend_date": 7,
+ "friend_recordtime": 7,
+ "friend_black": 50,
+ "channel_cd_world": 5,
+ "channel_cd_guild": 3,
+ "channel_cd_private": 3,
+ "channel_cd_public": 15,
+ "channel_lock_icon": 200,
+ "max_word": 200,
+ "max_chat": 99,
+ "max_object": 50,
+ "load_chat": 10,
+ "channel_allocation_max": 2000,
+ "channel_switching_max": 3000,
+ "draw_toplimit": 9999,
+ "draw10_star4_max": 8,
+ "draw10_star5_max": 2,
+ "draw_floor_star4": 20,
+ "draw_floor_star5": 100,
+ "duplicate_removal": 1,
+ "base_pool_cost": {
+ "a": "item",
+ "t": "10001",
+ "n": 1
+ },
+ "camp1_pool_cost": {
+ "a": "item",
+ "t": "10002",
+ "n": 1
+ },
+ "camp2_pool_cost": {
+ "a": "item",
+ "t": "10003",
+ "n": 1
+ },
+ "camp3_pool_cost": {
+ "a": "item",
+ "t": "10004",
+ "n": 1
+ },
+ "camp4_pool_cost": {
+ "a": "item",
+ "t": "10005",
+ "n": 1
+ },
+ "camp1_pool1": "camp1_pool",
+ "camp2_pool1": "camp2_pool",
+ "camp3_pool1": "camp3_pool",
+ "camp4_pool1": "camp4_pool",
+ "base_pool1": {
+ "s": 1,
+ "e": 60,
+ "p": "base_pool1"
+ },
+ "base_pool2": {
+ "s": 61,
+ "e": 200,
+ "p": "base_pool2"
+ },
+ "base_pool3": {
+ "s": 201,
+ "e": 1000,
+ "p": "base_pool3"
+ },
+ "base_pool4": {
+ "s": 1000,
+ "e": 99999999,
+ "p": "base_pool4"
+ },
+ "base_pool_star3": 9000,
+ "base_pool_star4": 900,
+ "base_pool_star5": 100,
+ "camp_pool_star3": 9000,
+ "camp_pool_star4": 900,
+ "camp_pool_star5": 100,
+ "gourmet": 500
}
]
\ No newline at end of file
diff --git a/bin/json/game_hero.json b/bin/json/game_hero.json
index b7e42125b..483952857 100644
--- a/bin/json/game_hero.json
+++ b/bin/json/game_hero.json
@@ -4442,10 +4442,10 @@
"y": -0.69,
"z": 0
},
- "skill": 190011000,
- "skill1": 110031,
- "skill2": 110032,
- "skill3": 110033,
+ "skill": 125004011,
+ "skill1": 125004111,
+ "skill2": 125004211,
+ "skill3": 125004311,
"txt": {
"key": "",
"text": ""
@@ -4610,10 +4610,10 @@
"y": -0.1,
"z": 0
},
- "skill": 190011000,
- "skill1": 110091,
- "skill2": 110092,
- "skill3": 110093,
+ "skill": 135002011,
+ "skill1": 135002111,
+ "skill2": 135002211,
+ "skill3": 135002311,
"txt": {
"key": "",
"text": ""
diff --git a/bin/json/game_heroawaken.json b/bin/json/game_heroawaken.json
index b1fe527d2..723c02637 100644
--- a/bin/json/game_heroawaken.json
+++ b/bin/json/game_heroawaken.json
@@ -171,12 +171,12 @@
{
"a": "attr",
"t": "gold",
- "n": 10000
+ "n": 3000
},
{
"a": "item",
- "t": "10011",
- "n": 10
+ "t": "50004",
+ "n": 15
}
]
},
@@ -194,11 +194,11 @@
{
"a": "attr",
"t": "gold",
- "n": 20000
+ "n": 5000
},
{
"a": "item",
- "t": "10011",
+ "t": "50004",
"n": 20
}
]
@@ -217,17 +217,17 @@
{
"a": "attr",
"t": "gold",
- "n": 30000
+ "n": 7000
},
{
"a": "item",
- "t": "10012",
- "n": 10
+ "t": "50004",
+ "n": 25
},
{
"a": "item",
- "t": "10011",
- "n": 10
+ "t": "50008",
+ "n": 15
}
]
},
@@ -245,16 +245,16 @@
{
"a": "attr",
"t": "gold",
- "n": 40000
+ "n": 9000
},
{
"a": "item",
- "t": "10012",
- "n": 20
+ "t": "50012",
+ "n": 10
},
{
"a": "item",
- "t": "10011",
+ "t": "50008",
"n": 20
}
]
@@ -273,17 +273,17 @@
{
"a": "attr",
"t": "gold",
- "n": 50000
+ "n": 11000
},
{
"a": "item",
- "t": "10013",
- "n": 10
+ "t": "50012",
+ "n": 15
},
{
"a": "item",
- "t": "10012",
- "n": 10
+ "t": "50008",
+ "n": 30
}
]
},
@@ -301,17 +301,17 @@
{
"a": "attr",
"t": "gold",
- "n": 60000
+ "n": 13000
},
{
"a": "item",
- "t": "10013",
- "n": 20
+ "t": "50012",
+ "n": 30
},
{
"a": "item",
- "t": "10012",
- "n": 20
+ "t": "50008",
+ "n": 40
}
]
},
@@ -630,5 +630,163 @@
"n": 20
}
]
+ },
+ {
+ "key": 25,
+ "hid": "25004",
+ "phase": 1,
+ "phasebonus": [
+ "hp",
+ "950"
+ ],
+ "icon": "js_jx_img_icon03",
+ "condition": 1,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 3000
+ },
+ {
+ "a": "item",
+ "t": "50004",
+ "n": 15
+ }
+ ]
+ },
+ {
+ "key": 26,
+ "hid": "25004",
+ "phase": 2,
+ "phasebonus": [
+ "def",
+ "70"
+ ],
+ "icon": "js_jx_img_icon04",
+ "condition": 10,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 5000
+ },
+ {
+ "a": "item",
+ "t": "50004",
+ "n": 20
+ }
+ ]
+ },
+ {
+ "key": 27,
+ "hid": "25004",
+ "phase": 3,
+ "phasebonus": [
+ "190017000",
+ "3"
+ ],
+ "icon": "js_jx_img_icon01",
+ "condition": 20,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 7000
+ },
+ {
+ "a": "item",
+ "t": "50004",
+ "n": 25
+ },
+ {
+ "a": "item",
+ "t": "50008",
+ "n": 15
+ }
+ ]
+ },
+ {
+ "key": 28,
+ "hid": "25004",
+ "phase": 4,
+ "phasebonus": [
+ "defpro",
+ "100"
+ ],
+ "icon": "js_jx_img_icon02",
+ "condition": 30,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 9000
+ },
+ {
+ "a": "item",
+ "t": "50012",
+ "n": 10
+ },
+ {
+ "a": "item",
+ "t": "50008",
+ "n": 20
+ }
+ ]
+ },
+ {
+ "key": 29,
+ "hid": "25004",
+ "phase": 5,
+ "phasebonus": [
+ "speed",
+ "10"
+ ],
+ "icon": "js_jx_img_icon03",
+ "condition": 40,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 11000
+ },
+ {
+ "a": "item",
+ "t": "50012",
+ "n": 15
+ },
+ {
+ "a": "item",
+ "t": "50008",
+ "n": 30
+ }
+ ]
+ },
+ {
+ "key": 30,
+ "hid": "25004",
+ "phase": 6,
+ "phasebonus": [
+ "hppro",
+ "200"
+ ],
+ "icon": "js_jx_img_icon04",
+ "condition": 50,
+ "phaseneed": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 13000
+ },
+ {
+ "a": "item",
+ "t": "50012",
+ "n": 30
+ },
+ {
+ "a": "item",
+ "t": "50008",
+ "n": 40
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_initial.json b/bin/json/game_initial.json
index ecc619063..1f5e1e511 100644
--- a/bin/json/game_initial.json
+++ b/bin/json/game_initial.json
@@ -228,5 +228,125 @@
"n": 1
}
]
+ },
+ {
+ "index": "27",
+ "var": [
+ {
+ "a": "item",
+ "t": "50001",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "28",
+ "var": [
+ {
+ "a": "item",
+ "t": "50002",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "29",
+ "var": [
+ {
+ "a": "item",
+ "t": "50003",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "30",
+ "var": [
+ {
+ "a": "item",
+ "t": "50004",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "31",
+ "var": [
+ {
+ "a": "item",
+ "t": "50005",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "32",
+ "var": [
+ {
+ "a": "item",
+ "t": "50006",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "33",
+ "var": [
+ {
+ "a": "item",
+ "t": "50007",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "34",
+ "var": [
+ {
+ "a": "item",
+ "t": "50008",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "35",
+ "var": [
+ {
+ "a": "item",
+ "t": "50009",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "36",
+ "var": [
+ {
+ "a": "item",
+ "t": "50010",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "37",
+ "var": [
+ {
+ "a": "item",
+ "t": "50011",
+ "n": 200
+ }
+ ]
+ },
+ {
+ "index": "38",
+ "var": [
+ {
+ "a": "item",
+ "t": "50012",
+ "n": 200
+ }
+ ]
}
]
\ No newline at end of file
diff --git a/bin/json/game_item.json b/bin/json/game_item.json
index 3ce8afd91..5d742c87d 100644
--- a/bin/json/game_item.json
+++ b/bin/json/game_item.json
@@ -33,7 +33,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10002",
@@ -69,7 +70,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10003",
@@ -105,7 +107,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10004",
@@ -141,7 +144,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10005",
@@ -177,7 +181,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10006",
@@ -213,7 +218,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10007",
@@ -249,7 +255,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10008",
@@ -285,7 +292,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10009",
@@ -321,7 +329,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10010",
@@ -357,7 +366,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10011",
@@ -393,7 +403,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10012",
@@ -429,7 +440,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10013",
@@ -465,7 +477,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10014",
@@ -501,7 +514,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10015",
@@ -537,7 +551,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "10016",
@@ -573,7 +588,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "20001",
@@ -609,7 +625,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "20002",
@@ -645,7 +662,8 @@
"t": "gold",
"n": 1000
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "50001",
@@ -681,6 +699,13 @@
"t": "gold",
"n": 1000
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -717,6 +742,13 @@
"t": "gold",
"n": 1000
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -753,6 +785,13 @@
"t": "gold",
"n": 1000
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -789,6 +828,13 @@
"t": "gold",
"n": 1000
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -806,7 +852,7 @@
"effects": "",
"box_id": 50009,
"synthetize_num": 5,
- "access": 0,
+ "access": 50001,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -825,6 +871,13 @@
"t": "50001",
"n": 3
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -842,7 +895,7 @@
"effects": "",
"box_id": 50010,
"synthetize_num": 5,
- "access": 0,
+ "access": 50002,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -861,6 +914,13 @@
"t": "50002",
"n": 3
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -878,7 +938,7 @@
"effects": "",
"box_id": 50011,
"synthetize_num": 5,
- "access": 0,
+ "access": 50003,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -897,6 +957,13 @@
"t": "50003",
"n": 3
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -914,7 +981,7 @@
"effects": "",
"box_id": 50012,
"synthetize_num": 5,
- "access": 0,
+ "access": 50004,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -933,6 +1000,13 @@
"t": "50004",
"n": 3
}
+ ],
+ "synthetize_deplete": [
+ {
+ "a": "attr",
+ "t": "gold",
+ "n": 1000
+ }
]
},
{
@@ -950,7 +1024,7 @@
"effects": "",
"box_id": 0,
"synthetize_num": 0,
- "access": 0,
+ "access": 50005,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -969,7 +1043,8 @@
"t": "50005",
"n": 3
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "50010",
@@ -986,7 +1061,7 @@
"effects": "",
"box_id": 0,
"synthetize_num": 0,
- "access": 0,
+ "access": 50006,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -1005,7 +1080,8 @@
"t": "50006",
"n": 3
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "50011",
@@ -1022,7 +1098,7 @@
"effects": "",
"box_id": 0,
"synthetize_num": 0,
- "access": 0,
+ "access": 50007,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -1041,7 +1117,8 @@
"t": "50007",
"n": 3
}
- ]
+ ],
+ "synthetize_deplete": []
},
{
"id": "50012",
@@ -1058,7 +1135,7 @@
"effects": "",
"box_id": 0,
"synthetize_num": 0,
- "access": 0,
+ "access": 50008,
"use_skip": 0,
"upper_limit": 999,
"uselv": 0,
@@ -1077,6 +1154,7 @@
"t": "50008",
"n": 3
}
- ]
+ ],
+ "synthetize_deplete": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_language.json b/bin/json/game_language.json
index d25bf6ec8..66f48206f 100644
--- a/bin/json/game_language.json
+++ b/bin/json/game_language.json
@@ -1,656 +1,765 @@
[
{
+ "index": "ChineseSimplified",
"keycode": {
"key": "ChineseSimplified",
- "text": "ChineseSimplified"
+ "text": ""
}
},
{
+ "index": "ChineseTraditional",
"keycode": {
"key": "ChineseTraditional",
- "text": "ChineseTraditional"
+ "text": ""
}
},
{
+ "index": "English",
"keycode": {
"key": "English",
- "text": "English"
+ "text": ""
}
},
{
+ "index": "1",
"keycode": {
"key": "1",
- "text": "1"
+ "text": ""
}
},
{
+ "index": "2",
"keycode": {
"key": "2",
- "text": "2"
+ "text": ""
}
},
{
+ "index": "3",
"keycode": {
"key": "3",
- "text": "3"
+ "text": ""
}
},
{
+ "index": "4",
"keycode": {
"key": "4",
- "text": "4"
+ "text": ""
}
},
{
+ "index": "5",
"keycode": {
"key": "5",
- "text": "5"
+ "text": ""
}
},
{
+ "index": "6",
"keycode": {
"key": "6",
- "text": "6"
+ "text": ""
}
},
{
+ "index": "7",
"keycode": {
"key": "7",
- "text": "7"
+ "text": ""
}
},
{
+ "index": "8",
"keycode": {
"key": "8",
- "text": "8"
+ "text": ""
}
},
{
+ "index": "9",
"keycode": {
"key": "9",
- "text": "9"
+ "text": ""
}
},
{
+ "index": "10",
"keycode": {
"key": "10",
- "text": "10"
+ "text": ""
}
},
{
+ "index": "Login",
"keycode": {
"key": "Login",
- "text": "Login"
+ "text": ""
}
},
{
+ "index": "MomentDay1",
"keycode": {
"key": "MomentDay1",
- "text": "MomentDay1"
+ "text": ""
}
},
{
+ "index": "MomentDay2",
"keycode": {
"key": "MomentDay2",
- "text": "MomentDay2"
+ "text": ""
}
},
{
+ "index": "MomentHour1",
"keycode": {
"key": "MomentHour1",
- "text": "MomentHour1"
+ "text": ""
}
},
{
+ "index": "MomentHour2",
"keycode": {
"key": "MomentHour2",
- "text": "MomentHour2"
+ "text": ""
}
},
{
+ "index": "MomentMinutes1",
"keycode": {
"key": "MomentMinutes1",
- "text": "MomentMinutes1"
+ "text": ""
}
},
{
+ "index": "MomentMinutes2",
"keycode": {
"key": "MomentMinutes2",
- "text": "MomentMinutes2"
+ "text": ""
}
},
{
+ "index": "MomentSeconds1",
"keycode": {
"key": "MomentSeconds1",
- "text": "MomentSeconds1"
+ "text": ""
}
},
{
+ "index": "MomentSeconds2",
"keycode": {
"key": "MomentSeconds2",
- "text": "MomentSeconds2"
+ "text": ""
}
},
{
+ "index": "Tuijian",
"keycode": {
"key": "Tuijian",
- "text": "Tuijian"
+ "text": ""
}
},
{
+ "index": "Juese",
"keycode": {
"key": "Juese",
- "text": "Juese"
+ "text": ""
}
},
{
+ "index": "star_2",
"keycode": {
"key": "star_2",
- "text": "star_2"
+ "text": ""
}
},
{
+ "index": "star_3",
"keycode": {
"key": "star_3",
- "text": "star_3"
+ "text": ""
}
},
{
+ "index": "star_4",
"keycode": {
"key": "star_4",
- "text": "star_4"
+ "text": ""
}
},
{
+ "index": "star_5",
"keycode": {
"key": "star_5",
- "text": "star_5"
+ "text": ""
}
},
{
+ "index": "color_1",
"keycode": {
"key": "color_1",
- "text": "color_1"
+ "text": ""
}
},
{
+ "index": "color_2",
"keycode": {
"key": "color_2",
- "text": "color_2"
+ "text": ""
}
},
{
+ "index": "color_3",
"keycode": {
"key": "color_3",
- "text": "color_3"
+ "text": ""
}
},
{
+ "index": "color_4",
"keycode": {
"key": "color_4",
- "text": "color_4"
+ "text": ""
}
},
{
+ "index": "color_5",
"keycode": {
"key": "color_5",
- "text": "color_5"
+ "text": ""
}
},
{
+ "index": "color_6",
"keycode": {
"key": "color_6",
- "text": "color_6"
+ "text": ""
}
},
{
+ "index": "race_1",
"keycode": {
"key": "race_1",
- "text": "race_1"
+ "text": ""
}
},
{
+ "index": "race_2",
"keycode": {
"key": "race_2",
- "text": "race_2"
+ "text": ""
}
},
{
+ "index": "race_3",
"keycode": {
"key": "race_3",
- "text": "race_3"
+ "text": ""
}
},
{
+ "index": "race_4",
"keycode": {
"key": "race_4",
- "text": "race_4"
+ "text": ""
}
},
{
+ "index": "job_1",
"keycode": {
"key": "job_1",
- "text": "job_1"
+ "text": ""
}
},
{
+ "index": "job_2",
"keycode": {
"key": "job_2",
- "text": "job_2"
+ "text": ""
}
},
{
+ "index": "job_3",
"keycode": {
"key": "job_3",
- "text": "job_3"
+ "text": ""
}
},
{
+ "index": "job_4",
"keycode": {
"key": "job_4",
- "text": "job_4"
+ "text": ""
}
},
{
+ "index": "job_5",
"keycode": {
"key": "job_5",
- "text": "job_5"
+ "text": ""
}
},
{
+ "index": "equip_10001",
"keycode": {
"key": "equip_10001",
- "text": "equip_10001"
+ "text": ""
}
},
{
+ "index": "equip_10002",
"keycode": {
"key": "equip_10002",
- "text": "equip_10002"
+ "text": ""
}
},
{
+ "index": "equip_10003",
"keycode": {
"key": "equip_10003",
- "text": "equip_10003"
+ "text": ""
}
},
{
+ "index": "equip_10004",
"keycode": {
"key": "equip_10004",
- "text": "equip_10004"
+ "text": ""
}
},
{
+ "index": "equip_10005",
"keycode": {
"key": "equip_10005",
- "text": "equip_10005"
+ "text": ""
}
},
{
+ "index": "hero_10001",
"keycode": {
"key": "hero_10001",
- "text": "hero_10001"
+ "text": ""
}
},
{
+ "index": "hero_10002",
"keycode": {
"key": "hero_10002",
- "text": "hero_10002"
+ "text": ""
}
},
{
+ "index": "hero_10003",
"keycode": {
"key": "hero_10003",
- "text": "hero_10003"
+ "text": ""
}
},
{
+ "index": "hero_10004",
"keycode": {
"key": "hero_10004",
- "text": "hero_10004"
+ "text": ""
}
},
{
+ "index": "hero_10005",
"keycode": {
"key": "hero_10005",
- "text": "hero_10005"
+ "text": ""
}
},
{
+ "index": "hero_10006",
"keycode": {
"key": "hero_10006",
- "text": "hero_10006"
+ "text": ""
}
},
{
+ "index": "hero_10007",
"keycode": {
"key": "hero_10007",
- "text": "hero_10007"
+ "text": ""
}
},
{
+ "index": "hero_10008",
"keycode": {
"key": "hero_10008",
- "text": "hero_10008"
+ "text": ""
}
},
{
+ "index": "nonactivated",
"keycode": {
"key": "nonactivated",
- "text": "nonactivated"
+ "text": ""
}
},
{
+ "index": "activated",
"keycode": {
"key": "activated",
- "text": "activated"
+ "text": ""
}
},
{
+ "index": "tips_1001",
"keycode": {
"key": "tips_1001",
- "text": "tips_1001"
+ "text": ""
}
},
{
+ "index": "tips_1002",
"keycode": {
"key": "tips_1002",
- "text": "tips_1002"
+ "text": ""
}
},
{
+ "index": "tips_1003",
"keycode": {
"key": "tips_1003",
- "text": "tips_1003"
+ "text": ""
}
},
{
+ "index": "tips_1004",
"keycode": {
"key": "tips_1004",
- "text": "tips_1004"
+ "text": ""
}
},
{
+ "index": "num_1001",
"keycode": {
"key": "num_1001",
- "text": "num_1001"
+ "text": ""
}
},
{
+ "index": "num_1002",
"keycode": {
"key": "num_1002",
- "text": "num_1002"
+ "text": ""
}
},
{
+ "index": "num_1003",
"keycode": {
"key": "num_1003",
- "text": "num_1003"
+ "text": ""
}
},
{
+ "index": "num_1004",
"keycode": {
"key": "num_1004",
- "text": "num_1004"
+ "text": ""
}
},
{
+ "index": "num_1005",
"keycode": {
"key": "num_1005",
- "text": "num_1005"
+ "text": ""
}
},
{
+ "index": "num_1006",
"keycode": {
"key": "num_1006",
- "text": "num_1006"
+ "text": ""
}
},
{
+ "index": "num_1007",
"keycode": {
"key": "num_1007",
- "text": "num_1007"
+ "text": ""
}
},
{
+ "index": "num_1008",
"keycode": {
"key": "num_1008",
- "text": "num_1008"
+ "text": ""
}
},
{
+ "index": "num_1009",
"keycode": {
"key": "num_1009",
- "text": "num_1009"
+ "text": ""
}
},
{
+ "index": "num_1010",
"keycode": {
"key": "num_1010",
- "text": "num_1010"
+ "text": ""
}
},
{
+ "index": "num_1011",
"keycode": {
"key": "num_1011",
- "text": "num_1011"
+ "text": ""
}
},
{
+ "index": "num_1012",
"keycode": {
"key": "num_1012",
- "text": "num_1012"
+ "text": ""
}
},
{
+ "index": "num_1013",
"keycode": {
"key": "num_1013",
- "text": "num_1013"
+ "text": ""
}
},
{
+ "index": "num_1014",
"keycode": {
"key": "num_1014",
- "text": "num_1014"
+ "text": ""
}
},
{
+ "index": "num_1015",
"keycode": {
"key": "num_1015",
- "text": "num_1015"
+ "text": ""
}
},
{
+ "index": "num_1016",
"keycode": {
"key": "num_1016",
- "text": "num_1016"
+ "text": ""
}
},
{
+ "index": "num_1017",
"keycode": {
"key": "num_1017",
- "text": "num_1017"
+ "text": ""
}
},
{
+ "index": "num_1018",
"keycode": {
"key": "num_1018",
- "text": "num_1018"
+ "text": ""
}
},
{
+ "index": "opencond_name_10001",
"keycode": {
"key": "opencond_name_10001",
- "text": "opencond_name_10001"
+ "text": ""
}
},
{
+ "index": "opencond_name_10002",
"keycode": {
"key": "opencond_name_10002",
- "text": "opencond_name_10002"
+ "text": ""
}
},
{
+ "index": "opencond_name_10003",
"keycode": {
"key": "opencond_name_10003",
- "text": "opencond_name_10003"
+ "text": ""
}
},
{
+ "index": "opencond_name_10004",
"keycode": {
"key": "opencond_name_10004",
- "text": "opencond_name_10004"
+ "text": ""
}
},
{
+ "index": "opencond_name_10005",
"keycode": {
"key": "opencond_name_10005",
- "text": "opencond_name_10005"
+ "text": ""
}
},
{
+ "index": "opencond_name_10006",
"keycode": {
"key": "opencond_name_10006",
- "text": "opencond_name_10006"
+ "text": ""
}
},
{
+ "index": "opencond_name_10007",
"keycode": {
"key": "opencond_name_10007",
- "text": "opencond_name_10007"
+ "text": ""
}
},
{
+ "index": "opencond_name_10008",
"keycode": {
"key": "opencond_name_10008",
- "text": "opencond_name_10008"
+ "text": ""
}
},
{
+ "index": "opencond_name_10009",
"keycode": {
"key": "opencond_name_10009",
- "text": "opencond_name_10009"
+ "text": ""
}
},
{
+ "index": "opencond_name_10010",
"keycode": {
"key": "opencond_name_10010",
- "text": "opencond_name_10010"
+ "text": ""
}
},
{
+ "index": "skill_190011000",
"keycode": {
"key": "skill_190011000",
- "text": "skill_190011000"
+ "text": ""
}
},
{
+ "index": "skill_190012000",
"keycode": {
"key": "skill_190012000",
- "text": "skill_190012000"
+ "text": ""
}
},
{
+ "index": "skill_190013000",
"keycode": {
"key": "skill_190013000",
- "text": "skill_190013000"
+ "text": ""
}
},
{
+ "index": "skill_190014000",
"keycode": {
"key": "skill_190014000",
- "text": "skill_190014000"
+ "text": ""
}
},
{
+ "index": "skill_190015000",
"keycode": {
"key": "skill_190015000",
- "text": "skill_190015000"
+ "text": ""
}
},
{
+ "index": "skill_190016000",
"keycode": {
"key": "skill_190016000",
- "text": "skill_190016000"
+ "text": ""
}
},
{
+ "index": "skill_190017000",
"keycode": {
"key": "skill_190017000",
- "text": "skill_190017000"
+ "text": ""
}
},
{
+ "index": "skill_190018000",
"keycode": {
"key": "skill_190018000",
- "text": "skill_190018000"
+ "text": ""
}
},
{
+ "index": "skill_190011001",
"keycode": {
"key": "skill_190011001",
- "text": "skill_190011001"
+ "text": ""
}
},
{
+ "index": "skill_190011002",
"keycode": {
"key": "skill_190011002",
- "text": "skill_190011002"
+ "text": ""
}
},
{
+ "index": "skill_190011003",
"keycode": {
"key": "skill_190011003",
- "text": "skill_190011003"
+ "text": ""
}
},
{
+ "index": "skill_190011004",
"keycode": {
"key": "skill_190011004",
- "text": "skill_190011004"
+ "text": ""
}
},
{
+ "index": "hero_help_10001",
"keycode": {
"key": "hero_help_10001",
- "text": "hero_help_10001"
+ "text": ""
}
},
{
+ "index": "hero_help_10002",
"keycode": {
"key": "hero_help_10002",
- "text": "hero_help_10002"
+ "text": ""
}
},
{
+ "index": "hero_help_10003",
"keycode": {
"key": "hero_help_10003",
- "text": "hero_help_10003"
+ "text": ""
}
},
{
+ "index": "hero_help_10004",
"keycode": {
"key": "hero_help_10004",
- "text": "hero_help_10004"
+ "text": ""
}
},
{
+ "index": "hero_help_10005",
"keycode": {
"key": "hero_help_10005",
- "text": "hero_help_10005"
+ "text": ""
}
},
{
+ "index": "hero_help_10006",
"keycode": {
"key": "hero_help_10006",
- "text": "hero_help_10006"
+ "text": ""
}
},
{
+ "index": "hero_help_10007",
"keycode": {
"key": "hero_help_10007",
- "text": "hero_help_10007"
+ "text": ""
}
}
]
\ No newline at end of file
diff --git a/bin/json/game_opencond.json b/bin/json/game_opencond.json
index edb86c0fd..51f270bfd 100644
--- a/bin/json/game_opencond.json
+++ b/bin/json/game_opencond.json
@@ -5,7 +5,7 @@
"key": "opencond_name_10002",
"text": "英雄"
},
- "main": "{\u0022lv\u0022: 0}",
+ "main": "{\"lv\": 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -21,7 +21,7 @@
"key": "opencond_name_10006",
"text": "背包"
},
- "main": "{\u0022lv\u0022: 0}",
+ "main": "{\"lv\": 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -37,7 +37,7 @@
"key": "opencond_name_10003",
"text": "商店"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -53,7 +53,7 @@
"key": "opencond_name_10004",
"text": "好友"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -69,7 +69,7 @@
"key": "opencond_name_10007",
"text": "活动"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -85,7 +85,7 @@
"key": "opencond_name_10005",
"text": "任务"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -101,7 +101,7 @@
"key": "num_1001",
"text": "主线入口"
},
- "main": "{\u0022lv\u0022: 0}",
+ "main": "{\"lv\": 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -117,7 +117,7 @@
"key": "num_1002",
"text": "招募"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -133,7 +133,7 @@
"key": "num_1003",
"text": "剧情副本"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -149,7 +149,7 @@
"key": "num_1004",
"text": "武馆入口"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -165,7 +165,7 @@
"key": "num_1005",
"text": "主题活动入口"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -181,7 +181,7 @@
"key": "num_1006",
"text": "迷雾岛屿"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -197,7 +197,7 @@
"key": "num_1007",
"text": "维京远征"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -213,7 +213,7 @@
"key": "num_1008",
"text": "心魔塔"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -229,7 +229,7 @@
"key": "num_1009",
"text": "捕羊大赛"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -245,7 +245,7 @@
"key": "num_1010",
"text": "黑暗料理大赛"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -261,7 +261,7 @@
"key": "num_1011",
"text": "地下角斗场"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -277,7 +277,7 @@
"key": "num_1012",
"text": "疯狂竞技赛"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -293,7 +293,7 @@
"key": "num_1013",
"text": "五侠擂台"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -309,7 +309,7 @@
"key": "num_1014",
"text": "藏书馆"
},
- "main": "{\u0022lv\u0022: 0}",
+ "main": "{\"lv\": 0}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -325,7 +325,7 @@
"key": "num_1015",
"text": "篝火舞会"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -341,7 +341,7 @@
"key": "num_1016",
"text": "商队"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -357,7 +357,7 @@
"key": "num_1017",
"text": "美食馆"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -373,7 +373,7 @@
"key": "num_1018",
"text": "戈伯铁匠铺"
},
- "main": "{\u0022lv\u0022: 999}",
+ "main": "{\"lv\": 999}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -389,7 +389,7 @@
"key": "num_1019",
"text": "聊天"
},
- "main": "{\u0022lv\u0022: 10}",
+ "main": "{\"lv\": 10}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -405,7 +405,7 @@
"key": "num_1020",
"text": "世界"
},
- "main": "{\u0022lv\u0022: 10}",
+ "main": "{\"lv\": 10}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -421,7 +421,7 @@
"key": "num_1021",
"text": "公会"
},
- "main": "{\u0022lv\u0022: 20}",
+ "main": "{\"lv\": 20}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -437,7 +437,7 @@
"key": "num_1022",
"text": "私聊"
},
- "main": "{\u0022lv\u0022: 15}",
+ "main": "{\"lv\": 15}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -453,7 +453,7 @@
"key": "num_1023",
"text": "跨服"
},
- "main": "{\u0022lv\u0022: 40}",
+ "main": "{\"lv\": 40}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
@@ -469,7 +469,7 @@
"key": "num_1024",
"text": "系统"
},
- "main": "{\u0022lv\u0022: 10}",
+ "main": "{\"lv\": 10}",
"optional": "",
"wkqbx": 0,
"kqbx": 0,
diff --git a/bin/json/game_skill.json b/bin/json/game_skill.json
index 2cc5b807c..65446527a 100644
--- a/bin/json/game_skill.json
+++ b/bin/json/game_skill.json
@@ -6759,7 +6759,7 @@
"key": "skillname_125004111",
"text": "波比1技能"
},
- "ico": "jn_icon_001",
+ "ico": "skillicon_004",
"act": "Skill_1",
"Type": 1,
"MaxLV": 6,
@@ -6826,7 +6826,7 @@
"key": "skillname_125004211",
"text": "波比2技能"
},
- "ico": "jn_icon_002",
+ "ico": "skillicon_005",
"act": "Skill_2",
"Type": 2,
"MaxLV": 3,
@@ -6875,7 +6875,7 @@
"key": "skillname_125004311",
"text": "波比3技能"
},
- "ico": "jn_icon_003",
+ "ico": "skillicon_006",
"act": "Skill_3",
"Type": 1,
"MaxLV": 5,
@@ -6961,7 +6961,7 @@
"key": "skillname_135002111",
"text": "希卡普1技能"
},
- "ico": "jn_icon_001",
+ "ico": "skillicon_007",
"act": "Skill_1",
"Type": 1,
"MaxLV": 6,
@@ -7031,7 +7031,7 @@
"key": "skillname_135002211",
"text": "希卡普2技能"
},
- "ico": "jn_icon_002",
+ "ico": "skillicon_008",
"act": "Skill_2",
"Type": 2,
"MaxLV": 1,
@@ -7061,7 +7061,7 @@
"key": "skillname_135002311",
"text": "希卡普3技能"
},
- "ico": "jn_icon_003",
+ "ico": "skillicon_009",
"act": "Skill_3",
"Type": 1,
"MaxLV": 6,
@@ -7191,5 +7191,241 @@
"skill_9350023216"
],
"buffid": []
+ },
+ {
+ "Id": 124003011,
+ "Name": {
+ "key": "skillname_124003011",
+ "text": "睡神队长技"
+ },
+ "ico": "jn_dzj_01",
+ "act": "",
+ "Type": 3,
+ "MaxLV": 1,
+ "CD": [
+ -1
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003011
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240030111"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003111,
+ "Name": {
+ "key": "skillname_124003111",
+ "text": "睡神1技能"
+ },
+ "ico": "jn_icon_001",
+ "act": "Skill_1",
+ "Type": 1,
+ "MaxLV": 5,
+ "CD": [
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "Target": 4,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003111,
+ 224003112
+ ]
+ },
+ {
+ "Id": [
+ 224003121,
+ 224003122
+ ]
+ },
+ {
+ "Id": [
+ 224003131,
+ 224003132
+ ]
+ },
+ {
+ "Id": [
+ 224003141,
+ 224003142
+ ]
+ },
+ {
+ "Id": [
+ 224003151,
+ 224003152
+ ]
+ },
+ {
+ "Id": [
+ 224003161,
+ 224003162
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240031111",
+ "skill_1240031112",
+ "skill_1240031113",
+ "skill_1240031114",
+ "skill_1240031115"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003211,
+ "Name": {
+ "key": "skillname_124003211",
+ "text": "睡神2技能"
+ },
+ "ico": "jn_icon_002",
+ "act": "Skill_2",
+ "Type": 2,
+ "MaxLV": 2,
+ "CD": [
+ 4,
+ 3
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003211,
+ 224003212
+ ]
+ },
+ {
+ "Id": [
+ 224003211,
+ 224003212
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240032111",
+ "skill_1240032112"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003311,
+ "Name": {
+ "key": "skillname_124003311",
+ "text": "睡神3技能"
+ },
+ "ico": "jn_icon_003",
+ "act": "Skill_3",
+ "Type": 1,
+ "MaxLV": 6,
+ "CD": [
+ 4,
+ 4,
+ 4,
+ 4,
+ 4,
+ 3
+ ],
+ "Target": 2,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003311,
+ 224003312,
+ 224003313
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003322,
+ 224003323
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003332,
+ 224003333
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003342,
+ 224003343
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003352,
+ 224003353
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003362,
+ 224003363
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240033111",
+ "skill_1240033112",
+ "skill_1240033113",
+ "skill_1240033114",
+ "skill_1240033115",
+ "skill_1240033116"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 924003411,
+ "Name": {
+ "key": "skillname_924003411",
+ "text": "睡神2技能"
+ },
+ "ico": "jn_icon_002",
+ "act": "Skill_2",
+ "Type": 4,
+ "MaxLV": 2,
+ "CD": [
+ 4,
+ 3
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 924003411,
+ 924003412,
+ 924003413
+ ]
+ },
+ {
+ "Id": [
+ 924003411,
+ 924003412,
+ 924003413
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_9240034111",
+ "skill_9240034112"
+ ],
+ "buffid": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillafteratk.json b/bin/json/game_skillafteratk.json
index 09600089c..307c54ac4 100644
--- a/bin/json/game_skillafteratk.json
+++ b/bin/json/game_skillafteratk.json
@@ -1280,7 +1280,7 @@
},
{
"Id": 290057001,
- "Desc": "己方全体增益BUFF持续回合\u002B1",
+ "Desc": "己方全体增益BUFF持续回合+1",
"From": 1,
"Limit": 5,
"EmitPR": 1000,
@@ -1301,7 +1301,7 @@
},
{
"Id": 290058001,
- "Desc": "敌方全体减益BUFF持续回合\u002B1",
+ "Desc": "敌方全体减益BUFF持续回合+1",
"From": 2,
"Limit": 5,
"EmitPR": 1000,
@@ -1343,7 +1343,7 @@
},
{
"Id": 290060001,
- "Desc": "敌方全体所有技能CD\u002B1",
+ "Desc": "敌方全体所有技能CD+1",
"From": 2,
"Limit": 5,
"EmitPR": 1000,
@@ -3655,7 +3655,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Hp,BufVal1=300,BufQuaType1=1",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=-1,BufPro1=Total_Hp,BufVal1=300,BufQuaType1=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -3914,7 +3914,7 @@
"Where": [],
"Order": [],
"Type": "RemoveDebuff",
- "Argu": "DoVal=1,Pr=1000",
+ "Argu": "DoVal=1,Pr=1000,BuffType=1,Id=202,val=-1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -3952,7 +3952,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Atk,BufVal1=400,BufQuaType1=1",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,BufPro1=Total_Atk,BufVal1=400,BufQuaType1=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -3971,7 +3971,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004009,Round=2,Type=TagBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004009,Round=2",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -3990,7 +3990,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=2,Type=ProBuff,BufPro1=DamRe,BufVal1=250,BufQuaType1=1",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=300102103,Round=2,BufPro1=DamRe,BufVal1=250,BufQuaType1=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4009,7 +4009,7 @@
"Where": [],
"Order": [],
"Type": "AddPas",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=425004301,Round=2,Type=CallSkillPas,PasPr=1000,PasCallType=0,PasId1=425004301",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=425004301,Round=2,PasPr=1000,PasCallType=0,PasId1=290012304",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4028,7 +4028,7 @@
"Where": [],
"Order": [],
"Type": "Tre",
- "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=Total_Hp,ProPar1=20,DetTarget1=1",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=Total_Hp,ProPar1=200,1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4047,7 +4047,7 @@
"Where": [],
"Order": [],
"Type": "RemoveDebuff",
- "Argu": "DoVal=1,Pr=1000",
+ "Argu": "DoVal=1,Pr=1000,BuffType=1,Id=202,val=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4066,7 +4066,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,Type=ProBuff,BufPro1=Total_Hp,BufVal1=300,BufQuaType1=1",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=2,BufPro1=Total_EffHit,BufVal1=400,BufQuaType1=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4085,7 +4085,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=300",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=300",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4106,7 +4106,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=800",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=800",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4167,7 +4167,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=900",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=900",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4207,7 +4207,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=900",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=900",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4247,7 +4247,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=1000",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1000",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4287,7 +4287,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=1000",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1000",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4327,7 +4327,7 @@
"Where": [],
"Order": [],
"Type": "Dmg",
- "Argu": "DoVal=1,Pr=1000,ProSou1=2,Pro1=Total_Atk,ProPar1=1100",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1100",
"AddEffect": false,
"FollowSK": [
235002113
@@ -4367,7 +4367,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005003,Round=-1,Type=TagBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390005003,Round=-1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4386,7 +4386,7 @@
"Where": [],
"Order": [],
"Type": "AddPas",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=435002201,Round=-1,Type=CallSkillPas,PasPr=1000,PasRouCD=0,PasId1=290012304",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=435002201,Round=-1,PasPr=1000,PasRouCD=0,PasId1=290012304",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4443,7 +4443,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004004,Round=1,Type=TagBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004004,Round=1",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4465,8 +4465,7 @@
"Argu": "DoVal=3,Pr=1000,Suck=0,ProSou1=1,Pro1=Total_Atk,ProPar1=350",
"AddEffect": false,
"FollowSK": [
- 235002312,
- 235002313
+ 235002312
],
"SucFollowSK": [],
"FailFollowSK": [],
@@ -4491,7 +4490,7 @@
"235002313"
],
"FailFollowSK": [],
- "MustHit": true,
+ "MustHit": false,
"Tags": [],
"RelyTags": [],
"NoRelyTags": []
@@ -4505,7 +4504,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,Type=ProBuff,BufPro1=MissPr,BufVal1=500,BufQuaType1=0",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,BufPro1=MissPr,BufVal1=500,BufQuaType1=0",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4695,8 +4694,8 @@
"Argu": "DoVal=3,Pr=1000,Suck=0,ProSou1=1,Pro1=Total_Atk,ProPar1=350",
"AddEffect": false,
"FollowSK": [
- 235002312,
- 235002313
+ 935002312,
+ 935002314
],
"SucFollowSK": [],
"FailFollowSK": [],
@@ -4735,7 +4734,7 @@
"Where": [],
"Order": [],
"Type": "AddBuff",
- "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,Type=ProBuff,BufPro1=MissPr,BufVal1=500,BufQuaType1=0",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390002006,Round=2,BufPro1=MissPr,BufVal1=500,BufQuaType1=0",
"AddEffect": false,
"FollowSK": [],
"SucFollowSK": [],
@@ -4935,5 +4934,547 @@
"Tags": [],
"RelyTags": [],
"NoRelyTags": []
+ },
+ {
+ "Id": 224003011,
+ "Desc": "友方全体效果命中提升30%",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001001,Round=-1,BufPro1=Total_EffHit,BufVal1=300,BufQuaType1=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003111,
+ "Desc": "攻击一个敌方1次，伤害为自身攻击力90%",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=900",
+ "AddEffect": false,
+ "FollowSK": [
+ 224003112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003112,
+ "Desc": "50%概率为目标附加1回合【睡眠】",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=500,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003121,
+ "Desc": "攻击一个敌方1次，伤害为自身攻击力100%",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1000",
+ "AddEffect": false,
+ "FollowSK": [
+ 224003112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003122,
+ "Desc": "50%概率为目标附加1回合【睡眠】",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=500,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003131,
+ "Desc": "攻击一个敌方1次，伤害为自身攻击力100%",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1000",
+ "AddEffect": false,
+ "FollowSK": [
+ 224003112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003132,
+ "Desc": "60%概率为目标附加1回合【睡眠】",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=600,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003141,
+ "Desc": "攻击一个敌方1次，伤害为自身攻击力100%",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1100",
+ "AddEffect": false,
+ "FollowSK": [
+ 224003112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003142,
+ "Desc": "60%概率为目标附加1回合【睡眠】",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=600,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003151,
+ "Desc": "攻击一个敌方1次，伤害为自身攻击力110%",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=0,Pro1=Total_Atk,ProPar1=1100",
+ "AddEffect": false,
+ "FollowSK": [
+ 224003112
+ ],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003152,
+ "Desc": "70%概率为目标附加1回合【睡眠】",
+ "From": 4,
+ "Limit": 1,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=700,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003211,
+ "Desc": "净化全体友方1个减益",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "RemoveDebuff",
+ "Argu": "DoVal=1,Pr=1000,BuffType=1,Id=201,val=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003212,
+ "Desc": "为目标附加2回合【速度提升】",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,BufPro1=Total_Agi,BufVal1=300,BufQuaType1=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 924003411,
+ "Desc": "净化全体友方1个减益",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "RemoveDebuff",
+ "Argu": "DoVal=1,Pr=1000,BuffType=1,Id=201,val=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 924003412,
+ "Desc": "为目标附加2回合【速度提升】",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=2,BufPro1=Total_Agi,BufVal1=300,BufQuaType1=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 924003413,
+ "Desc": "为目标附加2回合【防御提升】",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001002,Round=2,BufPro1=Total_Agi,BufVal1=600,BufQuaType1=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003311,
+ "Desc": "攻击敌方全体，伤害为自身攻击力80%",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "Dmg",
+ "Argu": "DoVal=1,Pr=1000,ProSou1=1,Pro1=Total_Atk,ProPar1=800",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003312,
+ "Desc": "降低目标20%行动值",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddActValue",
+ "Argu": "DoVal=1,Pr=1000,QuaType=0,Val=200",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003313,
+ "Desc": "80%概率为目标附加1回合【睡眠】",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003322,
+ "Desc": "降低目标25%行动值",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddActValue",
+ "Argu": "DoVal=1,Pr=1000,QuaType=0,Val=200",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003323,
+ "Desc": "80%概率为目标附加1回合【睡眠】",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003332,
+ "Desc": "降低目标25%行动值",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddActValue",
+ "Argu": "DoVal=1,Pr=1000,QuaType=0,Val=200",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003333,
+ "Desc": "90%概率为目标附加1回合【睡眠】",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003342,
+ "Desc": "降低目标30%行动值",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddActValue",
+ "Argu": "DoVal=1,Pr=1000,QuaType=0,Val=200",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003343,
+ "Desc": "90%概率为目标附加1回合【睡眠】",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003352,
+ "Desc": "降低目标30%行动值",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddActValue",
+ "Argu": "DoVal=1,Pr=1000,QuaType=0,Val=200",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 224003353,
+ "Desc": "100%概率为目标附加1回合【睡眠】",
+ "From": 2,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390004010,Round=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
+ },
+ {
+ "Id": 234006011,
+ "Desc": "全体速度提升20%",
+ "From": 1,
+ "Limit": 10,
+ "EmitPR": 1000,
+ "Where": [],
+ "Order": [],
+ "Type": "AddBuff",
+ "Argu": "DoVal=1,Pr=1000,NumVal=1,Id=390001003,Round=-1,BufPro1=Total_Agi,BufVal1=200,BufQuaType1=1",
+ "AddEffect": false,
+ "FollowSK": [],
+ "SucFollowSK": [],
+ "FailFollowSK": [],
+ "MustHit": false,
+ "Tags": [],
+ "RelyTags": [],
+ "NoRelyTags": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_skillatk.json b/bin/json/game_skillatk.json
index 2cc5b807c..65446527a 100644
--- a/bin/json/game_skillatk.json
+++ b/bin/json/game_skillatk.json
@@ -6759,7 +6759,7 @@
"key": "skillname_125004111",
"text": "波比1技能"
},
- "ico": "jn_icon_001",
+ "ico": "skillicon_004",
"act": "Skill_1",
"Type": 1,
"MaxLV": 6,
@@ -6826,7 +6826,7 @@
"key": "skillname_125004211",
"text": "波比2技能"
},
- "ico": "jn_icon_002",
+ "ico": "skillicon_005",
"act": "Skill_2",
"Type": 2,
"MaxLV": 3,
@@ -6875,7 +6875,7 @@
"key": "skillname_125004311",
"text": "波比3技能"
},
- "ico": "jn_icon_003",
+ "ico": "skillicon_006",
"act": "Skill_3",
"Type": 1,
"MaxLV": 5,
@@ -6961,7 +6961,7 @@
"key": "skillname_135002111",
"text": "希卡普1技能"
},
- "ico": "jn_icon_001",
+ "ico": "skillicon_007",
"act": "Skill_1",
"Type": 1,
"MaxLV": 6,
@@ -7031,7 +7031,7 @@
"key": "skillname_135002211",
"text": "希卡普2技能"
},
- "ico": "jn_icon_002",
+ "ico": "skillicon_008",
"act": "Skill_2",
"Type": 2,
"MaxLV": 1,
@@ -7061,7 +7061,7 @@
"key": "skillname_135002311",
"text": "希卡普3技能"
},
- "ico": "jn_icon_003",
+ "ico": "skillicon_009",
"act": "Skill_3",
"Type": 1,
"MaxLV": 6,
@@ -7191,5 +7191,241 @@
"skill_9350023216"
],
"buffid": []
+ },
+ {
+ "Id": 124003011,
+ "Name": {
+ "key": "skillname_124003011",
+ "text": "睡神队长技"
+ },
+ "ico": "jn_dzj_01",
+ "act": "",
+ "Type": 3,
+ "MaxLV": 1,
+ "CD": [
+ -1
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003011
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240030111"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003111,
+ "Name": {
+ "key": "skillname_124003111",
+ "text": "睡神1技能"
+ },
+ "ico": "jn_icon_001",
+ "act": "Skill_1",
+ "Type": 1,
+ "MaxLV": 5,
+ "CD": [
+ 0,
+ 0,
+ 0,
+ 0,
+ 0
+ ],
+ "Target": 4,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003111,
+ 224003112
+ ]
+ },
+ {
+ "Id": [
+ 224003121,
+ 224003122
+ ]
+ },
+ {
+ "Id": [
+ 224003131,
+ 224003132
+ ]
+ },
+ {
+ "Id": [
+ 224003141,
+ 224003142
+ ]
+ },
+ {
+ "Id": [
+ 224003151,
+ 224003152
+ ]
+ },
+ {
+ "Id": [
+ 224003161,
+ 224003162
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240031111",
+ "skill_1240031112",
+ "skill_1240031113",
+ "skill_1240031114",
+ "skill_1240031115"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003211,
+ "Name": {
+ "key": "skillname_124003211",
+ "text": "睡神2技能"
+ },
+ "ico": "jn_icon_002",
+ "act": "Skill_2",
+ "Type": 2,
+ "MaxLV": 2,
+ "CD": [
+ 4,
+ 3
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003211,
+ 224003212
+ ]
+ },
+ {
+ "Id": [
+ 224003211,
+ 224003212
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240032111",
+ "skill_1240032112"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 124003311,
+ "Name": {
+ "key": "skillname_124003311",
+ "text": "睡神3技能"
+ },
+ "ico": "jn_icon_003",
+ "act": "Skill_3",
+ "Type": 1,
+ "MaxLV": 6,
+ "CD": [
+ 4,
+ 4,
+ 4,
+ 4,
+ 4,
+ 3
+ ],
+ "Target": 2,
+ "ChildSkill": [
+ {
+ "Id": [
+ 224003311,
+ 224003312,
+ 224003313
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003322,
+ 224003323
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003332,
+ 224003333
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003342,
+ 224003343
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003352,
+ 224003353
+ ]
+ },
+ {
+ "Id": [
+ 224003311,
+ 224003362,
+ 224003363
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_1240033111",
+ "skill_1240033112",
+ "skill_1240033113",
+ "skill_1240033114",
+ "skill_1240033115",
+ "skill_1240033116"
+ ],
+ "buffid": []
+ },
+ {
+ "Id": 924003411,
+ "Name": {
+ "key": "skillname_924003411",
+ "text": "睡神2技能"
+ },
+ "ico": "jn_icon_002",
+ "act": "Skill_2",
+ "Type": 4,
+ "MaxLV": 2,
+ "CD": [
+ 4,
+ 3
+ ],
+ "Target": 1,
+ "ChildSkill": [
+ {
+ "Id": [
+ 924003411,
+ 924003412,
+ 924003413
+ ]
+ },
+ {
+ "Id": [
+ 924003411,
+ 924003412,
+ 924003413
+ ]
+ }
+ ],
+ "Desc": [
+ "skill_9240034111",
+ "skill_9240034112"
+ ],
+ "buffid": []
}
]
\ No newline at end of file
diff --git a/bin/json/game_stroy.json b/bin/json/game_stroy.json
index e0295fc5d..0f050c739 100644
--- a/bin/json/game_stroy.json
+++ b/bin/json/game_stroy.json
@@ -16,7 +16,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -38,7 +52,21 @@
"action": "",
"sound": "",
"place": 1,
- "revolve": "180|120|180",
+ "position": {
+ "x": 0,
+ "y": 207,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -65,7 +93,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -87,7 +129,21 @@
"action": "",
"sound": "",
"place": 1,
- "revolve": "180|120|180",
+ "position": {
+ "x": 0,
+ "y": 207,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -109,7 +165,21 @@
"action": "",
"sound": "",
"place": 1,
- "revolve": "180|120|180",
+ "position": {
+ "x": 0,
+ "y": 207,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -131,7 +201,21 @@
"action": "",
"sound": "",
"place": 1,
- "revolve": "180|120|180",
+ "position": {
+ "x": 0,
+ "y": 207,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -153,7 +237,21 @@
"action": "",
"sound": "",
"place": 1,
- "revolve": "180|120|180",
+ "position": {
+ "x": 0,
+ "y": 207,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -175,7 +273,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -197,7 +309,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -219,7 +345,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
@@ -241,7 +381,21 @@
"action": "",
"sound": "",
"place": 0,
- "revolve": "180|60|180",
+ "position": {
+ "x": 0,
+ "y": 40,
+ "z": 900
+ },
+ "revolve": {
+ "x": 0,
+ "y": -180,
+ "z": 0
+ },
+ "size": {
+ "x": 4,
+ "y": 4,
+ "z": 4
+ },
"perf": "",
"cg": "",
"skip": 1
diff --git a/modules/chat/configure.go b/modules/chat/configure.go
index 3fb8e4cec..26aefdbd2 100644
--- a/modules/chat/configure.go
+++ b/modules/chat/configure.go
@@ -25,10 +25,10 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options)
this.module = module.(*Chat)
- this.LoadConfigure(game_chatchannel, cfg.NewGame_chatChannel)
- this.LoadConfigure(game_chatsystem, cfg.NewGame_chatSystem)
+ this.LoadConfigure(game_chatchannel, cfg.NewGamechatChannel)
+ this.LoadConfigure(game_chatsystem, cfg.NewGamechatSystem)
- this.LoadConfigure(game_chatchannelcom, cfg.NewGame_chatChannelCom)
+ this.LoadConfigure(game_chatchannelcom, cfg.NewGamechatChannelCom)
return
}
@@ -36,21 +36,21 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
func (this *configureComp) GetAutoIntoChannelMax() (max int32, err error) {
var (
v interface{}
- configure *cfg.Game_chatChannelComData
+ configure *cfg.GamechatChannelComData
ok bool
)
if v, err = this.GetConfigure(game_chatchannelcom); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_chatChannelCom).GetDataMap()["channel_allocation_max"]; !ok {
+ if configure, ok = v.(*cfg.GamechatChannelCom).GetDataMap()["channel_allocation_max"]; !ok {
err = fmt.Errorf("cfg.Game_chatServerGroupData on found channel_allocation_max")
this.module.Errorf("err:%v", err)
return
}
max = configure.Value
if max <= 0 {
- err = fmt.Errorf("cfg.Game_chatChannelComData channel_allocation_max:%v", v)
+ err = fmt.Errorf("cfg.GamechatChannelComData channel_allocation_max:%v", v)
}
}
return
@@ -60,21 +60,21 @@ func (this *configureComp) GetAutoIntoChannelMax() (max int32, err error) {
func (this *configureComp) GetChanageChannelMax() (max int32, err error) {
var (
v interface{}
- configure *cfg.Game_chatChannelComData
+ configure *cfg.GamechatChannelComData
ok bool
)
if v, err = this.GetConfigure(game_chatchannelcom); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_chatChannelCom).GetDataMap()["channel_switching_max"]; !ok {
+ if configure, ok = v.(*cfg.GamechatChannelCom).GetDataMap()["channel_switching_max"]; !ok {
err = fmt.Errorf("cfg.Game_chatServerGroupData on found channel_switching_max")
this.module.Errorf("err:%v", err)
return
}
max = configure.Value
if max <= 0 {
- err = fmt.Errorf("cfg.Game_chatChannelComData channel_switching_max:%v", v)
+ err = fmt.Errorf("cfg.GamechatChannelComData channel_switching_max:%v", v)
}
}
return
@@ -84,21 +84,21 @@ func (this *configureComp) GetChanageChannelMax() (max int32, err error) {
func (this *configureComp) GetChannelRecordMax() (max int32, err error) {
var (
v interface{}
- configure *cfg.Game_chatChannelComData
+ configure *cfg.GamechatChannelComData
ok bool
)
if v, err = this.GetConfigure(game_chatchannelcom); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_chatChannelCom).GetDataMap()["max_chat"]; !ok {
+ if configure, ok = v.(*cfg.GamechatChannelCom).GetDataMap()["max_chat"]; !ok {
err = fmt.Errorf("cfg.Game_chatServerGroupData on found max_chat")
this.module.Errorf("err:%v", err)
return
}
max = configure.Value
if max <= 0 {
- err = fmt.Errorf("cfg.Game_chatChannelComData max_chat:%v", v)
+ err = fmt.Errorf("cfg.GamechatChannelComData max_chat:%v", v)
}
}
return
@@ -108,21 +108,21 @@ func (this *configureComp) GetChannelRecordMax() (max int32, err error) {
func (this *configureComp) GetChannelReadRecordNum() (max int32, err error) {
var (
v interface{}
- configure *cfg.Game_chatChannelComData
+ configure *cfg.GamechatChannelComData
ok bool
)
if v, err = this.GetConfigure(game_chatchannelcom); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_chatChannelCom).GetDataMap()["load_chat"]; !ok {
+ if configure, ok = v.(*cfg.GamechatChannelCom).GetDataMap()["load_chat"]; !ok {
err = fmt.Errorf("cfg.Game_chatServerGroupData on found max_chat")
this.module.Errorf("err:%v", err)
return
}
max = configure.Value
if max <= 0 {
- err = fmt.Errorf("cfg.Game_chatChannelComData max_chat:%v", v)
+ err = fmt.Errorf("cfg.GamechatChannelComData max_chat:%v", v)
}
}
return
diff --git a/modules/comp_configure.go b/modules/comp_configure.go
index bf875d191..31149617c 100644
--- a/modules/comp_configure.go
+++ b/modules/comp_configure.go
@@ -24,10 +24,10 @@ type MCompConfigure struct {
//组件初始化接口
func (this *MCompConfigure) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.ModuleCompBase.Init(service, module, comp, options)
- err = this.LoadConfigure(game_global, cfg.NewGame_global)
- err = this.LoadConfigure(game_initial, cfg.NewGame_initial)
- err = this.LoadConfigure(game_playerlv, cfg.NewGame_playerlv)
- err = this.LoadConfigure(game_facemod, cfg.NewGame_facemod)
+ err = this.LoadConfigure(game_global, cfg.NewGameglobal)
+ err = this.LoadConfigure(game_initial, cfg.NewGameinitial)
+ err = this.LoadConfigure(game_playerlv, cfg.NewGameplayerlv)
+ err = this.LoadConfigure(game_facemod, cfg.NewGamefacemod)
return
}
@@ -54,28 +54,24 @@ func (this *MCompConfigure) GetConfigure(name string) (v interface{}, err error)
}
//全局配置
-func (this *MCompConfigure) GetGlobalConf(key string) string {
+func (this *MCompConfigure) GetGlobalConf() *cfg.GameglobalData {
if v, err := this.GetConfigure(game_global); err != nil {
log.Errorf("get global conf err:%v", err)
- return ""
+ return nil
} else {
var (
- configure *cfg.Game_global
+ configure *cfg.Gameglobal
ok bool
)
- if configure, ok = v.(*cfg.Game_global); !ok {
+ if configure, ok = v.(*cfg.Gameglobal); !ok {
log.Errorf("%T no is *cfg.Game_global", v)
- return ""
- }
-
- if v, ok := configure.GetDataMap()[key]; ok {
- return v.Var
+ return nil
}
+ return configure.GetDataList()[0]
}
- return ""
}
-func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Game_initial, err error) {
+func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Gameinitial, err error) {
var (
v interface{}
ok bool
@@ -83,7 +79,7 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Game_initial, er
if v, err = this.GetConfigure(game_initial); err != nil {
return
} else {
- if configure, ok = v.(*cfg.Game_initial); !ok {
+ if configure, ok = v.(*cfg.Gameinitial); !ok {
err = fmt.Errorf("%T no is *cfg.Game_comInitial", v)
return
}
@@ -92,11 +88,11 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Game_initial, er
}
// 主角等级经验配置列表
-func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.Game_playerlvData) {
+func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GameplayerlvData) {
if v, err := this.GetConfigure(game_playerlv); err != nil {
return
} else {
- if configure, ok := v.(*cfg.Game_playerlv); !ok {
+ if configure, ok := v.(*cfg.Gameplayerlv); !ok {
err = fmt.Errorf("%T no is *cfg.Game_playerlv", v)
return
} else {
@@ -109,11 +105,11 @@ func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.Game_playerlvData
}
// 玩家等级经验配置表
-func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvData) {
+func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.GameplayerlvData) {
if v, err := this.GetConfigure(game_playerlv); err != nil {
return
} else {
- if configure, ok := v.(*cfg.Game_playerlv); !ok {
+ if configure, ok := v.(*cfg.Gameplayerlv); !ok {
err = fmt.Errorf("%T no is *cfg.Game_playerlv", v)
return
} else {
@@ -126,11 +122,11 @@ func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.Game_playerlvDa
}
// 玩家形象预设配置
-func (this *MCompConfigure) GetPlayerFigureConf() (list []*cfg.Game_facemodData) {
+func (this *MCompConfigure) GetPlayerFigureConf() (list []*cfg.GamefacemodData) {
if v, err := this.GetConfigure(game_facemod); err != nil {
return
} else {
- if configure, ok := v.(*cfg.Game_facemod); !ok {
+ if configure, ok := v.(*cfg.Gamefacemod); !ok {
err = fmt.Errorf("%T no is *cfg.Game_playerlv", v)
return
} else {
diff --git a/modules/core.go b/modules/core.go
index e1f15c701..6bc9dcd4a 100644
--- a/modules/core.go
+++ b/modules/core.go
@@ -22,6 +22,6 @@ type (
//向多个用户发送消息
SendMsgToUsers(mainType, subType string, msg proto.Message, user ...*pb.CacheUser) (err error)
//校验消耗资源
- CheckConsumeRes(uid string, res []*cfg.Game_atn) (code pb.ErrorCode)
+ CheckConsumeRes(uid string, res []*cfg.Gameatn) (code pb.ErrorCode)
}
)
diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go
index 31d2fb73f..953b995b2 100644
--- a/modules/equipment/api_equip.go
+++ b/modules/equipment/api_equip.go
@@ -22,7 +22,7 @@ func (this *apiComp) EquipCheck(session comm.IUserSession, req *pb.EquipmentEqui
func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq) (code pb.ErrorCode, data proto.Message) {
var (
err error
- confs []*cfg.Game_equipData
+ confs []*cfg.GameequipData
equipment *pb.DB_Equipment
equipments []*pb.DB_Equipment
updatequipment []*pb.DB_Equipment
@@ -33,7 +33,7 @@ func (this *apiComp) Equip(session comm.IUserSession, req *pb.EquipmentEquipReq)
return
}
//校验数据
- confs = make([]*cfg.Game_equipData, len(req.EquipmentId))
+ confs = make([]*cfg.GameequipData, len(req.EquipmentId))
equipments = make([]*pb.DB_Equipment, len(req.EquipmentId))
//获取英雄数据
diff --git a/modules/equipment/api_upgrade.go b/modules/equipment/api_upgrade.go
index 83a51bfb7..4a05d85b9 100644
--- a/modules/equipment/api_upgrade.go
+++ b/modules/equipment/api_upgrade.go
@@ -27,8 +27,8 @@ func (this *apiComp) UpgradeCheck(session comm.IUserSession, req *pb.EquipmentUp
func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.EquipmentUpgradeReq) (code pb.ErrorCode, data proto.Message) {
var (
err error
- conf *cfg.Game_equipData
- intensify *cfg.Game_equipIntensifyData
+ conf *cfg.GameequipData
+ intensify *cfg.GameequipIntensifyData
equipment *pb.DB_Equipment
modifyequipments []*pb.DB_Equipment
hero *pb.DBHero
diff --git a/modules/equipment/configure.go b/modules/equipment/configure.go
index 6da2c84bc..be82e3cbb 100644
--- a/modules/equipment/configure.go
+++ b/modules/equipment/configure.go
@@ -25,15 +25,15 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options)
this.module = module.(*Equipment)
- this.LoadConfigure(game_equip, cfg.NewGame_equip)
- this.LoadConfigure(equip_attrlibrary, cfg.NewGame_equipAttrlibrary)
- this.LoadConfigure(equip_intensify, cfg.NewGame_equipIntensify)
- this.LoadConfigure(equip_suit, cfg.NewGame_equipSuit)
+ this.LoadConfigure(game_equip, cfg.NewGameequip)
+ this.LoadConfigure(equip_attrlibrary, cfg.NewGameequipAttrlibrary)
+ this.LoadConfigure(equip_intensify, cfg.NewGameequipIntensify)
+ this.LoadConfigure(equip_suit, cfg.NewGameequipSuit)
return
}
//获取装备配置数据
-func (this *configureComp) GetEquipmentConfigure() (configure *cfg.Game_equip, err error) {
+func (this *configureComp) GetEquipmentConfigure() (configure *cfg.Gameequip, err error) {
var (
v interface{}
ok bool
@@ -42,7 +42,7 @@ func (this *configureComp) GetEquipmentConfigure() (configure *cfg.Game_equip, e
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_equip); !ok {
+ if configure, ok = v.(*cfg.Gameequip); !ok {
err = fmt.Errorf("%T no is *cfg.Game_equipment", v)
this.module.Errorf("err:%v", err)
return
@@ -52,7 +52,7 @@ func (this *configureComp) GetEquipmentConfigure() (configure *cfg.Game_equip, e
}
//获取装备配置数据
-func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (configure *cfg.Game_equipData, err error) {
+func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameequipData, err error) {
var (
v interface{}
ok bool
@@ -61,7 +61,7 @@ func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (config
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_equip).GetDataMap()[equipmentId]; !ok {
+ if configure, ok = v.(*cfg.Gameequip).GetDataMap()[equipmentId]; !ok {
err = fmt.Errorf("EquipmentConfigure not found:%s ", equipmentId)
this.module.Errorf("err:%v", err)
return
@@ -71,7 +71,7 @@ func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (config
}
//获取装备属性表
-func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.Game_equipAttrlibrary, err error) {
+func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.GameequipAttrlibrary, err error) {
var (
v interface{}
ok bool
@@ -80,7 +80,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.Ga
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_equipAttrlibrary); !ok {
+ if configure, ok = v.(*cfg.GameequipAttrlibrary); !ok {
err = fmt.Errorf("%T no is *cfg.Game_equipment", v)
this.module.Errorf("err:%v", err)
return
@@ -90,7 +90,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigure() (configure *cfg.Ga
}
//获取属性词列表
-func (this *configureComp) GetEquipmentAttrlibraryConfigureByKey(key int32) (configure *cfg.Game_equipAttrlibraryData, err error) {
+func (this *configureComp) GetEquipmentAttrlibraryConfigureByKey(key int32) (configure *cfg.GameequipAttrlibraryData, err error) {
var (
v interface{}
ok bool
@@ -99,7 +99,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureByKey(key int32) (con
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_equipAttrlibrary).GetDataMap()[key]; !ok {
+ if configure, ok = v.(*cfg.GameequipAttrlibrary).GetDataMap()[key]; !ok {
err = fmt.Errorf("EquipmentConfigure GetEquipmentAttrlibraryConfigureByKey not found:%d ", key)
this.module.Errorf("err:%v", err)
return
@@ -109,7 +109,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureByKey(key int32) (con
}
//获取属性词列表
-func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (configure []*cfg.Game_equipAttrlibraryData, err error) {
+func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (configure []*cfg.GameequipAttrlibraryData, err error) {
var (
v interface{}
)
@@ -117,8 +117,8 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (confi
this.module.Errorf("err:%v", err)
return
} else {
- configure = make([]*cfg.Game_equipAttrlibraryData, 0)
- for _, v1 := range v.(*cfg.Game_equipAttrlibrary).GetDataList() {
+ configure = make([]*cfg.GameequipAttrlibraryData, 0)
+ for _, v1 := range v.(*cfg.GameequipAttrlibrary).GetDataList() {
if v1.Libraryid == Id {
configure = append(configure, v1)
}
@@ -128,7 +128,7 @@ func (this *configureComp) GetEquipmentAttrlibraryConfigureById(Id int32) (confi
}
//获取武器等级消耗表
-func (this *configureComp) GetEquipmentIntensifyConfigure() (configure *cfg.Game_equipIntensify, err error) {
+func (this *configureComp) GetEquipmentIntensifyConfigure() (configure *cfg.GameequipIntensify, err error) {
var (
v interface{}
ok bool
@@ -137,7 +137,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigure() (configure *cfg.Game
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_equipIntensify); !ok {
+ if configure, ok = v.(*cfg.GameequipIntensify); !ok {
err = fmt.Errorf("%T no is *cfg.Game_equipment", v)
this.module.Errorf("err:%v", err)
return
@@ -147,7 +147,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigure() (configure *cfg.Game
}
//获取武器等级消耗表
-func (this *configureComp) GetEquipmentIntensifyConfigureById(star, lv int32) (configure *cfg.Game_equipIntensifyData, err error) {
+func (this *configureComp) GetEquipmentIntensifyConfigureById(star, lv int32) (configure *cfg.GameequipIntensifyData, err error) {
var (
v interface{}
)
@@ -155,7 +155,7 @@ func (this *configureComp) GetEquipmentIntensifyConfigureById(star, lv int32) (c
this.module.Errorf("err:%v", err)
return
} else {
- for _, v1 := range v.(*cfg.Game_equipIntensify).GetDataList() {
+ for _, v1 := range v.(*cfg.GameequipIntensify).GetDataList() {
if v1.Star == star && v1.Level == lv {
configure = v1
diff --git a/modules/equipment/modelEquipment.go b/modules/equipment/modelEquipment.go
index 3b3bee65e..466a9fbb7 100644
--- a/modules/equipment/modelEquipment.go
+++ b/modules/equipment/modelEquipment.go
@@ -70,7 +70,7 @@ func (this *modelEquipmentComp) QueryEquipmentAmount(uid string, equipmentId str
//添加装备
func (this *modelEquipmentComp) AddEquipments(uId string, cIds map[string]uint32) (change []*pb.DB_Equipment, err error) {
var (
- configure *cfg.Game_equip
+ configure *cfg.Gameequip
equipments []*pb.DB_Equipment
iskeep bool
add map[string]*pb.DB_Equipment
@@ -137,10 +137,10 @@ func (this *modelEquipmentComp) UpdateByHeroId(uid string, equipments ...*pb.DB_
}
//创建新的武器对象
-func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.Game_equipData, num uint32) (equipment *pb.DB_Equipment, err error) {
+func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameequipData, num uint32) (equipment *pb.DB_Equipment, err error) {
var (
- mattr []*cfg.Game_equipAttrlibraryData
- sattr []*cfg.Game_equipAttrlibraryData
+ mattr []*cfg.GameequipAttrlibraryData
+ sattr []*cfg.GameequipAttrlibraryData
total int
satterNum int32
)
@@ -193,7 +193,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.Game_equipDat
}
//升级武器
-func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.Game_equipData, intensify *cfg.Game_equipIntensifyData) (err error) {
+func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.GameequipData, intensify *cfg.GameequipIntensifyData) (err error) {
equipment.Lv++
equipment.MainEntry.Lv++
equipment.MainEntry.Value += int32(float64(equipment.MainEntry.Value) * float64(intensify.Bonus) / 1000.0)
@@ -201,8 +201,8 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
return
}
if len(equipment.AdverbEntry) < 4 { //去随机副词条
- var temp []*cfg.Game_equipAttrlibraryData
- var sattr []*cfg.Game_equipAttrlibraryData
+ var temp []*cfg.GameequipAttrlibraryData
+ var sattr []*cfg.GameequipAttrlibraryData
if temp, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(equip.Addlibrary); err != nil || len(temp) == 0 {
log.Errorf("升级服务错误 读取副词条配置错误!")
return
@@ -229,7 +229,7 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
Value: sattr[index].Attrvar,
})
} else { //随机一个副词条 强化
- var attrlibrary *cfg.Game_equipAttrlibraryData
+ var attrlibrary *cfg.GameequipAttrlibraryData
r := rand.New(rand.NewSource(time.Now().Unix()))
index := r.Perm(len(equipment.AdverbEntry))[0]
diff --git a/modules/friend/module.go b/modules/friend/module.go
index 230c757ad..7c06158a2 100644
--- a/modules/friend/module.go
+++ b/modules/friend/module.go
@@ -6,8 +6,6 @@ import (
"go_dreamfactory/lego/core"
"go_dreamfactory/lego/sys/log"
-
- "github.com/spf13/cast"
)
func NewModule() core.IModule {
@@ -40,33 +38,33 @@ func (this *Friend) OnInstallComp() {
//获取最大好友数
func (this *Friend) getFriendMax() int {
- if maxHy := this.configure.GetGlobalConf("friend_maxnum"); maxHy != "" {
- return cast.ToInt(maxHy)
- }
+ // if maxHy := this.configure.GetGlobalConf("friend_maxnum"); maxHy != "" {
+ // return cast.ToInt(maxHy)
+ // }
return 0
}
//获取最大黑名单数
func (this *Friend) getBlackMax() int {
- if maxHy := this.configure.GetGlobalConf("friend_black"); maxHy != "" {
- return cast.ToInt(maxHy)
- }
+ // if maxHy := this.configure.GetGlobalConf("friend_black"); maxHy != "" {
+ // return cast.ToInt(maxHy)
+ // }
return 0
}
// 每日最大送出友情点
func (this *Friend) getOutFriendPointMax() int {
- if max := this.configure.GetGlobalConf("friend_maxsendnum"); max != "" {
- return cast.ToInt(max)
- }
+ // if max := this.configure.GetGlobalConf("friend_maxsendnum"); max != "" {
+ // return cast.ToInt(max)
+ // }
return 0
}
// 每日最大获赠友情点
func (this *Friend) getInFriendPointMax() int {
- if max := this.configure.GetGlobalConf("friend_maxsendnum"); max != "" {
- return cast.ToInt(max)
- }
+ // if max := this.configure.GetGlobalConf("friend_maxsendnum"); max != "" {
+ // return cast.ToInt(max)
+ // }
return 0
}
@@ -78,7 +76,7 @@ func (this *Friend) ResetFriend(uid string) {
if err := this.modelFriend.Change(uid, zanUpdate); err != nil {
log.Error("resetZanFriend err", log.Field{Key: "err", Value: err})
}
-
+
// 重置今日友情点
update := map[string]interface{}{
"friendPointID": 0,
diff --git a/modules/game/fight/logic/FightAfterSkill.go b/modules/game/fight/logic/FightAfterSkill.go
index b3467bb89..2341b16e1 100644
--- a/modules/game/fight/logic/FightAfterSkill.go
+++ b/modules/game/fight/logic/FightAfterSkill.go
@@ -9,7 +9,7 @@ import (
///
/// 谁的技能
/// 技能配置
-func newFightAfterSkill(role *FightRole, skillConf *cfg.Game_skillAfteratkData) *FightAfterSkill {
+func newFightAfterSkill(role *FightRole, skillConf *cfg.GameskillAfteratkData) *FightAfterSkill {
return &FightAfterSkill{
OwnerRole: role,
SkillConf: skillConf,
@@ -20,7 +20,7 @@ type FightAfterSkill struct {
//从哪个技能触发的
OwnerRole *FightRole
//技能配置
- SkillConf *cfg.Game_skillAfteratkData
+ SkillConf *cfg.GameskillAfteratkData
}
///
diff --git a/modules/gateway/configure_comp.go b/modules/gateway/configure_comp.go
index 1dddac24d..13b879c22 100644
--- a/modules/gateway/configure_comp.go
+++ b/modules/gateway/configure_comp.go
@@ -19,7 +19,7 @@ type configureComp struct {
// Init 组件初始化接口
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options)
- this.LoadConfigure(game_msgdistrib, cfg.NewGame_msgdistrib)
+ this.LoadConfigure(game_msgdistrib, cfg.NewGamemsgdistrib)
return
}
@@ -28,13 +28,13 @@ func (this *configureComp) GetMsgDistribute(msgid string) (rule string, ok bool)
var (
err error
v interface{}
- item *cfg.Game_msgdistribData
+ item *cfg.GamemsgdistribData
)
if v, err = this.GetConfigure(game_msgdistrib); err != nil {
ok = false
return
} else {
- if item, ok = v.(*cfg.Game_msgdistrib).GetDataMap()[msgid]; ok {
+ if item, ok = v.(*cfg.Gamemsgdistrib).GetDataMap()[msgid]; ok {
rule = item.Routrules
}
}
diff --git a/modules/gm/api_cmd.go b/modules/gm/api_cmd.go
index 81f225f72..a46c761ee 100644
--- a/modules/gm/api_cmd.go
+++ b/modules/gm/api_cmd.go
@@ -37,7 +37,7 @@ func (this *apiComp) Cmd(session comm.IUserSession, req *pb.GMCmdReq) (code pb.E
code = pb.ErrorCode_ReqParameterError
return
}
- code = this.module.DispenseRes(session, []*cfg.Game_atn{ // 添加资源
+ code = this.module.DispenseRes(session, []*cfg.Gameatn{ // 添加资源
{
A: datas[0],
T: datas[1],
diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go
index 9a01f3358..34f52a672 100644
--- a/modules/hero/api_awaken.go
+++ b/modules/hero/api_awaken.go
@@ -22,7 +22,7 @@ func (this *apiComp) AwakenCheck(session comm.IUserSession, req *pb.HeroAwakenRe
/// 英雄觉醒
func (this *apiComp) Awaken(session comm.IUserSession, req *pb.HeroAwakenReq) (code pb.ErrorCode, data proto.Message) {
var (
- awakenData *cfg.Game_heroAwakenData
+ awakenData *cfg.GameheroAwakenData
_hero *pb.DBHero
chanegCard []*pb.DBHero // change
)
diff --git a/modules/hero/api_drawCard.go b/modules/hero/api_drawCard.go
index 670d683e1..e83e96d28 100644
--- a/modules/hero/api_drawCard.go
+++ b/modules/hero/api_drawCard.go
@@ -1,14 +1,8 @@
package hero
import (
- "crypto/rand"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
- cfg "go_dreamfactory/sys/configure/structs"
- "math"
- "math/big"
- "strconv"
- "time"
"google.golang.org/protobuf/proto"
)
@@ -22,129 +16,134 @@ func (this *apiComp) DrawCardCheck(session comm.IUserSession, req *pb.HeroDrawCa
//抽卡
func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq) (code pb.ErrorCode, data proto.Message) {
- var (
- szCards []string // 最终抽到的卡牌
- totalWeight int64 // 总权重
- curWeigth int64 // 临时随机获得的权重
- curStar4Count int32 // 当前4星没抽到的次数
- curStar5Count int32 // 当前5星没抽到的次数
- config4Count int32 // 配置表中4星保底次数
- config5Count int32 // 配置表中5星保底次数
- race int32
- cardW map[string]int32 // 当前卡牌卡池卡牌对应的权重
- baodiPool int32 // 保底卡池id
- )
+ // var (
+ // szCards []string // 最终抽到的卡牌
+ // totalWeight int64 // 总权重
+ // curWeigth int64 // 临时随机获得的权重
+ // curStar4Count int32 // 当前4星没抽到的次数
+ // curStar5Count int32 // 当前5星没抽到的次数
+ // config4Count int32 // 配置表中4星保底次数
+ // config5Count int32 // 配置表中5星保底次数
+ // race int32
+ // cardW map[string]int32 // 当前卡牌卡池卡牌对应的权重
+ // baodiPool int32 // 保底卡池id
+ // drawCount int32 // 抽卡次数
+ // )
- cardW = make(map[string]int32, 0)
- szCards = make([]string, 0)
- rsp := &pb.HeroDrawCardResp{}
- this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count)
+ // cardW = make(map[string]int32, 0)
+ // szCards = make([]string, 0)
+ // rsp := &pb.HeroDrawCardResp{}
+ // this.module.Debugf("当前4星抽卡没中次数:%d, 当前5星抽卡没中次数:%d", curStar4Count, curStar5Count)
- curStar4Count, curStar5Count = this.module.modelHero.GetCurStarCount(session.GetUserId(), req.DrawType) // 获取缓存中4,5星没抽到的次数
- // 获取配置文件的权重信息
- _conf, err := this.module.configure.GetHeroDrawConfig(race)
- if err != nil {
- code = pb.ErrorCode_DrawCardTypeNotFound // 抽卡类型不匹配
- return
- }
- // 权重赋值
- for _, v := range _conf {
- cardW[v.Id] += v.Weight
- totalWeight += int64(cardW[v.Id])
- }
+ // curStar4Count, curStar5Count, drawCount = this.module.modelHero.GetCurStarCount(session.GetUserId(), req.DrawType) // 获取缓存中4,5星没抽到的次数
+ // // 获取配置文件的权重信息
+ // // _conf, err := this.module.configure.GetHeroDrawConfig(race)
+ // // if err != nil {
+ // // code = pb.ErrorCode_DrawCardTypeNotFound // 抽卡类型不匹配
+ // // return
+ // // }
+ // // // 权重赋值
+ // // for _, v := range _conf {
+ // // cardW[v.Id] += v.Weight
+ // // totalWeight += int64(cardW[v.Id])
+ // // }
- // ======记录活动数据
- cfgData, err := this.module.configure.GetDrawUpDrawConfig()
- if err == nil {
- for _, v := range cfgData.GetDataList() {
- if time.Now().Unix() >= int64(v.TimeOn) && time.Now().Unix() <= int64(v.TimeOff) { // 在这个时间范围之内
- for index, v1 := range v.UpHero {
- if _, ok := cardW[v1]; ok { // 判断卡池有没有这张卡
- cardW[v1] += v.UpWeight[index]
- totalWeight += int64(v.UpWeight[index])
- }
- }
- }
- }
- }
+ // // ======记录活动数据
+ // cfgData, err := this.module.configure.GetDrawUpDrawConfig()
+ // if err == nil {
+ // for _, v := range cfgData.GetDataList() {
+ // if time.Now().Unix() >= int64(v.TimeOn) && time.Now().Unix() <= int64(v.TimeOff) { // 在这个时间范围之内
+ // for index, v1 := range v.UpHero {
+ // if _, ok := cardW[v1]; ok { // 判断卡池有没有这张卡
+ // cardW[v1] += v.UpWeight[index]
+ // totalWeight += int64(v.UpWeight[index])
+ // }
+ // }
+ // }
+ // }
+ // }
// =======活动数据记录完成
- _costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType) // 抽卡消耗
- if err != nil {
- code = pb.ErrorCode_ConfigNoFound
- return
- }
- config4Count = _costConf.Floor4 // 4星保底次数
- config5Count = _costConf.Floor5 // 5星保底次数
- if config4Count <= 0 { // 小于等于零 表示没有保底
- config4Count = math.MaxInt32
- }
- if config5Count <= 0 { // 小于等于零 表示没有保底
- config5Count = math.MaxInt32
- }
+ //_costConf, err := this.module.configure.GetDrawCostConfigByID(req.DrawType) // 抽卡消耗
- code = this.module.CheckRes(session, []*cfg.Game_atn{_costConf.Cost}) // 消耗校验
- if code != pb.ErrorCode_Success {
- return
- }
+ // if err != nil {
+ // code = pb.ErrorCode_ConfigNoFound
+ // return
+ // }
+ // config4Count = _costConf.Floor4 // 4星保底次数
+ // config5Count = _costConf.Floor5 // 5星保底次数
+ // if config4Count <= 0 { // 小于等于零 表示没有保底
+ // config4Count = math.MaxInt32
+ // }
+ // if config5Count <= 0 { // 小于等于零 表示没有保底
+ // config5Count = math.MaxInt32
+ // }
- for i := 0; i < int(_costConf.Count); i++ {
- n, _ := rand.Int(rand.Reader, big.NewInt(totalWeight)) // [0,totalWeight)
- curWeigth = 0
- for k, v := range cardW {
- curWeigth += int64(v)
- if curWeigth > n.Int64() { // 命中
- // 获取当前星级
- _getCardCfg := this.module.configure.GetHero(k) //获取的英雄信息
- if _getCardCfg == nil {
- continue
- }
- curStar4Count++
- curStar5Count++
- if _getCardCfg.Star == 4 { // 当抽取到的英雄是4星的时候 清除 该类型的保底次数
- curStar4Count = 0
+ // code = this.module.CheckRes(session, []*cfg.Gameatn{_costConf.Cost}) // 消耗校验
+ // if code != pb.ErrorCode_Success {
+ // return
+ // }
- } else if _getCardCfg.Star == 5 { // 当抽取到的英雄是5星的时候 清除 该类型的保底次数
- curStar5Count = 0 // 清0
- }
+ // for i := 0; i < int(_costConf.Count); i++ {
+ // n, _ := rand.Int(rand.Reader, big.NewInt(totalWeight)) // [0,totalWeight)
+ // curWeigth = 0
+ // for k, v := range cardW {
+ // curWeigth += int64(v)
+ // if curWeigth > n.Int64() { // 命中
+ // // 获取当前星级
+ // _getCardCfg := this.module.configure.GetHero(k) //获取的英雄信息
+ // if _getCardCfg == nil {
+ // continue
+ // }
+ // curStar4Count++
+ // curStar5Count++
+ // if _getCardCfg.Star == 4 { // 当抽取到的英雄是4星的时候 清除 该类型的保底次数
+ // curStar4Count = 0
- // 达标保底次数
- if curStar4Count >= config4Count {
- baodiPool = _costConf.Floor4cards
- } else if curStar5Count >= config5Count {
- baodiPool = _costConf.Floor5cards
- }
- if baodiPool != 0 {
- id := this.module.modelHero.FloorDrawCard(baodiPool)
- if id != "" {
- szCards = append(szCards, id) // 保底卡池里的卡放入数组种
- break
- }
- }
- szCards = append(szCards, k)
- break
- }
- }
- }
- raceData := &pb.Floor{
- H4: curStar4Count,
- H5: curStar5Count,
- }
- // 更新record 配置信息
- update := map[string]interface{}{}
+ // } else if _getCardCfg.Star == 5 { // 当抽取到的英雄是5星的时候 清除 该类型的保底次数
+ // curStar5Count = 0 // 清0
+ // }
- update["race"+strconv.Itoa(int(race)-1)] = raceData
- this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
- // 消耗道具
- code = this.module.ConsumeRes(session, []*cfg.Game_atn{_costConf.Cost}, true)
- if code != pb.ErrorCode_Success {
- return
- }
- if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil {
- code = pb.ErrorCode_HeroCreate
- return
- }
+ // // 达标保底次数
+ // if curStar4Count >= config4Count {
+ // baodiPool = _costConf.Floor4cards
+ // } else if curStar5Count >= config5Count {
+ // baodiPool = _costConf.Floor5cards
+ // }
+ // if baodiPool != 0 {
+ // id := this.module.modelHero.FloorDrawCard(baodiPool)
+ // if id != "" {
+ // szCards = append(szCards, id) // 保底卡池里的卡放入数组种
+ // break
+ // }
+ // }
+ // szCards = append(szCards, k)
+ // break
+ // }
+ // }
+ // }
+ // raceData := &pb.Floor{
+ // H4: curStar4Count,
+ // H5: curStar5Count,
+ // }
+ // // 更新record 配置信息
+ // update := map[string]interface{}{}
+ // if drawCount != -1 {
+ // drawCount += _costConf.Count
+ // update["drawcount"] = drawCount
+ // }
+ // update["race"+strconv.Itoa(int(race)-1)] = raceData
+ // this.module.modelRecord.ChangeHeroRecord(session.GetUserId(), update)
+ // // 消耗道具
+ // code = this.module.ConsumeRes(session, []*cfg.Gameatn{_costConf.Cost}, true)
+ // if code != pb.ErrorCode_Success {
+ // return
+ // }
+ // if err := this.module.modelHero.createMultiHero(session.GetUserId(), szCards...); err != nil {
+ // code = pb.ErrorCode_HeroCreate
+ // return
+ // }
- rsp.Heroes = szCards
- session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
+ // rsp.Heroes = szCards
+ // session.SendMsg(string(this.module.GetType()), DrawCard, rsp)
return
}
diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go
index dff19d61a..d066f854a 100644
--- a/modules/hero/api_strengthenUpStar.go
+++ b/modules/hero/api_strengthenUpStar.go
@@ -33,14 +33,14 @@ func (this *apiComp) StrengthenUpStarCheck(session comm.IUserSession, req *pb.He
/// 英雄升星
func (this *apiComp) StrengthenUpStar(session comm.IUserSession, req *pb.HeroStrengthenUpStarReq) (code pb.ErrorCode, data proto.Message) {
var (
- target *cfg.Game_heroStarupData // 配置表目标升星英雄信息
- costNeedHeroCount int32 // 消耗指定英雄的数量
- costRaceHeroCount int32 // 消耗种族英雄的数量
- _hero *pb.DBHero // 目标英雄
- tagHero *pb.DBHero // 消耗指定英雄
- mapCostHero map[string]int32 // 所有消耗英雄分类
- chanegCard []*pb.DBHero // 变化的英雄数据
- CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类
+ target *cfg.GameheroStarupData // 配置表目标升星英雄信息
+ costNeedHeroCount int32 // 消耗指定英雄的数量
+ costRaceHeroCount int32 // 消耗种族英雄的数量
+ _hero *pb.DBHero // 目标英雄
+ tagHero *pb.DBHero // 消耗指定英雄
+ mapCostHero map[string]int32 // 所有消耗英雄分类
+ chanegCard []*pb.DBHero // 变化的英雄数据
+ CostHeroObj map[string]*pb.DBHero // 所有消耗英雄分类
)
mapCostHero = make(map[string]int32, 0)
CostHeroObj = make(map[string]*pb.DBHero, 0)
diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go
index dfab12956..8bae84cab 100644
--- a/modules/hero/configure_comp.go
+++ b/modules/hero/configure_comp.go
@@ -3,6 +3,7 @@ package hero
import (
"fmt"
"go_dreamfactory/modules"
+ "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs"
"go_dreamfactory/lego/core"
@@ -28,6 +29,8 @@ const (
///配置管理组件
type configureComp struct {
modules.MCompConfigure
+ drawCardCfg map[string]map[int32][]*cfg.GamedrawCardData // 第一个key 卡池id 第二个key 星级
+ //map["base_pool1"]map[3]*cfg.Game_drawCardData
}
//组件初始化接口
@@ -35,27 +38,58 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.MCompConfigure.Init(service, module, comp, options)
err = this.LoadMultiConfigure(map[string]interface{}{
- new_hero: cfg.NewGame_hero,
- hero_stargrow: cfg.NewGame_heroStargrow,
- hero_levelgrow: cfg.NewGame_heroLevelgrow,
- hero_starup: cfg.NewGame_heroStarup,
- hero_levelup: cfg.NewGame_heroLevelup,
- hero_exp: cfg.NewGame_heroExp,
- hero_skillup: cfg.NewGame_heroSkillLevel,
- game_skillatk: cfg.NewGame_skillAtk,
- hero_resonance: cfg.NewGame_heroResonance,
- hero_comatn: cfg.NewGame_comAtn,
- hero_awaken: cfg.NewGame_heroAwaken,
- hero_drawcard: cfg.NewGame_drawCard,
+ new_hero: cfg.NewGamehero,
+ hero_stargrow: cfg.NewGameheroStargrow,
+ hero_levelgrow: cfg.NewGameheroLevelgrow,
+ hero_starup: cfg.NewGameheroStarup,
+ hero_levelup: cfg.NewGameheroLevelup,
+ hero_exp: cfg.NewGameheroExp,
+ hero_skillup: cfg.NewGameheroSkillLevel,
+ game_skillatk: cfg.NewGameskillAtk,
+ hero_resonance: cfg.NewGameheroResonance,
+ hero_comatn: cfg.NewGamecomAtn,
+ hero_awaken: cfg.NewGameheroAwaken,
+ hero_drawcard: cfg.NewGamedrawCard,
hero_drawupdraw: cfg.NewGame_drawUpdraw,
- hero_drawcost: cfg.NewGame_drawCost,
+ //hero_drawcost: cfg.NewGamedrawCost,
})
+ this.drawCardCfg = make(map[string]map[int32][]*cfg.GamedrawCardData, 0)
+
+ configure.RegisterConfigure(hero_drawcard, cfg.NewGamedrawCard, func() {
+ this.GetHeroDrawConfig()
+ })
+ return
+}
+
+// 抽卡配置表
+func (this *configureComp) GetHeroDrawConfig() (err error) {
+ var (
+ v interface{}
+ )
+ if v, err = this.GetConfigure(hero_drawcard); err == nil {
+ if _configure, ok := v.(*cfg.GamedrawCard); !ok {
+ err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
+ return
+ } else {
+ for _, v := range _configure.GetDataList() {
+ if _, ok := this.drawCardCfg[v.CardPoolType]; !ok {
+ this.drawCardCfg[v.CardPoolType] = make(map[int32][]*cfg.GamedrawCardData, 0)
+ }
+ if _, ok := this.drawCardCfg[v.CardPoolType][v.Star]; !ok {
+ this.drawCardCfg[v.CardPoolType][v.Star] = make([]*cfg.GamedrawCardData, 0)
+ }
+ this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v)
+ }
+ }
+ } else {
+ err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
+ }
return
}
//获取英雄配置数据
-func (this *configureComp) getHeroConfigure() (configure *cfg.Game_hero, err error) {
+func (this *configureComp) getHeroConfigure() (configure *cfg.Gamehero, err error) {
var (
v interface{}
ok bool
@@ -64,40 +98,40 @@ func (this *configureComp) getHeroConfigure() (configure *cfg.Game_hero, err err
if v, err = this.GetConfigure(new_hero); err != nil {
return
} else {
- if configure, ok = v.(*cfg.Game_hero); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_hero", v)
+ if configure, ok = v.(*cfg.Gamehero); !ok {
+ err = fmt.Errorf("%T no is *cfg.Gamehero", v)
}
}
return
}
// 获取英雄强化增加属性配置数据
-func (this *configureComp) GetHeroStargrowConfig() (configure *cfg.Game_heroStargrow, err error) {
+func (this *configureComp) GetHeroStargrowConfig() (configure *cfg.GameheroStargrow, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_stargrow); err == nil {
- if configure, ok = v.(*cfg.Game_heroStargrow); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_hero", v)
+ if configure, ok = v.(*cfg.GameheroStargrow); !ok {
+ err = fmt.Errorf("%T no is *cfg.Gamehero", v)
return
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_hero", v)
+ err = fmt.Errorf("%T no is *cfg.Gamehero", v)
}
return
}
// 获取英雄升级属性变化相关配置数据
-func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.Game_heroLevelgrow, err error) {
+func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.GameheroLevelgrow, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_levelgrow); err == nil {
- if configure, ok = v.(*cfg.Game_heroLevelgrow); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroLevelgrow", v)
+ if configure, ok = v.(*cfg.GameheroLevelgrow); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroLevelgrow", v)
return
}
@@ -106,71 +140,71 @@ func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.Game_heroLev
}
// 获取英雄升星相关配置数据
-func (this *configureComp) GetHeroStarupConfig() (configure *cfg.Game_heroStarup, err error) {
+func (this *configureComp) GetHeroStarupConfig() (configure *cfg.GameheroStarup, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_starup); err == nil {
- if configure, ok = v.(*cfg.Game_heroStarup); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroStarup", v)
+ if configure, ok = v.(*cfg.GameheroStarup); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroStarup", v)
return
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroStarup", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroStarup", v)
}
return
}
// 获取英雄升级相关配置数据
-func (this *configureComp) GetHeroLevelUpConfig() (configure *cfg.Game_heroLevelup, err error) {
+func (this *configureComp) GetHeroLevelUpConfig() (configure *cfg.GameheroLevelup, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_levelup); err == nil {
- if configure, ok = v.(*cfg.Game_heroLevelup); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroLevelup", v)
+ if configure, ok = v.(*cfg.GameheroLevelup); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroLevelup", v)
return
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroLevelup", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroLevelup", v)
}
return
}
-func (this *configureComp) GetHeroExpConfig() (configure *cfg.Game_heroExp, err error) {
+func (this *configureComp) GetHeroExpConfig() (configure *cfg.GameheroExp, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_exp); err == nil {
- if configure, ok = v.(*cfg.Game_heroExp); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroExp", v)
+ if configure, ok = v.(*cfg.GameheroExp); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroExp", v)
return
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroExp", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroExp", v)
}
return
}
-func (this *configureComp) GetHeroExp(hid string) *cfg.Game_heroExpData {
+func (this *configureComp) GetHeroExp(hid string) *cfg.GameheroExpData {
if v, err := this.GetConfigure(hero_exp); err == nil {
- if configure, ok := v.(*cfg.Game_heroExp); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroExp", v)
+ if configure, ok := v.(*cfg.GameheroExp); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroExp", v)
return nil
} else {
return configure.Get(hid)
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroExp", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroExp", v)
}
return nil
}
//英雄等级基础属性
-func (this *configureComp) GetHeroLevelup() (configure *cfg.Game_heroLevelup, err error) {
+func (this *configureComp) GetHeroLevelup() (configure *cfg.GameheroLevelup, err error) {
var (
v interface{}
ok bool
@@ -178,8 +212,8 @@ func (this *configureComp) GetHeroLevelup() (configure *cfg.Game_heroLevelup, er
if v, err = this.GetConfigure(hero_levelup); err != nil {
return
} else {
- if configure, ok = v.(*cfg.Game_heroLevelup); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroLevelup", v)
+ if configure, ok = v.(*cfg.GameheroLevelup); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroLevelup", v)
return
}
}
@@ -187,7 +221,7 @@ func (this *configureComp) GetHeroLevelup() (configure *cfg.Game_heroLevelup, er
}
//英雄品质系数
-func (this *configureComp) GetHeroStargrow() (configure *cfg.Game_heroStargrow, err error) {
+func (this *configureComp) GetHeroStargrow() (configure *cfg.GameheroStargrow, err error) {
var (
v interface{}
ok bool
@@ -195,8 +229,8 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.Game_heroStargrow,
if v, err = this.GetConfigure(hero_stargrow); err != nil {
return
} else {
- if configure, ok = v.(*cfg.Game_heroStargrow); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroStargrow", v)
+ if configure, ok = v.(*cfg.GameheroStargrow); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroStargrow", v)
return
}
}
@@ -204,7 +238,7 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.Game_heroStargrow,
}
//获取英雄配置
-func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_heroData {
+func (this *configureComp) GetHero(heroCfgId string) *cfg.GameheroData {
cfg, err := this.getHeroConfigure()
if err != nil {
return nil
@@ -216,7 +250,7 @@ func (this *configureComp) GetHero(heroCfgId string) *cfg.Game_heroData {
}
//获取英雄星级配置
-func (this *configureComp) GetHeroStar(star int32) *cfg.Game_heroStargrowData {
+func (this *configureComp) GetHeroStar(star int32) *cfg.GameheroStargrowData {
cfg, err := this.GetHeroStargrow()
if err != nil {
return nil
@@ -229,7 +263,7 @@ func (this *configureComp) GetHeroStar(star int32) *cfg.Game_heroStargrowData {
}
//获取英雄等级配置
-func (this *configureComp) GetHeroLv(lv int32) *cfg.Game_heroLevelupData {
+func (this *configureComp) GetHeroLv(lv int32) *cfg.GameheroLevelupData {
cfg, err := this.GetHeroLevelup()
if err != nil {
return nil
@@ -241,7 +275,7 @@ func (this *configureComp) GetHeroLv(lv int32) *cfg.Game_heroLevelupData {
}
// 英雄成长系数
-func (this *configureComp) GetHeroLevelgrow() (configure *cfg.Game_heroLevelgrow, err error) {
+func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameheroLevelgrow, err error) {
var (
v interface{}
ok bool
@@ -249,8 +283,8 @@ func (this *configureComp) GetHeroLevelgrow() (configure *cfg.Game_heroLevelgrow
if v, err = this.GetConfigure(hero_levelgrow); err != nil {
return
} else {
- if configure, ok = v.(*cfg.Game_heroLevelgrow); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroLevelgrow", v)
+ if configure, ok = v.(*cfg.GameheroLevelgrow); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroLevelgrow", v)
return
}
}
@@ -258,7 +292,7 @@ func (this *configureComp) GetHeroLevelgrow() (configure *cfg.Game_heroLevelgrow
}
//英雄成长配置
-func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.Game_heroLevelgrowData {
+func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.GameheroLevelgrowData {
cfg, err := this.GetHeroLevelgrow()
if err != nil {
return nil
@@ -270,10 +304,10 @@ func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.Game_heroLevelgrowD
}
// 获取英雄技能升级相关信息
-func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.Game_heroSkillLevelData) {
+func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.GameheroSkillLevelData) {
if v, err := this.GetConfigure(hero_skillup); err == nil {
- if conf, ok := v.(*cfg.Game_heroSkillLevel); ok {
+ if conf, ok := v.(*cfg.GameheroSkillLevel); ok {
data = conf.Get(skillid)
return
}
@@ -286,7 +320,7 @@ func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.Game_h
func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 {
if v, err := this.GetConfigure(game_skillatk); err == nil {
- if configure, ok := v.(*cfg.Game_skillAtk); ok {
+ if configure, ok := v.(*cfg.GameskillAtk); ok {
return configure.Get(int32(skillId)).MaxLV
}
}
@@ -295,31 +329,31 @@ func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 {
}
// 通过英雄配置ID获取共鸣配置信息
-func (this *configureComp) GetHeroResonanceConfig(cardConfigID string) (data *cfg.Game_heroResonanceData, err error) {
+func (this *configureComp) GetHeroResonanceConfig(cardConfigID string) (data *cfg.GameheroResonanceData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(hero_resonance); err == nil {
- if configure, ok := v.(*cfg.Game_heroResonance); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroResonance", v)
+ if configure, ok := v.(*cfg.GameheroResonance); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroResonance", v)
return
} else {
data = configure.Get(cardConfigID)
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroResonance", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroResonance", v)
}
return
}
-func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.Game_comAtnData, err error) {
+func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GamecomAtnData, err error) {
var (
v interface{}
)
if v, err = this.GetConfigure(hero_comatn); err == nil {
- if configure, ok := v.(*cfg.Game_comAtn); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_comAtn", v)
+ if configure, ok := v.(*cfg.GamecomAtn); !ok {
+ err = fmt.Errorf("%T no is *cfg.GamecomAtn", v)
return
} else {
data = configure.Get("hero_reset")
@@ -330,41 +364,18 @@ func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.Game_comAtnDa
return
}
-func (this *configureComp) GetHeroAwakenConfig() (configure *cfg.Game_heroAwaken, err error) {
+func (this *configureComp) GetHeroAwakenConfig() (configure *cfg.GameheroAwaken, err error) {
var (
v interface{}
ok bool
)
if v, err = this.GetConfigure(hero_awaken); err == nil {
- if configure, ok = v.(*cfg.Game_heroAwaken); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_heroAwaken", v)
+ if configure, ok = v.(*cfg.GameheroAwaken); !ok {
+ err = fmt.Errorf("%T no is *cfg.GameheroAwaken", v)
return
}
} else {
- err = fmt.Errorf("%T no is *cfg.Game_heroAwaken", v)
- }
-
- return
-}
-
-// 抽卡配置表
-func (this *configureComp) GetHeroDrawConfig(typeid int32) (card []*cfg.Game_drawCardData, err error) {
- var (
- v interface{}
- )
- if v, err = this.GetConfigure(hero_drawcard); err == nil {
- if _configure, ok := v.(*cfg.Game_drawCard); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
- return
- } else {
- for _, v := range _configure.GetDataList() {
- if v.TypeId == typeid {
- card = append(card, v)
- }
- }
- }
- } else {
- err = fmt.Errorf("%T no is *cfg.Game_drawCard", v)
+ err = fmt.Errorf("%T no is *cfg.GameheroAwaken", v)
}
return
@@ -387,40 +398,3 @@ func (this *configureComp) GetDrawUpDrawConfig() (configure *cfg.Game_drawUpdraw
return
}
-
-// 抽卡消耗
-func (this *configureComp) GetDrawCostConfig() (configure *cfg.Game_drawCost, err error) {
- var (
- v interface{}
- ok bool
- )
- if v, err = this.GetConfigure(hero_drawcost); err == nil {
- if configure, ok = v.(*cfg.Game_drawCost); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
- return
- }
- } else {
- err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
- }
-
- return
-}
-
-func (this *configureComp) GetDrawCostConfigByID(id int32) (data *cfg.Game_drawCostData, err error) {
- var (
- v interface{}
- )
- if v, err = this.GetConfigure(hero_drawcost); err == nil {
- if configure, ok := v.(*cfg.Game_drawCost); !ok {
- err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
- return
- } else {
- data = configure.Get(id)
- }
-
- } else {
- err = fmt.Errorf("%T no is *cfg.Game_drawCost", v)
- }
-
- return
-}
diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go
index 9c661bf00..3820cf21f 100644
--- a/modules/hero/model_hero.go
+++ b/modules/hero/model_hero.go
@@ -1,7 +1,6 @@
package hero
import (
- "crypto/rand"
"errors"
"fmt"
"go_dreamfactory/comm"
@@ -9,7 +8,6 @@ import (
"go_dreamfactory/modules"
"go_dreamfactory/pb"
"math"
- "math/big"
mengine "github.com/dengsgo/math-engine/engine"
"go.mongodb.org/mongo-driver/bson/primitive"
@@ -525,7 +523,7 @@ func (this *ModelHero) RemoveUserHeroInfo(session comm.IUserSession) (err error)
}
// 获取抽卡保底相关数据
-func (this *ModelHero) GetCurStarCount(uid string, drawType int32) (curStar4Count int32, curStar5Count int32) {
+func (this *ModelHero) GetCurStarCount(uid string, drawType int32) (curStar4Count int32, curStar5Count int32, drawCount int32) {
var race int32
rst, _ := this.moduleHero.modelRecord.GetHeroRecord(uid)
if drawType%2 == 0 { // 转成对应阵营信息 1~5
@@ -533,13 +531,13 @@ func (this *ModelHero) GetCurStarCount(uid string, drawType int32) (curStar4Coun
} else {
race = int32(int(drawType+1) / 2)
}
-
+ drawCount = -1
if race == comm.RacePt { // 普通卡池
if rst.Race0 != nil {
curStar4Count = rst.Race0.H4
curStar5Count = rst.Race0.H5
}
-
+ drawCount = rst.Drawcount
} else if race == comm.RaceZr { // 灼热
if rst.Race1 != nil {
curStar4Count = rst.Race1.H4
@@ -561,27 +559,28 @@ func (this *ModelHero) GetCurStarCount(uid string, drawType int32) (curStar4Coun
curStar5Count = rst.Race4.H5
}
}
+
return
}
// 保底抽卡 (参数 卡池id, 返回抽到卡配置id)
func (this *ModelHero) FloorDrawCard(Cardpool int32) (cardId string) {
- _bd, err := this.moduleHero.configure.GetHeroDrawConfig(Cardpool)
- if err == nil && len(_bd) != 0 {
- var _totalW int64 // 总权重
- var _tmpW int64 // 临时权重
- for _, v := range _bd {
- _totalW += int64(v.Weight)
- }
- // 随机权重
- n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
- for _, v := range _bd {
- _tmpW += int64(v.Weight)
- if n.Int64() < _tmpW { // 种族保底卡池命中
- cardId = v.Id
- break
- }
- }
- }
+ // _bd, err := this.moduleHero.configure.GetHeroDrawConfig(Cardpool)
+ // if err == nil && len(_bd) != 0 {
+ // var _totalW int64 // 总权重
+ // var _tmpW int64 // 临时权重
+ // for _, v := range _bd {
+ // _totalW += int64(v.Weight)
+ // }
+ // // 随机权重
+ // n, _ := rand.Int(rand.Reader, big.NewInt(_totalW))
+ // for _, v := range _bd {
+ // _tmpW += int64(v.Weight)
+ // if n.Int64() < _tmpW { // 种族保底卡池命中
+ // cardId = v.Id
+ // break
+ // }
+ // }
+ // }
return
}
diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go
index ceb966178..3e710e4b5 100644
--- a/modules/items/api_sellItem.go
+++ b/modules/items/api_sellItem.go
@@ -21,8 +21,8 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe
var (
err error
item *pb.DB_UserItemData
- itemcf *cfg.Game_itemData
- sale []*cfg.Game_atn
+ itemcf *cfg.GameitemData
+ sale []*cfg.Gameatn
)
if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success {
return
@@ -40,7 +40,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe
this.module.Errorf("SellItemCheck over all amount:[%d:%d]", req.Amount, item.Amount)
return
}
- sale = make([]*cfg.Game_atn, len(itemcf.Sale))
+ sale = make([]*cfg.Gameatn, len(itemcf.Sale))
for i, v := range itemcf.Sale {
temp := *v
sale[i] = &temp
diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go
index 51e8401ae..1742b7619 100644
--- a/modules/items/api_useItem.go
+++ b/modules/items/api_useItem.go
@@ -21,8 +21,8 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
var (
err error
item *pb.DB_UserItemData
- itemcf *cfg.Game_itemData
- prop []*cfg.Game_propsgroupData
+ itemcf *cfg.GameitemData
+ prop []*cfg.GamepropsgroupData
)
if code = this.UseitemCheck(session, req); code != pb.ErrorCode_Success {
return
@@ -60,11 +60,11 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*int32(req.Amount), true); code != pb.ErrorCode_Success {
return
}
- var sale []*cfg.Game_atn
+ var sale []*cfg.Gameatn
for _, v := range prop {
if v.Key == req.Select {
for _, v1 := range v.Prize {
- sale = append(sale, &cfg.Game_atn{
+ sale = append(sale, &cfg.Gameatn{
A: v1.A,
T: v1.T,
N: v1.N * int32(req.Amount),
@@ -86,7 +86,7 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
code = pb.ErrorCode_ConfigNoFound
return
}
- sale := make([]*cfg.Game_atn, 0)
+ sale := make([]*cfg.Gameatn, 0)
for range sale {
sale = append(sale, RandomProps(prop).Prize...)
}
@@ -101,10 +101,10 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
code = pb.ErrorCode_ConfigNoFound
return
}
- sale := make([]*cfg.Game_atn, len(prop))
+ sale := make([]*cfg.Gameatn, len(prop))
for _, v := range prop {
for _, v1 := range v.Prize {
- sale = append(sale, &cfg.Game_atn{
+ sale = append(sale, &cfg.Gameatn{
A: v1.A,
T: v1.T,
N: v1.N * int32(req.Amount),
@@ -130,10 +130,10 @@ func (this *apiComp) Useitem(session comm.IUserSession, req *pb.ItemsUseItemReq)
if code = this.module.AddItemforGrid(&comm.ModuleCallSource{}, session, req.GridId, -1*itemcf.SynthetizeNum*int32(req.Amount), true); code != pb.ErrorCode_Success {
return
}
- sale := make([]*cfg.Game_atn, len(prop))
+ sale := make([]*cfg.Gameatn, len(prop))
for _, v := range prop {
for _, v1 := range v.Prize {
- sale = append(sale, &cfg.Game_atn{
+ sale = append(sale, &cfg.Gameatn{
A: v1.A,
T: v1.T,
N: v1.N * int32(req.Amount),
diff --git a/modules/items/configure.go b/modules/items/configure.go
index d33523b8e..6b878c735 100644
--- a/modules/items/configure.go
+++ b/modules/items/configure.go
@@ -22,23 +22,23 @@ type ConfigureComp struct {
modules.MCompConfigure
module *Items
lock sync.RWMutex
- propsgroup map[int32][]*cfg.Game_propsgroupData
+ propsgroup map[int32][]*cfg.GamepropsgroupData
}
//组件初始化接口
func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.MCompConfigure.Init(service, module, comp, options)
this.module = module.(*Items)
- this.propsgroup = make(map[int32][]*cfg.Game_propsgroupData)
- err = this.LoadConfigure(game_item, cfg.NewGame_item)
- err = configure.RegisterConfigure(game_propsgroup, cfg.NewGame_propsgroup, func() {
+ this.propsgroup = make(map[int32][]*cfg.GamepropsgroupData)
+ err = this.LoadConfigure(game_item, cfg.NewGameitem)
+ err = configure.RegisterConfigure(game_propsgroup, cfg.NewGamepropsgroup, func() {
if v, err := this.GetConfigure(game_propsgroup); err == nil {
- if configure, ok := v.(*cfg.Game_propsgroup); ok {
+ if configure, ok := v.(*cfg.Gamepropsgroup); ok {
this.lock.Lock()
defer this.lock.Unlock()
for _, value := range configure.GetDataList() {
if _, ok = this.propsgroup[value.Group]; !ok {
- this.propsgroup[value.Group] = make([]*cfg.Game_propsgroupData, 0)
+ this.propsgroup[value.Group] = make([]*cfg.GamepropsgroupData, 0)
}
this.propsgroup[value.Group] = append(this.propsgroup[value.Group], value)
}
@@ -52,7 +52,7 @@ func (this *ConfigureComp) Init(service core.IService, module core.IModule, comp
}
//读取物品配置
-func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.Game_itemData, err error) {
+func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.GameitemData, err error) {
var (
v interface{}
)
@@ -60,13 +60,13 @@ func (this *ConfigureComp) GetItemsConfigure() (items map[string]*cfg.Game_itemD
this.module.Errorf("err:%v", err)
return
} else {
- items = v.(*cfg.Game_item).GetDataMap()
+ items = v.(*cfg.Gameitem).GetDataMap()
}
return
}
//读取物品配置
-func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.Game_itemData, err error) {
+func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.GameitemData, err error) {
var (
v interface{}
ok bool
@@ -75,7 +75,7 @@ func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.Game_itemData,
this.module.Errorf("err:%v", err)
return
} else {
- if item, ok = v.(*cfg.Game_item).GetDataMap()[id]; !ok {
+ if item, ok = v.(*cfg.Gameitem).GetDataMap()[id]; !ok {
err = fmt.Errorf("no found item:%s configure", id)
this.module.Errorf("err:%v", err)
return
@@ -89,8 +89,8 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtyp
result = make([]*pb.DB_UserItemData, 0, len(itmes))
var (
v interface{}
- table *cfg.Game_item
- item *cfg.Game_itemData
+ table *cfg.Gameitem
+ item *cfg.GameitemData
ok bool
err error
)
@@ -98,7 +98,7 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtyp
this.module.Errorf("err:%v", err)
return
} else {
- table = v.(*cfg.Game_item)
+ table = v.(*cfg.Gameitem)
for _, v := range itmes {
if item, ok = table.GetDataMap()[v.ItemId]; ok {
if item.Bagtype == bagtype {
@@ -113,7 +113,7 @@ func (this *ConfigureComp) GetPackItemByType(itmes []*pb.DB_UserItemData, bagtyp
}
//获取道具礼包组
-func (this *ConfigureComp) GetPropsgroupConfigure(gid int32) (result []*cfg.Game_propsgroupData, err error) {
+func (this *ConfigureComp) GetPropsgroupConfigure(gid int32) (result []*cfg.GamepropsgroupData, err error) {
var ok bool
this.lock.RLock()
result, ok = this.propsgroup[gid]
diff --git a/modules/items/core.go b/modules/items/core.go
index ef36a9f67..f12586f62 100644
--- a/modules/items/core.go
+++ b/modules/items/core.go
@@ -27,7 +27,7 @@ var (
)
//随机权重宝箱
-func RandomProps(group []*cfg.Game_propsgroupData) (prop *cfg.Game_propsgroupData) {
+func RandomProps(group []*cfg.GamepropsgroupData) (prop *cfg.GamepropsgroupData) {
if group == nil || len(group) == 0 {
return
}
diff --git a/modules/items/modelitems.go b/modules/items/modelitems.go
index 5a92ecbaf..5b6099d37 100644
--- a/modules/items/modelitems.go
+++ b/modules/items/modelitems.go
@@ -204,7 +204,7 @@ func (this *ModelItemsComp) AddItemsToUserPack(uId string, items map[string]int3
///修改指定格子的物品数量
func (this *ModelItemsComp) AddItemToUserPackByGrid(uId string, gridid string, addnum int32) (change []*pb.DB_UserItemData, err error) {
var (
- conf *cfg.Game_itemData
+ conf *cfg.GameitemData
itme *pb.DB_UserItemData
num int64
amount int64
@@ -248,7 +248,7 @@ func (this *ModelItemsComp) AddItemToUserPackByGrid(uId string, gridid string, a
func (this *ModelItemsComp) addItemToUserPack(uid string, items []*pb.DB_UserItemData, itemId string, addnum int32) (add, update, del []*pb.DB_UserItemData, leftnum int64) {
var (
err error
- conf *cfg.Game_itemData
+ conf *cfg.GameitemData
num int64
isNew bool
)
diff --git a/modules/mail/api_getAttachment.go b/modules/mail/api_getAttachment.go
index 332b379f7..ed0e89d8a 100644
--- a/modules/mail/api_getAttachment.go
+++ b/modules/mail/api_getAttachment.go
@@ -34,9 +34,9 @@ func (this *apiComp) GetUserMailAttachment(session comm.IUserSession, req *pb.Ma
_data, err := this.module.modelMail.MailGetMailAttachment(req.ObjID)
if err == nil {
if len(_data) > 0 {
- res := make([]*cfg.Game_atn, 0)
+ res := make([]*cfg.Gameatn, 0)
for _, v := range _data {
- d := &cfg.Game_atn{
+ d := &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N,
@@ -81,9 +81,9 @@ func (this *apiComp) GetAllMailAttachment(session comm.IUserSession, req *pb.Mai
fj := make([]*pb.UserAssets, 0)
for _, v := range mails {
- res := make([]*cfg.Game_atn, 0)
+ res := make([]*cfg.Gameatn, 0)
for _, v1 := range v.Items {
- d := &cfg.Game_atn{
+ d := &cfg.Gameatn{
A: v1.A,
T: v1.T,
N: v1.N,
diff --git a/modules/mainline/api_challenge.go b/modules/mainline/api_challenge.go
index f7f7cbf36..e4f59ecc8 100644
--- a/modules/mainline/api_challenge.go
+++ b/modules/mainline/api_challenge.go
@@ -25,9 +25,9 @@ func (this *apiComp) Challenge(session comm.IUserSession, req *pb.MainlineChalle
curChapter *pb.DBMainline // 当前章节信息
bBranch bool // 当前挑战关卡是不是分支
bCheck bool
- res []*cfg.Game_atn // 小章节奖励
+ res []*cfg.Gameatn // 小章节奖励
)
- res = make([]*cfg.Game_atn, 0)
+ res = make([]*cfg.Gameatn, 0)
bBranch = false
code = this.ChallengeCheck(session, req)
if code != pb.ErrorCode_Success {
diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go
index cfc0eccea..70308ab6d 100644
--- a/modules/mainline/comp_configure.go
+++ b/modules/mainline/comp_configure.go
@@ -25,10 +25,10 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.ModuleCompBase.Init(service, module, comp, options)
this.module = module.(*Mainline)
err = this.LoadMultiConfigure(map[string]interface{}{
- game_mainlinechapter: cfg.NewGame_mainlineChapter,
- game_mainlineeasy: cfg.NewGame_mainlineEasy,
- game_mainlinehard: cfg.NewGame_mainlineHard,
- game_mainlinepurgatory: cfg.NewGame_mainlinePurgatory,
+ game_mainlinechapter: cfg.NewGamemainlineChapter,
+ game_mainlineeasy: cfg.NewGamemainlineEasy,
+ game_mainlinehard: cfg.NewGamemainlineHard,
+ game_mainlinepurgatory: cfg.NewGamemainlinePurgatory,
})
return
@@ -39,16 +39,16 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error)
return configure.GetConfigure(name)
}
-func (this *configureComp) GetMainlineChapter(id int32) (data *cfg.Game_mainlineChapterData) {
+func (this *configureComp) GetMainlineChapter(id int32) (data *cfg.GamemainlineChapterData) {
if v, err := this.GetConfigure(game_mainlinechapter); err != nil {
this.module.Errorf("get global conf err:%v", err)
return
} else {
var (
- configure *cfg.Game_mainlineChapter
+ configure *cfg.GamemainlineChapter
ok bool
)
- if configure, ok = v.(*cfg.Game_mainlineChapter); !ok {
+ if configure, ok = v.(*cfg.GamemainlineChapter); !ok {
this.module.Errorf("%T no is *cfg.Game_mainlineChapterData", v)
return
}
@@ -61,16 +61,16 @@ func (this *configureComp) GetMainlineChapter(id int32) (data *cfg.Game_mainline
}
// 获取简单的关卡配置信息
-func (this *configureComp) GetMainlineEasyChapter(id int32) (data *cfg.Game_mainlineEasyData) {
+func (this *configureComp) GetMainlineEasyChapter(id int32) (data *cfg.GamemainlineEasyData) {
if v, err := this.GetConfigure(game_mainlineeasy); err != nil {
this.module.Errorf("get global conf err:%v", err)
return
} else {
var (
- configure *cfg.Game_mainlineEasy
+ configure *cfg.GamemainlineEasy
ok bool
)
- if configure, ok = v.(*cfg.Game_mainlineEasy); !ok {
+ if configure, ok = v.(*cfg.GamemainlineEasy); !ok {
this.module.Errorf("%T no is *cfg.Game_mainlineEasyData", v)
return
}
@@ -83,16 +83,16 @@ func (this *configureComp) GetMainlineEasyChapter(id int32) (data *cfg.Game_main
}
// 获取炼狱级别难度的关卡配置
-func (this *configureComp) GetMainlinePurgatoryChapter(id int32) (data *cfg.Game_mainlinePurgatoryData) {
+func (this *configureComp) GetMainlinePurgatoryChapter(id int32) (data *cfg.GamemainlinePurgatoryData) {
if v, err := this.GetConfigure(game_mainlinepurgatory); err != nil {
this.module.Errorf("get global conf err:%v", err)
return
} else {
var (
- configure *cfg.Game_mainlinePurgatory
+ configure *cfg.GamemainlinePurgatory
ok bool
)
- if configure, ok = v.(*cfg.Game_mainlinePurgatory); !ok {
+ if configure, ok = v.(*cfg.GamemainlinePurgatory); !ok {
this.module.Errorf("%T no is *cfg.Game_mainlinePurgatoryData", v)
return
}
@@ -105,16 +105,16 @@ func (this *configureComp) GetMainlinePurgatoryChapter(id int32) (data *cfg.Game
}
// 获取困难的关卡配置
-func (this *configureComp) GetMainlineHardChapter(id int32) (data *cfg.Game_mainlineHardData) {
+func (this *configureComp) GetMainlineHardChapter(id int32) (data *cfg.GamemainlineHardData) {
if v, err := this.GetConfigure(game_mainlinehard); err != nil {
this.module.Errorf("get global conf err:%v", err)
return
} else {
var (
- configure *cfg.Game_mainlineHard
+ configure *cfg.GamemainlineHard
ok bool
)
- if configure, ok = v.(*cfg.Game_mainlineHard); !ok {
+ if configure, ok = v.(*cfg.GamemainlineHard); !ok {
this.module.Errorf("%T no is *cfg.Game_mainlineHardData", v)
return
}
diff --git a/modules/modulebase.go b/modules/modulebase.go
index c6f8d7f4f..61142d8fc 100644
--- a/modules/modulebase.go
+++ b/modules/modulebase.go
@@ -149,7 +149,7 @@ func (this *ModuleBase) SendMsgToUsers(mainType, subType string, msg proto.Messa
}
// 只校验资源 参数 atn格式
-func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Game_atn) (code pb.ErrorCode) {
+func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Gameatn) (code pb.ErrorCode) {
var (
amount int32
)
@@ -183,7 +183,7 @@ func (this *ModuleBase) CheckRes(session comm.IUserSession, res []*cfg.Game_atn)
}
//消耗资源
-func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) {
+func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (code pb.ErrorCode) {
var (
items map[string]int32 // 道具背包 批量处理
attrs map[string]int32 // 属性
@@ -241,7 +241,7 @@ func (this *ModuleBase) ConsumeRes(session comm.IUserSession, res []*cfg.Game_at
}
//发放资源
-func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Game_atn, bPush bool) (code pb.ErrorCode) {
+func (this *ModuleBase) DispenseRes(session comm.IUserSession, res []*cfg.Gameatn, bPush bool) (code pb.ErrorCode) {
var (
items map[string]int32 // 道具背包 批量处理
heros map[string]int32 // 英雄
diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go
index de9a3d3d8..dc26b19f5 100644
--- a/modules/pagoda/comp_configure.go
+++ b/modules/pagoda/comp_configure.go
@@ -19,7 +19,7 @@ const (
type configureComp struct {
cbase.ModuleCompBase
hlock sync.RWMutex
- _pagodaMap map[int64]*cfg.Game_pagodaData
+ _pagodaMap map[int64]*cfg.GamepagodaData
}
//组件初始化接口
@@ -27,14 +27,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
err = this.ModuleCompBase.Init(service, module, comp, options)
err = this.LoadMultiConfigure(map[string]interface{}{
//game_pagoda: cfg.NewGame_pagoda,
- game_pagodaseasonreward: cfg.NewGame_pagodaSeasonReward,
- game_pagodataskreward: cfg.NewGame_pagodaTaskReward,
+ game_pagodaseasonreward: cfg.NewGamepagodaSeasonReward,
+ game_pagodataskreward: cfg.NewGamepagodaTaskReward,
})
- this._pagodaMap = make(map[int64]*cfg.Game_pagodaData, 0)
- configure.RegisterConfigure(game_pagoda, cfg.NewGame_pagoda, func() {
+ this._pagodaMap = make(map[int64]*cfg.GamepagodaData, 0)
+ configure.RegisterConfigure(game_pagoda, cfg.NewGamepagoda, func() {
if v, err := this.GetConfigure(game_pagoda); err == nil {
- if configure, ok := v.(*cfg.Game_pagoda); ok {
+ if configure, ok := v.(*cfg.Gamepagoda); ok {
this.hlock.Lock()
defer this.hlock.Unlock()
for _, value := range configure.GetDataList() {
@@ -50,7 +50,7 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp
}
// 获取爬塔信息 参数1 塔类型 参数2 层数
-func (this *configureComp) GetPagodaConfigData(PagodaType int32, floorId int32) (data *cfg.Game_pagodaData) {
+func (this *configureComp) GetPagodaConfigData(PagodaType int32, floorId int32) (data *cfg.GamepagodaData) {
return this._pagodaMap[int64(PagodaType<<16)+int64(floorId)]
}
@@ -73,16 +73,16 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error)
}
// 获取爬塔配置表数据
-func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.Game_pagodaData) {
+func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.GamepagodaData) {
if v, err := this.GetConfigure(game_pagoda); err != nil {
log.Errorf("get global conf err:%v", err)
return
} else {
var (
- configure *cfg.Game_pagoda
+ configure *cfg.Gamepagoda
ok bool
)
- if configure, ok = v.(*cfg.Game_pagoda); !ok {
+ if configure, ok = v.(*cfg.Gamepagoda); !ok {
log.Errorf("%T no is *cfg.Game_pagodaData", v)
return
}
diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go
index e339a9e02..58373cf43 100644
--- a/modules/shop/api_buy.go
+++ b/modules/shop/api_buy.go
@@ -24,10 +24,10 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
var (
err error
ok bool
- conf *cfg.Game_shopitemData
+ conf *cfg.GameshopitemData
shopitem *pb.DBShopItem
- need []*cfg.Game_atn
- give []*cfg.Game_atn
+ need []*cfg.Gameatn
+ give []*cfg.Gameatn
)
if code = this.BuyCheck(session, req); code != pb.ErrorCode_Success {
return
@@ -46,18 +46,18 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb
LastBuyTime: map[int32]int64{1: 0, 2: 0, 3: 0, 4: 0, 5: 0},
}
}
- need = make([]*cfg.Game_atn, len(conf.Need))
+ need = make([]*cfg.Gameatn, len(conf.Need))
for i, v := range conf.Need {
- need[i] = &cfg.Game_atn{
+ need[i] = &cfg.Gameatn{
A: v.A,
T: v.T,
N: int32(math.Ceil(float64(v.N)*float64(conf.Sale)/float64(1000))) * req.BuyNum,
}
}
- give = make([]*cfg.Game_atn, len(conf.Iteminfo))
+ give = make([]*cfg.Gameatn, len(conf.Iteminfo))
for i, v := range conf.Iteminfo {
- give[i] = &cfg.Game_atn{
+ give[i] = &cfg.Gameatn{
A: v.A,
T: v.T,
N: v.N * req.BuyNum,
diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go
index ab3c2dfc1..7db41f356 100644
--- a/modules/shop/api_getlist.go
+++ b/modules/shop/api_getlist.go
@@ -23,11 +23,11 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
var (
err error
filed string
- shopconf *cfg.Game_shopData
+ shopconf *cfg.GameshopData
shopData *pb.DBShop
udata *pb.DBUser
sdata *pb.UserShopData
- items []*cfg.Game_shopitemData
+ items []*cfg.GameshopitemData
ushoputem map[int32]*pb.DBShopItem
goods []*pb.ShopItem
tdata time.Duration
@@ -112,7 +112,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
if code = this.module.ConsumeRes(session, shopconf.Rneed, true); code != pb.ErrorCode_Success {
return
}
- var _items []*cfg.Game_shopitemData
+ var _items []*cfg.GameshopitemData
for _, v := range shopconf.Shopitem {
if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
code = pb.ErrorCode_SystemError
@@ -130,7 +130,7 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
this.module.modelShop.Change(session.GetUserId(), map[string]interface{}{filed: sdata})
} else if !req.IsManualRefresh {
if tdata > ltime { //达到刷新时间 可以刷新商品列表
- var _items []*cfg.Game_shopitemData
+ var _items []*cfg.GameshopitemData
for _, v := range shopconf.Shopitem {
if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {
code = pb.ErrorCode_SystemError
diff --git a/modules/shop/configure.go b/modules/shop/configure.go
index 2fc1d3a0c..fbd59f097 100644
--- a/modules/shop/configure.go
+++ b/modules/shop/configure.go
@@ -23,13 +23,13 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
this.ModuleCompBase.Init(service, module, comp, options)
this.module = module.(*Shop)
- this.LoadConfigure(game_shop, cfg.NewGame_shop)
- this.LoadConfigure(game_shopitem, cfg.NewGame_shopitem)
+ this.LoadConfigure(game_shop, cfg.NewGameshop)
+ this.LoadConfigure(game_shopitem, cfg.NewGameshopitem)
return
}
//获取装备配置数据
-func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.Game_shopData, err error) {
+func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.GameshopData, err error) {
var (
v interface{}
ok bool
@@ -38,7 +38,7 @@ func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.Game_shopD
this.module.Errorf("err:%v", err)
return
} else {
- if configure, ok = v.(*cfg.Game_shop).GetDataMap()[id]; !ok {
+ if configure, ok = v.(*cfg.Gameshop).GetDataMap()[id]; !ok {
err = fmt.Errorf("ShopConfigure not found:%d ", id)
this.module.Errorf("err:%v", err)
return
@@ -48,7 +48,7 @@ func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.Game_shopD
}
//读取商品
-func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.Game_shopitemData, err error) {
+func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.GameshopitemData, err error) {
var (
v interface{}
ok bool
@@ -57,7 +57,7 @@ func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.Game_sh
this.module.Errorf("err:%v", err)
return
} else {
- if result, ok = v.(*cfg.Game_shopitem).GetDataMap()[key]; !ok {
+ if result, ok = v.(*cfg.Gameshopitem).GetDataMap()[key]; !ok {
err = fmt.Errorf("ShopConfigure not found:%d ", key)
this.module.Errorf("err:%v", err)
return
@@ -67,17 +67,17 @@ func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.Game_sh
}
//读取商品组
-func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb.DBUser) (result []*cfg.Game_shopitemData, err error) {
- result = make([]*cfg.Game_shopitemData, 0, 10)
+func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb.DBUser) (result []*cfg.GameshopitemData, err error) {
+ result = make([]*cfg.GameshopitemData, 0, 10)
var (
v interface{}
- table *cfg.Game_shopitem
+ table *cfg.Gameshopitem
)
if v, err = this.GetConfigure(game_shopitem); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- table = v.(*cfg.Game_shopitem)
+ table = v.(*cfg.Gameshopitem)
for _, v := range table.GetDataMap() {
if v.Id == groupid &&
user.Lv >= v.Lvmin &&
@@ -91,19 +91,19 @@ func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb
}
//读取商品
-func (this *configureComp) GetShopItemsConfigureByIds(keys ...int32) (result []*cfg.Game_shopitemData, err error) {
- result = make([]*cfg.Game_shopitemData, 0, len(keys))
+func (this *configureComp) GetShopItemsConfigureByIds(keys ...int32) (result []*cfg.GameshopitemData, err error) {
+ result = make([]*cfg.GameshopitemData, 0, len(keys))
var (
v interface{}
- table *cfg.Game_shopitem
- item *cfg.Game_shopitemData
+ table *cfg.Gameshopitem
+ item *cfg.GameshopitemData
ok bool
)
if v, err = this.GetConfigure(game_shopitem); err != nil {
this.module.Errorf("err:%v", err)
return
} else {
- table = v.(*cfg.Game_shopitem)
+ table = v.(*cfg.Gameshopitem)
for _, v := range keys {
if item, ok = table.GetDataMap()[v]; ok {
result = append(result, item)
diff --git a/modules/shop/core.go b/modules/shop/core.go
index 3c7354c0b..f43e44324 100644
--- a/modules/shop/core.go
+++ b/modules/shop/core.go
@@ -9,7 +9,7 @@ import (
)
//随机商品列表
-func randomGoods(goods []*cfg.Game_shopitemData) (result *cfg.Game_shopitemData) {
+func randomGoods(goods []*cfg.GameshopitemData) (result *cfg.GameshopitemData) {
var (
totle int64
curr int64
@@ -31,7 +31,7 @@ func randomGoods(goods []*cfg.Game_shopitemData) (result *cfg.Game_shopitemData)
}
//转换商品对象
-func transGoods(stype pb.ShopType, goods []*cfg.Game_shopitemData, ushoputem map[int32]*pb.DBShopItem) (result []*pb.ShopItem) {
+func transGoods(stype pb.ShopType, goods []*cfg.GameshopitemData, ushoputem map[int32]*pb.DBShopItem) (result []*pb.ShopItem) {
result = make([]*pb.ShopItem, len(goods))
ok := false
uitem := &pb.DBShopItem{}
diff --git a/modules/task/config.go b/modules/task/config.go
index 01bc57560..8d6f1c34e 100644
--- a/modules/task/config.go
+++ b/modules/task/config.go
@@ -22,14 +22,14 @@ type configureComp struct {
func (this *configureComp) Init(service core.IService, module core.IModule, comp core.IModuleComp, options core.IModuleOptions) (err error) {
err = this.MCompConfigure.Init(service, module, comp, options)
this.LoadMultiConfigure(map[string]interface{}{
- gameTaskRound: cfg.NewGame_taskRound,
- gameActiveReward: cfg.NewGame_activeReward,
+ gameTaskRound: cfg.NewGametaskRound,
+ gameActiveReward: cfg.NewGameactiveReward,
})
return
}
//获取活跃度奖励配置
-func (this *configureComp) getActiveRewardCfg() (data *cfg.Game_activeReward, err error) {
+func (this *configureComp) getActiveRewardCfg() (data *cfg.GameactiveReward, err error) {
var (
v interface{}
ok bool
@@ -37,7 +37,7 @@ func (this *configureComp) getActiveRewardCfg() (data *cfg.Game_activeReward, er
if v, err = this.GetConfigure(gameActiveReward); err != nil {
return
} else {
- if data, ok = v.(*cfg.Game_activeReward); !ok {
+ if data, ok = v.(*cfg.GameactiveReward); !ok {
err = fmt.Errorf("%T no is *cfg.Game_ActiveReward", v)
return
}
@@ -46,7 +46,7 @@ func (this *configureComp) getActiveRewardCfg() (data *cfg.Game_activeReward, er
}
//获取任务配置
-func (this *configureComp) getTaskRoundCfg() (data *cfg.Game_taskRound, err error) {
+func (this *configureComp) getTaskRoundCfg() (data *cfg.GametaskRound, err error) {
var (
v interface{}
ok bool
@@ -54,7 +54,7 @@ func (this *configureComp) getTaskRoundCfg() (data *cfg.Game_taskRound, err erro
if v, err = this.GetConfigure(gameTaskRound); err != nil {
return
} else {
- if data, ok = v.(*cfg.Game_taskRound); !ok {
+ if data, ok = v.(*cfg.GametaskRound); !ok {
err = fmt.Errorf("%T no is *cfg.Game_taskRound", v)
return
}
@@ -63,7 +63,7 @@ func (this *configureComp) getTaskRoundCfg() (data *cfg.Game_taskRound, err erro
}
//根据taskId获取配置
-func (this *configureComp) getTaskById(taskId int32) (data *cfg.Game_taskRoundData) {
+func (this *configureComp) getTaskById(taskId int32) (data *cfg.GametaskRoundData) {
cfg, err := this.getTaskRoundCfg()
if err != nil {
log.Errorf("%v", err)
@@ -87,7 +87,7 @@ func (this *configureComp) isFirstTask(taskId int32) bool {
}
// 上一个任务
-func (this *configureComp) getPreTask(preTaskId int32) *cfg.Game_taskRoundData {
+func (this *configureComp) getPreTask(preTaskId int32) *cfg.GametaskRoundData {
data := this.getTaskByTag(int32(comm.TASK_ACHIEVE))
for _, v := range data {
if v.IdAfter == preTaskId {
@@ -98,7 +98,7 @@ func (this *configureComp) getPreTask(preTaskId int32) *cfg.Game_taskRoundData {
}
//获取任务配置列表
-func (this *configureComp) getTaskList() (data []*cfg.Game_taskRoundData, err error) {
+func (this *configureComp) getTaskList() (data []*cfg.GametaskRoundData, err error) {
cfg, err := this.getTaskRoundCfg()
if err != nil {
log.Errorf("%v", err)
@@ -111,7 +111,7 @@ func (this *configureComp) getTaskList() (data []*cfg.Game_taskRoundData, err er
}
//根据任务类型获取任务列表
-func (this *configureComp) getTasks(taskType int32) (data []*cfg.Game_taskRoundData, err error) {
+func (this *configureComp) getTasks(taskType int32) (data []*cfg.GametaskRoundData, err error) {
list, err := this.getTaskList()
if err != nil {
log.Errorf("%v", err)
@@ -128,7 +128,7 @@ func (this *configureComp) getTasks(taskType int32) (data []*cfg.Game_taskRoundD
}
//任务列表 正序
-func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.Game_taskRoundData, err error) {
+func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.GametaskRoundData, err error) {
if data, err = this.getTasks(taskType); err != nil {
return nil, err
}
@@ -139,7 +139,7 @@ func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.Game_task
}
//获取任务配置 条件 tasktag
-func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.Game_taskRoundData) {
+func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.GametaskRoundData) {
list, err := this.getTaskList()
if err != nil {
log.Errorf("%v", err)
@@ -153,7 +153,7 @@ func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.Game_taskRou
return
}
-func (this *configureComp) getTaskActiveList() (data []*cfg.Game_activeRewardData) {
+func (this *configureComp) getTaskActiveList() (data []*cfg.GameactiveRewardData) {
conf, err := this.getActiveRewardCfg()
if err != nil {
log.Errorf("get conf err:%v", err)
@@ -166,7 +166,7 @@ func (this *configureComp) getTaskActiveList() (data []*cfg.Game_activeRewardDat
}
//获取活跃度奖励list
-func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.Game_activeRewardData, err error) {
+func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.GameactiveRewardData, err error) {
conf, err := this.getActiveRewardCfg()
if err != nil {
log.Errorf("get conf err:%v", err)
@@ -184,7 +184,7 @@ func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.Game_a
}
// 获取活跃度配置map
-func (this *configureComp) getTaskActiveById(id int32) (data *cfg.Game_activeRewardData) {
+func (this *configureComp) getTaskActiveById(id int32) (data *cfg.GameactiveRewardData) {
conf, err := this.getActiveRewardCfg()
if err != nil {
log.Errorf("get conf err:%v", err)
diff --git a/modules/user/api_create.go b/modules/user/api_create.go
index cfcc651be..e4ec7a7eb 100644
--- a/modules/user/api_create.go
+++ b/modules/user/api_create.go
@@ -67,7 +67,7 @@ func (this *apiComp) Create(session comm.IUserSession, req *pb.UserCreateReq) (c
return
}
var (
- res []*cfg.Game_atn
+ res []*cfg.Gameatn
)
//初始化英雄卡
if val, err := this.module.configure.GetGlobalInitConf(); err == nil {
diff --git a/modules/user/api_modifyname.go b/modules/user/api_modifyname.go
index 5318108ad..9b7bb927d 100644
--- a/modules/user/api_modifyname.go
+++ b/modules/user/api_modifyname.go
@@ -37,7 +37,7 @@ func (this *apiComp) Modifyname(session comm.IUserSession, req *pb.UserModifynam
//校验名称修改次数
if expand.ModifynameCount <= 0 {
//TODO 从全局配置从读取消耗道具
- if code = this.module.ConsumeRes(session, []*cfg.Game_atn{
+ if code = this.module.ConsumeRes(session, []*cfg.Gameatn{
{
A: "attr",
T: "gold",
diff --git a/modules/user/api_res.go b/modules/user/api_res.go
index 6e0ca029e..3904aa6f9 100644
--- a/modules/user/api_res.go
+++ b/modules/user/api_res.go
@@ -25,8 +25,8 @@ func (this *apiComp) AddRes(session comm.IUserSession, req *pb.UserAddResReq) (c
code = pb.ErrorCode_UserSessionNobeing
return
}
- res := make([]*cfg.Game_atn, 0)
- atn := &cfg.Game_atn{
+ res := make([]*cfg.Gameatn, 0)
+ atn := &cfg.Gameatn{
A: req.Res.A,
T: req.Res.T,
N: req.Res.N,
diff --git a/pb/comm.pb.go b/pb/comm.pb.go
index 529b5dc1a..0943732fb 100644
--- a/pb/comm.pb.go
+++ b/pb/comm.pb.go
@@ -838,7 +838,7 @@ func (x *NoticeUserCloseReq) GetGatewayServiceId() string {
return ""
}
-//用户资产数据 对标*cfg.Game_atn 数据结构
+//用户资产数据 对标*cfg.Gameatn 数据结构
type UserAssets struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
diff --git a/pb/hero_db.pb.go b/pb/hero_db.pb.go
index ac0702399..d56f72a34 100644
--- a/pb/hero_db.pb.go
+++ b/pb/hero_db.pb.go
@@ -385,6 +385,7 @@ type DBHeroRecord struct {
Triggernum int32 `protobuf:"varint,8,opt,name=triggernum,proto3" json:"triggernum"` // 活动数据 存放没有触发次数
Activityid int32 `protobuf:"varint,9,opt,name=activityid,proto3" json:"activityid"` // 活动id
Mtime int64 `protobuf:"varint,10,opt,name=mtime,proto3" json:"mtime"` // 修改时间
+ Drawcount int32 `protobuf:"varint,11,opt,name=drawcount,proto3" json:"drawcount"` // 普通卡牌累计抽取次数
}
func (x *DBHeroRecord) Reset() {
@@ -489,6 +490,13 @@ func (x *DBHeroRecord) GetMtime() int64 {
return 0
}
+func (x *DBHeroRecord) GetDrawcount() int32 {
+ if x != nil {
+ return x.Drawcount
+ }
+ return 0
+}
+
var File_hero_hero_db_proto protoreflect.FileDescriptor
var file_hero_hero_db_proto_rawDesc = []byte{
@@ -573,7 +581,7 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x27, 0x0a, 0x05, 0x46, 0x6c, 0x6f, 0x6f,
0x72, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x34, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68,
0x34, 0x12, 0x0e, 0x0a, 0x02, 0x68, 0x35, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x68,
- 0x35, 0x22, 0x9c, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f,
+ 0x35, 0x22, 0xba, 0x02, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x63, 0x6f,
0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x02,
0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52,
0x03, 0x75, 0x69, 0x64, 0x12, 0x1c, 0x0a, 0x05, 0x72, 0x61, 0x63, 0x65, 0x30, 0x18, 0x03, 0x20,
@@ -591,7 +599,9 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0a,
0x61, 0x63, 0x74, 0x69, 0x76, 0x69, 0x74, 0x79, 0x69, 0x64, 0x12, 0x14, 0x0a, 0x05, 0x6d, 0x74,
0x69, 0x6d, 0x65, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x03, 0x52, 0x05, 0x6d, 0x74, 0x69, 0x6d, 0x65,
- 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
+ 0x12, 0x1c, 0x0a, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x18, 0x0b, 0x20,
+ 0x01, 0x28, 0x05, 0x52, 0x09, 0x64, 0x72, 0x61, 0x77, 0x63, 0x6f, 0x75, 0x6e, 0x74, 0x42, 0x06,
+ 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
diff --git a/sys/configure/bright/serialization/ByteBuf.go b/sys/configure/bright/serialization/ByteBuf.go
index a2ec1c515..0b7e23fb4 100644
--- a/sys/configure/bright/serialization/ByteBuf.go
+++ b/sys/configure/bright/serialization/ByteBuf.go
@@ -1,7 +1,6 @@
package serialization
import (
- math2 "bright/math"
"errors"
"math"
)
@@ -86,7 +85,7 @@ func (buf *ByteBuf) EnsureWrite(remain int) {
if size+remain <= buf.capacity {
copy(buf.bytes, buf.bytes[buf.readerIndex:buf.writerIndex])
} else {
- buf.capacity = buf.CalcNewCap(buf.capacity, size + remain)
+ buf.capacity = buf.CalcNewCap(buf.capacity, size+remain)
newBytes := make([]byte, buf.capacity, buf.capacity)
copy(newBytes, buf.bytes[buf.readerIndex:buf.writerIndex])
buf.bytes = newBytes
@@ -151,7 +150,7 @@ func (buf *ByteBuf) ReadShort() (int16, error) {
if buf.readerIndex+3 > buf.writerIndex {
return 0, UnmarshalErr
}
- x := (uint32(buf.bytes[buf.readerIndex+1])<<8) | uint32(buf.bytes[buf.readerIndex+2])
+ x := (uint32(buf.bytes[buf.readerIndex+1]) << 8) | uint32(buf.bytes[buf.readerIndex+2])
buf.readerIndex += 3
return int16(x), nil
} else {
@@ -193,7 +192,7 @@ func (buf *ByteBuf) ReadFshort() (int16, error) {
func (buf *ByteBuf) WriteFshort(x int16) {
buf.EnsureWrite(2)
buf.bytes[buf.writerIndex] = byte(x)
- buf.bytes[buf.writerIndex + 1] = byte(x >> 8)
+ buf.bytes[buf.writerIndex+1] = byte(x >> 8)
buf.writerIndex += 2
}
@@ -611,51 +610,51 @@ func (buf *ByteBuf) WriteBytesWithoutSize(x []byte) {
buf.writerIndex += size
}
-func (buf *ByteBuf) ReadVector2() (math2.Vector2, error) {
+func (buf *ByteBuf) ReadVector2() (Vector2, error) {
if x, err := buf.ReadFloat(); err == nil {
if y, err2 := buf.ReadFloat(); err2 == nil {
- return math2.Vector2{X: x, Y: y}, nil
+ return Vector2{X: x, Y: y}, nil
}
}
- return math2.Vector2{}, UnmarshalErr
+ return Vector2{}, UnmarshalErr
}
-func (buf *ByteBuf) WriteVector2(x math2.Vector2) {
+func (buf *ByteBuf) WriteVector2(x Vector2) {
buf.WriteFloat(x.X)
buf.WriteFloat(x.Y)
}
-func (buf *ByteBuf) ReadVector3() (math2.Vector3, error) {
+func (buf *ByteBuf) ReadVector3() (Vector3, error) {
if x, err := buf.ReadFloat(); err == nil {
if y, err2 := buf.ReadFloat(); err2 == nil {
if z, err3 := buf.ReadFloat(); err3 == nil {
- return math2.Vector3{X: x, Y: y, Z: z}, nil
+ return Vector3{X: x, Y: y, Z: z}, nil
}
}
}
- return math2.Vector3{}, UnmarshalErr
+ return Vector3{}, UnmarshalErr
}
-func (buf *ByteBuf) WriteVector3(x math2.Vector3) {
+func (buf *ByteBuf) WriteVector3(x Vector3) {
buf.WriteFloat(x.X)
buf.WriteFloat(x.Y)
buf.WriteFloat(x.Z)
}
-func (buf *ByteBuf) ReadVector4() (math2.Vector4, error) {
+func (buf *ByteBuf) ReadVector4() (Vector4, error) {
if x, err := buf.ReadFloat(); err == nil {
if y, err2 := buf.ReadFloat(); err2 == nil {
if z, err3 := buf.ReadFloat(); err3 == nil {
if w, err4 := buf.ReadFloat(); err4 == nil {
- return math2.Vector4{X: x, Y: y, Z: z, W: w}, nil
+ return Vector4{X: x, Y: y, Z: z, W: w}, nil
}
}
}
}
- return math2.Vector4{}, UnmarshalErr
+ return Vector4{}, UnmarshalErr
}
-func (buf *ByteBuf) WriteVector4(x math2.Vector4) {
+func (buf *ByteBuf) WriteVector4(x Vector4) {
buf.WriteFloat(x.X)
buf.WriteFloat(x.Y)
buf.WriteFloat(x.Z)
diff --git a/sys/configure/bright/serialization/Vector2.go b/sys/configure/bright/serialization/Vector2.go
new file mode 100644
index 000000000..a317f6779
--- /dev/null
+++ b/sys/configure/bright/serialization/Vector2.go
@@ -0,0 +1,10 @@
+package serialization
+
+type Vector2 struct {
+ X float32
+ Y float32
+}
+
+func NewVector2(x float32, y float32) Vector2 {
+ return Vector2{X: x, Y: y}
+}
diff --git a/sys/configure/bright/serialization/Vector3.go b/sys/configure/bright/serialization/Vector3.go
new file mode 100644
index 000000000..d81602838
--- /dev/null
+++ b/sys/configure/bright/serialization/Vector3.go
@@ -0,0 +1,11 @@
+package serialization
+
+type Vector3 struct {
+ X float32
+ Y float32
+ Z float32
+}
+
+func NewVector3(x float32, y float32, z float32) Vector3 {
+ return Vector3{X: x, Y: y, Z: z}
+}
diff --git a/sys/configure/bright/serialization/Vector4.go b/sys/configure/bright/serialization/Vector4.go
new file mode 100644
index 000000000..54201fc05
--- /dev/null
+++ b/sys/configure/bright/serialization/Vector4.go
@@ -0,0 +1,12 @@
+package serialization
+
+type Vector4 struct {
+ X float32
+ Y float32
+ Z float32
+ W float32
+}
+
+func NewVector4(x float32, y float32, z float32, w float32) Vector4 {
+ return Vector4{X: x, Y: y, Z: z, W: w}
+}
diff --git a/sys/configure/bright/serialization/marshal_test.go b/sys/configure/bright/serialization/marshal_test.go
index f2c26a512..0a3fd21ba 100644
--- a/sys/configure/bright/serialization/marshal_test.go
+++ b/sys/configure/bright/serialization/marshal_test.go
@@ -1,7 +1,6 @@
package serialization
import (
- math2 "bright/math"
"bytes"
"testing"
)
@@ -9,7 +8,7 @@ import (
func TestMarshal(t *testing.T) {
buf := NewByteBuf(10)
- for i:= 0 ; i < 2 ; i++ {
+ for i := 0; i < 2; i++ {
x := i != 0
buf.WriteBool(x)
if v, err := buf.ReadBool(); err != nil || v != x {
@@ -20,8 +19,7 @@ func TestMarshal(t *testing.T) {
}
}
-
- for i := 0 ; i < 256 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 256; i = i*3/2 + 1 {
x := byte(i)
buf.WriteByte(x)
if v, err := buf.ReadByte(); err != nil || v != x {
@@ -32,8 +30,7 @@ func TestMarshal(t *testing.T) {
}
}
-
- for i := 0 ; i < 0x10000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x10000; i = i*3/2 + 1 {
x := int16(i)
buf.WriteShort(x)
if v, err := buf.ReadShort(); err != nil || v != x {
@@ -44,7 +41,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x10000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x10000; i = i*3/2 + 1 {
x := int16(i)
buf.WriteFshort(x)
if v, err := buf.ReadFshort(); err != nil || v != x {
@@ -55,7 +52,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x1000000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x1000000000; i = i*3/2 + 1 {
x := int32(i)
buf.WriteInt(x)
if v, err := buf.ReadInt(); err != nil || v != x {
@@ -66,7 +63,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x1000000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x1000000000; i = i*3/2 + 1 {
x := int32(i)
buf.WriteFint(x)
if v, err := buf.ReadFint(); err != nil || v != x {
@@ -77,7 +74,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x100000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x100000000; i = i*3/2 + 1 {
x := int(i)
buf.WriteSize(x)
if v, err := buf.ReadSize(); err != nil || v != x {
@@ -88,7 +85,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x100000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x100000000; i = i*3/2 + 1 {
x := int32(i)
buf.WriteSint(x)
if v, err := buf.ReadSint(); err != nil || v != x {
@@ -99,7 +96,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x1000000000000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x1000000000000000; i = i*3/2 + 1 {
x := int64(i)
buf.WriteLong(x)
if v, err := buf.ReadLong(); err != nil || v != x {
@@ -119,7 +116,7 @@ func TestMarshal(t *testing.T) {
}
}
- for i := 0 ; i < 0x100000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x100000000; i = i*3/2 + 1 {
x := float32(i)
buf.WriteFloat(x)
if v, err := buf.ReadFloat(); err != nil || v != x {
@@ -129,7 +126,7 @@ func TestMarshal(t *testing.T) {
t.Fatalf("expect empty. but size:%v, x:%v", buf.Size(), x)
}
}
- for i := 0 ; i < 0x100000000 ; i = i * 3 / 2 + 1 {
+ for i := 0; i < 0x100000000; i = i*3/2 + 1 {
x := float64(i)
buf.WriteDouble(x)
if v, err := buf.ReadDouble(); err != nil || v != x {
@@ -152,7 +149,7 @@ func TestMarshal(t *testing.T) {
}
{
- x := math2.Vector2{X:1,Y:2}
+ x := Vector2{X: 1, Y: 2}
buf.WriteVector2(x)
if v, err := buf.ReadVector2(); err != nil || v != x {
t.Fatalf("expect %v, get %v", x, v)
@@ -163,7 +160,7 @@ func TestMarshal(t *testing.T) {
}
{
- x := math2.Vector3{X:1,Y:2,Z:3}
+ x := Vector3{X: 1, Y: 2, Z: 3}
buf.WriteVector3(x)
if v, err := buf.ReadVector3(); err != nil || v != x {
t.Fatalf("expect %v, get %v", x, v)
@@ -174,7 +171,7 @@ func TestMarshal(t *testing.T) {
}
{
- x := math2.Vector4{X:1,Y:2,Z:3,W:4}
+ x := Vector4{X: 1, Y: 2, Z: 3, W: 4}
buf.WriteVector4(x)
if v, err := buf.ReadVector4(); err != nil || v != x {
t.Fatalf("expect %v, get %v", x, v)
@@ -185,7 +182,7 @@ func TestMarshal(t *testing.T) {
}
{
- x := []byte{1,2,3}
+ x := []byte{1, 2, 3}
buf.WriteBytes(x)
if v, err := buf.ReadBytes(); err != nil || !bytes.Equal(x, v) {
t.Fatalf("expect %v, get %v", x, v)
@@ -195,9 +192,9 @@ func TestMarshal(t *testing.T) {
}
}
{
- x := []byte{1,2,3,4}
+ x := []byte{1, 2, 3, 4}
buf.WriteBytesWithoutSize(x)
- if v, err := buf.ReadFint(); err != nil || v != 0x04030201 {
+ if v, err := buf.ReadFint(); err != nil || v != 0x04030201 {
t.Fatalf("expect %v, get %v", x, v)
}
if buf.Size() != 0 {
@@ -205,5 +202,4 @@ func TestMarshal(t *testing.T) {
}
}
-
}
diff --git a/sys/configure/structs/ALocalizeConfig.go b/sys/configure/structs/ALocalizeConfig.go
index 20153ce9e..2fab4df79 100644
--- a/sys/configure/structs/ALocalizeConfig.go
+++ b/sys/configure/structs/ALocalizeConfig.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,32 +5,36 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type _ALocalizeConfig struct {
+type ALocalizeConfig struct {
Key string
}
+const TypeId_ALocalizeConfig = 1703856460
-func New_ALocalizeConfig(_buf map[string]interface{}) (_v interface{}, err error) {
- var id string
- var _ok_ bool
- if id, _ok_ = _buf["__type__"].(string) ; !_ok_ {
- return nil, errors.New("type id missing")
- }
- switch id {
- case "LocalizeConfig_CN": return New_LocalizeConfig_CN(_buf);
- case "LocalizeConfig_EN": return New_LocalizeConfig_EN(_buf);
- case "LocalizeConfig_TW": return New_LocalizeConfig_TW(_buf);
- default: return nil, errors.New("unknown type id")
- }
- return
+func (*ALocalizeConfig) GetTypeId() int32 {
+ return 1703856460
}
-func New_ALocalizeConfig_Body(_buf map[string]interface{}) (_v *_ALocalizeConfig, err error) {
- _v = &_ALocalizeConfig{}
+func (_v *ALocalizeConfig)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
return
}
+
+func DeserializeALocalizeConfig(_buf map[string]interface{}) (interface{}, error) {
+ var id string
+ var _ok_ bool
+ if id, _ok_ = _buf["$type"].(string) ; !_ok_ {
+ return nil, errors.New("type id missing")
+ }
+ switch id {
+ case "LocalizeConfig_CN": _v := &LocalizeConfig_CN{}; if err := _v.Deserialize(_buf); err != nil { return nil, errors.New("LocalizeConfig_CN") } else { return _v, nil }
+ case "LocalizeConfig_EN": _v := &LocalizeConfig_EN{}; if err := _v.Deserialize(_buf); err != nil { return nil, errors.New("LocalizeConfig_EN") } else { return _v, nil }
+ case "LocalizeConfig_TW": _v := &LocalizeConfig_TW{}; if err := _v.Deserialize(_buf); err != nil { return nil, errors.New("LocalizeConfig_TW") } else { return _v, nil }
+ default: return nil, errors.New("unknown type id")
+ }
+}
diff --git a/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go b/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go
index 47a76a588..f36e1c142 100644
--- a/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go
+++ b/sys/configure/structs/Localize.LocalizeConfig_CNCategory.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Localize_LocalizeConfig_CNCategory struct {
- _dataMap map[string]*_LocalizeConfig_CN
- _dataList []*_LocalizeConfig_CN
+type LocalizeLocalizeConfig_CNCategory struct {
+ _dataMap map[string]*LocalizeConfig_CN
+ _dataList []*LocalizeConfig_CN
}
-func NewLocalize_LocalizeConfig_CNCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_CNCategory, error) {
- _dataList := make([]*_LocalizeConfig_CN, 0, len(_buf))
- dataMap := make(map[string]*_LocalizeConfig_CN)
+func NewLocalizeLocalizeConfig_CNCategory(_buf []map[string]interface{}) (*LocalizeLocalizeConfig_CNCategory, error) {
+ _dataList := make([]*LocalizeConfig_CN, 0, len(_buf))
+ dataMap := make(map[string]*LocalizeConfig_CN)
for _, _ele_ := range _buf {
- if _v, err2 := New_LocalizeConfig_CN(_ele_); err2 != nil {
+ if _v, err2 := DeserializeLocalizeConfig_CN(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Localize_LocalizeConfig_CNCategory{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &LocalizeLocalizeConfig_CNCategory{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Localize_LocalizeConfig_CNCategory) GetDataMap() map[string]*_LocalizeConfig_CN {
+func (table *LocalizeLocalizeConfig_CNCategory) GetDataMap() map[string]*LocalizeConfig_CN {
return table._dataMap
}
-func (table *Localize_LocalizeConfig_CNCategory) GetDataList() []*_LocalizeConfig_CN {
+func (table *LocalizeLocalizeConfig_CNCategory) GetDataList() []*LocalizeConfig_CN {
return table._dataList
}
-func (table *Localize_LocalizeConfig_CNCategory) Get(key string) *_LocalizeConfig_CN {
+func (table *LocalizeLocalizeConfig_CNCategory) Get(key string) *LocalizeConfig_CN {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go b/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go
index e5e0070f8..72d72195d 100644
--- a/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go
+++ b/sys/configure/structs/Localize.LocalizeConfig_ENCategory.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Localize_LocalizeConfig_ENCategory struct {
- _dataMap map[string]*_LocalizeConfig_EN
- _dataList []*_LocalizeConfig_EN
+type LocalizeLocalizeConfig_ENCategory struct {
+ _dataMap map[string]*LocalizeConfig_EN
+ _dataList []*LocalizeConfig_EN
}
-func NewLocalize_LocalizeConfig_ENCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_ENCategory, error) {
- _dataList := make([]*_LocalizeConfig_EN, 0, len(_buf))
- dataMap := make(map[string]*_LocalizeConfig_EN)
+func NewLocalizeLocalizeConfig_ENCategory(_buf []map[string]interface{}) (*LocalizeLocalizeConfig_ENCategory, error) {
+ _dataList := make([]*LocalizeConfig_EN, 0, len(_buf))
+ dataMap := make(map[string]*LocalizeConfig_EN)
for _, _ele_ := range _buf {
- if _v, err2 := New_LocalizeConfig_EN(_ele_); err2 != nil {
+ if _v, err2 := DeserializeLocalizeConfig_EN(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Localize_LocalizeConfig_ENCategory{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &LocalizeLocalizeConfig_ENCategory{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Localize_LocalizeConfig_ENCategory) GetDataMap() map[string]*_LocalizeConfig_EN {
+func (table *LocalizeLocalizeConfig_ENCategory) GetDataMap() map[string]*LocalizeConfig_EN {
return table._dataMap
}
-func (table *Localize_LocalizeConfig_ENCategory) GetDataList() []*_LocalizeConfig_EN {
+func (table *LocalizeLocalizeConfig_ENCategory) GetDataList() []*LocalizeConfig_EN {
return table._dataList
}
-func (table *Localize_LocalizeConfig_ENCategory) Get(key string) *_LocalizeConfig_EN {
+func (table *LocalizeLocalizeConfig_ENCategory) Get(key string) *LocalizeConfig_EN {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go b/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go
index 37969713d..8a6459c02 100644
--- a/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go
+++ b/sys/configure/structs/Localize.LocalizeConfig_TWCategory.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Localize_LocalizeConfig_TWCategory struct {
- _dataMap map[string]*_LocalizeConfig_TW
- _dataList []*_LocalizeConfig_TW
+type LocalizeLocalizeConfig_TWCategory struct {
+ _dataMap map[string]*LocalizeConfig_TW
+ _dataList []*LocalizeConfig_TW
}
-func NewLocalize_LocalizeConfig_TWCategory(_buf []map[string]interface{}) (*Localize_LocalizeConfig_TWCategory, error) {
- _dataList := make([]*_LocalizeConfig_TW, 0, len(_buf))
- dataMap := make(map[string]*_LocalizeConfig_TW)
+func NewLocalizeLocalizeConfig_TWCategory(_buf []map[string]interface{}) (*LocalizeLocalizeConfig_TWCategory, error) {
+ _dataList := make([]*LocalizeConfig_TW, 0, len(_buf))
+ dataMap := make(map[string]*LocalizeConfig_TW)
for _, _ele_ := range _buf {
- if _v, err2 := New_LocalizeConfig_TW(_ele_); err2 != nil {
+ if _v, err2 := DeserializeLocalizeConfig_TW(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Localize_LocalizeConfig_TWCategory{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &LocalizeLocalizeConfig_TWCategory{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Localize_LocalizeConfig_TWCategory) GetDataMap() map[string]*_LocalizeConfig_TW {
+func (table *LocalizeLocalizeConfig_TWCategory) GetDataMap() map[string]*LocalizeConfig_TW {
return table._dataMap
}
-func (table *Localize_LocalizeConfig_TWCategory) GetDataList() []*_LocalizeConfig_TW {
+func (table *LocalizeLocalizeConfig_TWCategory) GetDataList() []*LocalizeConfig_TW {
return table._dataList
}
-func (table *Localize_LocalizeConfig_TWCategory) Get(key string) *_LocalizeConfig_TW {
+func (table *LocalizeLocalizeConfig_TWCategory) Get(key string) *LocalizeConfig_TW {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/LocalizeConfig_CN.go b/sys/configure/structs/LocalizeConfig_CN.go
index 9e7f934a5..9450e03a8 100644
--- a/sys/configure/structs/LocalizeConfig_CN.go
+++ b/sys/configure/structs/LocalizeConfig_CN.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type _LocalizeConfig_CN struct {
- _ALocalizeConfig
+type LocalizeConfig_CN struct {
+ Key string
TextCn string
}
-func (_LocalizeConfig_CN) GetTypeId() int {
+const TypeId_LocalizeConfig_CN = 2049582687
+
+func (*LocalizeConfig_CN) GetTypeId() int32 {
return 2049582687
}
-func New_LocalizeConfig_CN(_buf map[string]interface{}) (_v *_LocalizeConfig_CN, err error) {
- _v = &_LocalizeConfig_CN{}
- var _p *_ALocalizeConfig
- if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return }
- _v._ALocalizeConfig = *_p
+func (_v *LocalizeConfig_CN)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.TextCn, _ok_ = _buf["text_cn"].(string); !_ok_ { err = errors.New("text_cn error"); return } }
return
}
+
+func DeserializeLocalizeConfig_CN(_buf map[string]interface{}) (*LocalizeConfig_CN, error) {
+ v := &LocalizeConfig_CN{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/LocalizeConfig_EN.go b/sys/configure/structs/LocalizeConfig_EN.go
index bc6a81130..6f63a12c6 100644
--- a/sys/configure/structs/LocalizeConfig_EN.go
+++ b/sys/configure/structs/LocalizeConfig_EN.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type _LocalizeConfig_EN struct {
- _ALocalizeConfig
+type LocalizeConfig_EN struct {
+ Key string
TextEn string
}
-func (_LocalizeConfig_EN) GetTypeId() int {
+const TypeId_LocalizeConfig_EN = 2049582749
+
+func (*LocalizeConfig_EN) GetTypeId() int32 {
return 2049582749
}
-func New_LocalizeConfig_EN(_buf map[string]interface{}) (_v *_LocalizeConfig_EN, err error) {
- _v = &_LocalizeConfig_EN{}
- var _p *_ALocalizeConfig
- if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return }
- _v._ALocalizeConfig = *_p
+func (_v *LocalizeConfig_EN)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.TextEn, _ok_ = _buf["text_en"].(string); !_ok_ { err = errors.New("text_en error"); return } }
return
}
+
+func DeserializeLocalizeConfig_EN(_buf map[string]interface{}) (*LocalizeConfig_EN, error) {
+ v := &LocalizeConfig_EN{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/LocalizeConfig_TW.go b/sys/configure/structs/LocalizeConfig_TW.go
index a35dec4c8..32a02e88a 100644
--- a/sys/configure/structs/LocalizeConfig_TW.go
+++ b/sys/configure/structs/LocalizeConfig_TW.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type _LocalizeConfig_TW struct {
- _ALocalizeConfig
+type LocalizeConfig_TW struct {
+ Key string
TextTw string
}
-func (_LocalizeConfig_TW) GetTypeId() int {
+const TypeId_LocalizeConfig_TW = 2049583223
+
+func (*LocalizeConfig_TW) GetTypeId() int32 {
return 2049583223
}
-func New_LocalizeConfig_TW(_buf map[string]interface{}) (_v *_LocalizeConfig_TW, err error) {
- _v = &_LocalizeConfig_TW{}
- var _p *_ALocalizeConfig
- if _p, err = New_ALocalizeConfig_Body(_buf) ; err != nil { return }
- _v._ALocalizeConfig = *_p
+func (_v *LocalizeConfig_TW)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.TextTw, _ok_ = _buf["text_tw"].(string); !_ok_ { err = errors.New("text_tw error"); return } }
return
}
+
+func DeserializeLocalizeConfig_TW(_buf map[string]interface{}) (*LocalizeConfig_TW, error) {
+ v := &LocalizeConfig_TW{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go
index ee0f2ef8b..9cad90257 100644
--- a/sys/configure/structs/Tables.go
+++ b/sys/configure/structs/Tables.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -12,69 +11,65 @@ package cfg
type JsonLoader func(string) ([]map[string]interface{}, error)
type Tables struct {
- LocalizeConfig_CNCategory *Localize_LocalizeConfig_CNCategory
- LocalizeConfig_ENCategory *Localize_LocalizeConfig_ENCategory
- LocalizeConfig_TWCategory *Localize_LocalizeConfig_TWCategory
- global *Game_global
- ui *Game_ui
- plot *Game_plot
- extservers *Game_extservers
- skillAtk *Game_skillAtk
- skillAfteratk *Game_skillAfteratk
- skillBuff *Game_skillBuff
- skillPassive *Game_skillPassive
- hero *Game_hero
- heroStargrow *Game_heroStargrow
- heroLevelgrow *Game_heroLevelgrow
- heroStarup *Game_heroStarup
- heroExp *Game_heroExp
- heroLevelup *Game_heroLevelup
- equip *Game_equip
- equipAttrlibrary *Game_equipAttrlibrary
- equipSuit *Game_equipSuit
- equipColor *Game_equipColor
- equipIntensify *Game_equipIntensify
- item *Game_item
- heroSkillLevel *Game_heroSkillLevel
- heroResonance *Game_heroResonance
- comAtn *Game_comAtn
- heroAwaken *Game_heroAwaken
- heroMethod *Game_heroMethod
- shop *Game_shop
- shopitem *Game_shopitem
- activeReward *Game_activeReward
- serverList *Game_serverList
- com *Game_com
- skill *Game_skill
- model *Game_model
- mainlineChapter *Game_mainlineChapter
- mainlineEasy *Game_mainlineEasy
- mainlineHard *Game_mainlineHard
- mainlinePurgatory *Game_mainlinePurgatory
- drawCard *Game_drawCard
- drawUpdraw *Game_drawUpdraw
- drawCom *Game_drawCom
- drawCost *Game_drawCost
- chatChannel *Game_chatChannel
- chatSystem *Game_chatSystem
- chatServerGroup *Game_chatServerGroup
- chatChannelCom *Game_chatChannelCom
- taskRound *Game_taskRound
- taskActiveReward *Game_taskActiveReward
- coin *Game_coin
- initial *Game_initial
- monster *Game_monster
- equipPos *Game_equipPos
- playerlv *Game_playerlv
- propsgroup *Game_propsgroup
- facemod *Game_facemod
- msgdistrib *Game_msgdistrib
- language *Game_language
- opencond *Game_opencond
- stroy *Game_stroy
- pagoda *Game_pagoda
- pagodaTaskReward *Game_pagodaTaskReward
- pagodaSeasonReward *Game_pagodaSeasonReward
+ LocalizeConfig_CNCategory *LocalizeLocalizeConfig_CNCategory
+ LocalizeConfig_ENCategory *LocalizeLocalizeConfig_ENCategory
+ LocalizeConfig_TWCategory *LocalizeLocalizeConfig_TWCategory
+ global *Gameglobal
+ ui *Gameui
+ plot *Gameplot
+ extservers *Gameextservers
+ skillAtk *GameskillAtk
+ skillAfteratk *GameskillAfteratk
+ skillBuff *GameskillBuff
+ skillPassive *GameskillPassive
+ hero *Gamehero
+ heroStargrow *GameheroStargrow
+ heroLevelgrow *GameheroLevelgrow
+ heroStarup *GameheroStarup
+ heroExp *GameheroExp
+ heroLevelup *GameheroLevelup
+ equip *Gameequip
+ equipAttrlibrary *GameequipAttrlibrary
+ equipSuit *GameequipSuit
+ equipColor *GameequipColor
+ equipIntensify *GameequipIntensify
+ item *Gameitem
+ heroSkillLevel *GameheroSkillLevel
+ heroResonance *GameheroResonance
+ comAtn *GamecomAtn
+ heroAwaken *GameheroAwaken
+ heroMethod *GameheroMethod
+ shop *Gameshop
+ shopitem *Gameshopitem
+ activeReward *GameactiveReward
+ com *Gamecom
+ skill *Gameskill
+ model *Gamemodel
+ mainlineChapter *GamemainlineChapter
+ mainlineEasy *GamemainlineEasy
+ mainlineHard *GamemainlineHard
+ mainlinePurgatory *GamemainlinePurgatory
+ drawCard *GamedrawCard
+ chatChannel *GamechatChannel
+ chatSystem *GamechatSystem
+ chatServerGroup *GamechatServerGroup
+ chatChannelCom *GamechatChannelCom
+ taskRound *GametaskRound
+ taskActiveReward *GametaskActiveReward
+ coin *Gamecoin
+ initial *Gameinitial
+ monster *Gamemonster
+ equipPos *GameequipPos
+ playerlv *Gameplayerlv
+ propsgroup *Gamepropsgroup
+ facemod *Gamefacemod
+ msgdistrib *Gamemsgdistrib
+ language *Gamelanguage
+ opencond *Gameopencond
+ stroy *Gamestroy
+ pagoda *Gamepagoda
+ pagodaTaskReward *GamepagodaTaskReward
+ pagodaSeasonReward *GamepagodaSeasonReward
}
func NewTables(loader JsonLoader) (*Tables, error) {
@@ -85,379 +80,355 @@ func NewTables(loader JsonLoader) (*Tables, error) {
if buf, err = loader("LocalizeConfig_CN") ; err != nil {
return nil, err
}
- if tables.LocalizeConfig_CNCategory, err = NewLocalize_LocalizeConfig_CNCategory(buf) ; err != nil {
+ if tables.LocalizeConfig_CNCategory, err = NewLocalizeLocalizeConfig_CNCategory(buf) ; err != nil {
return nil, err
}
if buf, err = loader("LocalizeConfig_EN") ; err != nil {
return nil, err
}
- if tables.LocalizeConfig_ENCategory, err = NewLocalize_LocalizeConfig_ENCategory(buf) ; err != nil {
+ if tables.LocalizeConfig_ENCategory, err = NewLocalizeLocalizeConfig_ENCategory(buf) ; err != nil {
return nil, err
}
if buf, err = loader("LocalizeConfig_TW") ; err != nil {
return nil, err
}
- if tables.LocalizeConfig_TWCategory, err = NewLocalize_LocalizeConfig_TWCategory(buf) ; err != nil {
+ if tables.LocalizeConfig_TWCategory, err = NewLocalizeLocalizeConfig_TWCategory(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_global") ; err != nil {
return nil, err
}
- if tables.global, err = NewGame_global(buf) ; err != nil {
+ if tables.global, err = NewGameglobal(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_ui") ; err != nil {
return nil, err
}
- if tables.ui, err = NewGame_ui(buf) ; err != nil {
+ if tables.ui, err = NewGameui(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_plot") ; err != nil {
return nil, err
}
- if tables.plot, err = NewGame_plot(buf) ; err != nil {
+ if tables.plot, err = NewGameplot(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_extservers") ; err != nil {
return nil, err
}
- if tables.extservers, err = NewGame_extservers(buf) ; err != nil {
+ if tables.extservers, err = NewGameextservers(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skillatk") ; err != nil {
return nil, err
}
- if tables.skillAtk, err = NewGame_skillAtk(buf) ; err != nil {
+ if tables.skillAtk, err = NewGameskillAtk(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skillafteratk") ; err != nil {
return nil, err
}
- if tables.skillAfteratk, err = NewGame_skillAfteratk(buf) ; err != nil {
+ if tables.skillAfteratk, err = NewGameskillAfteratk(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skillbuff") ; err != nil {
return nil, err
}
- if tables.skillBuff, err = NewGame_skillBuff(buf) ; err != nil {
+ if tables.skillBuff, err = NewGameskillBuff(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skillpassive") ; err != nil {
return nil, err
}
- if tables.skillPassive, err = NewGame_skillPassive(buf) ; err != nil {
+ if tables.skillPassive, err = NewGameskillPassive(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_hero") ; err != nil {
return nil, err
}
- if tables.hero, err = NewGame_hero(buf) ; err != nil {
+ if tables.hero, err = NewGamehero(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_herostargrow") ; err != nil {
return nil, err
}
- if tables.heroStargrow, err = NewGame_heroStargrow(buf) ; err != nil {
+ if tables.heroStargrow, err = NewGameheroStargrow(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_herolevelgrow") ; err != nil {
return nil, err
}
- if tables.heroLevelgrow, err = NewGame_heroLevelgrow(buf) ; err != nil {
+ if tables.heroLevelgrow, err = NewGameheroLevelgrow(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_herostarup") ; err != nil {
return nil, err
}
- if tables.heroStarup, err = NewGame_heroStarup(buf) ; err != nil {
+ if tables.heroStarup, err = NewGameheroStarup(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_heroexp") ; err != nil {
return nil, err
}
- if tables.heroExp, err = NewGame_heroExp(buf) ; err != nil {
+ if tables.heroExp, err = NewGameheroExp(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_herolevelup") ; err != nil {
return nil, err
}
- if tables.heroLevelup, err = NewGame_heroLevelup(buf) ; err != nil {
+ if tables.heroLevelup, err = NewGameheroLevelup(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equip") ; err != nil {
return nil, err
}
- if tables.equip, err = NewGame_equip(buf) ; err != nil {
+ if tables.equip, err = NewGameequip(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equipattrlibrary") ; err != nil {
return nil, err
}
- if tables.equipAttrlibrary, err = NewGame_equipAttrlibrary(buf) ; err != nil {
+ if tables.equipAttrlibrary, err = NewGameequipAttrlibrary(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equipsuit") ; err != nil {
return nil, err
}
- if tables.equipSuit, err = NewGame_equipSuit(buf) ; err != nil {
+ if tables.equipSuit, err = NewGameequipSuit(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equipcolor") ; err != nil {
return nil, err
}
- if tables.equipColor, err = NewGame_equipColor(buf) ; err != nil {
+ if tables.equipColor, err = NewGameequipColor(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equipintensify") ; err != nil {
return nil, err
}
- if tables.equipIntensify, err = NewGame_equipIntensify(buf) ; err != nil {
+ if tables.equipIntensify, err = NewGameequipIntensify(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_item") ; err != nil {
return nil, err
}
- if tables.item, err = NewGame_item(buf) ; err != nil {
+ if tables.item, err = NewGameitem(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_heroskilllevel") ; err != nil {
return nil, err
}
- if tables.heroSkillLevel, err = NewGame_heroSkillLevel(buf) ; err != nil {
+ if tables.heroSkillLevel, err = NewGameheroSkillLevel(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_heroresonance") ; err != nil {
return nil, err
}
- if tables.heroResonance, err = NewGame_heroResonance(buf) ; err != nil {
+ if tables.heroResonance, err = NewGameheroResonance(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_comatn") ; err != nil {
return nil, err
}
- if tables.comAtn, err = NewGame_comAtn(buf) ; err != nil {
+ if tables.comAtn, err = NewGamecomAtn(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_heroawaken") ; err != nil {
return nil, err
}
- if tables.heroAwaken, err = NewGame_heroAwaken(buf) ; err != nil {
+ if tables.heroAwaken, err = NewGameheroAwaken(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_heromethod") ; err != nil {
return nil, err
}
- if tables.heroMethod, err = NewGame_heroMethod(buf) ; err != nil {
+ if tables.heroMethod, err = NewGameheroMethod(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_shop") ; err != nil {
return nil, err
}
- if tables.shop, err = NewGame_shop(buf) ; err != nil {
+ if tables.shop, err = NewGameshop(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_shopitem") ; err != nil {
return nil, err
}
- if tables.shopitem, err = NewGame_shopitem(buf) ; err != nil {
+ if tables.shopitem, err = NewGameshopitem(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_activereward") ; err != nil {
return nil, err
}
- if tables.activeReward, err = NewGame_activeReward(buf) ; err != nil {
- return nil, err
- }
- if buf, err = loader("game_serverlist") ; err != nil {
- return nil, err
- }
- if tables.serverList, err = NewGame_serverList(buf) ; err != nil {
+ if tables.activeReward, err = NewGameactiveReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_com") ; err != nil {
return nil, err
}
- if tables.com, err = NewGame_com(buf) ; err != nil {
+ if tables.com, err = NewGamecom(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_skill") ; err != nil {
return nil, err
}
- if tables.skill, err = NewGame_skill(buf) ; err != nil {
+ if tables.skill, err = NewGameskill(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_model") ; err != nil {
return nil, err
}
- if tables.model, err = NewGame_model(buf) ; err != nil {
+ if tables.model, err = NewGamemodel(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_mainlinechapter") ; err != nil {
return nil, err
}
- if tables.mainlineChapter, err = NewGame_mainlineChapter(buf) ; err != nil {
+ if tables.mainlineChapter, err = NewGamemainlineChapter(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_mainlineeasy") ; err != nil {
return nil, err
}
- if tables.mainlineEasy, err = NewGame_mainlineEasy(buf) ; err != nil {
+ if tables.mainlineEasy, err = NewGamemainlineEasy(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_mainlinehard") ; err != nil {
return nil, err
}
- if tables.mainlineHard, err = NewGame_mainlineHard(buf) ; err != nil {
+ if tables.mainlineHard, err = NewGamemainlineHard(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_mainlinepurgatory") ; err != nil {
return nil, err
}
- if tables.mainlinePurgatory, err = NewGame_mainlinePurgatory(buf) ; err != nil {
+ if tables.mainlinePurgatory, err = NewGamemainlinePurgatory(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_drawcard") ; err != nil {
return nil, err
}
- if tables.drawCard, err = NewGame_drawCard(buf) ; err != nil {
- return nil, err
- }
- if buf, err = loader("game_drawupdraw") ; err != nil {
- return nil, err
- }
- if tables.drawUpdraw, err = NewGame_drawUpdraw(buf) ; err != nil {
- return nil, err
- }
- if buf, err = loader("game_drawcom") ; err != nil {
- return nil, err
- }
- if tables.drawCom, err = NewGame_drawCom(buf) ; err != nil {
- return nil, err
- }
- if buf, err = loader("game_drawcost") ; err != nil {
- return nil, err
- }
- if tables.drawCost, err = NewGame_drawCost(buf) ; err != nil {
+ if tables.drawCard, err = NewGamedrawCard(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_chatchannel") ; err != nil {
return nil, err
}
- if tables.chatChannel, err = NewGame_chatChannel(buf) ; err != nil {
+ if tables.chatChannel, err = NewGamechatChannel(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_chatsystem") ; err != nil {
return nil, err
}
- if tables.chatSystem, err = NewGame_chatSystem(buf) ; err != nil {
+ if tables.chatSystem, err = NewGamechatSystem(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_chatservergroup") ; err != nil {
return nil, err
}
- if tables.chatServerGroup, err = NewGame_chatServerGroup(buf) ; err != nil {
+ if tables.chatServerGroup, err = NewGamechatServerGroup(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_chatchannelcom") ; err != nil {
return nil, err
}
- if tables.chatChannelCom, err = NewGame_chatChannelCom(buf) ; err != nil {
+ if tables.chatChannelCom, err = NewGamechatChannelCom(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_taskround") ; err != nil {
return nil, err
}
- if tables.taskRound, err = NewGame_taskRound(buf) ; err != nil {
+ if tables.taskRound, err = NewGametaskRound(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_taskactivereward") ; err != nil {
return nil, err
}
- if tables.taskActiveReward, err = NewGame_taskActiveReward(buf) ; err != nil {
+ if tables.taskActiveReward, err = NewGametaskActiveReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_coin") ; err != nil {
return nil, err
}
- if tables.coin, err = NewGame_coin(buf) ; err != nil {
+ if tables.coin, err = NewGamecoin(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_initial") ; err != nil {
return nil, err
}
- if tables.initial, err = NewGame_initial(buf) ; err != nil {
+ if tables.initial, err = NewGameinitial(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_monster") ; err != nil {
return nil, err
}
- if tables.monster, err = NewGame_monster(buf) ; err != nil {
+ if tables.monster, err = NewGamemonster(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_equippos") ; err != nil {
return nil, err
}
- if tables.equipPos, err = NewGame_equipPos(buf) ; err != nil {
+ if tables.equipPos, err = NewGameequipPos(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_playerlv") ; err != nil {
return nil, err
}
- if tables.playerlv, err = NewGame_playerlv(buf) ; err != nil {
+ if tables.playerlv, err = NewGameplayerlv(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_propsgroup") ; err != nil {
return nil, err
}
- if tables.propsgroup, err = NewGame_propsgroup(buf) ; err != nil {
+ if tables.propsgroup, err = NewGamepropsgroup(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_facemod") ; err != nil {
return nil, err
}
- if tables.facemod, err = NewGame_facemod(buf) ; err != nil {
+ if tables.facemod, err = NewGamefacemod(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_msgdistrib") ; err != nil {
return nil, err
}
- if tables.msgdistrib, err = NewGame_msgdistrib(buf) ; err != nil {
+ if tables.msgdistrib, err = NewGamemsgdistrib(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_language") ; err != nil {
return nil, err
}
- if tables.language, err = NewGame_language(buf) ; err != nil {
+ if tables.language, err = NewGamelanguage(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_opencond") ; err != nil {
return nil, err
}
- if tables.opencond, err = NewGame_opencond(buf) ; err != nil {
+ if tables.opencond, err = NewGameopencond(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_stroy") ; err != nil {
return nil, err
}
- if tables.stroy, err = NewGame_stroy(buf) ; err != nil {
+ if tables.stroy, err = NewGamestroy(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_pagoda") ; err != nil {
return nil, err
}
- if tables.pagoda, err = NewGame_pagoda(buf) ; err != nil {
+ if tables.pagoda, err = NewGamepagoda(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_pagodataskreward") ; err != nil {
return nil, err
}
- if tables.pagodaTaskReward, err = NewGame_pagodaTaskReward(buf) ; err != nil {
+ if tables.pagodaTaskReward, err = NewGamepagodaTaskReward(buf) ; err != nil {
return nil, err
}
if buf, err = loader("game_pagodaseasonreward") ; err != nil {
return nil, err
}
- if tables.pagodaSeasonReward, err = NewGame_pagodaSeasonReward(buf) ; err != nil {
+ if tables.pagodaSeasonReward, err = NewGamepagodaSeasonReward(buf) ; err != nil {
return nil, err
}
return tables, nil
diff --git a/sys/configure/structs/game.ChildSkills.go b/sys/configure/structs/game.ChildSkills.go
index 2efcd1bd6..b84c9b753 100644
--- a/sys/configure/structs/game.ChildSkills.go
+++ b/sys/configure/structs/game.ChildSkills.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,20 +5,22 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_ChildSkills struct {
+type GameChildSkills struct {
Id []int32
}
-func (Game_ChildSkills) GetTypeId() int {
+const TypeId_GameChildSkills = -1958253470
+
+func (*GameChildSkills) GetTypeId() int32 {
return -1958253470
}
-func NewGame_ChildSkills(_buf map[string]interface{}) (_v *Game_ChildSkills, err error) {
- _v = &Game_ChildSkills{}
+func (_v *GameChildSkills)Deserialize(_buf map[string]interface{}) (err error) {
{
var _arr_ []interface{}
var _ok_ bool
@@ -36,3 +37,12 @@ func NewGame_ChildSkills(_buf map[string]interface{}) (_v *Game_ChildSkills, err
return
}
+
+func DeserializeGameChildSkills(_buf map[string]interface{}) (*GameChildSkills, error) {
+ v := &GameChildSkills{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.Figure.go b/sys/configure/structs/game.Figure.go
index ca6add3cc..8d05ed784 100644
--- a/sys/configure/structs/game.Figure.go
+++ b/sys/configure/structs/game.Figure.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_Figure struct {
+type GameFigure struct {
Id int32
Key string
Color string
@@ -21,12 +21,13 @@ type Game_Figure struct {
Icon string
}
-func (Game_Figure) GetTypeId() int {
+const TypeId_GameFigure = -1818502016
+
+func (*GameFigure) GetTypeId() int32 {
return -1818502016
}
-func NewGame_Figure(_buf map[string]interface{}) (_v *Game_Figure, err error) {
- _v = &Game_Figure{}
+func (_v *GameFigure)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.Color, _ok_ = _buf["color"].(string); !_ok_ { err = errors.New("color error"); return } }
@@ -37,3 +38,12 @@ func NewGame_Figure(_buf map[string]interface{}) (_v *Game_Figure, err error) {
{ var _ok_ bool; if _v.Icon, _ok_ = _buf["icon"].(string); !_ok_ { err = errors.New("icon error"); return } }
return
}
+
+func DeserializeGameFigure(_buf map[string]interface{}) (*GameFigure, error) {
+ v := &GameFigure{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.activeReward.go b/sys/configure/structs/game.activeReward.go
index 9b437ee83..f7bee6f74 100644
--- a/sys/configure/structs/game.activeReward.go
+++ b/sys/configure/structs/game.activeReward.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_activeReward struct {
- _dataMap map[int32]*Game_activeRewardData
- _dataList []*Game_activeRewardData
+type GameactiveReward struct {
+ _dataMap map[int32]*GameactiveRewardData
+ _dataList []*GameactiveRewardData
}
-func NewGame_activeReward(_buf []map[string]interface{}) (*Game_activeReward, error) {
- _dataList := make([]*Game_activeRewardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_activeRewardData)
+func NewGameactiveReward(_buf []map[string]interface{}) (*GameactiveReward, error) {
+ _dataList := make([]*GameactiveRewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GameactiveRewardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_activeRewardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameactiveRewardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_activeReward{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameactiveReward{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_activeReward) GetDataMap() map[int32]*Game_activeRewardData {
+func (table *GameactiveReward) GetDataMap() map[int32]*GameactiveRewardData {
return table._dataMap
}
-func (table *Game_activeReward) GetDataList() []*Game_activeRewardData {
+func (table *GameactiveReward) GetDataList() []*GameactiveRewardData {
return table._dataList
}
-func (table *Game_activeReward) Get(key int32) *Game_activeRewardData {
+func (table *GameactiveReward) Get(key int32) *GameactiveRewardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.activeRewardData.go b/sys/configure/structs/game.activeRewardData.go
index 06a07412c..d17ed3caf 100644
--- a/sys/configure/structs/game.activeRewardData.go
+++ b/sys/configure/structs/game.activeRewardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,23 +5,25 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_activeRewardData struct {
+type GameactiveRewardData struct {
Key int32
IdTag int32
Active int32
- Reword []*Game_atn
+ Reword []*Gameatn
}
-func (Game_activeRewardData) GetTypeId() int {
+const TypeId_GameactiveRewardData = -41023077
+
+func (*GameactiveRewardData) GetTypeId() int32 {
return -41023077
}
-func NewGame_activeRewardData(_buf map[string]interface{}) (_v *Game_activeRewardData, err error) {
- _v = &Game_activeRewardData{}
+func (_v *GameactiveRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }
@@ -31,14 +32,23 @@ func NewGame_activeRewardData(_buf map[string]interface{}) (_v *Game_activeRewar
var _ok_ bool
if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
- _v.Reword = make([]*Game_atn, 0, len(_arr_))
+ _v.Reword = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reword = append(_v.Reword, _list_v_)
}
}
return
}
+
+func DeserializeGameactiveRewardData(_buf map[string]interface{}) (*GameactiveRewardData, error) {
+ v := &GameactiveRewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.atn.go b/sys/configure/structs/game.atn.go
index 67a89b5b5..b0401181b 100644
--- a/sys/configure/structs/game.atn.go
+++ b/sys/configure/structs/game.atn.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,35 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_atn struct {
+type Gameatn struct {
A string
T string
N int32
}
-func (Game_atn) GetTypeId() int {
+const TypeId_Gameatn = -1770297697
+
+func (*Gameatn) GetTypeId() int32 {
return -1770297697
}
-func NewGame_atn(_buf map[string]interface{}) (_v *Game_atn, err error) {
- _v = &Game_atn{}
+func (_v *Gameatn)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.A, _ok_ = _buf["a"].(string); !_ok_ { err = errors.New("a error"); return } }
{ var _ok_ bool; if _v.T, _ok_ = _buf["t"].(string); !_ok_ { err = errors.New("t error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) }
return
}
+
+func DeserializeGameatn(_buf map[string]interface{}) (*Gameatn, error) {
+ v := &Gameatn{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.basepool.go b/sys/configure/structs/game.basepool.go
new file mode 100644
index 000000000..440c2e5a7
--- /dev/null
+++ b/sys/configure/structs/game.basepool.go
@@ -0,0 +1,39 @@
+//------------------------------------------------------------------------------
+//
+// 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 "errors"
+
+type Gamebasepool struct {
+ S int32
+ E int32
+ P string
+}
+
+const TypeId_Gamebasepool = -451033879
+
+func (*Gamebasepool) GetTypeId() int32 {
+ return -451033879
+}
+
+func (_v *Gamebasepool)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["s"].(float64); !_ok_ { err = errors.New("s error"); return }; _v.S = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["e"].(float64); !_ok_ { err = errors.New("e error"); return }; _v.E = int32(_tempNum_) }
+ { var _ok_ bool; if _v.P, _ok_ = _buf["p"].(string); !_ok_ { err = errors.New("p error"); return } }
+ return
+}
+
+func DeserializeGamebasepool(_buf map[string]interface{}) (*Gamebasepool, error) {
+ v := &Gamebasepool{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.chatChannel.go b/sys/configure/structs/game.chatChannel.go
index 73b68e5be..6731a816d 100644
--- a/sys/configure/structs/game.chatChannel.go
+++ b/sys/configure/structs/game.chatChannel.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_chatChannel struct {
- _dataMap map[string]*Game_chatChannelData
- _dataList []*Game_chatChannelData
+type GamechatChannel struct {
+ _dataMap map[string]*GamechatChannelData
+ _dataList []*GamechatChannelData
}
-func NewGame_chatChannel(_buf []map[string]interface{}) (*Game_chatChannel, error) {
- _dataList := make([]*Game_chatChannelData, 0, len(_buf))
- dataMap := make(map[string]*Game_chatChannelData)
+func NewGamechatChannel(_buf []map[string]interface{}) (*GamechatChannel, error) {
+ _dataList := make([]*GamechatChannelData, 0, len(_buf))
+ dataMap := make(map[string]*GamechatChannelData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_chatChannelData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamechatChannelData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_chatChannel{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamechatChannel{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_chatChannel) GetDataMap() map[string]*Game_chatChannelData {
+func (table *GamechatChannel) GetDataMap() map[string]*GamechatChannelData {
return table._dataMap
}
-func (table *Game_chatChannel) GetDataList() []*Game_chatChannelData {
+func (table *GamechatChannel) GetDataList() []*GamechatChannelData {
return table._dataList
}
-func (table *Game_chatChannel) Get(key string) *Game_chatChannelData {
+func (table *GamechatChannel) Get(key string) *GamechatChannelData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.chatChannelCom.go b/sys/configure/structs/game.chatChannelCom.go
index dfe61a5e6..fed9fad27 100644
--- a/sys/configure/structs/game.chatChannelCom.go
+++ b/sys/configure/structs/game.chatChannelCom.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_chatChannelCom struct {
- _dataMap map[string]*Game_chatChannelComData
- _dataList []*Game_chatChannelComData
+type GamechatChannelCom struct {
+ _dataMap map[string]*GamechatChannelComData
+ _dataList []*GamechatChannelComData
}
-func NewGame_chatChannelCom(_buf []map[string]interface{}) (*Game_chatChannelCom, error) {
- _dataList := make([]*Game_chatChannelComData, 0, len(_buf))
- dataMap := make(map[string]*Game_chatChannelComData)
+func NewGamechatChannelCom(_buf []map[string]interface{}) (*GamechatChannelCom, error) {
+ _dataList := make([]*GamechatChannelComData, 0, len(_buf))
+ dataMap := make(map[string]*GamechatChannelComData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_chatChannelComData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamechatChannelComData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_chatChannelCom{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamechatChannelCom{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_chatChannelCom) GetDataMap() map[string]*Game_chatChannelComData {
+func (table *GamechatChannelCom) GetDataMap() map[string]*GamechatChannelComData {
return table._dataMap
}
-func (table *Game_chatChannelCom) GetDataList() []*Game_chatChannelComData {
+func (table *GamechatChannelCom) GetDataList() []*GamechatChannelComData {
return table._dataList
}
-func (table *Game_chatChannelCom) Get(key string) *Game_chatChannelComData {
+func (table *GamechatChannelCom) Get(key string) *GamechatChannelComData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.chatChannelComData.go b/sys/configure/structs/game.chatChannelComData.go
index f1783bd72..51078cbf0 100644
--- a/sys/configure/structs/game.chatChannelComData.go
+++ b/sys/configure/structs/game.chatChannelComData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,35 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_chatChannelComData struct {
+type GamechatChannelComData struct {
Key string
Value int32
Dec string
}
-func (Game_chatChannelComData) GetTypeId() int {
+const TypeId_GamechatChannelComData = 1284108092
+
+func (*GamechatChannelComData) GetTypeId() int32 {
return 1284108092
}
-func NewGame_chatChannelComData(_buf map[string]interface{}) (_v *Game_chatChannelComData, err error) {
- _v = &Game_chatChannelComData{}
+func (_v *GamechatChannelComData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
{ var _ok_ bool; if _v.Dec, _ok_ = _buf["dec"].(string); !_ok_ { err = errors.New("dec error"); return } }
return
}
+
+func DeserializeGamechatChannelComData(_buf map[string]interface{}) (*GamechatChannelComData, error) {
+ v := &GamechatChannelComData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.chatChannelData.go b/sys/configure/structs/game.chatChannelData.go
index de47825ad..f60942f35 100644
--- a/sys/configure/structs/game.chatChannelData.go
+++ b/sys/configure/structs/game.chatChannelData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,35 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_chatChannelData struct {
+type GamechatChannelData struct {
Key string
TagList int32
SpeakCd int32
}
-func (Game_chatChannelData) GetTypeId() int {
+const TypeId_GamechatChannelData = -19547431
+
+func (*GamechatChannelData) GetTypeId() int32 {
return -19547431
}
-func NewGame_chatChannelData(_buf map[string]interface{}) (_v *Game_chatChannelData, err error) {
- _v = &Game_chatChannelData{}
+func (_v *GamechatChannelData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tag_list"].(float64); !_ok_ { err = errors.New("tag_list error"); return }; _v.TagList = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speak_cd"].(float64); !_ok_ { err = errors.New("speak_cd error"); return }; _v.SpeakCd = int32(_tempNum_) }
return
}
+
+func DeserializeGamechatChannelData(_buf map[string]interface{}) (*GamechatChannelData, error) {
+ v := &GamechatChannelData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.chatServerGroup.go b/sys/configure/structs/game.chatServerGroup.go
index 89422c404..0b8e3af09 100644
--- a/sys/configure/structs/game.chatServerGroup.go
+++ b/sys/configure/structs/game.chatServerGroup.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_chatServerGroup struct {
- _dataMap map[string]*Game_chatServerGroupData
- _dataList []*Game_chatServerGroupData
+type GamechatServerGroup struct {
+ _dataMap map[string]*GamechatServerGroupData
+ _dataList []*GamechatServerGroupData
}
-func NewGame_chatServerGroup(_buf []map[string]interface{}) (*Game_chatServerGroup, error) {
- _dataList := make([]*Game_chatServerGroupData, 0, len(_buf))
- dataMap := make(map[string]*Game_chatServerGroupData)
+func NewGamechatServerGroup(_buf []map[string]interface{}) (*GamechatServerGroup, error) {
+ _dataList := make([]*GamechatServerGroupData, 0, len(_buf))
+ dataMap := make(map[string]*GamechatServerGroupData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_chatServerGroupData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamechatServerGroupData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Server] = _v
}
}
- return &Game_chatServerGroup{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamechatServerGroup{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_chatServerGroup) GetDataMap() map[string]*Game_chatServerGroupData {
+func (table *GamechatServerGroup) GetDataMap() map[string]*GamechatServerGroupData {
return table._dataMap
}
-func (table *Game_chatServerGroup) GetDataList() []*Game_chatServerGroupData {
+func (table *GamechatServerGroup) GetDataList() []*GamechatServerGroupData {
return table._dataList
}
-func (table *Game_chatServerGroup) Get(key string) *Game_chatServerGroupData {
+func (table *GamechatServerGroup) Get(key string) *GamechatServerGroupData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.chatServerGroupData.go b/sys/configure/structs/game.chatServerGroupData.go
index c2eef6cca..2ff6241b5 100644
--- a/sys/configure/structs/game.chatServerGroupData.go
+++ b/sys/configure/structs/game.chatServerGroupData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,22 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_chatServerGroupData struct {
+type GamechatServerGroupData struct {
Server string
Group int32
}
-func (Game_chatServerGroupData) GetTypeId() int {
+const TypeId_GamechatServerGroupData = 825941074
+
+func (*GamechatServerGroupData) GetTypeId() int32 {
return 825941074
}
-func NewGame_chatServerGroupData(_buf map[string]interface{}) (_v *Game_chatServerGroupData, err error) {
- _v = &Game_chatServerGroupData{}
+func (_v *GamechatServerGroupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Server, _ok_ = _buf["server"].(string); !_ok_ { err = errors.New("server error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
return
}
+
+func DeserializeGamechatServerGroupData(_buf map[string]interface{}) (*GamechatServerGroupData, error) {
+ v := &GamechatServerGroupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.chatSystem.go b/sys/configure/structs/game.chatSystem.go
index 195d95f1e..83432332c 100644
--- a/sys/configure/structs/game.chatSystem.go
+++ b/sys/configure/structs/game.chatSystem.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_chatSystem struct {
- _dataMap map[int32]*Game_chatSystemData
- _dataList []*Game_chatSystemData
+type GamechatSystem struct {
+ _dataMap map[int32]*GamechatSystemData
+ _dataList []*GamechatSystemData
}
-func NewGame_chatSystem(_buf []map[string]interface{}) (*Game_chatSystem, error) {
- _dataList := make([]*Game_chatSystemData, 0, len(_buf))
- dataMap := make(map[int32]*Game_chatSystemData)
+func NewGamechatSystem(_buf []map[string]interface{}) (*GamechatSystem, error) {
+ _dataList := make([]*GamechatSystemData, 0, len(_buf))
+ dataMap := make(map[int32]*GamechatSystemData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_chatSystemData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamechatSystemData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_chatSystem{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamechatSystem{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_chatSystem) GetDataMap() map[int32]*Game_chatSystemData {
+func (table *GamechatSystem) GetDataMap() map[int32]*GamechatSystemData {
return table._dataMap
}
-func (table *Game_chatSystem) GetDataList() []*Game_chatSystemData {
+func (table *GamechatSystem) GetDataList() []*GamechatSystemData {
return table._dataList
}
-func (table *Game_chatSystem) Get(key int32) *Game_chatSystemData {
+func (table *GamechatSystem) Get(key int32) *GamechatSystemData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.chatSystemData.go b/sys/configure/structs/game.chatSystemData.go
index 14e617f2a..c4d03e8b5 100644
--- a/sys/configure/structs/game.chatSystemData.go
+++ b/sys/configure/structs/game.chatSystemData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_chatSystemData struct {
+type GamechatSystemData struct {
Key int32
Type int32
Title string
@@ -22,12 +22,13 @@ type Game_chatSystemData struct {
TimeM int32
}
-func (Game_chatSystemData) GetTypeId() int {
+const TypeId_GamechatSystemData = -198348435
+
+func (*GamechatSystemData) GetTypeId() int32 {
return -198348435
}
-func NewGame_chatSystemData(_buf map[string]interface{}) (_v *Game_chatSystemData, err error) {
- _v = &Game_chatSystemData{}
+func (_v *GamechatSystemData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
{ var _ok_ bool; if _v.Title, _ok_ = _buf["title"].(string); !_ok_ { err = errors.New("title error"); return } }
@@ -52,3 +53,12 @@ func NewGame_chatSystemData(_buf map[string]interface{}) (_v *Game_chatSystemDat
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["time_m"].(float64); !_ok_ { err = errors.New("time_m error"); return }; _v.TimeM = int32(_tempNum_) }
return
}
+
+func DeserializeGamechatSystemData(_buf map[string]interface{}) (*GamechatSystemData, error) {
+ v := &GamechatSystemData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.coin.go b/sys/configure/structs/game.coin.go
index f60c6c59f..644c1c3df 100644
--- a/sys/configure/structs/game.coin.go
+++ b/sys/configure/structs/game.coin.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_coin struct {
- _dataMap map[string]*Game_coinData
- _dataList []*Game_coinData
+type Gamecoin struct {
+ _dataMap map[string]*GamecoinData
+ _dataList []*GamecoinData
}
-func NewGame_coin(_buf []map[string]interface{}) (*Game_coin, error) {
- _dataList := make([]*Game_coinData, 0, len(_buf))
- dataMap := make(map[string]*Game_coinData)
+func NewGamecoin(_buf []map[string]interface{}) (*Gamecoin, error) {
+ _dataList := make([]*GamecoinData, 0, len(_buf))
+ dataMap := make(map[string]*GamecoinData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_coinData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamecoinData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_coin{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamecoin{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_coin) GetDataMap() map[string]*Game_coinData {
+func (table *Gamecoin) GetDataMap() map[string]*GamecoinData {
return table._dataMap
}
-func (table *Game_coin) GetDataList() []*Game_coinData {
+func (table *Gamecoin) GetDataList() []*GamecoinData {
return table._dataList
}
-func (table *Game_coin) Get(key string) *Game_coinData {
+func (table *Gamecoin) Get(key string) *GamecoinData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.coinData.go b/sys/configure/structs/game.coinData.go
index 7a24070e9..6b1e594bd 100644
--- a/sys/configure/structs/game.coinData.go
+++ b/sys/configure/structs/game.coinData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_coinData struct {
+type GamecoinData struct {
Key string
Name string
Color int32
@@ -23,12 +23,13 @@ type Game_coinData struct {
Intr string
}
-func (Game_coinData) GetTypeId() int {
+const TypeId_GamecoinData = 552622167
+
+func (*GamecoinData) GetTypeId() int32 {
return 552622167
}
-func NewGame_coinData(_buf map[string]interface{}) (_v *Game_coinData, err error) {
- _v = &Game_coinData{}
+func (_v *GamecoinData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
@@ -41,3 +42,12 @@ func NewGame_coinData(_buf map[string]interface{}) (_v *Game_coinData, err error
{ var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
return
}
+
+func DeserializeGamecoinData(_buf map[string]interface{}) (*GamecoinData, error) {
+ v := &GamecoinData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.com.go b/sys/configure/structs/game.com.go
index e35c8ba0d..3f51a249f 100644
--- a/sys/configure/structs/game.com.go
+++ b/sys/configure/structs/game.com.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_com struct {
- _dataMap map[string]*Game_comData
- _dataList []*Game_comData
+type Gamecom struct {
+ _dataMap map[int32]*GamecomData
+ _dataList []*GamecomData
}
-func NewGame_com(_buf []map[string]interface{}) (*Game_com, error) {
- _dataList := make([]*Game_comData, 0, len(_buf))
- dataMap := make(map[string]*Game_comData)
+func NewGamecom(_buf []map[string]interface{}) (*Gamecom, error) {
+ _dataList := make([]*GamecomData, 0, len(_buf))
+ dataMap := make(map[int32]*GamecomData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_comData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamecomData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Index] = _v
+ dataMap[_v.MaxChar] = _v
}
}
- return &Game_com{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamecom{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_com) GetDataMap() map[string]*Game_comData {
+func (table *Gamecom) GetDataMap() map[int32]*GamecomData {
return table._dataMap
}
-func (table *Game_com) GetDataList() []*Game_comData {
+func (table *Gamecom) GetDataList() []*GamecomData {
return table._dataList
}
-func (table *Game_com) Get(key string) *Game_comData {
+func (table *Gamecom) Get(key int32) *GamecomData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.comAtn.go b/sys/configure/structs/game.comAtn.go
index 054643b7d..9d2097ede 100644
--- a/sys/configure/structs/game.comAtn.go
+++ b/sys/configure/structs/game.comAtn.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_comAtn struct {
- _dataMap map[string]*Game_comAtnData
- _dataList []*Game_comAtnData
+type GamecomAtn struct {
+ _dataMap map[string]*GamecomAtnData
+ _dataList []*GamecomAtnData
}
-func NewGame_comAtn(_buf []map[string]interface{}) (*Game_comAtn, error) {
- _dataList := make([]*Game_comAtnData, 0, len(_buf))
- dataMap := make(map[string]*Game_comAtnData)
+func NewGamecomAtn(_buf []map[string]interface{}) (*GamecomAtn, error) {
+ _dataList := make([]*GamecomAtnData, 0, len(_buf))
+ dataMap := make(map[string]*GamecomAtnData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_comAtnData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamecomAtnData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Index] = _v
}
}
- return &Game_comAtn{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamecomAtn{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_comAtn) GetDataMap() map[string]*Game_comAtnData {
+func (table *GamecomAtn) GetDataMap() map[string]*GamecomAtnData {
return table._dataMap
}
-func (table *Game_comAtn) GetDataList() []*Game_comAtnData {
+func (table *GamecomAtn) GetDataList() []*GamecomAtnData {
return table._dataList
}
-func (table *Game_comAtn) Get(key string) *Game_comAtnData {
+func (table *GamecomAtn) Get(key string) *GamecomAtnData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.comAtnData.go b/sys/configure/structs/game.comAtnData.go
index 9aabf1a9a..6ddb1ca67 100644
--- a/sys/configure/structs/game.comAtnData.go
+++ b/sys/configure/structs/game.comAtnData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,35 +5,46 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_comAtnData struct {
+type GamecomAtnData struct {
Index string
- Var []*Game_atn
+ Var []*Gameatn
}
-func (Game_comAtnData) GetTypeId() int {
+const TypeId_GamecomAtnData = 1272050592
+
+func (*GamecomAtnData) GetTypeId() int32 {
return 1272050592
}
-func NewGame_comAtnData(_buf map[string]interface{}) (_v *Game_comAtnData, err error) {
- _v = &Game_comAtnData{}
+func (_v *GamecomAtnData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["var"].([]interface{}); !_ok_ { err = errors.New("var error"); return }
- _v.Var = make([]*Game_atn, 0, len(_arr_))
+ _v.Var = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Var = append(_v.Var, _list_v_)
}
}
return
}
+
+func DeserializeGamecomAtnData(_buf map[string]interface{}) (*GamecomAtnData, error) {
+ v := &GamecomAtnData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.comData.go b/sys/configure/structs/game.comData.go
index 90e4d0dbd..9d340aa9b 100644
--- a/sys/configure/structs/game.comData.go
+++ b/sys/configure/structs/game.comData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,200 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_comData struct {
- Index string
- Var string
- Intr string
+type GamecomData struct {
+ MaxChar int32
+ TaskReset int32
+ InitGold int32
+ InitHero []int32
+ Cameramin []int32
+ MaxGetreward []int32
+ Cameramax []float32
+ Heroshownum int32
+ Equipsuitsum []int32
+ FriendMaxnum int32
+ FriendMinnum int32
+ FriendMaxgetnum int32
+ FriendMaxsendnum int32
+ FriendDate int32
+ FriendRecordtime int32
+ FriendBlack int32
+ ChannelCdWorld int32
+ ChannelCdGuild int32
+ ChannelCdPrivate int32
+ ChannelCdPublic int32
+ ChannelLockIcon int32
+ MaxWord int32
+ MaxChat int32
+ MaxObject int32
+ LoadChat int32
+ ChannelAllocationMax int32
+ ChannelSwitchingMax int32
+ DrawToplimit int32
+ Draw10Star4Max int32
+ Draw10Star5Max int32
+ DrawFloorStar4 int32
+ DrawFloorStar5 int32
+ DuplicateRemoval int32
+ BasePoolCost *Gameatn
+ Camp1PoolCost *Gameatn
+ Camp2PoolCost *Gameatn
+ Camp3PoolCost *Gameatn
+ Camp4PoolCost *Gameatn
+ Camp1Pool1 string
+ Camp2Pool1 string
+ Camp3Pool1 string
+ Camp4Pool1 string
+ BasePool1 *Gamebasepool
+ BasePool2 *Gamebasepool
+ BasePool3 *Gamebasepool
+ BasePool4 *Gamebasepool
+ BasePoolStar3 int32
+ BasePoolStar4 int32
+ BasePoolStar5 int32
+ CampPoolStar3 int32
+ CampPoolStar4 int32
+ CampPoolStar5 int32
+ Gourmet int32
}
-func (Game_comData) GetTypeId() int {
+const TypeId_GamecomData = -395344177
+
+func (*GamecomData) GetTypeId() int32 {
return -395344177
}
-func NewGame_comData(_buf map[string]interface{}) (_v *Game_comData, err error) {
- _v = &Game_comData{}
- { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
- { var _ok_ bool; if _v.Var, _ok_ = _buf["var"].(string); !_ok_ { err = errors.New("var error"); return } }
- { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
+func (_v *GamecomData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_char"].(float64); !_ok_ { err = errors.New("max_char error"); return }; _v.MaxChar = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_reset"].(float64); !_ok_ { err = errors.New("task_reset error"); return }; _v.TaskReset = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["init_gold"].(float64); !_ok_ { err = errors.New("init_gold error"); return }; _v.InitGold = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["init_hero"].([]interface{}); !_ok_ { err = errors.New("init_hero error"); return }
+
+ _v.InitHero = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.InitHero = append(_v.InitHero, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cameramin"].([]interface{}); !_ok_ { err = errors.New("cameramin error"); return }
+
+ _v.Cameramin = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Cameramin = append(_v.Cameramin, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["max_getreward"].([]interface{}); !_ok_ { err = errors.New("max_getreward error"); return }
+
+ _v.MaxGetreward = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.MaxGetreward = append(_v.MaxGetreward, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cameramax"].([]interface{}); !_ok_ { err = errors.New("cameramax error"); return }
+
+ _v.Cameramax = make([]float32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ float32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = float32(_x_) }
+ _v.Cameramax = append(_v.Cameramax, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroshownum"].(float64); !_ok_ { err = errors.New("heroshownum error"); return }; _v.Heroshownum = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["equipsuitsum"].([]interface{}); !_ok_ { err = errors.New("equipsuitsum error"); return }
+
+ _v.Equipsuitsum = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Equipsuitsum = append(_v.Equipsuitsum, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxnum"].(float64); !_ok_ { err = errors.New("friend_maxnum error"); return }; _v.FriendMaxnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_minnum"].(float64); !_ok_ { err = errors.New("friend_minnum error"); return }; _v.FriendMinnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxgetnum"].(float64); !_ok_ { err = errors.New("friend_maxgetnum error"); return }; _v.FriendMaxgetnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxsendnum"].(float64); !_ok_ { err = errors.New("friend_maxsendnum error"); return }; _v.FriendMaxsendnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_date"].(float64); !_ok_ { err = errors.New("friend_date error"); return }; _v.FriendDate = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_recordtime"].(float64); !_ok_ { err = errors.New("friend_recordtime error"); return }; _v.FriendRecordtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_black"].(float64); !_ok_ { err = errors.New("friend_black error"); return }; _v.FriendBlack = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_world"].(float64); !_ok_ { err = errors.New("channel_cd_world error"); return }; _v.ChannelCdWorld = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_guild"].(float64); !_ok_ { err = errors.New("channel_cd_guild error"); return }; _v.ChannelCdGuild = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_private"].(float64); !_ok_ { err = errors.New("channel_cd_private error"); return }; _v.ChannelCdPrivate = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_public"].(float64); !_ok_ { err = errors.New("channel_cd_public error"); return }; _v.ChannelCdPublic = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_lock_icon"].(float64); !_ok_ { err = errors.New("channel_lock_icon error"); return }; _v.ChannelLockIcon = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_word"].(float64); !_ok_ { err = errors.New("max_word error"); return }; _v.MaxWord = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_chat"].(float64); !_ok_ { err = errors.New("max_chat error"); return }; _v.MaxChat = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_object"].(float64); !_ok_ { err = errors.New("max_object error"); return }; _v.MaxObject = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["load_chat"].(float64); !_ok_ { err = errors.New("load_chat error"); return }; _v.LoadChat = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_allocation_max"].(float64); !_ok_ { err = errors.New("channel_allocation_max error"); return }; _v.ChannelAllocationMax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_switching_max"].(float64); !_ok_ { err = errors.New("channel_switching_max error"); return }; _v.ChannelSwitchingMax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_toplimit"].(float64); !_ok_ { err = errors.New("draw_toplimit error"); return }; _v.DrawToplimit = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star4_max"].(float64); !_ok_ { err = errors.New("draw10_star4_max error"); return }; _v.Draw10Star4Max = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star5_max"].(float64); !_ok_ { err = errors.New("draw10_star5_max error"); return }; _v.Draw10Star5Max = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star4"].(float64); !_ok_ { err = errors.New("draw_floor_star4 error"); return }; _v.DrawFloorStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star5"].(float64); !_ok_ { err = errors.New("draw_floor_star5 error"); return }; _v.DrawFloorStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duplicate_removal"].(float64); !_ok_ { err = errors.New("duplicate_removal error"); return }; _v.DuplicateRemoval = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_cost error"); return }; if _v.BasePoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_cost error"); return }; if _v.Camp1PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_cost error"); return }; if _v.Camp2PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_cost error"); return }; if _v.Camp3PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_cost error"); return }; if _v.Camp4PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; if _v.Camp1Pool1, _ok_ = _buf["camp1_pool1"].(string); !_ok_ { err = errors.New("camp1_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp2Pool1, _ok_ = _buf["camp2_pool1"].(string); !_ok_ { err = errors.New("camp2_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp3Pool1, _ok_ = _buf["camp3_pool1"].(string); !_ok_ { err = errors.New("camp3_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp4Pool1, _ok_ = _buf["camp4_pool1"].(string); !_ok_ { err = errors.New("camp4_pool1 error"); return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool1"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool1 error"); return }; if _v.BasePool1, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star3"].(float64); !_ok_ { err = errors.New("camp_pool_star3 error"); return }; _v.CampPoolStar3 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star4"].(float64); !_ok_ { err = errors.New("camp_pool_star4 error"); return }; _v.CampPoolStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star5"].(float64); !_ok_ { err = errors.New("camp_pool_star5 error"); return }; _v.CampPoolStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gourmet"].(float64); !_ok_ { err = errors.New("gourmet error"); return }; _v.Gourmet = int32(_tempNum_) }
return
}
+
+func DeserializeGamecomData(_buf map[string]interface{}) (*GamecomData, error) {
+ v := &GamecomData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.drawCard.go b/sys/configure/structs/game.drawCard.go
index 5d2bf1d12..3d94955de 100644
--- a/sys/configure/structs/game.drawCard.go
+++ b/sys/configure/structs/game.drawCard.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_drawCard struct {
- _dataMap map[int32]*Game_drawCardData
- _dataList []*Game_drawCardData
+type GamedrawCard struct {
+ _dataMap map[int32]*GamedrawCardData
+ _dataList []*GamedrawCardData
}
-func NewGame_drawCard(_buf []map[string]interface{}) (*Game_drawCard, error) {
- _dataList := make([]*Game_drawCardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_drawCardData)
+func NewGamedrawCard(_buf []map[string]interface{}) (*GamedrawCard, error) {
+ _dataList := make([]*GamedrawCardData, 0, len(_buf))
+ dataMap := make(map[int32]*GamedrawCardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_drawCardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamedrawCardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_drawCard{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamedrawCard{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_drawCard) GetDataMap() map[int32]*Game_drawCardData {
+func (table *GamedrawCard) GetDataMap() map[int32]*GamedrawCardData {
return table._dataMap
}
-func (table *Game_drawCard) GetDataList() []*Game_drawCardData {
+func (table *GamedrawCard) GetDataList() []*GamedrawCardData {
return table._dataList
}
-func (table *Game_drawCard) Get(key int32) *Game_drawCardData {
+func (table *GamedrawCard) Get(key int32) *GamedrawCardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.drawCardData.go b/sys/configure/structs/game.drawCardData.go
index f37cbd8f2..220a9c09f 100644
--- a/sys/configure/structs/game.drawCardData.go
+++ b/sys/configure/structs/game.drawCardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,26 +5,43 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_drawCardData struct {
+type GamedrawCardData struct {
Key int32
+ RecruitmentType int32
+ CardPoolType string
+ Star int32
+ Race int32
Id string
- TypeId int32
Weight int32
}
-func (Game_drawCardData) GetTypeId() int {
+const TypeId_GamedrawCardData = -179684166
+
+func (*GamedrawCardData) GetTypeId() int32 {
return -179684166
}
-func NewGame_drawCardData(_buf map[string]interface{}) (_v *Game_drawCardData, err error) {
- _v = &Game_drawCardData{}
+func (_v *GamedrawCardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["recruitment_type"].(float64); !_ok_ { err = errors.New("recruitment_type error"); return }; _v.RecruitmentType = int32(_tempNum_) }
+ { var _ok_ bool; if _v.CardPoolType, _ok_ = _buf["card_pool_type"].(string); !_ok_ { err = errors.New("card_pool_type error"); return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type_id"].(float64); !_ok_ { err = errors.New("type_id error"); return }; _v.TypeId = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["weight"].(float64); !_ok_ { err = errors.New("weight error"); return }; _v.Weight = int32(_tempNum_) }
return
}
+
+func DeserializeGamedrawCardData(_buf map[string]interface{}) (*GamedrawCardData, error) {
+ v := &GamedrawCardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.drawCom.go b/sys/configure/structs/game.drawCom.go
deleted file mode 100644
index 5fd356b16..000000000
--- a/sys/configure/structs/game.drawCom.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// 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
-
-type Game_drawCom struct {
- _dataMap map[string]*Game_drawComData
- _dataList []*Game_drawComData
-}
-
-func NewGame_drawCom(_buf []map[string]interface{}) (*Game_drawCom, error) {
- _dataList := make([]*Game_drawComData, 0, len(_buf))
- dataMap := make(map[string]*Game_drawComData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_drawComData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
- }
- }
- return &Game_drawCom{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_drawCom) GetDataMap() map[string]*Game_drawComData {
- return table._dataMap
-}
-
-func (table *Game_drawCom) GetDataList() []*Game_drawComData {
- return table._dataList
-}
-
-func (table *Game_drawCom) Get(key string) *Game_drawComData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.drawComData.go b/sys/configure/structs/game.drawComData.go
deleted file mode 100644
index 038eea745..000000000
--- a/sys/configure/structs/game.drawComData.go
+++ /dev/null
@@ -1,27 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// 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 "errors"
-
-type Game_drawComData struct {
- Key string
- Value int32
-}
-
-func (Game_drawComData) GetTypeId() int {
- return 2052037355
-}
-
-func NewGame_drawComData(_buf map[string]interface{}) (_v *Game_drawComData, err error) {
- _v = &Game_drawComData{}
- { var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["value"].(float64); !_ok_ { err = errors.New("value error"); return }; _v.Value = int32(_tempNum_) }
- return
-}
diff --git a/sys/configure/structs/game.drawCost.go b/sys/configure/structs/game.drawCost.go
deleted file mode 100644
index 5cc993000..000000000
--- a/sys/configure/structs/game.drawCost.go
+++ /dev/null
@@ -1,42 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// 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
-
-type Game_drawCost struct {
- _dataMap map[int32]*Game_drawCostData
- _dataList []*Game_drawCostData
-}
-
-func NewGame_drawCost(_buf []map[string]interface{}) (*Game_drawCost, error) {
- _dataList := make([]*Game_drawCostData, 0, len(_buf))
- dataMap := make(map[int32]*Game_drawCostData)
- for _, _ele_ := range _buf {
- if _v, err2 := NewGame_drawCostData(_ele_); err2 != nil {
- return nil, err2
- } else {
- _dataList = append(_dataList, _v)
- dataMap[_v.Key] = _v
- }
- }
- return &Game_drawCost{_dataList:_dataList, _dataMap:dataMap}, nil
-}
-
-func (table *Game_drawCost) GetDataMap() map[int32]*Game_drawCostData {
- return table._dataMap
-}
-
-func (table *Game_drawCost) GetDataList() []*Game_drawCostData {
- return table._dataList
-}
-
-func (table *Game_drawCost) Get(key int32) *Game_drawCostData {
- return table._dataMap[key]
-}
-
-
diff --git a/sys/configure/structs/game.drawCostData.go b/sys/configure/structs/game.drawCostData.go
deleted file mode 100644
index 6cf30b45f..000000000
--- a/sys/configure/structs/game.drawCostData.go
+++ /dev/null
@@ -1,37 +0,0 @@
-
-//------------------------------------------------------------------------------
-//
-// 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 "errors"
-
-type Game_drawCostData struct {
- Key int32
- Count int32
- Cost *Game_atn
- Floor4 int32
- Floor5 int32
- Floor4cards int32
- Floor5cards int32
-}
-
-func (Game_drawCostData) GetTypeId() int {
- return -596129033
-}
-
-func NewGame_drawCostData(_buf map[string]interface{}) (_v *Game_drawCostData, err error) {
- _v = &Game_drawCostData{}
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["count"].(float64); !_ok_ { err = errors.New("count error"); return }; _v.Count = int32(_tempNum_) }
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["cost"].(map[string]interface{}); !_ok_ { err = errors.New("cost error"); return }; if _v.Cost, err = NewGame_atn(_x_); err != nil { return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4"].(float64); !_ok_ { err = errors.New("floor4 error"); return }; _v.Floor4 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5"].(float64); !_ok_ { err = errors.New("floor5 error"); return }; _v.Floor5 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor4cards"].(float64); !_ok_ { err = errors.New("floor4cards error"); return }; _v.Floor4cards = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["floor5cards"].(float64); !_ok_ { err = errors.New("floor5cards error"); return }; _v.Floor5cards = int32(_tempNum_) }
- return
-}
diff --git a/sys/configure/structs/game.equip.go b/sys/configure/structs/game.equip.go
index c192ccf50..637ecd327 100644
--- a/sys/configure/structs/game.equip.go
+++ b/sys/configure/structs/game.equip.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equip struct {
- _dataMap map[string]*Game_equipData
- _dataList []*Game_equipData
+type Gameequip struct {
+ _dataMap map[string]*GameequipData
+ _dataList []*GameequipData
}
-func NewGame_equip(_buf []map[string]interface{}) (*Game_equip, error) {
- _dataList := make([]*Game_equipData, 0, len(_buf))
- dataMap := make(map[string]*Game_equipData)
+func NewGameequip(_buf []map[string]interface{}) (*Gameequip, error) {
+ _dataList := make([]*GameequipData, 0, len(_buf))
+ dataMap := make(map[string]*GameequipData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_equip{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameequip{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_equip) GetDataMap() map[string]*Game_equipData {
+func (table *Gameequip) GetDataMap() map[string]*GameequipData {
return table._dataMap
}
-func (table *Game_equip) GetDataList() []*Game_equipData {
+func (table *Gameequip) GetDataList() []*GameequipData {
return table._dataList
}
-func (table *Game_equip) Get(key string) *Game_equipData {
+func (table *Gameequip) Get(key string) *GameequipData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.equipAttrlibrary.go b/sys/configure/structs/game.equipAttrlibrary.go
index 4328e55a7..5e83b9d22 100644
--- a/sys/configure/structs/game.equipAttrlibrary.go
+++ b/sys/configure/structs/game.equipAttrlibrary.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equipAttrlibrary struct {
- _dataMap map[int32]*Game_equipAttrlibraryData
- _dataList []*Game_equipAttrlibraryData
+type GameequipAttrlibrary struct {
+ _dataMap map[int32]*GameequipAttrlibraryData
+ _dataList []*GameequipAttrlibraryData
}
-func NewGame_equipAttrlibrary(_buf []map[string]interface{}) (*Game_equipAttrlibrary, error) {
- _dataList := make([]*Game_equipAttrlibraryData, 0, len(_buf))
- dataMap := make(map[int32]*Game_equipAttrlibraryData)
+func NewGameequipAttrlibrary(_buf []map[string]interface{}) (*GameequipAttrlibrary, error) {
+ _dataList := make([]*GameequipAttrlibraryData, 0, len(_buf))
+ dataMap := make(map[int32]*GameequipAttrlibraryData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipAttrlibraryData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipAttrlibraryData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_equipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameequipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_equipAttrlibrary) GetDataMap() map[int32]*Game_equipAttrlibraryData {
+func (table *GameequipAttrlibrary) GetDataMap() map[int32]*GameequipAttrlibraryData {
return table._dataMap
}
-func (table *Game_equipAttrlibrary) GetDataList() []*Game_equipAttrlibraryData {
+func (table *GameequipAttrlibrary) GetDataList() []*GameequipAttrlibraryData {
return table._dataList
}
-func (table *Game_equipAttrlibrary) Get(key int32) *Game_equipAttrlibraryData {
+func (table *GameequipAttrlibrary) Get(key int32) *GameequipAttrlibraryData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.equipAttrlibraryData.go b/sys/configure/structs/game.equipAttrlibraryData.go
index bd4de379e..7b4721825 100644
--- a/sys/configure/structs/game.equipAttrlibraryData.go
+++ b/sys/configure/structs/game.equipAttrlibraryData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipAttrlibraryData struct {
+type GameequipAttrlibraryData struct {
Key int32
Libraryid int32
Attrkey string
@@ -19,12 +19,13 @@ type Game_equipAttrlibraryData struct {
Addition []int32
}
-func (Game_equipAttrlibraryData) GetTypeId() int {
+const TypeId_GameequipAttrlibraryData = -437457248
+
+func (*GameequipAttrlibraryData) GetTypeId() int32 {
return -437457248
}
-func NewGame_equipAttrlibraryData(_buf map[string]interface{}) (_v *Game_equipAttrlibraryData, err error) {
- _v = &Game_equipAttrlibraryData{}
+func (_v *GameequipAttrlibraryData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["libraryid"].(float64); !_ok_ { err = errors.New("libraryid error"); return }; _v.Libraryid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Attrkey, _ok_ = _buf["attrkey"].(string); !_ok_ { err = errors.New("attrkey error"); return } }
@@ -46,3 +47,12 @@ func NewGame_equipAttrlibraryData(_buf map[string]interface{}) (_v *Game_equipAt
return
}
+
+func DeserializeGameequipAttrlibraryData(_buf map[string]interface{}) (*GameequipAttrlibraryData, error) {
+ v := &GameequipAttrlibraryData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.equipColor.go b/sys/configure/structs/game.equipColor.go
index 038bea3a9..7f9b0025c 100644
--- a/sys/configure/structs/game.equipColor.go
+++ b/sys/configure/structs/game.equipColor.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,37 +5,36 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equipColor struct {
- _dataMap map[int32]*Game_equipColorData
- _dataList []*Game_equipColorData
+type GameequipColor struct {
+ _dataMap map[int32]*GameequipColorData
+ _dataList []*GameequipColorData
}
-func NewGame_equipColor(_buf []map[string]interface{}) (*Game_equipColor, error) {
- _dataList := make([]*Game_equipColorData, 0, len(_buf))
- dataMap := make(map[int32]*Game_equipColorData)
+func NewGameequipColor(_buf []map[string]interface{}) (*GameequipColor, error) {
+ _dataList := make([]*GameequipColorData, 0, len(_buf))
+ dataMap := make(map[int32]*GameequipColorData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipColorData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipColorData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Num] = _v
}
}
- return &Game_equipColor{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameequipColor{_dataList: _dataList, _dataMap: dataMap}, nil
}
-func (table *Game_equipColor) GetDataMap() map[int32]*Game_equipColorData {
- return table._dataMap
+func (table *GameequipColor) GetDataMap() map[int32]*GameequipColorData {
+ return table._dataMap
}
-func (table *Game_equipColor) GetDataList() []*Game_equipColorData {
- return table._dataList
+func (table *GameequipColor) GetDataList() []*GameequipColorData {
+ return table._dataList
}
-func (table *Game_equipColor) Get(key int32) *Game_equipColorData {
- return table._dataMap[key]
+func (table *GameequipColor) Get(key int32) *GameequipColorData {
+ return table._dataMap[key]
}
-
-
diff --git a/sys/configure/structs/game.equipColorData.go b/sys/configure/structs/game.equipColorData.go
index 4b30c731e..6b3583cf2 100644
--- a/sys/configure/structs/game.equipColorData.go
+++ b/sys/configure/structs/game.equipColorData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,22 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipColorData struct {
+type GameequipColorData struct {
Num int32
Color string
}
-func (Game_equipColorData) GetTypeId() int {
+const TypeId_GameequipColorData = 2132033753
+
+func (*GameequipColorData) GetTypeId() int32 {
return 2132033753
}
-func NewGame_equipColorData(_buf map[string]interface{}) (_v *Game_equipColorData, err error) {
- _v = &Game_equipColorData{}
+func (_v *GameequipColorData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["color"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Color error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Color, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGameequipColorData(_buf map[string]interface{}) (*GameequipColorData, error) {
+ v := &GameequipColorData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go
index 004ba8db1..14397d8cc 100644
--- a/sys/configure/structs/game.equipData.go
+++ b/sys/configure/structs/game.equipData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipData struct {
+type GameequipData struct {
Id string
Name string
Suittype int32
@@ -24,15 +24,16 @@ type Game_equipData struct {
Addlibrary int32
Ico string
UseSkip int32
- Sale []*Game_atn
+ Sale []*Gameatn
}
-func (Game_equipData) GetTypeId() int {
+const TypeId_GameequipData = 1778846974
+
+func (*GameequipData) GetTypeId() int32 {
return 1778846974
}
-func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err error) {
- _v = &Game_equipData{}
+func (_v *GameequipData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
@@ -77,14 +78,23 @@ func NewGame_equipData(_buf map[string]interface{}) (_v *Game_equipData, err err
var _ok_ bool
if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return }
- _v.Sale = make([]*Game_atn, 0, len(_arr_))
+ _v.Sale = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Sale = append(_v.Sale, _list_v_)
}
}
return
}
+
+func DeserializeGameequipData(_buf map[string]interface{}) (*GameequipData, error) {
+ v := &GameequipData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.equipIntensify.go b/sys/configure/structs/game.equipIntensify.go
index a0a3de41d..9584812de 100644
--- a/sys/configure/structs/game.equipIntensify.go
+++ b/sys/configure/structs/game.equipIntensify.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equipIntensify struct {
- _dataMap map[int32]*Game_equipIntensifyData
- _dataList []*Game_equipIntensifyData
+type GameequipIntensify struct {
+ _dataMap map[int32]*GameequipIntensifyData
+ _dataList []*GameequipIntensifyData
}
-func NewGame_equipIntensify(_buf []map[string]interface{}) (*Game_equipIntensify, error) {
- _dataList := make([]*Game_equipIntensifyData, 0, len(_buf))
- dataMap := make(map[int32]*Game_equipIntensifyData)
+func NewGameequipIntensify(_buf []map[string]interface{}) (*GameequipIntensify, error) {
+ _dataList := make([]*GameequipIntensifyData, 0, len(_buf))
+ dataMap := make(map[int32]*GameequipIntensifyData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipIntensifyData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipIntensifyData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_equipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameequipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_equipIntensify) GetDataMap() map[int32]*Game_equipIntensifyData {
+func (table *GameequipIntensify) GetDataMap() map[int32]*GameequipIntensifyData {
return table._dataMap
}
-func (table *Game_equipIntensify) GetDataList() []*Game_equipIntensifyData {
+func (table *GameequipIntensify) GetDataList() []*GameequipIntensifyData {
return table._dataList
}
-func (table *Game_equipIntensify) Get(key int32) *Game_equipIntensifyData {
+func (table *GameequipIntensify) Get(key int32) *GameequipIntensifyData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.equipIntensifyData.go b/sys/configure/structs/game.equipIntensifyData.go
index bdc365a98..e92a11dce 100644
--- a/sys/configure/structs/game.equipIntensifyData.go
+++ b/sys/configure/structs/game.equipIntensifyData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,27 +5,29 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipIntensifyData struct {
+type GameequipIntensifyData struct {
Key int32
Star int32
Level int32
- Need []*Game_atn
+ Need []*Gameatn
Bonus int32
Activation bool
Probability int32
Num int32
}
-func (Game_equipIntensifyData) GetTypeId() int {
+const TypeId_GameequipIntensifyData = 1687417591
+
+func (*GameequipIntensifyData) GetTypeId() int32 {
return 1687417591
}
-func NewGame_equipIntensifyData(_buf map[string]interface{}) (_v *Game_equipIntensifyData, err error) {
- _v = &Game_equipIntensifyData{}
+func (_v *GameequipIntensifyData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
@@ -35,11 +36,11 @@ func NewGame_equipIntensifyData(_buf map[string]interface{}) (_v *Game_equipInte
var _ok_ bool
if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
- _v.Need = make([]*Game_atn, 0, len(_arr_))
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Need = append(_v.Need, _list_v_)
}
}
@@ -50,3 +51,12 @@ func NewGame_equipIntensifyData(_buf map[string]interface{}) (_v *Game_equipInte
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["num"].(float64); !_ok_ { err = errors.New("num error"); return }; _v.Num = int32(_tempNum_) }
return
}
+
+func DeserializeGameequipIntensifyData(_buf map[string]interface{}) (*GameequipIntensifyData, error) {
+ v := &GameequipIntensifyData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.equipPos.go b/sys/configure/structs/game.equipPos.go
index fa12bb4f7..f85e2822b 100644
--- a/sys/configure/structs/game.equipPos.go
+++ b/sys/configure/structs/game.equipPos.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equipPos struct {
- _dataMap map[int32]*Game_equipPosData
- _dataList []*Game_equipPosData
+type GameequipPos struct {
+ _dataMap map[int32]*GameequipPosData
+ _dataList []*GameequipPosData
}
-func NewGame_equipPos(_buf []map[string]interface{}) (*Game_equipPos, error) {
- _dataList := make([]*Game_equipPosData, 0, len(_buf))
- dataMap := make(map[int32]*Game_equipPosData)
+func NewGameequipPos(_buf []map[string]interface{}) (*GameequipPos, error) {
+ _dataList := make([]*GameequipPosData, 0, len(_buf))
+ dataMap := make(map[int32]*GameequipPosData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipPosData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipPosData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Pos] = _v
}
}
- return &Game_equipPos{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameequipPos{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_equipPos) GetDataMap() map[int32]*Game_equipPosData {
+func (table *GameequipPos) GetDataMap() map[int32]*GameequipPosData {
return table._dataMap
}
-func (table *Game_equipPos) GetDataList() []*Game_equipPosData {
+func (table *GameequipPos) GetDataList() []*GameequipPosData {
return table._dataList
}
-func (table *Game_equipPos) Get(key int32) *Game_equipPosData {
+func (table *GameequipPos) Get(key int32) *GameequipPosData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.equipPosData.go b/sys/configure/structs/game.equipPosData.go
index 722f3efd9..794fd4bd2 100644
--- a/sys/configure/structs/game.equipPosData.go
+++ b/sys/configure/structs/game.equipPosData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,23 +5,25 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipPosData struct {
+type GameequipPosData struct {
Pos int32
Suitnum int32
Leadlibrary []string
Addlibrary []string
}
-func (Game_equipPosData) GetTypeId() int {
+const TypeId_GameequipPosData = 487964234
+
+func (*GameequipPosData) GetTypeId() int32 {
return 487964234
}
-func NewGame_equipPosData(_buf map[string]interface{}) (_v *Game_equipPosData, err error) {
- _v = &Game_equipPosData{}
+func (_v *GameequipPosData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pos"].(float64); !_ok_ { err = errors.New("pos error"); return }; _v.Pos = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) }
{
@@ -55,3 +56,12 @@ func NewGame_equipPosData(_buf map[string]interface{}) (_v *Game_equipPosData, e
return
}
+
+func DeserializeGameequipPosData(_buf map[string]interface{}) (*GameequipPosData, error) {
+ v := &GameequipPosData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.equipSuit.go b/sys/configure/structs/game.equipSuit.go
index a2000ec43..c26d343a6 100644
--- a/sys/configure/structs/game.equipSuit.go
+++ b/sys/configure/structs/game.equipSuit.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_equipSuit struct {
- _dataMap map[int32]*Game_equipSuitData
- _dataList []*Game_equipSuitData
+type GameequipSuit struct {
+ _dataMap map[int32]*GameequipSuitData
+ _dataList []*GameequipSuitData
}
-func NewGame_equipSuit(_buf []map[string]interface{}) (*Game_equipSuit, error) {
- _dataList := make([]*Game_equipSuitData, 0, len(_buf))
- dataMap := make(map[int32]*Game_equipSuitData)
+func NewGameequipSuit(_buf []map[string]interface{}) (*GameequipSuit, error) {
+ _dataList := make([]*GameequipSuitData, 0, len(_buf))
+ dataMap := make(map[int32]*GameequipSuitData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_equipSuitData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameequipSuitData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Suittype] = _v
}
}
- return &Game_equipSuit{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameequipSuit{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_equipSuit) GetDataMap() map[int32]*Game_equipSuitData {
+func (table *GameequipSuit) GetDataMap() map[int32]*GameequipSuitData {
return table._dataMap
}
-func (table *Game_equipSuit) GetDataList() []*Game_equipSuitData {
+func (table *GameequipSuit) GetDataList() []*GameequipSuitData {
return table._dataList
}
-func (table *Game_equipSuit) Get(key int32) *Game_equipSuitData {
+func (table *GameequipSuit) Get(key int32) *GameequipSuitData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.equipSuitData.go b/sys/configure/structs/game.equipSuitData.go
index b874c6519..a0cef2cb5 100644
--- a/sys/configure/structs/game.equipSuitData.go
+++ b/sys/configure/structs/game.equipSuitData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_equipSuitData struct {
+type GameequipSuitData struct {
Suittype int32
Suitnum int32
Skill int32
@@ -18,12 +18,13 @@ type Game_equipSuitData struct {
Skillintr string
}
-func (Game_equipSuitData) GetTypeId() int {
+const TypeId_GameequipSuitData = -332303445
+
+func (*GameequipSuitData) GetTypeId() int32 {
return -332303445
}
-func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData, err error) {
- _v = &Game_equipSuitData{}
+func (_v *GameequipSuitData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suitnum"].(float64); !_ok_ { err = errors.New("suitnum error"); return }; _v.Suitnum = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
@@ -31,3 +32,12 @@ func NewGame_equipSuitData(_buf map[string]interface{}) (_v *Game_equipSuitData,
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGameequipSuitData(_buf map[string]interface{}) (*GameequipSuitData, error) {
+ v := &GameequipSuitData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.extservers.go b/sys/configure/structs/game.extservers.go
index fad235100..3d923d1ff 100644
--- a/sys/configure/structs/game.extservers.go
+++ b/sys/configure/structs/game.extservers.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_extservers struct {
- _dataMap map[string]*Game_extserversData
- _dataList []*Game_extserversData
+type Gameextservers struct {
+ _dataMap map[int32]*GameextserversData
+ _dataList []*GameextserversData
}
-func NewGame_extservers(_buf []map[string]interface{}) (*Game_extservers, error) {
- _dataList := make([]*Game_extserversData, 0, len(_buf))
- dataMap := make(map[string]*Game_extserversData)
+func NewGameextservers(_buf []map[string]interface{}) (*Gameextservers, error) {
+ _dataList := make([]*GameextserversData, 0, len(_buf))
+ dataMap := make(map[int32]*GameextserversData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_extserversData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameextserversData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Name] = _v
+ dataMap[_v.Index] = _v
}
}
- return &Game_extservers{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameextservers{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_extservers) GetDataMap() map[string]*Game_extserversData {
+func (table *Gameextservers) GetDataMap() map[int32]*GameextserversData {
return table._dataMap
}
-func (table *Game_extservers) GetDataList() []*Game_extserversData {
+func (table *Gameextservers) GetDataList() []*GameextserversData {
return table._dataList
}
-func (table *Game_extservers) Get(key string) *Game_extserversData {
+func (table *Gameextservers) Get(key int32) *GameextserversData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.extserversData.go b/sys/configure/structs/game.extserversData.go
index 621d25f63..a76cf3ec7 100644
--- a/sys/configure/structs/game.extserversData.go
+++ b/sys/configure/structs/game.extserversData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,26 +5,39 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_extserversData struct {
+type GameextserversData struct {
+ Index int32
Name string
Ips string
Debug bool
Sid string
}
-func (Game_extserversData) GetTypeId() int {
+const TypeId_GameextserversData = -245856747
+
+func (*GameextserversData) GetTypeId() int32 {
return -245856747
}
-func NewGame_extserversData(_buf map[string]interface{}) (_v *Game_extserversData, err error) {
- _v = &Game_extserversData{}
+func (_v *GameextserversData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["index"].(float64); !_ok_ { err = errors.New("index error"); return }; _v.Index = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Ips, _ok_ = _buf["ips"].(string); !_ok_ { err = errors.New("ips error"); return } }
{ var _ok_ bool; if _v.Debug, _ok_ = _buf["debug"].(bool); !_ok_ { err = errors.New("debug error"); return } }
{ var _ok_ bool; if _v.Sid, _ok_ = _buf["sid"].(string); !_ok_ { err = errors.New("sid error"); return } }
return
}
+
+func DeserializeGameextserversData(_buf map[string]interface{}) (*GameextserversData, error) {
+ v := &GameextserversData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.facemod.go b/sys/configure/structs/game.facemod.go
index dc10813dc..172370f02 100644
--- a/sys/configure/structs/game.facemod.go
+++ b/sys/configure/structs/game.facemod.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_facemod struct {
- _dataMap map[int32]*Game_facemodData
- _dataList []*Game_facemodData
+type Gamefacemod struct {
+ _dataMap map[int32]*GamefacemodData
+ _dataList []*GamefacemodData
}
-func NewGame_facemod(_buf []map[string]interface{}) (*Game_facemod, error) {
- _dataList := make([]*Game_facemodData, 0, len(_buf))
- dataMap := make(map[int32]*Game_facemodData)
+func NewGamefacemod(_buf []map[string]interface{}) (*Gamefacemod, error) {
+ _dataList := make([]*GamefacemodData, 0, len(_buf))
+ dataMap := make(map[int32]*GamefacemodData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_facemodData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamefacemodData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_facemod{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamefacemod{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_facemod) GetDataMap() map[int32]*Game_facemodData {
+func (table *Gamefacemod) GetDataMap() map[int32]*GamefacemodData {
return table._dataMap
}
-func (table *Game_facemod) GetDataList() []*Game_facemodData {
+func (table *Gamefacemod) GetDataList() []*GamefacemodData {
return table._dataList
}
-func (table *Game_facemod) Get(key int32) *Game_facemodData {
+func (table *Gamefacemod) Get(key int32) *GamefacemodData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.facemodData.go b/sys/configure/structs/game.facemodData.go
index 104e459c0..50067518d 100644
--- a/sys/configure/structs/game.facemodData.go
+++ b/sys/configure/structs/game.facemodData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,22 +5,24 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_facemodData struct {
+type GamefacemodData struct {
Id int32
Suitintr string
- Figure []*Game_Figure
+ Figure []*GameFigure
}
-func (Game_facemodData) GetTypeId() int {
+const TypeId_GamefacemodData = -214755117
+
+func (*GamefacemodData) GetTypeId() int32 {
return -214755117
}
-func NewGame_facemodData(_buf map[string]interface{}) (_v *Game_facemodData, err error) {
- _v = &Game_facemodData{}
+func (_v *GamefacemodData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Suitintr, _ok_ = _buf["suitintr"].(string); !_ok_ { err = errors.New("suitintr error"); return } }
{
@@ -29,14 +30,23 @@ func NewGame_facemodData(_buf map[string]interface{}) (_v *Game_facemodData, err
var _ok_ bool
if _arr_, _ok_ = _buf["figure"].([]interface{}); !_ok_ { err = errors.New("figure error"); return }
- _v.Figure = make([]*Game_Figure, 0, len(_arr_))
+ _v.Figure = make([]*GameFigure, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_Figure
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_Figure(_x_); err != nil { return } }
+ var _list_v_ *GameFigure
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameFigure(_x_); err != nil { return } }
_v.Figure = append(_v.Figure, _list_v_)
}
}
return
}
+
+func DeserializeGamefacemodData(_buf map[string]interface{}) (*GamefacemodData, error) {
+ v := &GamefacemodData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.global.go b/sys/configure/structs/game.global.go
index 16bfe0898..2233d0ae4 100644
--- a/sys/configure/structs/game.global.go
+++ b/sys/configure/structs/game.global.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_global struct {
- _dataMap map[string]*Game_globalData
- _dataList []*Game_globalData
+type Gameglobal struct {
+ _dataMap map[int32]*GameglobalData
+ _dataList []*GameglobalData
}
-func NewGame_global(_buf []map[string]interface{}) (*Game_global, error) {
- _dataList := make([]*Game_globalData, 0, len(_buf))
- dataMap := make(map[string]*Game_globalData)
+func NewGameglobal(_buf []map[string]interface{}) (*Gameglobal, error) {
+ _dataList := make([]*GameglobalData, 0, len(_buf))
+ dataMap := make(map[int32]*GameglobalData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_globalData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameglobalData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Index] = _v
+ dataMap[_v.MaxChar] = _v
}
}
- return &Game_global{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameglobal{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_global) GetDataMap() map[string]*Game_globalData {
+func (table *Gameglobal) GetDataMap() map[int32]*GameglobalData {
return table._dataMap
}
-func (table *Game_global) GetDataList() []*Game_globalData {
+func (table *Gameglobal) GetDataList() []*GameglobalData {
return table._dataList
}
-func (table *Game_global) Get(key string) *Game_globalData {
+func (table *Gameglobal) Get(key int32) *GameglobalData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.globalData.go b/sys/configure/structs/game.globalData.go
index 0645b8bad..6bb58126e 100644
--- a/sys/configure/structs/game.globalData.go
+++ b/sys/configure/structs/game.globalData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,200 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_globalData struct {
- Index string
- Var string
- Intr string
+type GameglobalData struct {
+ MaxChar int32
+ TaskReset int32
+ InitGold int32
+ InitHero []int32
+ Cameramin []int32
+ MaxGetreward []int32
+ Cameramax []float32
+ Heroshownum int32
+ Equipsuitsum []int32
+ FriendMaxnum int32
+ FriendMinnum int32
+ FriendMaxgetnum int32
+ FriendMaxsendnum int32
+ FriendDate int32
+ FriendRecordtime int32
+ FriendBlack int32
+ ChannelCdWorld int32
+ ChannelCdGuild int32
+ ChannelCdPrivate int32
+ ChannelCdPublic int32
+ ChannelLockIcon int32
+ MaxWord int32
+ MaxChat int32
+ MaxObject int32
+ LoadChat int32
+ ChannelAllocationMax int32
+ ChannelSwitchingMax int32
+ DrawToplimit int32
+ Draw10Star4Max int32
+ Draw10Star5Max int32
+ DrawFloorStar4 int32
+ DrawFloorStar5 int32
+ DuplicateRemoval int32
+ BasePoolCost *Gameatn
+ Camp1PoolCost *Gameatn
+ Camp2PoolCost *Gameatn
+ Camp3PoolCost *Gameatn
+ Camp4PoolCost *Gameatn
+ Camp1Pool1 string
+ Camp2Pool1 string
+ Camp3Pool1 string
+ Camp4Pool1 string
+ BasePool1 *Gamebasepool
+ BasePool2 *Gamebasepool
+ BasePool3 *Gamebasepool
+ BasePool4 *Gamebasepool
+ BasePoolStar3 int32
+ BasePoolStar4 int32
+ BasePoolStar5 int32
+ CampPoolStar3 int32
+ CampPoolStar4 int32
+ CampPoolStar5 int32
+ Gourmet int32
}
-func (Game_globalData) GetTypeId() int {
+const TypeId_GameglobalData = -518904471
+
+func (*GameglobalData) GetTypeId() int32 {
return -518904471
}
-func NewGame_globalData(_buf map[string]interface{}) (_v *Game_globalData, err error) {
- _v = &Game_globalData{}
- { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
- { var _ok_ bool; if _v.Var, _ok_ = _buf["var"].(string); !_ok_ { err = errors.New("var error"); return } }
- { var _ok_ bool; if _v.Intr, _ok_ = _buf["intr"].(string); !_ok_ { err = errors.New("intr error"); return } }
+func (_v *GameglobalData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_char"].(float64); !_ok_ { err = errors.New("max_char error"); return }; _v.MaxChar = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["task_reset"].(float64); !_ok_ { err = errors.New("task_reset error"); return }; _v.TaskReset = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["init_gold"].(float64); !_ok_ { err = errors.New("init_gold error"); return }; _v.InitGold = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["init_hero"].([]interface{}); !_ok_ { err = errors.New("init_hero error"); return }
+
+ _v.InitHero = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.InitHero = append(_v.InitHero, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cameramin"].([]interface{}); !_ok_ { err = errors.New("cameramin error"); return }
+
+ _v.Cameramin = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Cameramin = append(_v.Cameramin, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["max_getreward"].([]interface{}); !_ok_ { err = errors.New("max_getreward error"); return }
+
+ _v.MaxGetreward = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.MaxGetreward = append(_v.MaxGetreward, _list_v_)
+ }
+ }
+
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["cameramax"].([]interface{}); !_ok_ { err = errors.New("cameramax error"); return }
+
+ _v.Cameramax = make([]float32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ float32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = float32(_x_) }
+ _v.Cameramax = append(_v.Cameramax, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["heroshownum"].(float64); !_ok_ { err = errors.New("heroshownum error"); return }; _v.Heroshownum = int32(_tempNum_) }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["equipsuitsum"].([]interface{}); !_ok_ { err = errors.New("equipsuitsum error"); return }
+
+ _v.Equipsuitsum = make([]int32, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
+ _v.Equipsuitsum = append(_v.Equipsuitsum, _list_v_)
+ }
+ }
+
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxnum"].(float64); !_ok_ { err = errors.New("friend_maxnum error"); return }; _v.FriendMaxnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_minnum"].(float64); !_ok_ { err = errors.New("friend_minnum error"); return }; _v.FriendMinnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxgetnum"].(float64); !_ok_ { err = errors.New("friend_maxgetnum error"); return }; _v.FriendMaxgetnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_maxsendnum"].(float64); !_ok_ { err = errors.New("friend_maxsendnum error"); return }; _v.FriendMaxsendnum = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_date"].(float64); !_ok_ { err = errors.New("friend_date error"); return }; _v.FriendDate = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_recordtime"].(float64); !_ok_ { err = errors.New("friend_recordtime error"); return }; _v.FriendRecordtime = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["friend_black"].(float64); !_ok_ { err = errors.New("friend_black error"); return }; _v.FriendBlack = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_world"].(float64); !_ok_ { err = errors.New("channel_cd_world error"); return }; _v.ChannelCdWorld = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_guild"].(float64); !_ok_ { err = errors.New("channel_cd_guild error"); return }; _v.ChannelCdGuild = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_private"].(float64); !_ok_ { err = errors.New("channel_cd_private error"); return }; _v.ChannelCdPrivate = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_cd_public"].(float64); !_ok_ { err = errors.New("channel_cd_public error"); return }; _v.ChannelCdPublic = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_lock_icon"].(float64); !_ok_ { err = errors.New("channel_lock_icon error"); return }; _v.ChannelLockIcon = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_word"].(float64); !_ok_ { err = errors.New("max_word error"); return }; _v.MaxWord = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_chat"].(float64); !_ok_ { err = errors.New("max_chat error"); return }; _v.MaxChat = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["max_object"].(float64); !_ok_ { err = errors.New("max_object error"); return }; _v.MaxObject = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["load_chat"].(float64); !_ok_ { err = errors.New("load_chat error"); return }; _v.LoadChat = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_allocation_max"].(float64); !_ok_ { err = errors.New("channel_allocation_max error"); return }; _v.ChannelAllocationMax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["channel_switching_max"].(float64); !_ok_ { err = errors.New("channel_switching_max error"); return }; _v.ChannelSwitchingMax = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_toplimit"].(float64); !_ok_ { err = errors.New("draw_toplimit error"); return }; _v.DrawToplimit = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star4_max"].(float64); !_ok_ { err = errors.New("draw10_star4_max error"); return }; _v.Draw10Star4Max = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw10_star5_max"].(float64); !_ok_ { err = errors.New("draw10_star5_max error"); return }; _v.Draw10Star5Max = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star4"].(float64); !_ok_ { err = errors.New("draw_floor_star4 error"); return }; _v.DrawFloorStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["draw_floor_star5"].(float64); !_ok_ { err = errors.New("draw_floor_star5 error"); return }; _v.DrawFloorStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["duplicate_removal"].(float64); !_ok_ { err = errors.New("duplicate_removal error"); return }; _v.DuplicateRemoval = int32(_tempNum_) }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool_cost error"); return }; if _v.BasePoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp1_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp1_pool_cost error"); return }; if _v.Camp1PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp2_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp2_pool_cost error"); return }; if _v.Camp2PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp3_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp3_pool_cost error"); return }; if _v.Camp3PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["camp4_pool_cost"].(map[string]interface{}); !_ok_ { err = errors.New("camp4_pool_cost error"); return }; if _v.Camp4PoolCost, err = DeserializeGameatn(_x_); err != nil { return } }
+ { var _ok_ bool; if _v.Camp1Pool1, _ok_ = _buf["camp1_pool1"].(string); !_ok_ { err = errors.New("camp1_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp2Pool1, _ok_ = _buf["camp2_pool1"].(string); !_ok_ { err = errors.New("camp2_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp3Pool1, _ok_ = _buf["camp3_pool1"].(string); !_ok_ { err = errors.New("camp3_pool1 error"); return } }
+ { var _ok_ bool; if _v.Camp4Pool1, _ok_ = _buf["camp4_pool1"].(string); !_ok_ { err = errors.New("camp4_pool1 error"); return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool1"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool1 error"); return }; if _v.BasePool1, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool2"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool2 error"); return }; if _v.BasePool2, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool3"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool3 error"); return }; if _v.BasePool3, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["base_pool4"].(map[string]interface{}); !_ok_ { err = errors.New("base_pool4 error"); return }; if _v.BasePool4, err = DeserializeGamebasepool(_x_); err != nil { return } }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star3"].(float64); !_ok_ { err = errors.New("base_pool_star3 error"); return }; _v.BasePoolStar3 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star4"].(float64); !_ok_ { err = errors.New("base_pool_star4 error"); return }; _v.BasePoolStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["base_pool_star5"].(float64); !_ok_ { err = errors.New("base_pool_star5 error"); return }; _v.BasePoolStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star3"].(float64); !_ok_ { err = errors.New("camp_pool_star3 error"); return }; _v.CampPoolStar3 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star4"].(float64); !_ok_ { err = errors.New("camp_pool_star4 error"); return }; _v.CampPoolStar4 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camp_pool_star5"].(float64); !_ok_ { err = errors.New("camp_pool_star5 error"); return }; _v.CampPoolStar5 = int32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gourmet"].(float64); !_ok_ { err = errors.New("gourmet error"); return }; _v.Gourmet = int32(_tempNum_) }
return
}
+
+func DeserializeGameglobalData(_buf map[string]interface{}) (*GameglobalData, error) {
+ v := &GameglobalData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.hero.go b/sys/configure/structs/game.hero.go
index 48cc2c6ea..a491cbcd9 100644
--- a/sys/configure/structs/game.hero.go
+++ b/sys/configure/structs/game.hero.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_hero struct {
- _dataMap map[string]*Game_heroData
- _dataList []*Game_heroData
+type Gamehero struct {
+ _dataMap map[string]*GameheroData
+ _dataList []*GameheroData
}
-func NewGame_hero(_buf []map[string]interface{}) (*Game_hero, error) {
- _dataList := make([]*Game_heroData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroData)
+func NewGamehero(_buf []map[string]interface{}) (*Gamehero, error) {
+ _dataList := make([]*GameheroData, 0, len(_buf))
+ dataMap := make(map[string]*GameheroData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Hid] = _v
}
}
- return &Game_hero{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamehero{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_hero) GetDataMap() map[string]*Game_heroData {
+func (table *Gamehero) GetDataMap() map[string]*GameheroData {
return table._dataMap
}
-func (table *Game_hero) GetDataList() []*Game_heroData {
+func (table *Gamehero) GetDataList() []*GameheroData {
return table._dataList
}
-func (table *Game_hero) Get(key string) *Game_heroData {
+func (table *Gamehero) Get(key string) *GameheroData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroAwaken.go b/sys/configure/structs/game.heroAwaken.go
index 1f4bace1e..4905f19e4 100644
--- a/sys/configure/structs/game.heroAwaken.go
+++ b/sys/configure/structs/game.heroAwaken.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroAwaken struct {
- _dataMap map[int32]*Game_heroAwakenData
- _dataList []*Game_heroAwakenData
+type GameheroAwaken struct {
+ _dataMap map[int32]*GameheroAwakenData
+ _dataList []*GameheroAwakenData
}
-func NewGame_heroAwaken(_buf []map[string]interface{}) (*Game_heroAwaken, error) {
- _dataList := make([]*Game_heroAwakenData, 0, len(_buf))
- dataMap := make(map[int32]*Game_heroAwakenData)
+func NewGameheroAwaken(_buf []map[string]interface{}) (*GameheroAwaken, error) {
+ _dataList := make([]*GameheroAwakenData, 0, len(_buf))
+ dataMap := make(map[int32]*GameheroAwakenData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroAwakenData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroAwakenData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_heroAwaken{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroAwaken{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroAwaken) GetDataMap() map[int32]*Game_heroAwakenData {
+func (table *GameheroAwaken) GetDataMap() map[int32]*GameheroAwakenData {
return table._dataMap
}
-func (table *Game_heroAwaken) GetDataList() []*Game_heroAwakenData {
+func (table *GameheroAwaken) GetDataList() []*GameheroAwakenData {
return table._dataList
}
-func (table *Game_heroAwaken) Get(key int32) *Game_heroAwakenData {
+func (table *GameheroAwaken) Get(key int32) *GameheroAwakenData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroAwakenData.go b/sys/configure/structs/game.heroAwakenData.go
index a3d23dd50..d2dfd90cb 100644
--- a/sys/configure/structs/game.heroAwakenData.go
+++ b/sys/configure/structs/game.heroAwakenData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,26 +5,28 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroAwakenData struct {
+type GameheroAwakenData struct {
Key int32
Hid string
Phase int32
Phasebonus []string
Icon string
Condition int32
- Phaseneed []*Game_atn
+ Phaseneed []*Gameatn
}
-func (Game_heroAwakenData) GetTypeId() int {
+const TypeId_GameheroAwakenData = -1396976663
+
+func (*GameheroAwakenData) GetTypeId() int32 {
return -1396976663
}
-func NewGame_heroAwakenData(_buf map[string]interface{}) (_v *Game_heroAwakenData, err error) {
- _v = &Game_heroAwakenData{}
+func (_v *GameheroAwakenData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["phase"].(float64); !_ok_ { err = errors.New("phase error"); return }; _v.Phase = int32(_tempNum_) }
@@ -50,14 +51,23 @@ func NewGame_heroAwakenData(_buf map[string]interface{}) (_v *Game_heroAwakenDat
var _ok_ bool
if _arr_, _ok_ = _buf["phaseneed"].([]interface{}); !_ok_ { err = errors.New("phaseneed error"); return }
- _v.Phaseneed = make([]*Game_atn, 0, len(_arr_))
+ _v.Phaseneed = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Phaseneed = append(_v.Phaseneed, _list_v_)
}
}
return
}
+
+func DeserializeGameheroAwakenData(_buf map[string]interface{}) (*GameheroAwakenData, error) {
+ v := &GameheroAwakenData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go
index 2e7541699..64a041b21 100644
--- a/sys/configure/structs/game.heroData.go
+++ b/sys/configure/structs/game.heroData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,102 +5,335 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-import "errors"
-import "bright/math"
+import (
+ "errors"
+)
-type Game_heroData struct {
- Hid string
- Name string
- Star int32
- Color int32
- Race int32
- Job int32
- Type int32
- Handbook int32
- Prefab int32
- Rotation string
- Icon int32
- Vocal string
- Tujing []int32
- Intr string
- Events string
- Cite string
- Effectstay []string
- Hpspace math.Vector3
- Skill int32
- Skill1 int32
- Skill2 int32
- Skill3 int32
- Txt string
- Enteranivalue int32
- Camerainterval float32
+type GameheroData struct {
+ Hid string
+ Name string
+ Star int32
+ Color int32
+ Race int32
+ Job int32
+ Type int32
+ Handbook int32
+ Prefab int32
+ Rotation string
+ Icon int32
+ Vocal string
+ Tujing []int32
+ Intr string
+ Events string
+ Cite string
+ Effectstay []string
+ //Hpspace serialization.Vector3
+ Skill int32
+ Skill1 int32
+ Skill2 int32
+ Skill3 int32
+ Txt string
+ Enteranivalue int32
+ Camerainterval float32
}
-func (Game_heroData) GetTypeId() int {
- return 650222912
+const TypeId_GameheroData = 650222912
+
+func (*GameheroData) GetTypeId() int32 {
+ return 650222912
}
-func NewGame_heroData(_buf map[string]interface{}) (_v *Game_heroData, err error) {
- _v = &Game_heroData{}
- { var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ { err = errors.New("color error"); return }; _v.Color = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ { err = errors.New("race error"); return }; _v.Race = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ { err = errors.New("job error"); return }; _v.Job = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ { err = errors.New("handbook error"); return }; _v.Handbook = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ { err = errors.New("prefab error"); return }; _v.Prefab = int32(_tempNum_) }
- { var _ok_ bool; if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ { err = errors.New("rotation error"); return } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ { err = errors.New("icon error"); return }; _v.Icon = int32(_tempNum_) }
- { var _ok_ bool; if _v.Vocal, _ok_ = _buf["vocal"].(string); !_ok_ { err = errors.New("vocal error"); return } }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ { err = errors.New("tujing error"); return }
+func (_v *GameheroData) Deserialize(_buf map[string]interface{}) (err error) {
+ {
+ var _ok_ bool
+ if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ {
+ err = errors.New("hid error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ var __json_text__ map[string]interface{}
+ if __json_text__, _ok_ = _buf["name"].(map[string]interface{}); !_ok_ {
+ err = errors.New("_v.Name error")
+ return
+ }
+ {
+ var _ok_ bool
+ if _, _ok_ = __json_text__["key"].(string); !_ok_ {
+ err = errors.New("key error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ {
+ err = errors.New("text error")
+ return
+ }
+ }
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ {
+ err = errors.New("star error")
+ return
+ }
+ _v.Star = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["color"].(float64); !_ok_ {
+ err = errors.New("color error")
+ return
+ }
+ _v.Color = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["race"].(float64); !_ok_ {
+ err = errors.New("race error")
+ return
+ }
+ _v.Race = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["job"].(float64); !_ok_ {
+ err = errors.New("job error")
+ return
+ }
+ _v.Job = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["type"].(float64); !_ok_ {
+ err = errors.New("type error")
+ return
+ }
+ _v.Type = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["handbook"].(float64); !_ok_ {
+ err = errors.New("handbook error")
+ return
+ }
+ _v.Handbook = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["prefab"].(float64); !_ok_ {
+ err = errors.New("prefab error")
+ return
+ }
+ _v.Prefab = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ if _v.Rotation, _ok_ = _buf["rotation"].(string); !_ok_ {
+ err = errors.New("rotation error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["icon"].(float64); !_ok_ {
+ err = errors.New("icon error")
+ return
+ }
+ _v.Icon = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ if _v.Vocal, _ok_ = _buf["vocal"].(string); !_ok_ {
+ err = errors.New("vocal error")
+ return
+ }
+ }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["tujing"].([]interface{}); !_ok_ {
+ err = errors.New("tujing error")
+ return
+ }
- _v.Tujing = make([]int32, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ int32
- { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
- _v.Tujing = append(_v.Tujing, _list_v_)
- }
- }
+ _v.Tujing = make([]int32, 0, len(_arr_))
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Intr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
- { var _ok_ bool; if _v.Events, _ok_ = _buf["events"].(string); !_ok_ { err = errors.New("events error"); return } }
- { var _ok_ bool; if _v.Cite, _ok_ = _buf["cite"].(string); !_ok_ { err = errors.New("cite error"); return } }
- {
- var _arr_ []interface{}
- var _ok_ bool
- if _arr_, _ok_ = _buf["effectstay"].([]interface{}); !_ok_ { err = errors.New("effectstay error"); return }
+ for _, _e_ := range _arr_ {
+ var _list_v_ int32
+ {
+ var _ok_ bool
+ var _x_ float64
+ if _x_, _ok_ = _e_.(float64); !_ok_ {
+ err = errors.New("_list_v_ error")
+ return
+ }
+ _list_v_ = int32(_x_)
+ }
+ _v.Tujing = append(_v.Tujing, _list_v_)
+ }
+ }
- _v.Effectstay = make([]string, 0, len(_arr_))
-
- for _, _e_ := range _arr_ {
- var _list_v_ string
- { if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } }
- _v.Effectstay = append(_v.Effectstay, _list_v_)
- }
- }
+ {
+ var _ok_ bool
+ var __json_text__ map[string]interface{}
+ if __json_text__, _ok_ = _buf["intr"].(map[string]interface{}); !_ok_ {
+ err = errors.New("_v.Intr error")
+ return
+ }
+ {
+ var _ok_ bool
+ if _, _ok_ = __json_text__["key"].(string); !_ok_ {
+ err = errors.New("key error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ if _v.Intr, _ok_ = __json_text__["text"].(string); !_ok_ {
+ err = errors.New("text error")
+ return
+ }
+ }
+ }
+ {
+ var _ok_ bool
+ if _v.Events, _ok_ = _buf["events"].(string); !_ok_ {
+ err = errors.New("events error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ if _v.Cite, _ok_ = _buf["cite"].(string); !_ok_ {
+ err = errors.New("cite error")
+ return
+ }
+ }
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["effectstay"].([]interface{}); !_ok_ {
+ err = errors.New("effectstay error")
+ return
+ }
- { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["hpspace"].(map[string]interface{}); !_ok_ { err = errors.New("hpspace error"); return }
- var _x_, _y_, _z_ float32;
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
- _v.Hpspace = math.NewVector3(_x_, _y_, _z_)
- }
+ _v.Effectstay = make([]string, 0, len(_arr_))
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ { err = errors.New("skill1 error"); return }; _v.Skill1 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ { err = errors.New("skill2 error"); return }; _v.Skill2 = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ { err = errors.New("skill3 error"); return }; _v.Skill3 = int32(_tempNum_) }
- {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Txt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ { err = errors.New("enteranivalue error"); return }; _v.Enteranivalue = int32(_tempNum_) }
- { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ { err = errors.New("camerainterval error"); return }; _v.Camerainterval = float32(_tempNum_) }
- return
+ for _, _e_ := range _arr_ {
+ var _list_v_ string
+ {
+ if _list_v_, _ok_ = _e_.(string); !_ok_ {
+ err = errors.New("_list_v_ error")
+ return
+ }
+ }
+ _v.Effectstay = append(_v.Effectstay, _list_v_)
+ }
+ }
+
+ {
+
+ //_v.Hpspace = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ {
+ err = errors.New("skill error")
+ return
+ }
+ _v.Skill = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["skill1"].(float64); !_ok_ {
+ err = errors.New("skill1 error")
+ return
+ }
+ _v.Skill1 = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["skill2"].(float64); !_ok_ {
+ err = errors.New("skill2 error")
+ return
+ }
+ _v.Skill2 = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["skill3"].(float64); !_ok_ {
+ err = errors.New("skill3 error")
+ return
+ }
+ _v.Skill3 = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var __json_text__ map[string]interface{}
+ if __json_text__, _ok_ = _buf["txt"].(map[string]interface{}); !_ok_ {
+ err = errors.New("_v.Txt error")
+ return
+ }
+ {
+ var _ok_ bool
+ if _, _ok_ = __json_text__["key"].(string); !_ok_ {
+ err = errors.New("key error")
+ return
+ }
+ }
+ {
+ var _ok_ bool
+ if _v.Txt, _ok_ = __json_text__["text"].(string); !_ok_ {
+ err = errors.New("text error")
+ return
+ }
+ }
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["enteranivalue"].(float64); !_ok_ {
+ err = errors.New("enteranivalue error")
+ return
+ }
+ _v.Enteranivalue = int32(_tempNum_)
+ }
+ {
+ var _ok_ bool
+ var _tempNum_ float64
+ if _tempNum_, _ok_ = _buf["camerainterval"].(float64); !_ok_ {
+ err = errors.New("camerainterval error")
+ return
+ }
+ _v.Camerainterval = float32(_tempNum_)
+ }
+ return
+}
+
+func DeserializeGameheroData(_buf map[string]interface{}) (*GameheroData, error) {
+ v := &GameheroData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
}
diff --git a/sys/configure/structs/game.heroExp.go b/sys/configure/structs/game.heroExp.go
index 453f3e1f2..e9bcf06b9 100644
--- a/sys/configure/structs/game.heroExp.go
+++ b/sys/configure/structs/game.heroExp.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroExp struct {
- _dataMap map[string]*Game_heroExpData
- _dataList []*Game_heroExpData
+type GameheroExp struct {
+ _dataMap map[string]*GameheroExpData
+ _dataList []*GameheroExpData
}
-func NewGame_heroExp(_buf []map[string]interface{}) (*Game_heroExp, error) {
- _dataList := make([]*Game_heroExpData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroExpData)
+func NewGameheroExp(_buf []map[string]interface{}) (*GameheroExp, error) {
+ _dataList := make([]*GameheroExpData, 0, len(_buf))
+ dataMap := make(map[string]*GameheroExpData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroExpData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroExpData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Hid] = _v
}
}
- return &Game_heroExp{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroExp{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroExp) GetDataMap() map[string]*Game_heroExpData {
+func (table *GameheroExp) GetDataMap() map[string]*GameheroExpData {
return table._dataMap
}
-func (table *Game_heroExp) GetDataList() []*Game_heroExpData {
+func (table *GameheroExp) GetDataList() []*GameheroExpData {
return table._dataList
}
-func (table *Game_heroExp) Get(key string) *Game_heroExpData {
+func (table *GameheroExp) Get(key string) *GameheroExpData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroExpData.go b/sys/configure/structs/game.heroExpData.go
index cf813e691..59a0cf1cf 100644
--- a/sys/configure/structs/game.heroExpData.go
+++ b/sys/configure/structs/game.heroExpData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroExpData struct {
+type GameheroExpData struct {
Hid string
Name string
Star int32
@@ -20,12 +20,13 @@ type Game_heroExpData struct {
Needgold int32
}
-func (Game_heroExpData) GetTypeId() int {
+const TypeId_GameheroExpData = 2029779473
+
+func (*GameheroExpData) GetTypeId() int32 {
return 2029779473
}
-func NewGame_heroExpData(_buf map[string]interface{}) (_v *Game_heroExpData, err error) {
- _v = &Game_heroExpData{}
+func (_v *GameheroExpData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
@@ -35,3 +36,12 @@ func NewGame_heroExpData(_buf map[string]interface{}) (_v *Game_heroExpData, err
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["needgold"].(float64); !_ok_ { err = errors.New("needgold error"); return }; _v.Needgold = int32(_tempNum_) }
return
}
+
+func DeserializeGameheroExpData(_buf map[string]interface{}) (*GameheroExpData, error) {
+ v := &GameheroExpData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroLevelgrow.go b/sys/configure/structs/game.heroLevelgrow.go
index ea7600383..ef187b27d 100644
--- a/sys/configure/structs/game.heroLevelgrow.go
+++ b/sys/configure/structs/game.heroLevelgrow.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroLevelgrow struct {
- _dataMap map[string]*Game_heroLevelgrowData
- _dataList []*Game_heroLevelgrowData
+type GameheroLevelgrow struct {
+ _dataMap map[string]*GameheroLevelgrowData
+ _dataList []*GameheroLevelgrowData
}
-func NewGame_heroLevelgrow(_buf []map[string]interface{}) (*Game_heroLevelgrow, error) {
- _dataList := make([]*Game_heroLevelgrowData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroLevelgrowData)
+func NewGameheroLevelgrow(_buf []map[string]interface{}) (*GameheroLevelgrow, error) {
+ _dataList := make([]*GameheroLevelgrowData, 0, len(_buf))
+ dataMap := make(map[string]*GameheroLevelgrowData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroLevelgrowData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroLevelgrowData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_heroLevelgrow{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroLevelgrow{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroLevelgrow) GetDataMap() map[string]*Game_heroLevelgrowData {
+func (table *GameheroLevelgrow) GetDataMap() map[string]*GameheroLevelgrowData {
return table._dataMap
}
-func (table *Game_heroLevelgrow) GetDataList() []*Game_heroLevelgrowData {
+func (table *GameheroLevelgrow) GetDataList() []*GameheroLevelgrowData {
return table._dataList
}
-func (table *Game_heroLevelgrow) Get(key string) *Game_heroLevelgrowData {
+func (table *GameheroLevelgrow) Get(key string) *GameheroLevelgrowData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroLevelgrowData.go b/sys/configure/structs/game.heroLevelgrowData.go
index 94b98b306..499ac0d44 100644
--- a/sys/configure/structs/game.heroLevelgrowData.go
+++ b/sys/configure/structs/game.heroLevelgrowData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroLevelgrowData struct {
+type GameheroLevelgrowData struct {
Id string
Hp int32
Atk int32
@@ -26,12 +26,13 @@ type Game_heroLevelgrowData struct {
Speedgrow int32
}
-func (Game_heroLevelgrowData) GetTypeId() int {
+const TypeId_GameheroLevelgrowData = 939442443
+
+func (*GameheroLevelgrowData) GetTypeId() int32 {
return 939442443
}
-func NewGame_heroLevelgrowData(_buf map[string]interface{}) (_v *Game_heroLevelgrowData, err error) {
- _v = &Game_heroLevelgrowData{}
+func (_v *GameheroLevelgrowData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) }
@@ -47,3 +48,12 @@ func NewGame_heroLevelgrowData(_buf map[string]interface{}) (_v *Game_heroLevelg
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["speedgrow"].(float64); !_ok_ { err = errors.New("speedgrow error"); return }; _v.Speedgrow = int32(_tempNum_) }
return
}
+
+func DeserializeGameheroLevelgrowData(_buf map[string]interface{}) (*GameheroLevelgrowData, error) {
+ v := &GameheroLevelgrowData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroLevelup.go b/sys/configure/structs/game.heroLevelup.go
index 16ac51268..5eb2ae194 100644
--- a/sys/configure/structs/game.heroLevelup.go
+++ b/sys/configure/structs/game.heroLevelup.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroLevelup struct {
- _dataMap map[int32]*Game_heroLevelupData
- _dataList []*Game_heroLevelupData
+type GameheroLevelup struct {
+ _dataMap map[int32]*GameheroLevelupData
+ _dataList []*GameheroLevelupData
}
-func NewGame_heroLevelup(_buf []map[string]interface{}) (*Game_heroLevelup, error) {
- _dataList := make([]*Game_heroLevelupData, 0, len(_buf))
- dataMap := make(map[int32]*Game_heroLevelupData)
+func NewGameheroLevelup(_buf []map[string]interface{}) (*GameheroLevelup, error) {
+ _dataList := make([]*GameheroLevelupData, 0, len(_buf))
+ dataMap := make(map[int32]*GameheroLevelupData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroLevelupData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroLevelupData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Level] = _v
}
}
- return &Game_heroLevelup{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroLevelup{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroLevelup) GetDataMap() map[int32]*Game_heroLevelupData {
+func (table *GameheroLevelup) GetDataMap() map[int32]*GameheroLevelupData {
return table._dataMap
}
-func (table *Game_heroLevelup) GetDataList() []*Game_heroLevelupData {
+func (table *GameheroLevelup) GetDataList() []*GameheroLevelupData {
return table._dataList
}
-func (table *Game_heroLevelup) Get(key int32) *Game_heroLevelupData {
+func (table *GameheroLevelup) Get(key int32) *GameheroLevelupData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroLevelupData.go b/sys/configure/structs/game.heroLevelupData.go
index 7199065a2..c043f49c9 100644
--- a/sys/configure/structs/game.heroLevelupData.go
+++ b/sys/configure/structs/game.heroLevelupData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,35 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroLevelupData struct {
+type GameheroLevelupData struct {
Level int32
- Heroexp []*Game_atn
+ Heroexp []*Gameatn
Hp float32
Atk float32
Def float32
}
-func (Game_heroLevelupData) GetTypeId() int {
+const TypeId_GameheroLevelupData = 1582994195
+
+func (*GameheroLevelupData) GetTypeId() int32 {
return 1582994195
}
-func NewGame_heroLevelupData(_buf map[string]interface{}) (_v *Game_heroLevelupData, err error) {
- _v = &Game_heroLevelupData{}
+func (_v *GameheroLevelupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["heroexp"].([]interface{}); !_ok_ { err = errors.New("heroexp error"); return }
- _v.Heroexp = make([]*Game_atn, 0, len(_arr_))
+ _v.Heroexp = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Heroexp = append(_v.Heroexp, _list_v_)
}
}
@@ -44,3 +45,12 @@ func NewGame_heroLevelupData(_buf map[string]interface{}) (_v *Game_heroLevelupD
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = float32(_tempNum_) }
return
}
+
+func DeserializeGameheroLevelupData(_buf map[string]interface{}) (*GameheroLevelupData, error) {
+ v := &GameheroLevelupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroMethod.go b/sys/configure/structs/game.heroMethod.go
index ac876cf5e..e1dd565f9 100644
--- a/sys/configure/structs/game.heroMethod.go
+++ b/sys/configure/structs/game.heroMethod.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroMethod struct {
- _dataMap map[string]*Game_heroMethodData
- _dataList []*Game_heroMethodData
+type GameheroMethod struct {
+ _dataMap map[string]*GameheroMethodData
+ _dataList []*GameheroMethodData
}
-func NewGame_heroMethod(_buf []map[string]interface{}) (*Game_heroMethod, error) {
- _dataList := make([]*Game_heroMethodData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroMethodData)
+func NewGameheroMethod(_buf []map[string]interface{}) (*GameheroMethod, error) {
+ _dataList := make([]*GameheroMethodData, 0, len(_buf))
+ dataMap := make(map[string]*GameheroMethodData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroMethodData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroMethodData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Hid] = _v
}
}
- return &Game_heroMethod{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroMethod{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroMethod) GetDataMap() map[string]*Game_heroMethodData {
+func (table *GameheroMethod) GetDataMap() map[string]*GameheroMethodData {
return table._dataMap
}
-func (table *Game_heroMethod) GetDataList() []*Game_heroMethodData {
+func (table *GameheroMethod) GetDataList() []*GameheroMethodData {
return table._dataList
}
-func (table *Game_heroMethod) Get(key string) *Game_heroMethodData {
+func (table *GameheroMethod) Get(key string) *GameheroMethodData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroMethodData.go b/sys/configure/structs/game.heroMethodData.go
index 161179844..5a3bac595 100644
--- a/sys/configure/structs/game.heroMethodData.go
+++ b/sys/configure/structs/game.heroMethodData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroMethodData struct {
+type GameheroMethodData struct {
Hid string
Herointr string
EquipSuit1 []int32
@@ -21,12 +21,13 @@ type Game_heroMethodData struct {
Pro3 int32
}
-func (Game_heroMethodData) GetTypeId() int {
+const TypeId_GameheroMethodData = -622558911
+
+func (*GameheroMethodData) GetTypeId() int32 {
return -622558911
}
-func NewGame_heroMethodData(_buf map[string]interface{}) (_v *Game_heroMethodData, err error) {
- _v = &Game_heroMethodData{}
+func (_v *GameheroMethodData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["herointr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Herointr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Herointr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{
@@ -76,3 +77,12 @@ func NewGame_heroMethodData(_buf map[string]interface{}) (_v *Game_heroMethodDat
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pro3"].(float64); !_ok_ { err = errors.New("pro3 error"); return }; _v.Pro3 = int32(_tempNum_) }
return
}
+
+func DeserializeGameheroMethodData(_buf map[string]interface{}) (*GameheroMethodData, error) {
+ v := &GameheroMethodData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroResonance.go b/sys/configure/structs/game.heroResonance.go
index 7dfc2f0df..250c3a2ab 100644
--- a/sys/configure/structs/game.heroResonance.go
+++ b/sys/configure/structs/game.heroResonance.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroResonance struct {
- _dataMap map[string]*Game_heroResonanceData
- _dataList []*Game_heroResonanceData
+type GameheroResonance struct {
+ _dataMap map[string]*GameheroResonanceData
+ _dataList []*GameheroResonanceData
}
-func NewGame_heroResonance(_buf []map[string]interface{}) (*Game_heroResonance, error) {
- _dataList := make([]*Game_heroResonanceData, 0, len(_buf))
- dataMap := make(map[string]*Game_heroResonanceData)
+func NewGameheroResonance(_buf []map[string]interface{}) (*GameheroResonance, error) {
+ _dataList := make([]*GameheroResonanceData, 0, len(_buf))
+ dataMap := make(map[string]*GameheroResonanceData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroResonanceData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroResonanceData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Hid] = _v
}
}
- return &Game_heroResonance{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroResonance{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroResonance) GetDataMap() map[string]*Game_heroResonanceData {
+func (table *GameheroResonance) GetDataMap() map[string]*GameheroResonanceData {
return table._dataMap
}
-func (table *Game_heroResonance) GetDataList() []*Game_heroResonanceData {
+func (table *GameheroResonance) GetDataList() []*GameheroResonanceData {
return table._dataList
}
-func (table *Game_heroResonance) Get(key string) *Game_heroResonanceData {
+func (table *GameheroResonance) Get(key string) *GameheroResonanceData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroResonanceData.go b/sys/configure/structs/game.heroResonanceData.go
index 437f14471..5ce87643c 100644
--- a/sys/configure/structs/game.heroResonanceData.go
+++ b/sys/configure/structs/game.heroResonanceData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,17 +5,18 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroResonanceData struct {
+type GameheroResonanceData struct {
Hid string
Star int32
Energy int32
- Prize []*Game_atn
- Heroneed []*Game_atn
- Need []*Game_atn
+ Prize []*Gameatn
+ Heroneed []*Gameatn
+ Need []*Gameatn
Hppro int32
Atkpro int32
Defpro int32
@@ -26,12 +26,13 @@ type Game_heroResonanceData struct {
Maxnum int32
}
-func (Game_heroResonanceData) GetTypeId() int {
+const TypeId_GameheroResonanceData = 1802653762
+
+func (*GameheroResonanceData) GetTypeId() int32 {
return 1802653762
}
-func NewGame_heroResonanceData(_buf map[string]interface{}) (_v *Game_heroResonanceData, err error) {
- _v = &Game_heroResonanceData{}
+func (_v *GameheroResonanceData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Hid, _ok_ = _buf["hid"].(string); !_ok_ { err = errors.New("hid error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["energy"].(float64); !_ok_ { err = errors.New("energy error"); return }; _v.Energy = int32(_tempNum_) }
@@ -40,11 +41,11 @@ func NewGame_heroResonanceData(_buf map[string]interface{}) (_v *Game_heroResona
var _ok_ bool
if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return }
- _v.Prize = make([]*Game_atn, 0, len(_arr_))
+ _v.Prize = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Prize = append(_v.Prize, _list_v_)
}
}
@@ -54,11 +55,11 @@ func NewGame_heroResonanceData(_buf map[string]interface{}) (_v *Game_heroResona
var _ok_ bool
if _arr_, _ok_ = _buf["heroneed"].([]interface{}); !_ok_ { err = errors.New("heroneed error"); return }
- _v.Heroneed = make([]*Game_atn, 0, len(_arr_))
+ _v.Heroneed = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Heroneed = append(_v.Heroneed, _list_v_)
}
}
@@ -68,11 +69,11 @@ func NewGame_heroResonanceData(_buf map[string]interface{}) (_v *Game_heroResona
var _ok_ bool
if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
- _v.Need = make([]*Game_atn, 0, len(_arr_))
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Need = append(_v.Need, _list_v_)
}
}
@@ -86,3 +87,12 @@ func NewGame_heroResonanceData(_buf map[string]interface{}) (_v *Game_heroResona
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxnum"].(float64); !_ok_ { err = errors.New("maxnum error"); return }; _v.Maxnum = int32(_tempNum_) }
return
}
+
+func DeserializeGameheroResonanceData(_buf map[string]interface{}) (*GameheroResonanceData, error) {
+ v := &GameheroResonanceData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroSkillLevel.go b/sys/configure/structs/game.heroSkillLevel.go
index b14aadbe3..97cfe2904 100644
--- a/sys/configure/structs/game.heroSkillLevel.go
+++ b/sys/configure/structs/game.heroSkillLevel.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroSkillLevel struct {
- _dataMap map[int32]*Game_heroSkillLevelData
- _dataList []*Game_heroSkillLevelData
+type GameheroSkillLevel struct {
+ _dataMap map[int32]*GameheroSkillLevelData
+ _dataList []*GameheroSkillLevelData
}
-func NewGame_heroSkillLevel(_buf []map[string]interface{}) (*Game_heroSkillLevel, error) {
- _dataList := make([]*Game_heroSkillLevelData, 0, len(_buf))
- dataMap := make(map[int32]*Game_heroSkillLevelData)
+func NewGameheroSkillLevel(_buf []map[string]interface{}) (*GameheroSkillLevel, error) {
+ _dataList := make([]*GameheroSkillLevelData, 0, len(_buf))
+ dataMap := make(map[int32]*GameheroSkillLevelData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroSkillLevelData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroSkillLevelData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_heroSkillLevel{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroSkillLevel{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroSkillLevel) GetDataMap() map[int32]*Game_heroSkillLevelData {
+func (table *GameheroSkillLevel) GetDataMap() map[int32]*GameheroSkillLevelData {
return table._dataMap
}
-func (table *Game_heroSkillLevel) GetDataList() []*Game_heroSkillLevelData {
+func (table *GameheroSkillLevel) GetDataList() []*GameheroSkillLevelData {
return table._dataList
}
-func (table *Game_heroSkillLevel) Get(key int32) *Game_heroSkillLevelData {
+func (table *GameheroSkillLevel) Get(key int32) *GameheroSkillLevelData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroSkillLevelData.go b/sys/configure/structs/game.heroSkillLevelData.go
index 6122c4c6e..b320c3e47 100644
--- a/sys/configure/structs/game.heroSkillLevelData.go
+++ b/sys/configure/structs/game.heroSkillLevelData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,21 +5,23 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroSkillLevelData struct {
+type GameheroSkillLevelData struct {
Id int32
Probability []int32
}
-func (Game_heroSkillLevelData) GetTypeId() int {
+const TypeId_GameheroSkillLevelData = -1505023981
+
+func (*GameheroSkillLevelData) GetTypeId() int32 {
return -1505023981
}
-func NewGame_heroSkillLevelData(_buf map[string]interface{}) (_v *Game_heroSkillLevelData, err error) {
- _v = &Game_heroSkillLevelData{}
+func (_v *GameheroSkillLevelData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{
var _arr_ []interface{}
@@ -38,3 +39,12 @@ func NewGame_heroSkillLevelData(_buf map[string]interface{}) (_v *Game_heroSkill
return
}
+
+func DeserializeGameheroSkillLevelData(_buf map[string]interface{}) (*GameheroSkillLevelData, error) {
+ v := &GameheroSkillLevelData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroStargrow.go b/sys/configure/structs/game.heroStargrow.go
index 07a977d12..e269d7565 100644
--- a/sys/configure/structs/game.heroStargrow.go
+++ b/sys/configure/structs/game.heroStargrow.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroStargrow struct {
- _dataMap map[int32]*Game_heroStargrowData
- _dataList []*Game_heroStargrowData
+type GameheroStargrow struct {
+ _dataMap map[int32]*GameheroStargrowData
+ _dataList []*GameheroStargrowData
}
-func NewGame_heroStargrow(_buf []map[string]interface{}) (*Game_heroStargrow, error) {
- _dataList := make([]*Game_heroStargrowData, 0, len(_buf))
- dataMap := make(map[int32]*Game_heroStargrowData)
+func NewGameheroStargrow(_buf []map[string]interface{}) (*GameheroStargrow, error) {
+ _dataList := make([]*GameheroStargrowData, 0, len(_buf))
+ dataMap := make(map[int32]*GameheroStargrowData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroStargrowData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroStargrowData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Star] = _v
}
}
- return &Game_heroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroStargrow) GetDataMap() map[int32]*Game_heroStargrowData {
+func (table *GameheroStargrow) GetDataMap() map[int32]*GameheroStargrowData {
return table._dataMap
}
-func (table *Game_heroStargrow) GetDataList() []*Game_heroStargrowData {
+func (table *GameheroStargrow) GetDataList() []*GameheroStargrowData {
return table._dataList
}
-func (table *Game_heroStargrow) Get(key int32) *Game_heroStargrowData {
+func (table *GameheroStargrow) Get(key int32) *GameheroStargrowData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroStargrowData.go b/sys/configure/structs/game.heroStargrowData.go
index e1cf7a0af..7f7825245 100644
--- a/sys/configure/structs/game.heroStargrowData.go
+++ b/sys/configure/structs/game.heroStargrowData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroStargrowData struct {
+type GameheroStargrowData struct {
Star int32
Level int32
Maxlevel int32
@@ -20,12 +20,13 @@ type Game_heroStargrowData struct {
StarupSpeed float32
}
-func (Game_heroStargrowData) GetTypeId() int {
+const TypeId_GameheroStargrowData = 882965061
+
+func (*GameheroStargrowData) GetTypeId() int32 {
return 882965061
}
-func NewGame_heroStargrowData(_buf map[string]interface{}) (_v *Game_heroStargrowData, err error) {
- _v = &Game_heroStargrowData{}
+func (_v *GameheroStargrowData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["level"].(float64); !_ok_ { err = errors.New("level error"); return }; _v.Level = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["maxlevel"].(float64); !_ok_ { err = errors.New("maxlevel error"); return }; _v.Maxlevel = int32(_tempNum_) }
@@ -35,3 +36,12 @@ func NewGame_heroStargrowData(_buf map[string]interface{}) (_v *Game_heroStargro
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["starup_speed"].(float64); !_ok_ { err = errors.New("starup_speed error"); return }; _v.StarupSpeed = float32(_tempNum_) }
return
}
+
+func DeserializeGameheroStargrowData(_buf map[string]interface{}) (*GameheroStargrowData, error) {
+ v := &GameheroStargrowData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.heroStarup.go b/sys/configure/structs/game.heroStarup.go
index 1f1207bfe..1243b3db6 100644
--- a/sys/configure/structs/game.heroStarup.go
+++ b/sys/configure/structs/game.heroStarup.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_heroStarup struct {
- _dataMap map[int32]*Game_heroStarupData
- _dataList []*Game_heroStarupData
+type GameheroStarup struct {
+ _dataMap map[int32]*GameheroStarupData
+ _dataList []*GameheroStarupData
}
-func NewGame_heroStarup(_buf []map[string]interface{}) (*Game_heroStarup, error) {
- _dataList := make([]*Game_heroStarupData, 0, len(_buf))
- dataMap := make(map[int32]*Game_heroStarupData)
+func NewGameheroStarup(_buf []map[string]interface{}) (*GameheroStarup, error) {
+ _dataList := make([]*GameheroStarupData, 0, len(_buf))
+ dataMap := make(map[int32]*GameheroStarupData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_heroStarupData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameheroStarupData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_heroStarup{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameheroStarup{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_heroStarup) GetDataMap() map[int32]*Game_heroStarupData {
+func (table *GameheroStarup) GetDataMap() map[int32]*GameheroStarupData {
return table._dataMap
}
-func (table *Game_heroStarup) GetDataList() []*Game_heroStarupData {
+func (table *GameheroStarup) GetDataList() []*GameheroStarupData {
return table._dataList
}
-func (table *Game_heroStarup) Get(key int32) *Game_heroStarupData {
+func (table *GameheroStarup) Get(key int32) *GameheroStarupData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.heroStarupData.go b/sys/configure/structs/game.heroStarupData.go
index 6fc2174b2..40b86754d 100644
--- a/sys/configure/structs/game.heroStarupData.go
+++ b/sys/configure/structs/game.heroStarupData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_heroStarupData struct {
+type GameheroStarupData struct {
Key int32
Id string
Star int32
@@ -23,12 +23,13 @@ type Game_heroStarupData struct {
Gold int32
}
-func (Game_heroStarupData) GetTypeId() int {
+const TypeId_GameheroStarupData = -1429351731
+
+func (*GameheroStarupData) GetTypeId() int32 {
return -1429351731
}
-func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupData, err error) {
- _v = &Game_heroStarupData{}
+func (_v *GameheroStarupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
@@ -54,3 +55,12 @@ func NewGame_heroStarupData(_buf map[string]interface{}) (_v *Game_heroStarupDat
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["gold"].(float64); !_ok_ { err = errors.New("gold error"); return }; _v.Gold = int32(_tempNum_) }
return
}
+
+func DeserializeGameheroStarupData(_buf map[string]interface{}) (*GameheroStarupData, error) {
+ v := &GameheroStarupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.initial.go b/sys/configure/structs/game.initial.go
index 303796eea..aa67771f6 100644
--- a/sys/configure/structs/game.initial.go
+++ b/sys/configure/structs/game.initial.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_initial struct {
- _dataMap map[string]*Game_initialData
- _dataList []*Game_initialData
+type Gameinitial struct {
+ _dataMap map[string]*GameinitialData
+ _dataList []*GameinitialData
}
-func NewGame_initial(_buf []map[string]interface{}) (*Game_initial, error) {
- _dataList := make([]*Game_initialData, 0, len(_buf))
- dataMap := make(map[string]*Game_initialData)
+func NewGameinitial(_buf []map[string]interface{}) (*Gameinitial, error) {
+ _dataList := make([]*GameinitialData, 0, len(_buf))
+ dataMap := make(map[string]*GameinitialData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_initialData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameinitialData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Index] = _v
}
}
- return &Game_initial{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameinitial{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_initial) GetDataMap() map[string]*Game_initialData {
+func (table *Gameinitial) GetDataMap() map[string]*GameinitialData {
return table._dataMap
}
-func (table *Game_initial) GetDataList() []*Game_initialData {
+func (table *Gameinitial) GetDataList() []*GameinitialData {
return table._dataList
}
-func (table *Game_initial) Get(key string) *Game_initialData {
+func (table *Gameinitial) Get(key string) *GameinitialData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.initialData.go b/sys/configure/structs/game.initialData.go
index 13cb1314a..53d0c30ff 100644
--- a/sys/configure/structs/game.initialData.go
+++ b/sys/configure/structs/game.initialData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,35 +5,46 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_initialData struct {
+type GameinitialData struct {
Index string
- Var []*Game_atn
+ Var []*Gameatn
}
-func (Game_initialData) GetTypeId() int {
+const TypeId_GameinitialData = -1101258478
+
+func (*GameinitialData) GetTypeId() int32 {
return -1101258478
}
-func NewGame_initialData(_buf map[string]interface{}) (_v *Game_initialData, err error) {
- _v = &Game_initialData{}
+func (_v *GameinitialData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["var"].([]interface{}); !_ok_ { err = errors.New("var error"); return }
- _v.Var = make([]*Game_atn, 0, len(_arr_))
+ _v.Var = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Var = append(_v.Var, _list_v_)
}
}
return
}
+
+func DeserializeGameinitialData(_buf map[string]interface{}) (*GameinitialData, error) {
+ v := &GameinitialData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.item.go b/sys/configure/structs/game.item.go
index 0c8c4c846..c1a3cf3ff 100644
--- a/sys/configure/structs/game.item.go
+++ b/sys/configure/structs/game.item.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_item struct {
- _dataMap map[string]*Game_itemData
- _dataList []*Game_itemData
+type Gameitem struct {
+ _dataMap map[string]*GameitemData
+ _dataList []*GameitemData
}
-func NewGame_item(_buf []map[string]interface{}) (*Game_item, error) {
- _dataList := make([]*Game_itemData, 0, len(_buf))
- dataMap := make(map[string]*Game_itemData)
+func NewGameitem(_buf []map[string]interface{}) (*Gameitem, error) {
+ _dataList := make([]*GameitemData, 0, len(_buf))
+ dataMap := make(map[string]*GameitemData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_itemData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameitemData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_item{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameitem{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_item) GetDataMap() map[string]*Game_itemData {
+func (table *Gameitem) GetDataMap() map[string]*GameitemData {
return table._dataMap
}
-func (table *Game_item) GetDataList() []*Game_itemData {
+func (table *Gameitem) GetDataList() []*GameitemData {
return table._dataList
}
-func (table *Game_item) Get(key string) *Game_itemData {
+func (table *Gameitem) Get(key string) *GameitemData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.itemData.go b/sys/configure/structs/game.itemData.go
index c02817a87..78a60e366 100644
--- a/sys/configure/structs/game.itemData.go
+++ b/sys/configure/structs/game.itemData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_itemData struct {
+type GameitemData struct {
Id string
Name string
Usetype int32
@@ -32,15 +32,17 @@ type Game_itemData struct {
Img string
Ico string
Intr string
- Sale []*Game_atn
+ Sale []*Gameatn
+ SynthetizeDeplete []*Gameatn
}
-func (Game_itemData) GetTypeId() int {
+const TypeId_GameitemData = -1848306727
+
+func (*GameitemData) GetTypeId() int32 {
return -1848306727
}
-func NewGame_itemData(_buf map[string]interface{}) (_v *Game_itemData, err error) {
- _v = &Game_itemData{}
+func (_v *GameitemData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["usetype"].(float64); !_ok_ { err = errors.New("usetype error"); return }; _v.Usetype = int32(_tempNum_) }
@@ -67,14 +69,37 @@ func NewGame_itemData(_buf map[string]interface{}) (_v *Game_itemData, err error
var _ok_ bool
if _arr_, _ok_ = _buf["sale"].([]interface{}); !_ok_ { err = errors.New("sale error"); return }
- _v.Sale = make([]*Game_atn, 0, len(_arr_))
+ _v.Sale = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Sale = append(_v.Sale, _list_v_)
}
}
+ {
+ var _arr_ []interface{}
+ var _ok_ bool
+ if _arr_, _ok_ = _buf["synthetize_deplete"].([]interface{}); !_ok_ { err = errors.New("synthetize_deplete error"); return }
+
+ _v.SynthetizeDeplete = make([]*Gameatn, 0, len(_arr_))
+
+ for _, _e_ := range _arr_ {
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
+ _v.SynthetizeDeplete = append(_v.SynthetizeDeplete, _list_v_)
+ }
+ }
+
return
}
+
+func DeserializeGameitemData(_buf map[string]interface{}) (*GameitemData, error) {
+ v := &GameitemData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.language.go b/sys/configure/structs/game.language.go
index 3d081116d..1aef1feb2 100644
--- a/sys/configure/structs/game.language.go
+++ b/sys/configure/structs/game.language.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_language struct {
- _dataMap map[string]*Game_languageData
- _dataList []*Game_languageData
+type Gamelanguage struct {
+ _dataMap map[string]*GamelanguageData
+ _dataList []*GamelanguageData
}
-func NewGame_language(_buf []map[string]interface{}) (*Game_language, error) {
- _dataList := make([]*Game_languageData, 0, len(_buf))
- dataMap := make(map[string]*Game_languageData)
+func NewGamelanguage(_buf []map[string]interface{}) (*Gamelanguage, error) {
+ _dataList := make([]*GamelanguageData, 0, len(_buf))
+ dataMap := make(map[string]*GamelanguageData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_languageData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamelanguageData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
- dataMap[_v.Keycode] = _v
+ dataMap[_v.Index] = _v
}
}
- return &Game_language{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamelanguage{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_language) GetDataMap() map[string]*Game_languageData {
+func (table *Gamelanguage) GetDataMap() map[string]*GamelanguageData {
return table._dataMap
}
-func (table *Game_language) GetDataList() []*Game_languageData {
+func (table *Gamelanguage) GetDataList() []*GamelanguageData {
return table._dataList
}
-func (table *Game_language) Get(key string) *Game_languageData {
+func (table *Gamelanguage) Get(key string) *GamelanguageData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.languageData.go b/sys/configure/structs/game.languageData.go
index 037c1c1b8..f70c5d7b0 100644
--- a/sys/configure/structs/game.languageData.go
+++ b/sys/configure/structs/game.languageData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,20 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_languageData struct {
+type GamelanguageData struct {
+ Index string
Keycode string
}
-func (Game_languageData) GetTypeId() int {
+const TypeId_GamelanguageData = -1436621922
+
+func (*GamelanguageData) GetTypeId() int32 {
return -1436621922
}
-func NewGame_languageData(_buf map[string]interface{}) (_v *Game_languageData, err error) {
- _v = &Game_languageData{}
+func (_v *GamelanguageData)Deserialize(_buf map[string]interface{}) (err error) {
+ { var _ok_ bool; if _v.Index, _ok_ = _buf["index"].(string); !_ok_ { err = errors.New("index error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["keycode"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Keycode error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Keycode, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGamelanguageData(_buf map[string]interface{}) (*GamelanguageData, error) {
+ v := &GamelanguageData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.mainlineChapter.go b/sys/configure/structs/game.mainlineChapter.go
index 644f0b943..23bf3db2c 100644
--- a/sys/configure/structs/game.mainlineChapter.go
+++ b/sys/configure/structs/game.mainlineChapter.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_mainlineChapter struct {
- _dataMap map[int32]*Game_mainlineChapterData
- _dataList []*Game_mainlineChapterData
+type GamemainlineChapter struct {
+ _dataMap map[int32]*GamemainlineChapterData
+ _dataList []*GamemainlineChapterData
}
-func NewGame_mainlineChapter(_buf []map[string]interface{}) (*Game_mainlineChapter, error) {
- _dataList := make([]*Game_mainlineChapterData, 0, len(_buf))
- dataMap := make(map[int32]*Game_mainlineChapterData)
+func NewGamemainlineChapter(_buf []map[string]interface{}) (*GamemainlineChapter, error) {
+ _dataList := make([]*GamemainlineChapterData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemainlineChapterData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_mainlineChapterData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemainlineChapterData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_mainlineChapter{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamemainlineChapter{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_mainlineChapter) GetDataMap() map[int32]*Game_mainlineChapterData {
+func (table *GamemainlineChapter) GetDataMap() map[int32]*GamemainlineChapterData {
return table._dataMap
}
-func (table *Game_mainlineChapter) GetDataList() []*Game_mainlineChapterData {
+func (table *GamemainlineChapter) GetDataList() []*GamemainlineChapterData {
return table._dataList
}
-func (table *Game_mainlineChapter) Get(key int32) *Game_mainlineChapterData {
+func (table *GamemainlineChapter) Get(key int32) *GamemainlineChapterData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.mainlineChapterData.go b/sys/configure/structs/game.mainlineChapterData.go
index b08f35d35..9bc2fa3c1 100644
--- a/sys/configure/structs/game.mainlineChapterData.go
+++ b/sys/configure/structs/game.mainlineChapterData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_mainlineChapterData struct {
+type GamemainlineChapterData struct {
Id int32
Name string
Intensity string
@@ -20,15 +20,16 @@ type Game_mainlineChapterData struct {
Icon string
Text string
Episode []int32
- Award []*Game_atn
+ Award []*Gameatn
}
-func (Game_mainlineChapterData) GetTypeId() int {
+const TypeId_GamemainlineChapterData = 35012142
+
+func (*GamemainlineChapterData) GetTypeId() int32 {
return 35012142
}
-func NewGame_mainlineChapterData(_buf map[string]interface{}) (_v *Game_mainlineChapterData, err error) {
- _v = &Game_mainlineChapterData{}
+func (_v *GamemainlineChapterData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Intensity, _ok_ = _buf["Intensity"].(string); !_ok_ { err = errors.New("Intensity error"); return } }
@@ -56,14 +57,23 @@ func NewGame_mainlineChapterData(_buf map[string]interface{}) (_v *Game_mainline
var _ok_ bool
if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
- _v.Award = make([]*Game_atn, 0, len(_arr_))
+ _v.Award = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Award = append(_v.Award, _list_v_)
}
}
return
}
+
+func DeserializeGamemainlineChapterData(_buf map[string]interface{}) (*GamemainlineChapterData, error) {
+ v := &GamemainlineChapterData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.mainlineEasy.go b/sys/configure/structs/game.mainlineEasy.go
index a94badaef..f0912cda3 100644
--- a/sys/configure/structs/game.mainlineEasy.go
+++ b/sys/configure/structs/game.mainlineEasy.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_mainlineEasy struct {
- _dataMap map[int32]*Game_mainlineEasyData
- _dataList []*Game_mainlineEasyData
+type GamemainlineEasy struct {
+ _dataMap map[int32]*GamemainlineEasyData
+ _dataList []*GamemainlineEasyData
}
-func NewGame_mainlineEasy(_buf []map[string]interface{}) (*Game_mainlineEasy, error) {
- _dataList := make([]*Game_mainlineEasyData, 0, len(_buf))
- dataMap := make(map[int32]*Game_mainlineEasyData)
+func NewGamemainlineEasy(_buf []map[string]interface{}) (*GamemainlineEasy, error) {
+ _dataList := make([]*GamemainlineEasyData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemainlineEasyData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_mainlineEasyData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemainlineEasyData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_mainlineEasy{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamemainlineEasy{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_mainlineEasy) GetDataMap() map[int32]*Game_mainlineEasyData {
+func (table *GamemainlineEasy) GetDataMap() map[int32]*GamemainlineEasyData {
return table._dataMap
}
-func (table *Game_mainlineEasy) GetDataList() []*Game_mainlineEasyData {
+func (table *GamemainlineEasy) GetDataList() []*GamemainlineEasyData {
return table._dataList
}
-func (table *Game_mainlineEasy) Get(key int32) *Game_mainlineEasyData {
+func (table *GamemainlineEasy) Get(key int32) *GamemainlineEasyData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.mainlineEasyData.go b/sys/configure/structs/game.mainlineEasyData.go
index 79ab36fbc..79700f35e 100644
--- a/sys/configure/structs/game.mainlineEasyData.go
+++ b/sys/configure/structs/game.mainlineEasyData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_mainlineEasyData struct {
+type GamemainlineEasyData struct {
Id int32
Previoustage int32
Order int32
@@ -35,19 +35,20 @@ type Game_mainlineEasyData struct {
Enemyid string
Battlescene string
Sceneeffect string
- Award []*Game_atn
+ Award []*Gameatn
Title string
Desc string
Stroyid []int32
Condition []int32
}
-func (Game_mainlineEasyData) GetTypeId() int {
+const TypeId_GamemainlineEasyData = 1212270997
+
+func (*GamemainlineEasyData) GetTypeId() int32 {
return 1212270997
}
-func NewGame_mainlineEasyData(_buf map[string]interface{}) (_v *Game_mainlineEasyData, err error) {
- _v = &Game_mainlineEasyData{}
+func (_v *GamemainlineEasyData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) }
@@ -116,11 +117,11 @@ func NewGame_mainlineEasyData(_buf map[string]interface{}) (_v *Game_mainlineEas
var _ok_ bool
if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
- _v.Award = make([]*Game_atn, 0, len(_arr_))
+ _v.Award = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Award = append(_v.Award, _list_v_)
}
}
@@ -157,3 +158,12 @@ func NewGame_mainlineEasyData(_buf map[string]interface{}) (_v *Game_mainlineEas
return
}
+
+func DeserializeGamemainlineEasyData(_buf map[string]interface{}) (*GamemainlineEasyData, error) {
+ v := &GamemainlineEasyData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.mainlineHard.go b/sys/configure/structs/game.mainlineHard.go
index e23747178..c8cb39291 100644
--- a/sys/configure/structs/game.mainlineHard.go
+++ b/sys/configure/structs/game.mainlineHard.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_mainlineHard struct {
- _dataMap map[int32]*Game_mainlineHardData
- _dataList []*Game_mainlineHardData
+type GamemainlineHard struct {
+ _dataMap map[int32]*GamemainlineHardData
+ _dataList []*GamemainlineHardData
}
-func NewGame_mainlineHard(_buf []map[string]interface{}) (*Game_mainlineHard, error) {
- _dataList := make([]*Game_mainlineHardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_mainlineHardData)
+func NewGamemainlineHard(_buf []map[string]interface{}) (*GamemainlineHard, error) {
+ _dataList := make([]*GamemainlineHardData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemainlineHardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_mainlineHardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemainlineHardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_mainlineHard{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamemainlineHard{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_mainlineHard) GetDataMap() map[int32]*Game_mainlineHardData {
+func (table *GamemainlineHard) GetDataMap() map[int32]*GamemainlineHardData {
return table._dataMap
}
-func (table *Game_mainlineHard) GetDataList() []*Game_mainlineHardData {
+func (table *GamemainlineHard) GetDataList() []*GamemainlineHardData {
return table._dataList
}
-func (table *Game_mainlineHard) Get(key int32) *Game_mainlineHardData {
+func (table *GamemainlineHard) Get(key int32) *GamemainlineHardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.mainlineHardData.go b/sys/configure/structs/game.mainlineHardData.go
index 6a93133db..0f3915ee2 100644
--- a/sys/configure/structs/game.mainlineHardData.go
+++ b/sys/configure/structs/game.mainlineHardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_mainlineHardData struct {
+type GamemainlineHardData struct {
Id int32
Previoustage int32
Order int32
@@ -35,17 +35,18 @@ type Game_mainlineHardData struct {
Enemyid string
Battlescene string
Sceneeffect string
- Award []*Game_atn
+ Award []*Gameatn
Title string
Desc string
}
-func (Game_mainlineHardData) GetTypeId() int {
+const TypeId_GamemainlineHardData = 2097711614
+
+func (*GamemainlineHardData) GetTypeId() int32 {
return 2097711614
}
-func NewGame_mainlineHardData(_buf map[string]interface{}) (_v *Game_mainlineHardData, err error) {
- _v = &Game_mainlineHardData{}
+func (_v *GamemainlineHardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) }
@@ -114,11 +115,11 @@ func NewGame_mainlineHardData(_buf map[string]interface{}) (_v *Game_mainlineHar
var _ok_ bool
if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
- _v.Award = make([]*Game_atn, 0, len(_arr_))
+ _v.Award = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Award = append(_v.Award, _list_v_)
}
}
@@ -127,3 +128,12 @@ func NewGame_mainlineHardData(_buf map[string]interface{}) (_v *Game_mainlineHar
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGamemainlineHardData(_buf map[string]interface{}) (*GamemainlineHardData, error) {
+ v := &GamemainlineHardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.mainlinePurgatory.go b/sys/configure/structs/game.mainlinePurgatory.go
index adb9b4d08..d44298155 100644
--- a/sys/configure/structs/game.mainlinePurgatory.go
+++ b/sys/configure/structs/game.mainlinePurgatory.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_mainlinePurgatory struct {
- _dataMap map[int32]*Game_mainlinePurgatoryData
- _dataList []*Game_mainlinePurgatoryData
+type GamemainlinePurgatory struct {
+ _dataMap map[int32]*GamemainlinePurgatoryData
+ _dataList []*GamemainlinePurgatoryData
}
-func NewGame_mainlinePurgatory(_buf []map[string]interface{}) (*Game_mainlinePurgatory, error) {
- _dataList := make([]*Game_mainlinePurgatoryData, 0, len(_buf))
- dataMap := make(map[int32]*Game_mainlinePurgatoryData)
+func NewGamemainlinePurgatory(_buf []map[string]interface{}) (*GamemainlinePurgatory, error) {
+ _dataList := make([]*GamemainlinePurgatoryData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemainlinePurgatoryData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_mainlinePurgatoryData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemainlinePurgatoryData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_mainlinePurgatory{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamemainlinePurgatory{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_mainlinePurgatory) GetDataMap() map[int32]*Game_mainlinePurgatoryData {
+func (table *GamemainlinePurgatory) GetDataMap() map[int32]*GamemainlinePurgatoryData {
return table._dataMap
}
-func (table *Game_mainlinePurgatory) GetDataList() []*Game_mainlinePurgatoryData {
+func (table *GamemainlinePurgatory) GetDataList() []*GamemainlinePurgatoryData {
return table._dataList
}
-func (table *Game_mainlinePurgatory) Get(key int32) *Game_mainlinePurgatoryData {
+func (table *GamemainlinePurgatory) Get(key int32) *GamemainlinePurgatoryData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.mainlinePurgatoryData.go b/sys/configure/structs/game.mainlinePurgatoryData.go
index 89e2bf18c..b5bbc8ceb 100644
--- a/sys/configure/structs/game.mainlinePurgatoryData.go
+++ b/sys/configure/structs/game.mainlinePurgatoryData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_mainlinePurgatoryData struct {
+type GamemainlinePurgatoryData struct {
Id int32
Previoustage int32
Order int32
@@ -35,17 +35,18 @@ type Game_mainlinePurgatoryData struct {
Enemyid string
Battlescene string
Sceneeffect string
- Award []*Game_atn
+ Award []*Gameatn
Title string
Desc string
}
-func (Game_mainlinePurgatoryData) GetTypeId() int {
+const TypeId_GamemainlinePurgatoryData = 1760368970
+
+func (*GamemainlinePurgatoryData) GetTypeId() int32 {
return 1760368970
}
-func NewGame_mainlinePurgatoryData(_buf map[string]interface{}) (_v *Game_mainlinePurgatoryData, err error) {
- _v = &Game_mainlinePurgatoryData{}
+func (_v *GamemainlinePurgatoryData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["previoustage"].(float64); !_ok_ { err = errors.New("previoustage error"); return }; _v.Previoustage = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["order"].(float64); !_ok_ { err = errors.New("order error"); return }; _v.Order = int32(_tempNum_) }
@@ -114,11 +115,11 @@ func NewGame_mainlinePurgatoryData(_buf map[string]interface{}) (_v *Game_mainli
var _ok_ bool
if _arr_, _ok_ = _buf["award"].([]interface{}); !_ok_ { err = errors.New("award error"); return }
- _v.Award = make([]*Game_atn, 0, len(_arr_))
+ _v.Award = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Award = append(_v.Award, _list_v_)
}
}
@@ -127,3 +128,12 @@ func NewGame_mainlinePurgatoryData(_buf map[string]interface{}) (_v *Game_mainli
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["desc"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Desc error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Desc, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGamemainlinePurgatoryData(_buf map[string]interface{}) (*GamemainlinePurgatoryData, error) {
+ v := &GamemainlinePurgatoryData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.model.go b/sys/configure/structs/game.model.go
index 6cdf57516..c144ab0a3 100644
--- a/sys/configure/structs/game.model.go
+++ b/sys/configure/structs/game.model.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_model struct {
- _dataMap map[int32]*Game_modelData
- _dataList []*Game_modelData
+type Gamemodel struct {
+ _dataMap map[int32]*GamemodelData
+ _dataList []*GamemodelData
}
-func NewGame_model(_buf []map[string]interface{}) (*Game_model, error) {
- _dataList := make([]*Game_modelData, 0, len(_buf))
- dataMap := make(map[int32]*Game_modelData)
+func NewGamemodel(_buf []map[string]interface{}) (*Gamemodel, error) {
+ _dataList := make([]*GamemodelData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemodelData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_modelData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemodelData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_model{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamemodel{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_model) GetDataMap() map[int32]*Game_modelData {
+func (table *Gamemodel) GetDataMap() map[int32]*GamemodelData {
return table._dataMap
}
-func (table *Game_model) GetDataList() []*Game_modelData {
+func (table *Gamemodel) GetDataList() []*GamemodelData {
return table._dataList
}
-func (table *Game_model) Get(key int32) *Game_modelData {
+func (table *Gamemodel) Get(key int32) *GamemodelData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.modelData.go b/sys/configure/structs/game.modelData.go
index 3a03127cf..70bb3a2cc 100644
--- a/sys/configure/structs/game.modelData.go
+++ b/sys/configure/structs/game.modelData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_modelData struct {
+type GamemodelData struct {
Id int32
Preson string
Presonshow string
@@ -22,12 +22,13 @@ type Game_modelData struct {
Postxyz []float32
}
-func (Game_modelData) GetTypeId() int {
+const TypeId_GamemodelData = -1307411593
+
+func (*GamemodelData) GetTypeId() int32 {
return -1307411593
}
-func NewGame_modelData(_buf map[string]interface{}) (_v *Game_modelData, err error) {
- _v = &Game_modelData{}
+func (_v *GamemodelData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Preson, _ok_ = _buf["preson"].(string); !_ok_ { err = errors.New("preson error"); return } }
{ var _ok_ bool; if _v.Presonshow, _ok_ = _buf["presonshow"].(string); !_ok_ { err = errors.New("presonshow error"); return } }
@@ -52,3 +53,12 @@ func NewGame_modelData(_buf map[string]interface{}) (_v *Game_modelData, err err
return
}
+
+func DeserializeGamemodelData(_buf map[string]interface{}) (*GamemodelData, error) {
+ v := &GamemodelData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.monster.go b/sys/configure/structs/game.monster.go
index f6324ff5a..4a3a49a40 100644
--- a/sys/configure/structs/game.monster.go
+++ b/sys/configure/structs/game.monster.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_monster struct {
- _dataMap map[int32]*Game_monsterData
- _dataList []*Game_monsterData
+type Gamemonster struct {
+ _dataMap map[int32]*GamemonsterData
+ _dataList []*GamemonsterData
}
-func NewGame_monster(_buf []map[string]interface{}) (*Game_monster, error) {
- _dataList := make([]*Game_monsterData, 0, len(_buf))
- dataMap := make(map[int32]*Game_monsterData)
+func NewGamemonster(_buf []map[string]interface{}) (*Gamemonster, error) {
+ _dataList := make([]*GamemonsterData, 0, len(_buf))
+ dataMap := make(map[int32]*GamemonsterData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_monsterData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemonsterData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.MonsterId] = _v
}
}
- return &Game_monster{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamemonster{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_monster) GetDataMap() map[int32]*Game_monsterData {
+func (table *Gamemonster) GetDataMap() map[int32]*GamemonsterData {
return table._dataMap
}
-func (table *Game_monster) GetDataList() []*Game_monsterData {
+func (table *Gamemonster) GetDataList() []*GamemonsterData {
return table._dataList
}
-func (table *Game_monster) Get(key int32) *Game_monsterData {
+func (table *Gamemonster) Get(key int32) *GamemonsterData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.monsterData.go b/sys/configure/structs/game.monsterData.go
index e2df38a20..e1d154d5d 100644
--- a/sys/configure/structs/game.monsterData.go
+++ b/sys/configure/structs/game.monsterData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_monsterData struct {
+type GamemonsterData struct {
MonsterId int32
HeroId string
Name string
@@ -18,12 +18,13 @@ type Game_monsterData struct {
Equip string
}
-func (Game_monsterData) GetTypeId() int {
+const TypeId_GamemonsterData = -793127256
+
+func (*GamemonsterData) GetTypeId() int32 {
return -793127256
}
-func NewGame_monsterData(_buf map[string]interface{}) (_v *Game_monsterData, err error) {
- _v = &Game_monsterData{}
+func (_v *GamemonsterData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["monster_id"].(float64); !_ok_ { err = errors.New("monster_id error"); return }; _v.MonsterId = int32(_tempNum_) }
{ var _ok_ bool; if _v.HeroId, _ok_ = _buf["hero_id"].(string); !_ok_ { err = errors.New("hero_id error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
@@ -31,3 +32,12 @@ func NewGame_monsterData(_buf map[string]interface{}) (_v *Game_monsterData, err
{ var _ok_ bool; if _v.Equip, _ok_ = _buf["equip"].(string); !_ok_ { err = errors.New("equip error"); return } }
return
}
+
+func DeserializeGamemonsterData(_buf map[string]interface{}) (*GamemonsterData, error) {
+ v := &GamemonsterData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.msgDistrib.go b/sys/configure/structs/game.msgDistrib.go
index d0a26dea7..15b4b58cc 100644
--- a/sys/configure/structs/game.msgDistrib.go
+++ b/sys/configure/structs/game.msgDistrib.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_msgdistrib struct {
- _dataMap map[string]*Game_msgdistribData
- _dataList []*Game_msgdistribData
+type Gamemsgdistrib struct {
+ _dataMap map[string]*GamemsgdistribData
+ _dataList []*GamemsgdistribData
}
-func NewGame_msgdistrib(_buf []map[string]interface{}) (*Game_msgdistrib, error) {
- _dataList := make([]*Game_msgdistribData, 0, len(_buf))
- dataMap := make(map[string]*Game_msgdistribData)
+func NewGamemsgdistrib(_buf []map[string]interface{}) (*Gamemsgdistrib, error) {
+ _dataList := make([]*GamemsgdistribData, 0, len(_buf))
+ dataMap := make(map[string]*GamemsgdistribData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_msgdistribData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamemsgdistribData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Msgid] = _v
}
}
- return &Game_msgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamemsgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_msgdistrib) GetDataMap() map[string]*Game_msgdistribData {
+func (table *Gamemsgdistrib) GetDataMap() map[string]*GamemsgdistribData {
return table._dataMap
}
-func (table *Game_msgdistrib) GetDataList() []*Game_msgdistribData {
+func (table *Gamemsgdistrib) GetDataList() []*GamemsgdistribData {
return table._dataList
}
-func (table *Game_msgdistrib) Get(key string) *Game_msgdistribData {
+func (table *Gamemsgdistrib) Get(key string) *GamemsgdistribData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.msgDistribData.go b/sys/configure/structs/game.msgDistribData.go
index 405637d6f..c9f21386e 100644
--- a/sys/configure/structs/game.msgDistribData.go
+++ b/sys/configure/structs/game.msgDistribData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,35 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_msgdistribData struct {
+type GamemsgdistribData struct {
Msgid string
Routrules string
Describe string
}
-func (Game_msgdistribData) GetTypeId() int {
+const TypeId_GamemsgdistribData = 1868137034
+
+func (*GamemsgdistribData) GetTypeId() int32 {
return 1868137034
}
-func NewGame_msgdistribData(_buf map[string]interface{}) (_v *Game_msgdistribData, err error) {
- _v = &Game_msgdistribData{}
+func (_v *GamemsgdistribData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Msgid, _ok_ = _buf["msgid"].(string); !_ok_ { err = errors.New("msgid error"); return } }
{ var _ok_ bool; if _v.Routrules, _ok_ = _buf["routrules"].(string); !_ok_ { err = errors.New("routrules error"); return } }
{ var _ok_ bool; if _v.Describe, _ok_ = _buf["describe"].(string); !_ok_ { err = errors.New("describe error"); return } }
return
}
+
+func DeserializeGamemsgdistribData(_buf map[string]interface{}) (*GamemsgdistribData, error) {
+ v := &GamemsgdistribData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.opencond.go b/sys/configure/structs/game.opencond.go
index 8defa3448..213a306f8 100644
--- a/sys/configure/structs/game.opencond.go
+++ b/sys/configure/structs/game.opencond.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_opencond struct {
- _dataMap map[string]*Game_opencondData
- _dataList []*Game_opencondData
+type Gameopencond struct {
+ _dataMap map[string]*GameopencondData
+ _dataList []*GameopencondData
}
-func NewGame_opencond(_buf []map[string]interface{}) (*Game_opencond, error) {
- _dataList := make([]*Game_opencondData, 0, len(_buf))
- dataMap := make(map[string]*Game_opencondData)
+func NewGameopencond(_buf []map[string]interface{}) (*Gameopencond, error) {
+ _dataList := make([]*GameopencondData, 0, len(_buf))
+ dataMap := make(map[string]*GameopencondData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_opencondData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameopencondData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_opencond{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameopencond{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_opencond) GetDataMap() map[string]*Game_opencondData {
+func (table *Gameopencond) GetDataMap() map[string]*GameopencondData {
return table._dataMap
}
-func (table *Game_opencond) GetDataList() []*Game_opencondData {
+func (table *Gameopencond) GetDataList() []*GameopencondData {
return table._dataList
}
-func (table *Game_opencond) Get(key string) *Game_opencondData {
+func (table *Gameopencond) Get(key string) *GameopencondData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.opencondData.go b/sys/configure/structs/game.opencondData.go
index 810b46ac8..522de5b05 100644
--- a/sys/configure/structs/game.opencondData.go
+++ b/sys/configure/structs/game.opencondData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_opencondData struct {
+type GameopencondData struct {
Id string
Name string
Main string
@@ -21,12 +21,13 @@ type Game_opencondData struct {
Prompt string
}
-func (Game_opencondData) GetTypeId() int {
+const TypeId_GameopencondData = -1798682958
+
+func (*GameopencondData) GetTypeId() int32 {
return -1798682958
}
-func NewGame_opencondData(_buf map[string]interface{}) (_v *Game_opencondData, err error) {
- _v = &Game_opencondData{}
+func (_v *GameopencondData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Main, _ok_ = _buf["main"].(string); !_ok_ { err = errors.New("main error"); return } }
@@ -37,3 +38,12 @@ func NewGame_opencondData(_buf map[string]interface{}) (_v *Game_opencondData, e
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["prompt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Prompt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Prompt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
return
}
+
+func DeserializeGameopencondData(_buf map[string]interface{}) (*GameopencondData, error) {
+ v := &GameopencondData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.pagoda.go b/sys/configure/structs/game.pagoda.go
index d028902aa..7afce38fa 100644
--- a/sys/configure/structs/game.pagoda.go
+++ b/sys/configure/structs/game.pagoda.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_pagoda struct {
- _dataMap map[int32]*Game_pagodaData
- _dataList []*Game_pagodaData
+type Gamepagoda struct {
+ _dataMap map[int32]*GamepagodaData
+ _dataList []*GamepagodaData
}
-func NewGame_pagoda(_buf []map[string]interface{}) (*Game_pagoda, error) {
- _dataList := make([]*Game_pagodaData, 0, len(_buf))
- dataMap := make(map[int32]*Game_pagodaData)
+func NewGamepagoda(_buf []map[string]interface{}) (*Gamepagoda, error) {
+ _dataList := make([]*GamepagodaData, 0, len(_buf))
+ dataMap := make(map[int32]*GamepagodaData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_pagodaData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamepagodaData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_pagoda{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamepagoda{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_pagoda) GetDataMap() map[int32]*Game_pagodaData {
+func (table *Gamepagoda) GetDataMap() map[int32]*GamepagodaData {
return table._dataMap
}
-func (table *Game_pagoda) GetDataList() []*Game_pagodaData {
+func (table *Gamepagoda) GetDataList() []*GamepagodaData {
return table._dataList
}
-func (table *Game_pagoda) Get(key int32) *Game_pagodaData {
+func (table *Gamepagoda) Get(key int32) *GamepagodaData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.pagodaData.go b/sys/configure/structs/game.pagodaData.go
index 5c4a355d7..f16123a68 100644
--- a/sys/configure/structs/game.pagodaData.go
+++ b/sys/configure/structs/game.pagodaData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_pagodaData struct {
+type GamepagodaData struct {
Key int32
PagodaType int32
LevelType int32
@@ -26,18 +26,19 @@ type Game_pagodaData struct {
Proportion1 []float32
Proportion2 []float32
Proportion3 []float32
- Reward []*Game_atn
+ Reward []*Gameatn
FightScene string
NameDisplay string
ModelDisplay int32
}
-func (Game_pagodaData) GetTypeId() int {
+const TypeId_GamepagodaData = -1914602212
+
+func (*GamepagodaData) GetTypeId() int32 {
return -1914602212
}
-func NewGame_pagodaData(_buf map[string]interface{}) (_v *Game_pagodaData, err error) {
- _v = &Game_pagodaData{}
+func (_v *GamepagodaData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pagoda_type"].(float64); !_ok_ { err = errors.New("pagoda_type error"); return }; _v.PagodaType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Level_type"].(float64); !_ok_ { err = errors.New("Level_type error"); return }; _v.LevelType = int32(_tempNum_) }
@@ -188,11 +189,11 @@ func NewGame_pagodaData(_buf map[string]interface{}) (_v *Game_pagodaData, err e
var _ok_ bool
if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
- _v.Reward = make([]*Game_atn, 0, len(_arr_))
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reward = append(_v.Reward, _list_v_)
}
}
@@ -202,3 +203,12 @@ func NewGame_pagodaData(_buf map[string]interface{}) (_v *Game_pagodaData, err e
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["model_display"].(float64); !_ok_ { err = errors.New("model_display error"); return }; _v.ModelDisplay = int32(_tempNum_) }
return
}
+
+func DeserializeGamepagodaData(_buf map[string]interface{}) (*GamepagodaData, error) {
+ v := &GamepagodaData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.pagodaSeasonReward.go b/sys/configure/structs/game.pagodaSeasonReward.go
index c5c9c27e1..e3e80a9ed 100644
--- a/sys/configure/structs/game.pagodaSeasonReward.go
+++ b/sys/configure/structs/game.pagodaSeasonReward.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_pagodaSeasonReward struct {
- _dataMap map[int32]*Game_pagodaSeasonRewardData
- _dataList []*Game_pagodaSeasonRewardData
+type GamepagodaSeasonReward struct {
+ _dataMap map[int32]*GamepagodaSeasonRewardData
+ _dataList []*GamepagodaSeasonRewardData
}
-func NewGame_pagodaSeasonReward(_buf []map[string]interface{}) (*Game_pagodaSeasonReward, error) {
- _dataList := make([]*Game_pagodaSeasonRewardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_pagodaSeasonRewardData)
+func NewGamepagodaSeasonReward(_buf []map[string]interface{}) (*GamepagodaSeasonReward, error) {
+ _dataList := make([]*GamepagodaSeasonRewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GamepagodaSeasonRewardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_pagodaSeasonRewardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamepagodaSeasonRewardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_pagodaSeasonReward{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamepagodaSeasonReward{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_pagodaSeasonReward) GetDataMap() map[int32]*Game_pagodaSeasonRewardData {
+func (table *GamepagodaSeasonReward) GetDataMap() map[int32]*GamepagodaSeasonRewardData {
return table._dataMap
}
-func (table *Game_pagodaSeasonReward) GetDataList() []*Game_pagodaSeasonRewardData {
+func (table *GamepagodaSeasonReward) GetDataList() []*GamepagodaSeasonRewardData {
return table._dataList
}
-func (table *Game_pagodaSeasonReward) Get(key int32) *Game_pagodaSeasonRewardData {
+func (table *GamepagodaSeasonReward) Get(key int32) *GamepagodaSeasonRewardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.pagodaSeasonRewardData.go b/sys/configure/structs/game.pagodaSeasonRewardData.go
index c677c1574..364249f04 100644
--- a/sys/configure/structs/game.pagodaSeasonRewardData.go
+++ b/sys/configure/structs/game.pagodaSeasonRewardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,22 +5,24 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_pagodaSeasonRewardData struct {
+type GamepagodaSeasonRewardData struct {
Key int32
Ranking []int32
- Reward []*Game_atn
+ Reward []*Gameatn
}
-func (Game_pagodaSeasonRewardData) GetTypeId() int {
+const TypeId_GamepagodaSeasonRewardData = -1585398482
+
+func (*GamepagodaSeasonRewardData) GetTypeId() int32 {
return -1585398482
}
-func NewGame_pagodaSeasonRewardData(_buf map[string]interface{}) (_v *Game_pagodaSeasonRewardData, err error) {
- _v = &Game_pagodaSeasonRewardData{}
+func (_v *GamepagodaSeasonRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{
var _arr_ []interface{}
@@ -42,14 +43,23 @@ func NewGame_pagodaSeasonRewardData(_buf map[string]interface{}) (_v *Game_pagod
var _ok_ bool
if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
- _v.Reward = make([]*Game_atn, 0, len(_arr_))
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reward = append(_v.Reward, _list_v_)
}
}
return
}
+
+func DeserializeGamepagodaSeasonRewardData(_buf map[string]interface{}) (*GamepagodaSeasonRewardData, error) {
+ v := &GamepagodaSeasonRewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.pagodaTaskReward.go b/sys/configure/structs/game.pagodaTaskReward.go
index c8c7a936c..6a078a153 100644
--- a/sys/configure/structs/game.pagodaTaskReward.go
+++ b/sys/configure/structs/game.pagodaTaskReward.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_pagodaTaskReward struct {
- _dataMap map[int32]*Game_pagodaTaskRewardData
- _dataList []*Game_pagodaTaskRewardData
+type GamepagodaTaskReward struct {
+ _dataMap map[int32]*GamepagodaTaskRewardData
+ _dataList []*GamepagodaTaskRewardData
}
-func NewGame_pagodaTaskReward(_buf []map[string]interface{}) (*Game_pagodaTaskReward, error) {
- _dataList := make([]*Game_pagodaTaskRewardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_pagodaTaskRewardData)
+func NewGamepagodaTaskReward(_buf []map[string]interface{}) (*GamepagodaTaskReward, error) {
+ _dataList := make([]*GamepagodaTaskRewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GamepagodaTaskRewardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_pagodaTaskRewardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamepagodaTaskRewardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_pagodaTaskReward{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GamepagodaTaskReward{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_pagodaTaskReward) GetDataMap() map[int32]*Game_pagodaTaskRewardData {
+func (table *GamepagodaTaskReward) GetDataMap() map[int32]*GamepagodaTaskRewardData {
return table._dataMap
}
-func (table *Game_pagodaTaskReward) GetDataList() []*Game_pagodaTaskRewardData {
+func (table *GamepagodaTaskReward) GetDataList() []*GamepagodaTaskRewardData {
return table._dataList
}
-func (table *Game_pagodaTaskReward) Get(key int32) *Game_pagodaTaskRewardData {
+func (table *GamepagodaTaskReward) Get(key int32) *GamepagodaTaskRewardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.pagodaTaskRewardData.go b/sys/configure/structs/game.pagodaTaskRewardData.go
index 49875768d..b2973d9c4 100644
--- a/sys/configure/structs/game.pagodaTaskRewardData.go
+++ b/sys/configure/structs/game.pagodaTaskRewardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,23 +5,25 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_pagodaTaskRewardData struct {
+type GamepagodaTaskRewardData struct {
Key int32
PagodaType int32
LayerNum int32
- Reward []*Game_atn
+ Reward []*Gameatn
}
-func (Game_pagodaTaskRewardData) GetTypeId() int {
+const TypeId_GamepagodaTaskRewardData = 530520528
+
+func (*GamepagodaTaskRewardData) GetTypeId() int32 {
return 530520528
}
-func NewGame_pagodaTaskRewardData(_buf map[string]interface{}) (_v *Game_pagodaTaskRewardData, err error) {
- _v = &Game_pagodaTaskRewardData{}
+func (_v *GamepagodaTaskRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pagoda_type"].(float64); !_ok_ { err = errors.New("pagoda_type error"); return }; _v.PagodaType = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["layer_num"].(float64); !_ok_ { err = errors.New("layer_num error"); return }; _v.LayerNum = int32(_tempNum_) }
@@ -31,14 +32,23 @@ func NewGame_pagodaTaskRewardData(_buf map[string]interface{}) (_v *Game_pagodaT
var _ok_ bool
if _arr_, _ok_ = _buf["reward"].([]interface{}); !_ok_ { err = errors.New("reward error"); return }
- _v.Reward = make([]*Game_atn, 0, len(_arr_))
+ _v.Reward = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reward = append(_v.Reward, _list_v_)
}
}
return
}
+
+func DeserializeGamepagodaTaskRewardData(_buf map[string]interface{}) (*GamepagodaTaskRewardData, error) {
+ v := &GamepagodaTaskRewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.playerlv.go b/sys/configure/structs/game.playerlv.go
index ff3b2b578..57a51297e 100644
--- a/sys/configure/structs/game.playerlv.go
+++ b/sys/configure/structs/game.playerlv.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_playerlv struct {
- _dataMap map[int32]*Game_playerlvData
- _dataList []*Game_playerlvData
+type Gameplayerlv struct {
+ _dataMap map[int32]*GameplayerlvData
+ _dataList []*GameplayerlvData
}
-func NewGame_playerlv(_buf []map[string]interface{}) (*Game_playerlv, error) {
- _dataList := make([]*Game_playerlvData, 0, len(_buf))
- dataMap := make(map[int32]*Game_playerlvData)
+func NewGameplayerlv(_buf []map[string]interface{}) (*Gameplayerlv, error) {
+ _dataList := make([]*GameplayerlvData, 0, len(_buf))
+ dataMap := make(map[int32]*GameplayerlvData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_playerlvData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameplayerlvData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Lv] = _v
}
}
- return &Game_playerlv{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameplayerlv{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_playerlv) GetDataMap() map[int32]*Game_playerlvData {
+func (table *Gameplayerlv) GetDataMap() map[int32]*GameplayerlvData {
return table._dataMap
}
-func (table *Game_playerlv) GetDataList() []*Game_playerlvData {
+func (table *Gameplayerlv) GetDataList() []*GameplayerlvData {
return table._dataList
}
-func (table *Game_playerlv) Get(key int32) *Game_playerlvData {
+func (table *Gameplayerlv) Get(key int32) *GameplayerlvData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.playerlvData.go b/sys/configure/structs/game.playerlvData.go
index 03538423f..3d9d38f4d 100644
--- a/sys/configure/structs/game.playerlvData.go
+++ b/sys/configure/structs/game.playerlvData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,22 +5,33 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_playerlvData struct {
+type GameplayerlvData struct {
Lv int32
Exp int32
}
-func (Game_playerlvData) GetTypeId() int {
+const TypeId_GameplayerlvData = 1119691505
+
+func (*GameplayerlvData) GetTypeId() int32 {
return 1119691505
}
-func NewGame_playerlvData(_buf map[string]interface{}) (_v *Game_playerlvData, err error) {
- _v = &Game_playerlvData{}
+func (_v *GameplayerlvData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lv"].(float64); !_ok_ { err = errors.New("lv error"); return }; _v.Lv = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["exp"].(float64); !_ok_ { err = errors.New("exp error"); return }; _v.Exp = int32(_tempNum_) }
return
}
+
+func DeserializeGameplayerlvData(_buf map[string]interface{}) (*GameplayerlvData, error) {
+ v := &GameplayerlvData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.plot.go b/sys/configure/structs/game.plot.go
index dc383d4cf..1b7179339 100644
--- a/sys/configure/structs/game.plot.go
+++ b/sys/configure/structs/game.plot.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_plot struct {
- _dataMap map[int32]*Game_plotData
- _dataList []*Game_plotData
+type Gameplot struct {
+ _dataMap map[int32]*GameplotData
+ _dataList []*GameplotData
}
-func NewGame_plot(_buf []map[string]interface{}) (*Game_plot, error) {
- _dataList := make([]*Game_plotData, 0, len(_buf))
- dataMap := make(map[int32]*Game_plotData)
+func NewGameplot(_buf []map[string]interface{}) (*Gameplot, error) {
+ _dataList := make([]*GameplotData, 0, len(_buf))
+ dataMap := make(map[int32]*GameplotData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_plotData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameplotData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Sameid] = _v
}
}
- return &Game_plot{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameplot{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_plot) GetDataMap() map[int32]*Game_plotData {
+func (table *Gameplot) GetDataMap() map[int32]*GameplotData {
return table._dataMap
}
-func (table *Game_plot) GetDataList() []*Game_plotData {
+func (table *Gameplot) GetDataList() []*GameplotData {
return table._dataList
}
-func (table *Game_plot) Get(key int32) *Game_plotData {
+func (table *Gameplot) Get(key int32) *GameplotData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.plotData.go b/sys/configure/structs/game.plotData.go
index de75b0825..597769215 100644
--- a/sys/configure/structs/game.plotData.go
+++ b/sys/configure/structs/game.plotData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,26 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_plotData struct {
+type GameplotData struct {
Sameid int32
Skip bool
Name string
Describe string
}
-func (Game_plotData) GetTypeId() int {
+const TypeId_GameplotData = -750874969
+
+func (*GameplotData) GetTypeId() int32 {
return -750874969
}
-func NewGame_plotData(_buf map[string]interface{}) (_v *Game_plotData, err error) {
- _v = &Game_plotData{}
+func (_v *GameplotData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sameid"].(float64); !_ok_ { err = errors.New("sameid error"); return }; _v.Sameid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Skip, _ok_ = _buf["skip"].(bool); !_ok_ { err = errors.New("skip error"); return } }
{ var _ok_ bool; if _v.Name, _ok_ = _buf["name"].(string); !_ok_ { err = errors.New("name error"); return } }
{ var _ok_ bool; if _v.Describe, _ok_ = _buf["describe"].(string); !_ok_ { err = errors.New("describe error"); return } }
return
}
+
+func DeserializeGameplotData(_buf map[string]interface{}) (*GameplotData, error) {
+ v := &GameplotData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.propsgroup.go b/sys/configure/structs/game.propsgroup.go
index 795a2758c..f252e8dd1 100644
--- a/sys/configure/structs/game.propsgroup.go
+++ b/sys/configure/structs/game.propsgroup.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_propsgroup struct {
- _dataMap map[int32]*Game_propsgroupData
- _dataList []*Game_propsgroupData
+type Gamepropsgroup struct {
+ _dataMap map[int32]*GamepropsgroupData
+ _dataList []*GamepropsgroupData
}
-func NewGame_propsgroup(_buf []map[string]interface{}) (*Game_propsgroup, error) {
- _dataList := make([]*Game_propsgroupData, 0, len(_buf))
- dataMap := make(map[int32]*Game_propsgroupData)
+func NewGamepropsgroup(_buf []map[string]interface{}) (*Gamepropsgroup, error) {
+ _dataList := make([]*GamepropsgroupData, 0, len(_buf))
+ dataMap := make(map[int32]*GamepropsgroupData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_propsgroupData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamepropsgroupData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_propsgroup{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamepropsgroup{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_propsgroup) GetDataMap() map[int32]*Game_propsgroupData {
+func (table *Gamepropsgroup) GetDataMap() map[int32]*GamepropsgroupData {
return table._dataMap
}
-func (table *Game_propsgroup) GetDataList() []*Game_propsgroupData {
+func (table *Gamepropsgroup) GetDataList() []*GamepropsgroupData {
return table._dataList
}
-func (table *Game_propsgroup) Get(key int32) *Game_propsgroupData {
+func (table *Gamepropsgroup) Get(key int32) *GamepropsgroupData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.propsgroupData.go b/sys/configure/structs/game.propsgroupData.go
index c1d4adbbb..51ce91206 100644
--- a/sys/configure/structs/game.propsgroupData.go
+++ b/sys/configure/structs/game.propsgroupData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,24 +5,26 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_propsgroupData struct {
+type GamepropsgroupData struct {
Key int32
Group int32
Star int32
- Prize []*Game_atn
+ Prize []*Gameatn
P int32
}
-func (Game_propsgroupData) GetTypeId() int {
+const TypeId_GamepropsgroupData = -1658257195
+
+func (*GamepropsgroupData) GetTypeId() int32 {
return -1658257195
}
-func NewGame_propsgroupData(_buf map[string]interface{}) (_v *Game_propsgroupData, err error) {
- _v = &Game_propsgroupData{}
+func (_v *GamepropsgroupData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["group"].(float64); !_ok_ { err = errors.New("group error"); return }; _v.Group = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["star"].(float64); !_ok_ { err = errors.New("star error"); return }; _v.Star = int32(_tempNum_) }
@@ -32,11 +33,11 @@ func NewGame_propsgroupData(_buf map[string]interface{}) (_v *Game_propsgroupDat
var _ok_ bool
if _arr_, _ok_ = _buf["prize"].([]interface{}); !_ok_ { err = errors.New("prize error"); return }
- _v.Prize = make([]*Game_atn, 0, len(_arr_))
+ _v.Prize = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Prize = append(_v.Prize, _list_v_)
}
}
@@ -44,3 +45,12 @@ func NewGame_propsgroupData(_buf map[string]interface{}) (_v *Game_propsgroupDat
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["p"].(float64); !_ok_ { err = errors.New("p error"); return }; _v.P = int32(_tempNum_) }
return
}
+
+func DeserializeGamepropsgroupData(_buf map[string]interface{}) (*GamepropsgroupData, error) {
+ v := &GamepropsgroupData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.shop.go b/sys/configure/structs/game.shop.go
index 56e75f4cf..7facd9144 100644
--- a/sys/configure/structs/game.shop.go
+++ b/sys/configure/structs/game.shop.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_shop struct {
- _dataMap map[int32]*Game_shopData
- _dataList []*Game_shopData
+type Gameshop struct {
+ _dataMap map[int32]*GameshopData
+ _dataList []*GameshopData
}
-func NewGame_shop(_buf []map[string]interface{}) (*Game_shop, error) {
- _dataList := make([]*Game_shopData, 0, len(_buf))
- dataMap := make(map[int32]*Game_shopData)
+func NewGameshop(_buf []map[string]interface{}) (*Gameshop, error) {
+ _dataList := make([]*GameshopData, 0, len(_buf))
+ dataMap := make(map[int32]*GameshopData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_shopData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameshopData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Shopid] = _v
}
}
- return &Game_shop{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameshop{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_shop) GetDataMap() map[int32]*Game_shopData {
+func (table *Gameshop) GetDataMap() map[int32]*GameshopData {
return table._dataMap
}
-func (table *Game_shop) GetDataList() []*Game_shopData {
+func (table *Gameshop) GetDataList() []*GameshopData {
return table._dataList
}
-func (table *Game_shop) Get(key int32) *Game_shopData {
+func (table *Gameshop) Get(key int32) *GameshopData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.shopData.go b/sys/configure/structs/game.shopData.go
index 21f0f27af..48f1f66f5 100644
--- a/sys/configure/structs/game.shopData.go
+++ b/sys/configure/structs/game.shopData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,29 +5,31 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_shopData struct {
+type GameshopData struct {
Shopid int32
Tab int32
Shopname string
UpperShop string
- Needshow []*Game_atn
+ Needshow []*Gameatn
Rtype int32
Rtime int32
Rnum int32
- Rneed []*Game_atn
+ Rneed []*Gameatn
Shopitem []int32
}
-func (Game_shopData) GetTypeId() int {
+const TypeId_GameshopData = 923847228
+
+func (*GameshopData) GetTypeId() int32 {
return 923847228
}
-func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error) {
- _v = &Game_shopData{}
+func (_v *GameshopData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["shopid"].(float64); !_ok_ { err = errors.New("shopid error"); return }; _v.Shopid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tab"].(float64); !_ok_ { err = errors.New("tab error"); return }; _v.Tab = int32(_tempNum_) }
{ var _ok_ bool; if _v.Shopname, _ok_ = _buf["shopname"].(string); !_ok_ { err = errors.New("shopname error"); return } }
@@ -38,11 +39,11 @@ func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error
var _ok_ bool
if _arr_, _ok_ = _buf["needshow"].([]interface{}); !_ok_ { err = errors.New("needshow error"); return }
- _v.Needshow = make([]*Game_atn, 0, len(_arr_))
+ _v.Needshow = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Needshow = append(_v.Needshow, _list_v_)
}
}
@@ -55,11 +56,11 @@ func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error
var _ok_ bool
if _arr_, _ok_ = _buf["rneed"].([]interface{}); !_ok_ { err = errors.New("rneed error"); return }
- _v.Rneed = make([]*Game_atn, 0, len(_arr_))
+ _v.Rneed = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Rneed = append(_v.Rneed, _list_v_)
}
}
@@ -80,3 +81,12 @@ func NewGame_shopData(_buf map[string]interface{}) (_v *Game_shopData, err error
return
}
+
+func DeserializeGameshopData(_buf map[string]interface{}) (*GameshopData, error) {
+ v := &GameshopData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.shopitem.go b/sys/configure/structs/game.shopitem.go
index 54c4f7c32..4484ad6c5 100644
--- a/sys/configure/structs/game.shopitem.go
+++ b/sys/configure/structs/game.shopitem.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_shopitem struct {
- _dataMap map[int32]*Game_shopitemData
- _dataList []*Game_shopitemData
+type Gameshopitem struct {
+ _dataMap map[int32]*GameshopitemData
+ _dataList []*GameshopitemData
}
-func NewGame_shopitem(_buf []map[string]interface{}) (*Game_shopitem, error) {
- _dataList := make([]*Game_shopitemData, 0, len(_buf))
- dataMap := make(map[int32]*Game_shopitemData)
+func NewGameshopitem(_buf []map[string]interface{}) (*Gameshopitem, error) {
+ _dataList := make([]*GameshopitemData, 0, len(_buf))
+ dataMap := make(map[int32]*GameshopitemData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_shopitemData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameshopitemData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_shopitem{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameshopitem{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_shopitem) GetDataMap() map[int32]*Game_shopitemData {
+func (table *Gameshopitem) GetDataMap() map[int32]*GameshopitemData {
return table._dataMap
}
-func (table *Game_shopitem) GetDataList() []*Game_shopitemData {
+func (table *Gameshopitem) GetDataList() []*GameshopitemData {
return table._dataList
}
-func (table *Game_shopitem) Get(key int32) *Game_shopitemData {
+func (table *Gameshopitem) Get(key int32) *GameshopitemData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.shopitemData.go b/sys/configure/structs/game.shopitemData.go
index ef147e2e9..201c8d4ba 100644
--- a/sys/configure/structs/game.shopitemData.go
+++ b/sys/configure/structs/game.shopitemData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,16 +5,17 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_shopitemData struct {
+type GameshopitemData struct {
Key int32
Id int32
- Iteminfo []*Game_atn
+ Iteminfo []*Gameatn
Probability int32
- Need []*Game_atn
+ Need []*Gameatn
Sale int32
Salelist []int32
Buyminnum int32
@@ -27,12 +27,13 @@ type Game_shopitemData struct {
Mapidmax int32
}
-func (Game_shopitemData) GetTypeId() int {
+const TypeId_GameshopitemData = 683408079
+
+func (*GameshopitemData) GetTypeId() int32 {
return 683408079
}
-func NewGame_shopitemData(_buf map[string]interface{}) (_v *Game_shopitemData, err error) {
- _v = &Game_shopitemData{}
+func (_v *GameshopitemData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{
@@ -40,11 +41,11 @@ func NewGame_shopitemData(_buf map[string]interface{}) (_v *Game_shopitemData, e
var _ok_ bool
if _arr_, _ok_ = _buf["iteminfo"].([]interface{}); !_ok_ { err = errors.New("iteminfo error"); return }
- _v.Iteminfo = make([]*Game_atn, 0, len(_arr_))
+ _v.Iteminfo = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Iteminfo = append(_v.Iteminfo, _list_v_)
}
}
@@ -55,11 +56,11 @@ func NewGame_shopitemData(_buf map[string]interface{}) (_v *Game_shopitemData, e
var _ok_ bool
if _arr_, _ok_ = _buf["need"].([]interface{}); !_ok_ { err = errors.New("need error"); return }
- _v.Need = make([]*Game_atn, 0, len(_arr_))
+ _v.Need = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Need = append(_v.Need, _list_v_)
}
}
@@ -88,3 +89,12 @@ func NewGame_shopitemData(_buf map[string]interface{}) (_v *Game_shopitemData, e
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["mapidmax"].(float64); !_ok_ { err = errors.New("mapidmax error"); return }; _v.Mapidmax = int32(_tempNum_) }
return
}
+
+func DeserializeGameshopitemData(_buf map[string]interface{}) (*GameshopitemData, error) {
+ v := &GameshopitemData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.skill.go b/sys/configure/structs/game.skill.go
index 49bbcf1da..3336e16db 100644
--- a/sys/configure/structs/game.skill.go
+++ b/sys/configure/structs/game.skill.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_skill struct {
- _dataMap map[int32]*Game_skillData
- _dataList []*Game_skillData
+type Gameskill struct {
+ _dataMap map[int32]*GameskillData
+ _dataList []*GameskillData
}
-func NewGame_skill(_buf []map[string]interface{}) (*Game_skill, error) {
- _dataList := make([]*Game_skillData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillData)
+func NewGameskill(_buf []map[string]interface{}) (*Gameskill, error) {
+ _dataList := make([]*GameskillData, 0, len(_buf))
+ dataMap := make(map[int32]*GameskillData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameskillData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_skill{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameskill{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_skill) GetDataMap() map[int32]*Game_skillData {
+func (table *Gameskill) GetDataMap() map[int32]*GameskillData {
return table._dataMap
}
-func (table *Game_skill) GetDataList() []*Game_skillData {
+func (table *Gameskill) GetDataList() []*GameskillData {
return table._dataList
}
-func (table *Game_skill) Get(key int32) *Game_skillData {
+func (table *Gameskill) Get(key int32) *GameskillData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.skillAfteratk.go b/sys/configure/structs/game.skillAfteratk.go
index 1b303c4f1..e62cb9204 100644
--- a/sys/configure/structs/game.skillAfteratk.go
+++ b/sys/configure/structs/game.skillAfteratk.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_skillAfteratk struct {
- _dataMap map[int32]*Game_skillAfteratkData
- _dataList []*Game_skillAfteratkData
+type GameskillAfteratk struct {
+ _dataMap map[int32]*GameskillAfteratkData
+ _dataList []*GameskillAfteratkData
}
-func NewGame_skillAfteratk(_buf []map[string]interface{}) (*Game_skillAfteratk, error) {
- _dataList := make([]*Game_skillAfteratkData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillAfteratkData)
+func NewGameskillAfteratk(_buf []map[string]interface{}) (*GameskillAfteratk, error) {
+ _dataList := make([]*GameskillAfteratkData, 0, len(_buf))
+ dataMap := make(map[int32]*GameskillAfteratkData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillAfteratkData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameskillAfteratkData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_skillAfteratk{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameskillAfteratk{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_skillAfteratk) GetDataMap() map[int32]*Game_skillAfteratkData {
+func (table *GameskillAfteratk) GetDataMap() map[int32]*GameskillAfteratkData {
return table._dataMap
}
-func (table *Game_skillAfteratk) GetDataList() []*Game_skillAfteratkData {
+func (table *GameskillAfteratk) GetDataList() []*GameskillAfteratkData {
return table._dataList
}
-func (table *Game_skillAfteratk) Get(key int32) *Game_skillAfteratkData {
+func (table *GameskillAfteratk) Get(key int32) *GameskillAfteratkData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.skillAfteratkData.go b/sys/configure/structs/game.skillAfteratkData.go
index b7b920a31..59a22a598 100644
--- a/sys/configure/structs/game.skillAfteratkData.go
+++ b/sys/configure/structs/game.skillAfteratkData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_skillAfteratkData struct {
+type GameskillAfteratkData struct {
Id int32
Desc string
From int32
@@ -30,12 +30,13 @@ type Game_skillAfteratkData struct {
NoRelyTags []string
}
-func (Game_skillAfteratkData) GetTypeId() int {
+const TypeId_GameskillAfteratkData = -718176517
+
+func (*GameskillAfteratkData) GetTypeId() int32 {
return -718176517
}
-func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfteratkData, err error) {
- _v = &Game_skillAfteratkData{}
+func (_v *GameskillAfteratkData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["From"].(float64); !_ok_ { err = errors.New("From error"); return }; _v.From = int32(_tempNum_) }
@@ -159,3 +160,12 @@ func NewGame_skillAfteratkData(_buf map[string]interface{}) (_v *Game_skillAfter
return
}
+
+func DeserializeGameskillAfteratkData(_buf map[string]interface{}) (*GameskillAfteratkData, error) {
+ v := &GameskillAfteratkData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.skillAtk.go b/sys/configure/structs/game.skillAtk.go
index 786ea1a20..10fdac4e8 100644
--- a/sys/configure/structs/game.skillAtk.go
+++ b/sys/configure/structs/game.skillAtk.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_skillAtk struct {
- _dataMap map[int32]*Game_skillAtkData
- _dataList []*Game_skillAtkData
+type GameskillAtk struct {
+ _dataMap map[int32]*GameskillAtkData
+ _dataList []*GameskillAtkData
}
-func NewGame_skillAtk(_buf []map[string]interface{}) (*Game_skillAtk, error) {
- _dataList := make([]*Game_skillAtkData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillAtkData)
+func NewGameskillAtk(_buf []map[string]interface{}) (*GameskillAtk, error) {
+ _dataList := make([]*GameskillAtkData, 0, len(_buf))
+ dataMap := make(map[int32]*GameskillAtkData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillAtkData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameskillAtkData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_skillAtk{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameskillAtk{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_skillAtk) GetDataMap() map[int32]*Game_skillAtkData {
+func (table *GameskillAtk) GetDataMap() map[int32]*GameskillAtkData {
return table._dataMap
}
-func (table *Game_skillAtk) GetDataList() []*Game_skillAtkData {
+func (table *GameskillAtk) GetDataList() []*GameskillAtkData {
return table._dataList
}
-func (table *Game_skillAtk) Get(key int32) *Game_skillAtkData {
+func (table *GameskillAtk) Get(key int32) *GameskillAtkData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.skillAtkData.go b/sys/configure/structs/game.skillAtkData.go
index cac5ba168..59152c8b6 100644
--- a/sys/configure/structs/game.skillAtkData.go
+++ b/sys/configure/structs/game.skillAtkData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_skillAtkData struct {
+type GameskillAtkData struct {
Id int32
Name string
Ico string
@@ -19,17 +19,18 @@ type Game_skillAtkData struct {
MaxLV int32
CD []int32
Target int32
- ChildSkill []*Game_ChildSkills
+ ChildSkill []*GameChildSkills
Desc []string
Buffid []int32
}
-func (Game_skillAtkData) GetTypeId() int {
+const TypeId_GameskillAtkData = -1545475251
+
+func (*GameskillAtkData) GetTypeId() int32 {
return -1545475251
}
-func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, err error) {
- _v = &Game_skillAtkData{}
+func (_v *GameskillAtkData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
@@ -56,11 +57,11 @@ func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, e
var _ok_ bool
if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return }
- _v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_))
+ _v.ChildSkill = make([]*GameChildSkills, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_ChildSkills
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_ChildSkills(_x_); err != nil { return } }
+ var _list_v_ *GameChildSkills
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameChildSkills(_x_); err != nil { return } }
_v.ChildSkill = append(_v.ChildSkill, _list_v_)
}
}
@@ -95,3 +96,12 @@ func NewGame_skillAtkData(_buf map[string]interface{}) (_v *Game_skillAtkData, e
return
}
+
+func DeserializeGameskillAtkData(_buf map[string]interface{}) (*GameskillAtkData, error) {
+ v := &GameskillAtkData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.skillBuff.go b/sys/configure/structs/game.skillBuff.go
index 436fb6767..77d4ea1fa 100644
--- a/sys/configure/structs/game.skillBuff.go
+++ b/sys/configure/structs/game.skillBuff.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_skillBuff struct {
- _dataMap map[int32]*Game_skillBuffData
- _dataList []*Game_skillBuffData
+type GameskillBuff struct {
+ _dataMap map[int32]*GameskillBuffData
+ _dataList []*GameskillBuffData
}
-func NewGame_skillBuff(_buf []map[string]interface{}) (*Game_skillBuff, error) {
- _dataList := make([]*Game_skillBuffData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillBuffData)
+func NewGameskillBuff(_buf []map[string]interface{}) (*GameskillBuff, error) {
+ _dataList := make([]*GameskillBuffData, 0, len(_buf))
+ dataMap := make(map[int32]*GameskillBuffData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillBuffData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameskillBuffData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_skillBuff{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameskillBuff{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_skillBuff) GetDataMap() map[int32]*Game_skillBuffData {
+func (table *GameskillBuff) GetDataMap() map[int32]*GameskillBuffData {
return table._dataMap
}
-func (table *Game_skillBuff) GetDataList() []*Game_skillBuffData {
+func (table *GameskillBuff) GetDataList() []*GameskillBuffData {
return table._dataList
}
-func (table *Game_skillBuff) Get(key int32) *Game_skillBuffData {
+func (table *GameskillBuff) Get(key int32) *GameskillBuffData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.skillBuffData.go b/sys/configure/structs/game.skillBuffData.go
index 42c95f310..848a6ef25 100644
--- a/sys/configure/structs/game.skillBuffData.go
+++ b/sys/configure/structs/game.skillBuffData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_skillBuffData struct {
+type GameskillBuffData struct {
Id int32
Type string
Name string
@@ -25,12 +25,13 @@ type Game_skillBuffData struct {
Buffpos string
}
-func (Game_skillBuffData) GetTypeId() int {
+const TypeId_GameskillBuffData = 1852593938
+
+func (*GameskillBuffData) GetTypeId() int32 {
return 1852593938
}
-func NewGame_skillBuffData(_buf map[string]interface{}) (_v *Game_skillBuffData, err error) {
- _v = &Game_skillBuffData{}
+func (_v *GameskillBuffData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Type, _ok_ = _buf["Type"].(string); !_ok_ { err = errors.New("Type error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
@@ -84,3 +85,12 @@ func NewGame_skillBuffData(_buf map[string]interface{}) (_v *Game_skillBuffData,
{ var _ok_ bool; if _v.Buffpos, _ok_ = _buf["buffpos"].(string); !_ok_ { err = errors.New("buffpos error"); return } }
return
}
+
+func DeserializeGameskillBuffData(_buf map[string]interface{}) (*GameskillBuffData, error) {
+ v := &GameskillBuffData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.skillData.go b/sys/configure/structs/game.skillData.go
index 598329b6c..69b83f186 100644
--- a/sys/configure/structs/game.skillData.go
+++ b/sys/configure/structs/game.skillData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_skillData struct {
+type GameskillData struct {
Id int32
Name string
Ico string
@@ -19,17 +19,18 @@ type Game_skillData struct {
MaxLV int32
CD []int32
Target int32
- ChildSkill []*Game_ChildSkills
+ ChildSkill []*GameChildSkills
Desc []string
Buffid []int32
}
-func (Game_skillData) GetTypeId() int {
+const TypeId_GameskillData = -1600555361
+
+func (*GameskillData) GetTypeId() int32 {
return -1600555361
}
-func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err error) {
- _v = &Game_skillData{}
+func (_v *GameskillData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["Name"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Name error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Name, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Ico, _ok_ = _buf["ico"].(string); !_ok_ { err = errors.New("ico error"); return } }
@@ -56,11 +57,11 @@ func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err err
var _ok_ bool
if _arr_, _ok_ = _buf["ChildSkill"].([]interface{}); !_ok_ { err = errors.New("ChildSkill error"); return }
- _v.ChildSkill = make([]*Game_ChildSkills, 0, len(_arr_))
+ _v.ChildSkill = make([]*GameChildSkills, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_ChildSkills
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_ChildSkills(_x_); err != nil { return } }
+ var _list_v_ *GameChildSkills
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameChildSkills(_x_); err != nil { return } }
_v.ChildSkill = append(_v.ChildSkill, _list_v_)
}
}
@@ -95,3 +96,12 @@ func NewGame_skillData(_buf map[string]interface{}) (_v *Game_skillData, err err
return
}
+
+func DeserializeGameskillData(_buf map[string]interface{}) (*GameskillData, error) {
+ v := &GameskillData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.skillPassive.go b/sys/configure/structs/game.skillPassive.go
index b4a7898de..662ee64fb 100644
--- a/sys/configure/structs/game.skillPassive.go
+++ b/sys/configure/structs/game.skillPassive.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_skillPassive struct {
- _dataMap map[int32]*Game_skillPassiveData
- _dataList []*Game_skillPassiveData
+type GameskillPassive struct {
+ _dataMap map[int32]*GameskillPassiveData
+ _dataList []*GameskillPassiveData
}
-func NewGame_skillPassive(_buf []map[string]interface{}) (*Game_skillPassive, error) {
- _dataList := make([]*Game_skillPassiveData, 0, len(_buf))
- dataMap := make(map[int32]*Game_skillPassiveData)
+func NewGameskillPassive(_buf []map[string]interface{}) (*GameskillPassive, error) {
+ _dataList := make([]*GameskillPassiveData, 0, len(_buf))
+ dataMap := make(map[int32]*GameskillPassiveData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_skillPassiveData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameskillPassiveData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_skillPassive{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GameskillPassive{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_skillPassive) GetDataMap() map[int32]*Game_skillPassiveData {
+func (table *GameskillPassive) GetDataMap() map[int32]*GameskillPassiveData {
return table._dataMap
}
-func (table *Game_skillPassive) GetDataList() []*Game_skillPassiveData {
+func (table *GameskillPassive) GetDataList() []*GameskillPassiveData {
return table._dataList
}
-func (table *Game_skillPassive) Get(key int32) *Game_skillPassiveData {
+func (table *GameskillPassive) Get(key int32) *GameskillPassiveData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.skillPassiveData.go b/sys/configure/structs/game.skillPassiveData.go
index e6ce3b814..3066b58d2 100644
--- a/sys/configure/structs/game.skillPassiveData.go
+++ b/sys/configure/structs/game.skillPassiveData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_skillPassiveData struct {
+type GameskillPassiveData struct {
Id int32
Desc string
When string
@@ -25,12 +25,13 @@ type Game_skillPassiveData struct {
NoRelyTags []string
}
-func (Game_skillPassiveData) GetTypeId() int {
+const TypeId_GameskillPassiveData = -1231842596
+
+func (*GameskillPassiveData) GetTypeId() int32 {
return -1231842596
}
-func NewGame_skillPassiveData(_buf map[string]interface{}) (_v *Game_skillPassiveData, err error) {
- _v = &Game_skillPassiveData{}
+func (_v *GameskillPassiveData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["Id"].(float64); !_ok_ { err = errors.New("Id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; if _v.Desc, _ok_ = _buf["Desc"].(string); !_ok_ { err = errors.New("Desc error"); return } }
{ var _ok_ bool; if _v.When, _ok_ = _buf["When"].(string); !_ok_ { err = errors.New("When error"); return } }
@@ -97,3 +98,12 @@ func NewGame_skillPassiveData(_buf map[string]interface{}) (_v *Game_skillPassiv
return
}
+
+func DeserializeGameskillPassiveData(_buf map[string]interface{}) (*GameskillPassiveData, error) {
+ v := &GameskillPassiveData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.stroy.go b/sys/configure/structs/game.stroy.go
index 1a145b6cc..cb13c3d7d 100644
--- a/sys/configure/structs/game.stroy.go
+++ b/sys/configure/structs/game.stroy.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_stroy struct {
- _dataMap map[int32]*Game_stroyData
- _dataList []*Game_stroyData
+type Gamestroy struct {
+ _dataMap map[int32]*GamestroyData
+ _dataList []*GamestroyData
}
-func NewGame_stroy(_buf []map[string]interface{}) (*Game_stroy, error) {
- _dataList := make([]*Game_stroyData, 0, len(_buf))
- dataMap := make(map[int32]*Game_stroyData)
+func NewGamestroy(_buf []map[string]interface{}) (*Gamestroy, error) {
+ _dataList := make([]*GamestroyData, 0, len(_buf))
+ dataMap := make(map[int32]*GamestroyData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_stroyData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGamestroyData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_stroy{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gamestroy{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_stroy) GetDataMap() map[int32]*Game_stroyData {
+func (table *Gamestroy) GetDataMap() map[int32]*GamestroyData {
return table._dataMap
}
-func (table *Game_stroy) GetDataList() []*Game_stroyData {
+func (table *Gamestroy) GetDataList() []*GamestroyData {
return table._dataList
}
-func (table *Game_stroy) Get(key int32) *Game_stroyData {
+func (table *Gamestroy) Get(key int32) *GamestroyData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.stroyData.go b/sys/configure/structs/game.stroyData.go
index f8b25a5b3..1f02d08e7 100644
--- a/sys/configure/structs/game.stroyData.go
+++ b/sys/configure/structs/game.stroyData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,13 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
+import "bright/serialization"
-type Game_stroyData struct {
+type GamestroyData struct {
Id int32
Groupid int32
Before int32
@@ -27,18 +28,21 @@ type Game_stroyData struct {
Action string
Sound string
Place int32
- Revolve string
+ Position serialization.Vector3
+ Revolve serialization.Vector3
+ Size serialization.Vector3
Perf string
Cg string
Skip int32
}
-func (Game_stroyData) GetTypeId() int {
+const TypeId_GamestroyData = 695327529
+
+func (*GamestroyData) GetTypeId() int32 {
return 695327529
}
-func NewGame_stroyData(_buf map[string]interface{}) (_v *Game_stroyData, err error) {
- _v = &Game_stroyData{}
+func (_v *GamestroyData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id"].(float64); !_ok_ { err = errors.New("id error"); return }; _v.Id = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["groupid"].(float64); !_ok_ { err = errors.New("groupid error"); return }; _v.Groupid = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["before"].(float64); !_ok_ { err = errors.New("before error"); return }; _v.Before = int32(_tempNum_) }
@@ -68,9 +72,41 @@ func NewGame_stroyData(_buf map[string]interface{}) (_v *Game_stroyData, err err
{ var _ok_ bool; if _v.Action, _ok_ = _buf["action"].(string); !_ok_ { err = errors.New("action error"); return } }
{ var _ok_ bool; if _v.Sound, _ok_ = _buf["sound"].(string); !_ok_ { err = errors.New("sound error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["place"].(float64); !_ok_ { err = errors.New("place error"); return }; _v.Place = int32(_tempNum_) }
- { var _ok_ bool; if _v.Revolve, _ok_ = _buf["revolve"].(string); !_ok_ { err = errors.New("revolve error"); return } }
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["position"].(map[string]interface{}); !_ok_ { err = errors.New("position error"); return }
+ var _x_, _y_, _z_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+ _v.Position = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["revolve"].(map[string]interface{}); !_ok_ { err = errors.New("revolve error"); return }
+ var _x_, _y_, _z_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+ _v.Revolve = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
+ { var _ok_ bool; var _v_ map[string]interface{}; if _v_, _ok_ = _buf["size"].(map[string]interface{}); !_ok_ { err = errors.New("size error"); return }
+ var _x_, _y_, _z_ float32;
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["x"].(float64); !_ok_ { err = errors.New("x error"); return }; _x_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["y"].(float64); !_ok_ { err = errors.New("y error"); return }; _y_ = float32(_tempNum_) }
+ { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _v_["z"].(float64); !_ok_ { err = errors.New("z error"); return }; _z_ = float32(_tempNum_) }
+ _v.Size = serialization.NewVector3(_x_, _y_, _z_)
+ }
+
{ var _ok_ bool; if _v.Perf, _ok_ = _buf["perf"].(string); !_ok_ { err = errors.New("perf error"); return } }
{ var _ok_ bool; if _v.Cg, _ok_ = _buf["cg"].(string); !_ok_ { err = errors.New("cg error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skip"].(float64); !_ok_ { err = errors.New("skip error"); return }; _v.Skip = int32(_tempNum_) }
return
}
+
+func DeserializeGamestroyData(_buf map[string]interface{}) (*GamestroyData, error) {
+ v := &GamestroyData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.taskActiveReward.go b/sys/configure/structs/game.taskActiveReward.go
index 254ec421b..d5ef3615a 100644
--- a/sys/configure/structs/game.taskActiveReward.go
+++ b/sys/configure/structs/game.taskActiveReward.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_taskActiveReward struct {
- _dataMap map[int32]*Game_taskActiveRewardData
- _dataList []*Game_taskActiveRewardData
+type GametaskActiveReward struct {
+ _dataMap map[int32]*GametaskActiveRewardData
+ _dataList []*GametaskActiveRewardData
}
-func NewGame_taskActiveReward(_buf []map[string]interface{}) (*Game_taskActiveReward, error) {
- _dataList := make([]*Game_taskActiveRewardData, 0, len(_buf))
- dataMap := make(map[int32]*Game_taskActiveRewardData)
+func NewGametaskActiveReward(_buf []map[string]interface{}) (*GametaskActiveReward, error) {
+ _dataList := make([]*GametaskActiveRewardData, 0, len(_buf))
+ dataMap := make(map[int32]*GametaskActiveRewardData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_taskActiveRewardData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGametaskActiveRewardData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_taskActiveReward{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GametaskActiveReward{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_taskActiveReward) GetDataMap() map[int32]*Game_taskActiveRewardData {
+func (table *GametaskActiveReward) GetDataMap() map[int32]*GametaskActiveRewardData {
return table._dataMap
}
-func (table *Game_taskActiveReward) GetDataList() []*Game_taskActiveRewardData {
+func (table *GametaskActiveReward) GetDataList() []*GametaskActiveRewardData {
return table._dataList
}
-func (table *Game_taskActiveReward) Get(key int32) *Game_taskActiveRewardData {
+func (table *GametaskActiveReward) Get(key int32) *GametaskActiveRewardData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.taskActiveRewardData.go b/sys/configure/structs/game.taskActiveRewardData.go
index 7479dadf2..c944ccbb3 100644
--- a/sys/configure/structs/game.taskActiveRewardData.go
+++ b/sys/configure/structs/game.taskActiveRewardData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,23 +5,25 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_taskActiveRewardData struct {
+type GametaskActiveRewardData struct {
Key int32
IdTag int32
Active int32
- Reword []*Game_atn
+ Reword []*Gameatn
}
-func (Game_taskActiveRewardData) GetTypeId() int {
+const TypeId_GametaskActiveRewardData = -660260032
+
+func (*GametaskActiveRewardData) GetTypeId() int32 {
return -660260032
}
-func NewGame_taskActiveRewardData(_buf map[string]interface{}) (_v *Game_taskActiveRewardData, err error) {
- _v = &Game_taskActiveRewardData{}
+func (_v *GametaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["active"].(float64); !_ok_ { err = errors.New("active error"); return }; _v.Active = int32(_tempNum_) }
@@ -31,14 +32,23 @@ func NewGame_taskActiveRewardData(_buf map[string]interface{}) (_v *Game_taskAct
var _ok_ bool
if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
- _v.Reword = make([]*Game_atn, 0, len(_arr_))
+ _v.Reword = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reword = append(_v.Reword, _list_v_)
}
}
return
}
+
+func DeserializeGametaskActiveRewardData(_buf map[string]interface{}) (*GametaskActiveRewardData, error) {
+ v := &GametaskActiveRewardData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.taskRound.go b/sys/configure/structs/game.taskRound.go
index 9a9129b71..8ea4524a7 100644
--- a/sys/configure/structs/game.taskRound.go
+++ b/sys/configure/structs/game.taskRound.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_taskRound struct {
- _dataMap map[int32]*Game_taskRoundData
- _dataList []*Game_taskRoundData
+type GametaskRound struct {
+ _dataMap map[int32]*GametaskRoundData
+ _dataList []*GametaskRoundData
}
-func NewGame_taskRound(_buf []map[string]interface{}) (*Game_taskRound, error) {
- _dataList := make([]*Game_taskRoundData, 0, len(_buf))
- dataMap := make(map[int32]*Game_taskRoundData)
+func NewGametaskRound(_buf []map[string]interface{}) (*GametaskRound, error) {
+ _dataList := make([]*GametaskRoundData, 0, len(_buf))
+ dataMap := make(map[int32]*GametaskRoundData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_taskRoundData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGametaskRoundData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Key] = _v
}
}
- return &Game_taskRound{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &GametaskRound{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_taskRound) GetDataMap() map[int32]*Game_taskRoundData {
+func (table *GametaskRound) GetDataMap() map[int32]*GametaskRoundData {
return table._dataMap
}
-func (table *Game_taskRound) GetDataList() []*Game_taskRoundData {
+func (table *GametaskRound) GetDataList() []*GametaskRoundData {
return table._dataList
}
-func (table *Game_taskRound) Get(key int32) *Game_taskRoundData {
+func (table *GametaskRound) Get(key int32) *GametaskRoundData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.taskRoundData.go b/sys/configure/structs/game.taskRoundData.go
index e9d815b8b..204614aba 100644
--- a/sys/configure/structs/game.taskRoundData.go
+++ b/sys/configure/structs/game.taskRoundData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_taskRoundData struct {
+type GametaskRoundData struct {
Key int32
IdList int32
IdTag int32
@@ -22,15 +22,16 @@ type Game_taskRoundData struct {
IdAfter int32
JumpInterface string
Icon string
- Reword []*Game_atn
+ Reword []*Gameatn
}
-func (Game_taskRoundData) GetTypeId() int {
+const TypeId_GametaskRoundData = 768648535
+
+func (*GametaskRoundData) GetTypeId() int32 {
return 768648535
}
-func NewGame_taskRoundData(_buf map[string]interface{}) (_v *Game_taskRoundData, err error) {
- _v = &Game_taskRoundData{}
+func (_v *GametaskRoundData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_list"].(float64); !_ok_ { err = errors.New("id_list error"); return }; _v.IdList = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["id_tag"].(float64); !_ok_ { err = errors.New("id_tag error"); return }; _v.IdTag = int32(_tempNum_) }
@@ -47,14 +48,23 @@ func NewGame_taskRoundData(_buf map[string]interface{}) (_v *Game_taskRoundData,
var _ok_ bool
if _arr_, _ok_ = _buf["reword"].([]interface{}); !_ok_ { err = errors.New("reword error"); return }
- _v.Reword = make([]*Game_atn, 0, len(_arr_))
+ _v.Reword = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
- var _list_v_ *Game_atn
- { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = NewGame_atn(_x_); err != nil { return } }
+ var _list_v_ *Gameatn
+ { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.Reword = append(_v.Reword, _list_v_)
}
}
return
}
+
+func DeserializeGametaskRoundData(_buf map[string]interface{}) (*GametaskRoundData, error) {
+ v := &GametaskRoundData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}
diff --git a/sys/configure/structs/game.ui.go b/sys/configure/structs/game.ui.go
index b10aa45ea..15658b31e 100644
--- a/sys/configure/structs/game.ui.go
+++ b/sys/configure/structs/game.ui.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,36 +5,37 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
-type Game_ui struct {
- _dataMap map[string]*Game_uiData
- _dataList []*Game_uiData
+type Gameui struct {
+ _dataMap map[string]*GameuiData
+ _dataList []*GameuiData
}
-func NewGame_ui(_buf []map[string]interface{}) (*Game_ui, error) {
- _dataList := make([]*Game_uiData, 0, len(_buf))
- dataMap := make(map[string]*Game_uiData)
+func NewGameui(_buf []map[string]interface{}) (*Gameui, error) {
+ _dataList := make([]*GameuiData, 0, len(_buf))
+ dataMap := make(map[string]*GameuiData)
for _, _ele_ := range _buf {
- if _v, err2 := NewGame_uiData(_ele_); err2 != nil {
+ if _v, err2 := DeserializeGameuiData(_ele_); err2 != nil {
return nil, err2
} else {
_dataList = append(_dataList, _v)
dataMap[_v.Id] = _v
}
}
- return &Game_ui{_dataList:_dataList, _dataMap:dataMap}, nil
+ return &Gameui{_dataList:_dataList, _dataMap:dataMap}, nil
}
-func (table *Game_ui) GetDataMap() map[string]*Game_uiData {
+func (table *Gameui) GetDataMap() map[string]*GameuiData {
return table._dataMap
}
-func (table *Game_ui) GetDataList() []*Game_uiData {
+func (table *Gameui) GetDataList() []*GameuiData {
return table._dataList
}
-func (table *Game_ui) Get(key string) *Game_uiData {
+func (table *Gameui) Get(key string) *GameuiData {
return table._dataMap[key]
}
diff --git a/sys/configure/structs/game.uiData.go b/sys/configure/structs/game.uiData.go
index 38b81fb85..778c0c09b 100644
--- a/sys/configure/structs/game.uiData.go
+++ b/sys/configure/structs/game.uiData.go
@@ -1,4 +1,3 @@
-
//------------------------------------------------------------------------------
//
// This code was generated by a tool.
@@ -6,11 +5,12 @@
// the code is regenerated.
//
//------------------------------------------------------------------------------
+
package cfg
import "errors"
-type Game_uiData struct {
+type GameuiData struct {
Id string
File string
Unloadpkg int32
@@ -23,12 +23,13 @@ type Game_uiData struct {
Des string
}
-func (Game_uiData) GetTypeId() int {
+const TypeId_GameuiData = -473993766
+
+func (*GameuiData) GetTypeId() int32 {
return -473993766
}
-func NewGame_uiData(_buf map[string]interface{}) (_v *Game_uiData, err error) {
- _v = &Game_uiData{}
+func (_v *GameuiData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Id, _ok_ = _buf["id"].(string); !_ok_ { err = errors.New("id error"); return } }
{ var _ok_ bool; if _v.File, _ok_ = _buf["file"].(string); !_ok_ { err = errors.New("file error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["unloadpkg"].(float64); !_ok_ { err = errors.New("unloadpkg error"); return }; _v.Unloadpkg = int32(_tempNum_) }
@@ -41,3 +42,12 @@ func NewGame_uiData(_buf map[string]interface{}) (_v *Game_uiData, err error) {
{ var _ok_ bool; if _v.Des, _ok_ = _buf["des"].(string); !_ok_ { err = errors.New("des error"); return } }
return
}
+
+func DeserializeGameuiData(_buf map[string]interface{}) (*GameuiData, error) {
+ v := &GameuiData{}
+ if err := v.Deserialize(_buf); err == nil {
+ return v, nil
+ } else {
+ return nil, err
+ }
+}