From cb7fff34454f2f34ad62417e26c452b6efd74932 Mon Sep 17 00:00:00 2001 From: liwei1dao Date: Thu, 18 Aug 2022 15:09:34 +0800 Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=85=8D=E7=BD=AE=E6=96=87?= =?UTF-8?q?=E4=BB=B6=E5=91=BD=E4=BB=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...rker.json => game_kungfumasterworker.json} | 0 ...gfu_unlock.json => game_kungfuunlock.json} | 0 bin/json/game_language.json | 765 --------------- bin/json/game_rdtaskall.json | 64 +- bin/json/game_rdtaskchoose.json | 24 +- bin/json/game_rdtasktype.json | 32 +- bin/json/game_ui.json | 926 ------------------ modules/chat/configure.go | 22 +- modules/comp_configure.go | 30 +- modules/equipment/api_equip.go | 4 +- modules/equipment/api_upgrade.go | 4 +- modules/equipment/configure.go | 38 +- modules/equipment/modelEquipment.go | 16 +- modules/gateway/configure_comp.go | 6 +- modules/hero/api_awaken.go | 2 +- modules/hero/api_drawCard.go | 2 +- modules/hero/api_strengthenUpStar.go | 2 +- modules/hero/configure_comp.go | 142 +-- modules/hero/model_hero.go | 2 +- modules/items/api_sellItem.go | 2 +- modules/items/api_useItem.go | 4 +- modules/items/configure.go | 28 +- modules/items/core.go | 2 +- modules/items/modelitems.go | 4 +- modules/mainline/comp_configure.go | 40 +- modules/martialhall/api_info.go | 2 +- modules/martialhall/api_practice.go | 2 +- modules/martialhall/api_receive.go | 2 +- modules/martialhall/api_unlock.go | 2 +- modules/martialhall/api_upgrade.go | 2 +- modules/martialhall/configure.go | 12 +- modules/martialhall/core.go | 4 +- modules/pagoda/comp_configure.go | 26 +- modules/rtask/config.go | 2 +- modules/rtask/model_rtask.go | 2 +- modules/rtask/module.go | 2 +- modules/shop/api_buy.go | 2 +- modules/shop/api_getlist.go | 8 +- modules/shop/configure.go | 30 +- modules/shop/core.go | 4 +- modules/task/config.go | 30 +- .../structs/Game.KungfuMasterworker.go | 42 + ...Data.go => Game.KungfuMasterworkerData.go} | 14 +- sys/configure/structs/Game.KungfuUnlock.go | 42 + ...unlockData.go => Game.KungfuUnlockData.go} | 14 +- sys/configure/structs/Tables.go | 253 +++-- sys/configure/structs/game.ChildSkills.go | 4 +- sys/configure/structs/game.DropData.go | 4 +- sys/configure/structs/game.Figure.go | 4 +- sys/configure/structs/game.GourmetData.go | 4 +- .../structs/game.GourmetSkillData.go | 4 +- sys/configure/structs/game.activeReward.go | 22 +- .../structs/game.activeRewardData.go | 14 +- sys/configure/structs/game.atn.go | 4 +- sys/configure/structs/game.basepool.go | 4 +- sys/configure/structs/game.chatChannel.go | 22 +- sys/configure/structs/game.chatChannelCom.go | 22 +- .../structs/game.chatChannelComData.go | 14 +- sys/configure/structs/game.chatChannelData.go | 14 +- sys/configure/structs/game.chatServerGroup.go | 22 +- .../structs/game.chatServerGroupData.go | 14 +- sys/configure/structs/game.chatSystem.go | 22 +- sys/configure/structs/game.chatSystemData.go | 14 +- sys/configure/structs/game.coin.go | 22 +- sys/configure/structs/game.coinData.go | 14 +- sys/configure/structs/game.com.go | 22 +- sys/configure/structs/game.comAtn.go | 22 +- sys/configure/structs/game.comAtnData.go | 14 +- sys/configure/structs/game.comData.go | 14 +- sys/configure/structs/game.drawCard.go | 22 +- sys/configure/structs/game.drawCardData.go | 14 +- sys/configure/structs/game.equip.go | 22 +- .../structs/game.equipAttrlibrary.go | 22 +- .../structs/game.equipAttrlibraryData.go | 14 +- sys/configure/structs/game.equipColor.go | 22 +- sys/configure/structs/game.equipColorData.go | 14 +- sys/configure/structs/game.equipData.go | 14 +- sys/configure/structs/game.equipIntensify.go | 22 +- .../structs/game.equipIntensifyData.go | 14 +- sys/configure/structs/game.equipPos.go | 22 +- sys/configure/structs/game.equipPosData.go | 14 +- sys/configure/structs/game.equipSuit.go | 22 +- sys/configure/structs/game.equipSuitData.go | 14 +- sys/configure/structs/game.extservers.go | 22 +- sys/configure/structs/game.extserversData.go | 14 +- sys/configure/structs/game.facemod.go | 22 +- sys/configure/structs/game.facemodData.go | 14 +- sys/configure/structs/game.global.go | 22 +- sys/configure/structs/game.globalData.go | 14 +- sys/configure/structs/game.hero.go | 22 +- sys/configure/structs/game.heroAwaken.go | 22 +- sys/configure/structs/game.heroAwakenData.go | 14 +- sys/configure/structs/game.heroData.go | 14 +- sys/configure/structs/game.heroExp.go | 22 +- sys/configure/structs/game.heroExpData.go | 14 +- sys/configure/structs/game.heroLevelgrow.go | 22 +- .../structs/game.heroLevelgrowData.go | 14 +- sys/configure/structs/game.heroLevelup.go | 22 +- sys/configure/structs/game.heroLevelupData.go | 14 +- sys/configure/structs/game.heroMethod.go | 22 +- sys/configure/structs/game.heroMethodData.go | 14 +- sys/configure/structs/game.heroResonance.go | 22 +- .../structs/game.heroResonanceData.go | 14 +- sys/configure/structs/game.heroSkillLevel.go | 22 +- .../structs/game.heroSkillLevelData.go | 14 +- sys/configure/structs/game.heroStargrow.go | 22 +- .../structs/game.heroStargrowData.go | 14 +- sys/configure/structs/game.heroStarup.go | 22 +- sys/configure/structs/game.heroStarupData.go | 14 +- sys/configure/structs/game.initial.go | 22 +- sys/configure/structs/game.initialData.go | 14 +- sys/configure/structs/game.item.go | 22 +- sys/configure/structs/game.itemData.go | 14 +- .../structs/game.kungfu_masterworker.go | 42 - sys/configure/structs/game.kungfu_unlock.go | 42 - sys/configure/structs/game.language.go | 42 - sys/configure/structs/game.languageData.go | 37 - sys/configure/structs/game.mainlineChapter.go | 22 +- .../structs/game.mainlineChapterData.go | 14 +- sys/configure/structs/game.mainlineEasy.go | 22 +- .../structs/game.mainlineEasyData.go | 14 +- sys/configure/structs/game.mainlineHard.go | 22 +- .../structs/game.mainlineHardData.go | 14 +- .../structs/game.mainlinePurgatory.go | 22 +- .../structs/game.mainlinePurgatoryData.go | 14 +- sys/configure/structs/game.model.go | 22 +- sys/configure/structs/game.modelData.go | 14 +- sys/configure/structs/game.monster.go | 22 +- sys/configure/structs/game.monsterData.go | 14 +- sys/configure/structs/game.msgDistrib.go | 22 +- sys/configure/structs/game.msgDistribData.go | 14 +- sys/configure/structs/game.opencond.go | 22 +- sys/configure/structs/game.opencondData.go | 14 +- sys/configure/structs/game.pagoda.go | 22 +- sys/configure/structs/game.pagodaData.go | 14 +- .../structs/game.pagodaSeasonReward.go | 22 +- .../structs/game.pagodaSeasonRewardData.go | 14 +- .../structs/game.pagodaTaskReward.go | 22 +- .../structs/game.pagodaTaskRewardData.go | 14 +- .../structs/game.pagodaseasonLoop.go | 22 +- .../structs/game.pagodaseasonLoopData.go | 14 +- sys/configure/structs/game.playerlv.go | 22 +- sys/configure/structs/game.playerlvData.go | 14 +- sys/configure/structs/game.plot.go | 22 +- sys/configure/structs/game.plotData.go | 14 +- sys/configure/structs/game.propsgroup.go | 22 +- sys/configure/structs/game.propsgroupData.go | 14 +- sys/configure/structs/game.rdtaskAllData.go | 24 +- .../structs/game.rdtaskChooseData.go | 8 +- sys/configure/structs/game.rdtaskType.go | 2 +- sys/configure/structs/game.rdtaskTypeData.go | 12 +- sys/configure/structs/game.shop.go | 22 +- sys/configure/structs/game.shopData.go | 14 +- sys/configure/structs/game.shopitem.go | 22 +- sys/configure/structs/game.shopitemData.go | 14 +- sys/configure/structs/game.skill.go | 22 +- sys/configure/structs/game.skillAfteratk.go | 22 +- .../structs/game.skillAfteratkData.go | 14 +- sys/configure/structs/game.skillAtk.go | 22 +- sys/configure/structs/game.skillAtkData.go | 14 +- sys/configure/structs/game.skillBuff.go | 22 +- sys/configure/structs/game.skillBuffData.go | 14 +- sys/configure/structs/game.skillData.go | 14 +- sys/configure/structs/game.skillPassive.go | 22 +- .../structs/game.skillPassiveData.go | 14 +- sys/configure/structs/game.stroy.go | 22 +- sys/configure/structs/game.stroyData.go | 14 +- .../structs/game.taskActiveReward.go | 22 +- .../structs/game.taskActiveRewardData.go | 14 +- sys/configure/structs/game.taskRound.go | 22 +- sys/configure/structs/game.taskRoundData.go | 14 +- sys/configure/structs/game.ui.go | 42 - sys/configure/structs/game.uiData.go | 53 - 173 files changed, 1549 insertions(+), 3421 deletions(-) rename bin/json/{game_kungfu_masterworker.json => game_kungfumasterworker.json} (100%) rename bin/json/{game_kungfu_unlock.json => game_kungfuunlock.json} (100%) delete mode 100644 bin/json/game_language.json delete mode 100644 bin/json/game_ui.json create mode 100644 sys/configure/structs/Game.KungfuMasterworker.go rename sys/configure/structs/{game.kungfu_masterworkerData.go => Game.KungfuMasterworkerData.go} (91%) create mode 100644 sys/configure/structs/Game.KungfuUnlock.go rename sys/configure/structs/{game.kungfu_unlockData.go => Game.KungfuUnlockData.go} (82%) delete mode 100644 sys/configure/structs/game.kungfu_masterworker.go delete mode 100644 sys/configure/structs/game.kungfu_unlock.go delete mode 100644 sys/configure/structs/game.language.go delete mode 100644 sys/configure/structs/game.languageData.go delete mode 100644 sys/configure/structs/game.ui.go delete mode 100644 sys/configure/structs/game.uiData.go diff --git a/bin/json/game_kungfu_masterworker.json b/bin/json/game_kungfumasterworker.json similarity index 100% rename from bin/json/game_kungfu_masterworker.json rename to bin/json/game_kungfumasterworker.json diff --git a/bin/json/game_kungfu_unlock.json b/bin/json/game_kungfuunlock.json similarity index 100% rename from bin/json/game_kungfu_unlock.json rename to bin/json/game_kungfuunlock.json diff --git a/bin/json/game_language.json b/bin/json/game_language.json deleted file mode 100644 index 66f48206f..000000000 --- a/bin/json/game_language.json +++ /dev/null @@ -1,765 +0,0 @@ -[ - { - "index": "ChineseSimplified", - "keycode": { - "key": "ChineseSimplified", - "text": "" - } - }, - { - "index": "ChineseTraditional", - "keycode": { - "key": "ChineseTraditional", - "text": "" - } - }, - { - "index": "English", - "keycode": { - "key": "English", - "text": "" - } - }, - { - "index": "1", - "keycode": { - "key": "1", - "text": "" - } - }, - { - "index": "2", - "keycode": { - "key": "2", - "text": "" - } - }, - { - "index": "3", - "keycode": { - "key": "3", - "text": "" - } - }, - { - "index": "4", - "keycode": { - "key": "4", - "text": "" - } - }, - { - "index": "5", - "keycode": { - "key": "5", - "text": "" - } - }, - { - "index": "6", - "keycode": { - "key": "6", - "text": "" - } - }, - { - "index": "7", - "keycode": { - "key": "7", - "text": "" - } - }, - { - "index": "8", - "keycode": { - "key": "8", - "text": "" - } - }, - { - "index": "9", - "keycode": { - "key": "9", - "text": "" - } - }, - { - "index": "10", - "keycode": { - "key": "10", - "text": "" - } - }, - { - "index": "Login", - "keycode": { - "key": "Login", - "text": "" - } - }, - { - "index": "MomentDay1", - "keycode": { - "key": "MomentDay1", - "text": "" - } - }, - { - "index": "MomentDay2", - "keycode": { - "key": "MomentDay2", - "text": "" - } - }, - { - "index": "MomentHour1", - "keycode": { - "key": "MomentHour1", - "text": "" - } - }, - { - "index": "MomentHour2", - "keycode": { - "key": "MomentHour2", - "text": "" - } - }, - { - "index": "MomentMinutes1", - "keycode": { - "key": "MomentMinutes1", - "text": "" - } - }, - { - "index": "MomentMinutes2", - "keycode": { - "key": "MomentMinutes2", - "text": "" - } - }, - { - "index": "MomentSeconds1", - "keycode": { - "key": "MomentSeconds1", - "text": "" - } - }, - { - "index": "MomentSeconds2", - "keycode": { - "key": "MomentSeconds2", - "text": "" - } - }, - { - "index": "Tuijian", - "keycode": { - "key": "Tuijian", - "text": "" - } - }, - { - "index": "Juese", - "keycode": { - "key": "Juese", - "text": "" - } - }, - { - "index": "star_2", - "keycode": { - "key": "star_2", - "text": "" - } - }, - { - "index": "star_3", - "keycode": { - "key": "star_3", - "text": "" - } - }, - { - "index": "star_4", - "keycode": { - "key": "star_4", - "text": "" - } - }, - { - "index": "star_5", - "keycode": { - "key": "star_5", - "text": "" - } - }, - { - "index": "color_1", - "keycode": { - "key": "color_1", - "text": "" - } - }, - { - "index": "color_2", - "keycode": { - "key": "color_2", - "text": "" - } - }, - { - "index": "color_3", - "keycode": { - "key": "color_3", - "text": "" - } - }, - { - "index": "color_4", - "keycode": { - "key": "color_4", - "text": "" - } - }, - { - "index": "color_5", - "keycode": { - "key": "color_5", - "text": "" - } - }, - { - "index": "color_6", - "keycode": { - "key": "color_6", - "text": "" - } - }, - { - "index": "race_1", - "keycode": { - "key": "race_1", - "text": "" - } - }, - { - "index": "race_2", - "keycode": { - "key": "race_2", - "text": "" - } - }, - { - "index": "race_3", - "keycode": { - "key": "race_3", - "text": "" - } - }, - { - "index": "race_4", - "keycode": { - "key": "race_4", - "text": "" - } - }, - { - "index": "job_1", - "keycode": { - "key": "job_1", - "text": "" - } - }, - { - "index": "job_2", - "keycode": { - "key": "job_2", - "text": "" - } - }, - { - "index": "job_3", - "keycode": { - "key": "job_3", - "text": "" - } - }, - { - "index": "job_4", - "keycode": { - "key": "job_4", - "text": "" - } - }, - { - "index": "job_5", - "keycode": { - "key": "job_5", - "text": "" - } - }, - { - "index": "equip_10001", - "keycode": { - "key": "equip_10001", - "text": "" - } - }, - { - "index": "equip_10002", - "keycode": { - "key": "equip_10002", - "text": "" - } - }, - { - "index": "equip_10003", - "keycode": { - "key": "equip_10003", - "text": "" - } - }, - { - "index": "equip_10004", - "keycode": { - "key": "equip_10004", - "text": "" - } - }, - { - "index": "equip_10005", - "keycode": { - "key": "equip_10005", - "text": "" - } - }, - { - "index": "hero_10001", - "keycode": { - "key": "hero_10001", - "text": "" - } - }, - { - "index": "hero_10002", - "keycode": { - "key": "hero_10002", - "text": "" - } - }, - { - "index": "hero_10003", - "keycode": { - "key": "hero_10003", - "text": "" - } - }, - { - "index": "hero_10004", - "keycode": { - "key": "hero_10004", - "text": "" - } - }, - { - "index": "hero_10005", - "keycode": { - "key": "hero_10005", - "text": "" - } - }, - { - "index": "hero_10006", - "keycode": { - "key": "hero_10006", - "text": "" - } - }, - { - "index": "hero_10007", - "keycode": { - "key": "hero_10007", - "text": "" - } - }, - { - "index": "hero_10008", - "keycode": { - "key": "hero_10008", - "text": "" - } - }, - { - "index": "nonactivated", - "keycode": { - "key": "nonactivated", - "text": "" - } - }, - { - "index": "activated", - "keycode": { - "key": "activated", - "text": "" - } - }, - { - "index": "tips_1001", - "keycode": { - "key": "tips_1001", - "text": "" - } - }, - { - "index": "tips_1002", - "keycode": { - "key": "tips_1002", - "text": "" - } - }, - { - "index": "tips_1003", - "keycode": { - "key": "tips_1003", - "text": "" - } - }, - { - "index": "tips_1004", - "keycode": { - "key": "tips_1004", - "text": "" - } - }, - { - "index": "num_1001", - "keycode": { - "key": "num_1001", - "text": "" - } - }, - { - "index": "num_1002", - "keycode": { - "key": "num_1002", - "text": "" - } - }, - { - "index": "num_1003", - "keycode": { - "key": "num_1003", - "text": "" - } - }, - { - "index": "num_1004", - "keycode": { - "key": "num_1004", - "text": "" - } - }, - { - "index": "num_1005", - "keycode": { - "key": "num_1005", - "text": "" - } - }, - { - "index": "num_1006", - "keycode": { - "key": "num_1006", - "text": "" - } - }, - { - "index": "num_1007", - "keycode": { - "key": "num_1007", - "text": "" - } - }, - { - "index": "num_1008", - "keycode": { - "key": "num_1008", - "text": "" - } - }, - { - "index": "num_1009", - "keycode": { - "key": "num_1009", - "text": "" - } - }, - { - "index": "num_1010", - "keycode": { - "key": "num_1010", - "text": "" - } - }, - { - "index": "num_1011", - "keycode": { - "key": "num_1011", - "text": "" - } - }, - { - "index": "num_1012", - "keycode": { - "key": "num_1012", - "text": "" - } - }, - { - "index": "num_1013", - "keycode": { - "key": "num_1013", - "text": "" - } - }, - { - "index": "num_1014", - "keycode": { - "key": "num_1014", - "text": "" - } - }, - { - "index": "num_1015", - "keycode": { - "key": "num_1015", - "text": "" - } - }, - { - "index": "num_1016", - "keycode": { - "key": "num_1016", - "text": "" - } - }, - { - "index": "num_1017", - "keycode": { - "key": "num_1017", - "text": "" - } - }, - { - "index": "num_1018", - "keycode": { - "key": "num_1018", - "text": "" - } - }, - { - "index": "opencond_name_10001", - "keycode": { - "key": "opencond_name_10001", - "text": "" - } - }, - { - "index": "opencond_name_10002", - "keycode": { - "key": "opencond_name_10002", - "text": "" - } - }, - { - "index": "opencond_name_10003", - "keycode": { - "key": "opencond_name_10003", - "text": "" - } - }, - { - "index": "opencond_name_10004", - "keycode": { - "key": "opencond_name_10004", - "text": "" - } - }, - { - "index": "opencond_name_10005", - "keycode": { - "key": "opencond_name_10005", - "text": "" - } - }, - { - "index": "opencond_name_10006", - "keycode": { - "key": "opencond_name_10006", - "text": "" - } - }, - { - "index": "opencond_name_10007", - "keycode": { - "key": "opencond_name_10007", - "text": "" - } - }, - { - "index": "opencond_name_10008", - "keycode": { - "key": "opencond_name_10008", - "text": "" - } - }, - { - "index": "opencond_name_10009", - "keycode": { - "key": "opencond_name_10009", - "text": "" - } - }, - { - "index": "opencond_name_10010", - "keycode": { - "key": "opencond_name_10010", - "text": "" - } - }, - { - "index": "skill_190011000", - "keycode": { - "key": "skill_190011000", - "text": "" - } - }, - { - "index": "skill_190012000", - "keycode": { - "key": "skill_190012000", - "text": "" - } - }, - { - "index": "skill_190013000", - "keycode": { - "key": "skill_190013000", - "text": "" - } - }, - { - "index": "skill_190014000", - "keycode": { - "key": "skill_190014000", - "text": "" - } - }, - { - "index": "skill_190015000", - "keycode": { - "key": "skill_190015000", - "text": "" - } - }, - { - "index": "skill_190016000", - "keycode": { - "key": "skill_190016000", - "text": "" - } - }, - { - "index": "skill_190017000", - "keycode": { - "key": "skill_190017000", - "text": "" - } - }, - { - "index": "skill_190018000", - "keycode": { - "key": "skill_190018000", - "text": "" - } - }, - { - "index": "skill_190011001", - "keycode": { - "key": "skill_190011001", - "text": "" - } - }, - { - "index": "skill_190011002", - "keycode": { - "key": "skill_190011002", - "text": "" - } - }, - { - "index": "skill_190011003", - "keycode": { - "key": "skill_190011003", - "text": "" - } - }, - { - "index": "skill_190011004", - "keycode": { - "key": "skill_190011004", - "text": "" - } - }, - { - "index": "hero_help_10001", - "keycode": { - "key": "hero_help_10001", - "text": "" - } - }, - { - "index": "hero_help_10002", - "keycode": { - "key": "hero_help_10002", - "text": "" - } - }, - { - "index": "hero_help_10003", - "keycode": { - "key": "hero_help_10003", - "text": "" - } - }, - { - "index": "hero_help_10004", - "keycode": { - "key": "hero_help_10004", - "text": "" - } - }, - { - "index": "hero_help_10005", - "keycode": { - "key": "hero_help_10005", - "text": "" - } - }, - { - "index": "hero_help_10006", - "keycode": { - "key": "hero_help_10006", - "text": "" - } - }, - { - "index": "hero_help_10007", - "keycode": { - "key": "hero_help_10007", - "text": "" - } - } -] \ No newline at end of file diff --git a/bin/json/game_rdtaskall.json b/bin/json/game_rdtaskall.json index 64cbcf8ce..d5ce93913 100644 --- a/bin/json/game_rdtaskall.json +++ b/bin/json/game_rdtaskall.json @@ -2,12 +2,12 @@ { "id": 1001, "type": 2, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtasknum": [ 101 ], - "aftertaks": 1002, - "icetime": 0, + "aftertask": 1002, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -32,13 +32,13 @@ { "id": 1002, "type": 2, - "lastend": 1001, - "rdtaks_num": [ + "lasttask": 1001, + "rdtasknum": [ 101, 102 ], - "aftertaks": 1003, - "icetime": 0, + "aftertask": 1003, + "taskcd": 0, "tag": 2, "story": 3, "completetask": 0, @@ -63,13 +63,13 @@ { "id": 1003, "type": 2, - "lastend": 1002, - "rdtaks_num": [ + "lasttask": 1002, + "rdtasknum": [ 101, 103 ], - "aftertaks": 1004, - "icetime": 0, + "aftertask": 1004, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -90,13 +90,13 @@ { "id": 1004, "type": 2, - "lastend": 1003, - "rdtaks_num": [ + "lasttask": 1003, + "rdtasknum": [ 101, 103 ], - "aftertaks": 1005, - "icetime": 0, + "aftertask": 1005, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -117,13 +117,13 @@ { "id": 1005, "type": 2, - "lastend": 1004, - "rdtaks_num": [ + "lasttask": 1004, + "rdtasknum": [ 104, 105 ], - "aftertaks": 1006, - "icetime": 0, + "aftertask": 1006, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -144,12 +144,12 @@ { "id": 1006, "type": 2, - "lastend": 1005, - "rdtaks_num": [ + "lasttask": 1005, + "rdtasknum": [ 106 ], - "aftertaks": 0, - "icetime": 0, + "aftertask": 0, + "taskcd": 0, "tag": 1, "story": 3, "completetask": 0, @@ -173,12 +173,12 @@ { "id": 1007, "type": 1, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtasknum": [ 107 ], - "aftertaks": 1002, - "icetime": 1, + "aftertask": 1002, + "taskcd": 1, "tag": 1, "story": 3, "completetask": 0, @@ -199,12 +199,12 @@ { "id": 1008, "type": 1, - "lastend": 0, - "rdtaks_num": [ + "lasttask": 0, + "rdtasknum": [ 108 ], - "aftertaks": 1002, - "icetime": -1, + "aftertask": 1002, + "taskcd": -1, "tag": 1, "story": 3, "completetask": 0, diff --git a/bin/json/game_rdtaskchoose.json b/bin/json/game_rdtaskchoose.json index 68e98b36d..19887bb52 100644 --- a/bin/json/game_rdtaskchoose.json +++ b/bin/json/game_rdtaskchoose.json @@ -2,7 +2,7 @@ { "chooseid": 10001, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -10,7 +10,7 @@ { "chooseid": 10002, "num": 2, - "rdtaks_num": 107, + "rdtaksnum": 107, "need": [ 0 ] @@ -18,7 +18,7 @@ { "chooseid": 10003, "num": 3, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -26,7 +26,7 @@ { "chooseid": 10011, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -34,7 +34,7 @@ { "chooseid": 10012, "num": 2, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -42,7 +42,7 @@ { "chooseid": 10013, "num": 3, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -50,7 +50,7 @@ { "chooseid": 10021, "num": 1, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -58,7 +58,7 @@ { "chooseid": 10022, "num": 2, - "rdtaks_num": 101, + "rdtaksnum": 101, "need": [ 0 ] @@ -66,7 +66,7 @@ { "chooseid": 10031, "num": 1, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 10012 ] @@ -74,7 +74,7 @@ { "chooseid": 10032, "num": 2, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 0 ] @@ -82,7 +82,7 @@ { "chooseid": 10041, "num": 1, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 10010 ] @@ -90,7 +90,7 @@ { "chooseid": 10042, "num": 2, - "rdtaks_num": 0, + "rdtaksnum": 0, "need": [ 0 ] diff --git a/bin/json/game_rdtasktype.json b/bin/json/game_rdtasktype.json index 6a8ba67cc..ba552fccf 100644 --- a/bin/json/game_rdtasktype.json +++ b/bin/json/game_rdtasktype.json @@ -1,72 +1,72 @@ [ { - "rdtaks_num": 101, + "rdtaksnum": 101, "typdes": 2, "datatime": 1, - "typtask_id": 1, + "typtaskid": 1, "data1": 90001, "data2": 0, "data3": 0 }, { - "rdtaks_num": 102, + "rdtaksnum": 102, "typdes": 2, "datatime": 1, - "typtask_id": 2, + "typtaskid": 2, "data1": 3, "data2": 0, "data3": 0 }, { - "rdtaks_num": 103, + "rdtaksnum": 103, "typdes": 2, "datatime": 1, - "typtask_id": 3, + "typtaskid": 3, "data1": 2, "data2": 0, "data3": 0 }, { - "rdtaks_num": 104, + "rdtaksnum": 104, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 90001, "data2": 15, "data3": 0 }, { - "rdtaks_num": 105, + "rdtaksnum": 105, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 25001, "data2": 10, "data3": 0 }, { - "rdtaks_num": 106, + "rdtaksnum": 106, "typdes": 2, "datatime": 1, - "typtask_id": 5, + "typtaskid": 5, "data1": 90001, "data2": 2, "data3": 0 }, { - "rdtaks_num": 107, + "rdtaksnum": 107, "typdes": 2, "datatime": 1, - "typtask_id": 4, + "typtaskid": 4, "data1": 25001, "data2": 20, "data3": 0 }, { - "rdtaks_num": 108, + "rdtaksnum": 108, "typdes": 2, "datatime": 1, - "typtask_id": 6, + "typtaskid": 6, "data1": 90001, "data2": 5, "data3": 0 diff --git a/bin/json/game_ui.json b/bin/json/game_ui.json deleted file mode 100644 index 6a7d64ccd..000000000 --- a/bin/json/game_ui.json +++ /dev/null @@ -1,926 +0,0 @@ -[ - { - "id": "loading", - "file": "LoadingWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "loading/loading", - "packagename": "loading", - "comname": "main", - "des": "加载界面" - }, - { - "id": "login", - "file": "LoginWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "main", - "des": "登录界面" - }, - { - "id": "useragreement", - "file": "LoginUseragreementWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "useragreement", - "des": "登录界面用户隐私协议" - }, - { - "id": "serverlist", - "file": "ServerListWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 2, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "serverlist", - "des": "服务器列表" - }, - { - "id": "loginaccountpopup", - "file": "LoginAccountPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "loginaccountnumber", - "des": "账号登录" - }, - { - "id": "mobilephonelogin", - "file": "MobilePhoneLoginPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "mobilephonelogin", - "des": "手机号登录" - }, - { - "id": "gameadvice", - "file": "GameAdviceWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "login/login", - "packagename": "login", - "comname": "gameadvice", - "des": "游戏logo" - }, - { - "id": "tanxian", - "file": "TanXianWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "tanxian/tanxian", - "packagename": "tanxian", - "comname": "main", - "des": "探险界面" - }, - { - "id": "bigmap", - "file": "BigmapWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "bigmap/bigmap", - "packagename": "bigmap", - "comname": "main", - "des": "大地图界面" - }, - { - "id": "starup_hero", - "file": "HeroStarUpWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "hero/hero", - "packagename": "hero", - "comname": "heroCultivatePanel", - "des": "英雄升星界面（临时）" - }, - { - "id": "heropanel", - "file": "HeroPanelWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "hero/hero", - "packagename": "hero", - "comname": "heroPanel", - "des": "英雄界面" - }, - { - "id": "exhibition2", - "file": "Exhibition2Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "main2", - "des": "临时展示界面" - }, - { - "id": "exhibition3", - "file": "Exhibition3Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "main1", - "des": "临时展示界面" - }, - { - "id": "exhibition_back1", - "file": "ExhibitionBack1Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "back", - "des": "临时展示界面-屏幕滑动" - }, - { - "id": "exhibition_back2", - "file": "ExhibitionBack2Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "back", - "des": "临时展示界面-左下按钮返回" - }, - { - "id": "exhibition_back3", - "file": "ExhibitionBack3Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "back", - "des": "临时展示界面-模型旋转" - }, - { - "id": "exhibition_back4", - "file": "ExhibitionBack4Window", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "exhibition/exhibition", - "packagename": "exhibition", - "comname": "back_up", - "des": "临时展示界面-左上按钮返回" - }, - { - "id": "generaltips", - "file": "GeneralTipsWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "GeneralTips", - "des": "跑马灯" - }, - { - "id": "noticetips", - "file": "NoticeTipsWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "NoticeTips", - "des": "通用提示" - }, - { - "id": "zhandou", - "file": "FightWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "main2", - "des": "战斗界面" - }, - { - "id": "koshow", - "file": "KOPanel", - "unloadpkg": 0, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "KOInterface", - "des": "KO界面" - }, - { - "id": "settlement", - "file": "SettlementWindow", - "unloadpkg": 1, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "main_account", - "des": "战斗结算界面" - }, - { - "id": "pausebattle", - "file": "PauseBattleWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "pausewindow", - "des": "战斗暂停界面" - }, - { - "id": "campties", - "file": "CampTiesWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "campties", - "des": "阵营加成" - }, - { - "id": "battleopen", - "file": "BattleOpenWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "battleopenwindow", - "des": "战斗开始界面" - }, - { - "id": "embattle", - "file": "EmbattleWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "Embattle", - "des": "布阵界面" - }, - { - "id": "battlestatistics", - "file": "BattleStatisticsWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "battlestatisticswindow", - "des": "战斗信息界面" - }, - { - "id": "battleinfo", - "file": "BattleInfoWindow", - "unloadpkg": 0, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "battleinfo", - "des": "战斗信息设置界面" - }, - { - "id": "maincity", - "file": "MainCityWindow", - "unloadpkg": 1, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "maincity/maincity", - "packagename": "maincity", - "comname": "main", - "des": "主城界面" - }, - { - "id": "flagstonefunc", - "file": "FlagstoneFuncWindow", - "unloadpkg": 1, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "maincity/maincity", - "packagename": "maincity", - "comname": "flagstonewindow", - "des": "交互场景石板功能界面" - }, - { - "id": "interactionui", - "file": "InteractionEventWindow", - "unloadpkg": 1, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "maincity/maincity", - "packagename": "maincity", - "comname": "interactioneventwindow", - "des": "交互UI" - }, - { - "id": "messagebox", - "file": "MessageBoxWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "public/public", - "packagename": "public", - "comname": "messagebox", - "des": "默认弹出框" - }, - { - "id": "heronewlist", - "file": "HeroNewListWindow", - "unloadpkg": 1, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "heronew/heronew", - "packagename": "heronew", - "comname": "heriopanel", - "des": "英雄列表" - }, - { - "id": "heronewinfo", - "file": "HeroNewInfoWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "heronew/heronew", - "packagename": "heronew", - "comname": "heroinfo", - "des": "英雄详情" - }, - { - "id": "heronewstart", - "file": "HeroNewStartWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "heronew/heronew", - "packagename": "heronew", - "comname": "herostarup", - "des": "升星-选择材料" - }, - { - "id": "battleready", - "file": "BattleReadyWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "battlereadywindow2", - "des": "战斗布阵界面" - }, - { - "id": "roledetail", - "file": "RoleDetailWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 3, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "roledetails", - "des": "英雄详细信息" - }, - { - "id": "bag", - "file": "BagWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "bag/bag", - "packagename": "bag", - "comname": "main", - "des": "背包" - }, - { - "id": "notice", - "file": "NoticeWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "notice/notice", - "packagename": "notice", - "comname": "main", - "des": "公告" - }, - { - "id": "mainbarrier", - "file": "MainBarrierWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "mainline/mainline", - "packagename": "mainline", - "comname": "battledetails", - "des": "主线任务关卡界面" - }, - { - "id": "mainworld", - "file": "MainWorldWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "mainline/mainline", - "packagename": "mainline", - "comname": "main", - "des": "主线任务世界界面" - }, - { - "id": "rewardTips", - "file": "GeneralRewardPopup", - "unloadpkg": 5, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "rewardTips", - "des": "奖励预览弹窗" - }, - { - "id": "roleupgrade", - "file": "RoleUpGradeWindow", - "unloadpkg": 5, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "roleupgrade", - "des": "英雄升级升星详情" - }, - { - "id": "manual", - "file": "HeroManualWindow", - "unloadpkg": 2, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "manual", - "des": "英雄图鉴" - }, - { - "id": "manual_grow", - "file": "ManualAttrGrowPopup", - "unloadpkg": 3, - "loadtype": 0, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "role_grow", - "des": "英雄图鉴属性弹窗" - }, - { - "id": "task", - "file": "TaskWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "task/task", - "packagename": "task", - "comname": "main", - "des": "任务" - }, - { - "id": "store", - "file": "StoreWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "store/store", - "packagename": "store", - "comname": "main", - "des": "商店" - }, - { - "id": "storebuypopup", - "file": "StoreBuyPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "store/store", - "packagename": "store", - "comname": "popwindow", - "des": "商店数量选择" - }, - { - "id": "maininterface", - "file": "MainInterFaceWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 3, - "blur": 0, - "package": "maininterface/maininterface", - "packagename": "maininterface", - "comname": "main", - "des": "主界面" - }, - { - "id": "mail", - "file": "EmailWindow", - "unloadpkg": 1, - "loadtype": 0, - "full": 0, - "blur": 0, - "package": "mail/mail", - "packagename": "mail", - "comname": "main", - "des": "邮件界面" - }, - { - "id": "confirmpopup", - "file": "ConfirmPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "tips/tips", - "packagename": "tips", - "comname": "storetips", - "des": " 确认框" - }, - { - "id": "taskrewardpreview", - "file": "TaskRewardPreviewPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "task/task", - "packagename": "task", - "comname": "rewardPreview", - "des": "任务奖励预览" - }, - { - "id": "generalitempopup", - "file": "GeneralItemPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "tips/tips", - "packagename": "tips", - "comname": "GeneralItem", - "des": "通用奖励获取弹框" - }, - { - "id": "userset", - "file": "UserSetWindow", - "unloadpkg": 2, - "loadtype": 0, - "full": 1, - "blur": 0, - "package": "userset/userset", - "packagename": "userset", - "comname": "main", - "des": "用户设置" - }, - { - "id": "skillinfotips", - "file": "SkillInfoTipsWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "skillnametips", - "des": "技能描述提示框" - }, - { - "id": "captainskillinfotips", - "file": "CaptainSkillInfoTipsWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "skillnametips3", - "des": "队长技描述提示框" - }, - { - "id": "equistrengthen", - "file": "EquiStrengthenWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "equistrengthen", - "des": "装备强化" - }, - { - "id": "equistrengthenup", - "file": "EquiStrengthenUpPopup", - "unloadpkg": 5, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "equistrengthenup", - "des": "装备强化成功弹窗" - }, - { - "id": "croppingwindow", - "file": "CroppingWindow", - "unloadpkg": 0, - "loadtype": 1, - "full": 2, - "blur": 0, - "package": "zhandou/zhandou", - "packagename": "zhandou", - "comname": "cropping", - "des": "遮幅" - }, - { - "id": "saleconfirmpopup", - "file": "SaleConfirmPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "tips/tips", - "packagename": "tips", - "comname": "SaleTips", - "des": "出售确认弹窗" - }, - { - "id": "accesstopopup", - "file": "AccessToPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "tips/tips", - "packagename": "tips", - "comname": "AccessTo", - "des": "跳转弹窗" - }, - { - "id": "rolestrategy", - "file": "RoleStrategyWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 3, - "blur": 0, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "rolestrategy", - "des": "角色攻略" - }, - { - "id": "examine", - "file": "ExaminePopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "examine", - "des": "战术考核" - }, - { - "id": "plotwindow", - "file": "PlotWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "plotsystem/plotsystem", - "packagename": "plotsystem", - "comname": "main", - "des": "剧情" - }, - { - "id": "recruit", - "file": "RecruitWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "recruit/recruit", - "packagename": "recruit", - "comname": "main", - "des": "招募" - }, - { - "id": "recruittendraw", - "file": "RecruitTenDrawWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "recruit/recruit", - "packagename": "recruit", - "comname": "tendraw", - "des": "招募十连抽" - }, - { - "id": "recruitonedraw", - "file": "RecruitOneDrawWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "recruit/recruit", - "packagename": "recruit", - "comname": "onedraw", - "des": "招募单抽" - }, - { - "id": "resonancepopup", - "file": "ResonancePopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "com_resonance", - "des": "共鸣弹窗" - }, - { - "id": "materialsynthesispopup", - "file": "MaterialSynthesisPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 1, - "package": "roledetails/roledetails", - "packagename": "roledetails", - "comname": "com_synthesis", - "des": "材料合成弹窗" - }, - { - "id": "chatsystem", - "file": "ChatSystemWindow", - "unloadpkg": 3, - "loadtype": 1, - "full": 2, - "blur": 0, - "package": "chatsystem/chatsystem", - "packagename": "chatsystem", - "comname": "main", - "des": "聊天" - }, - { - "id": "pagoda", - "file": "PagodaWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "pagoda/pagoda", - "packagename": "pagoda", - "comname": "main", - "des": "心魔之塔" - }, - { - "id": "pagodaadoptreward", - "file": "PagodaAdoptRewardPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "pagoda/pagoda", - "packagename": "pagoda", - "comname": "pagodaadoptreward", - "des": "心魔之塔奖励弹窗" - }, - { - "id": "pagodalineup", - "file": "PagodaLineupPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "pagoda/pagoda", - "packagename": "pagoda", - "comname": "pagodalineup", - "des": "心魔之塔推荐阵容弹窗" - }, - { - "id": "pagodarankingpopup", - "file": "PagodaRankingPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "pagoda/pagoda", - "packagename": "pagoda", - "comname": "pagodaranking", - "des": "心魔之塔排行弹窗" - }, - { - "id": "pagodaseasonpopup", - "file": "PagodaRankingPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "pagoda/pagoda", - "packagename": "pagoda", - "comname": "pagodaranking", - "des": "心魔之塔排行弹窗" - }, - { - "id": "friendsystemwin", - "file": "FriendSystemWindow", - "unloadpkg": 2, - "loadtype": 1, - "full": 1, - "blur": 0, - "package": "friendsystem/friendsystem", - "packagename": "friendsystem", - "comname": "main", - "des": "好友系统" - }, - { - "id": "frienddetailspop", - "file": "FriendDetailsPopup", - "unloadpkg": 3, - "loadtype": 1, - "full": 0, - "blur": 0, - "package": "friendsystem/friendsystem", - "packagename": "friendsystem", - "comname": "details", - "des": "好详细信息" - } -] \ No newline at end of file diff --git a/modules/chat/configure.go b/modules/chat/configure.go index 26aefdbd2..954a1b9cf 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.NewGamechatChannel) - this.LoadConfigure(game_chatsystem, cfg.NewGamechatSystem) + this.LoadConfigure(game_chatchannel, cfg.NewGameChatChannel) + this.LoadConfigure(game_chatsystem, cfg.NewGameChatSystem) - this.LoadConfigure(game_chatchannelcom, cfg.NewGamechatChannelCom) + this.LoadConfigure(game_chatchannelcom, cfg.NewGameChatChannelCom) return } @@ -36,14 +36,14 @@ func (this *configureComp) Init(service core.IService, module core.IModule, comp func (this *configureComp) GetAutoIntoChannelMax() (max int32, err error) { var ( v interface{} - configure *cfg.GamechatChannelComData + 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.GamechatChannelCom).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 @@ -60,14 +60,14 @@ func (this *configureComp) GetAutoIntoChannelMax() (max int32, err error) { func (this *configureComp) GetChanageChannelMax() (max int32, err error) { var ( v interface{} - configure *cfg.GamechatChannelComData + 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.GamechatChannelCom).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 @@ -84,14 +84,14 @@ func (this *configureComp) GetChanageChannelMax() (max int32, err error) { func (this *configureComp) GetChannelRecordMax() (max int32, err error) { var ( v interface{} - configure *cfg.GamechatChannelComData + 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.GamechatChannelCom).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 @@ -108,14 +108,14 @@ func (this *configureComp) GetChannelRecordMax() (max int32, err error) { func (this *configureComp) GetChannelReadRecordNum() (max int32, err error) { var ( v interface{} - configure *cfg.GamechatChannelComData + 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.GamechatChannelCom).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 diff --git a/modules/comp_configure.go b/modules/comp_configure.go index 78e0a334a..6ec99b3df 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.NewGameglobal) - err = this.LoadConfigure(game_initial, cfg.NewGameinitial) - err = this.LoadConfigure(game_playerlv, cfg.NewGameplayerlv) - err = this.LoadConfigure(game_facemod, cfg.NewGamefacemod) + 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,22 +54,22 @@ func (this *MCompConfigure) GetConfigure(name string) (v interface{}, err error) } //全局配置 -func (this *MCompConfigure) GetGlobalConf() *cfg.GameglobalData { +func (this *MCompConfigure) GetGlobalConf() *cfg.GameGlobalData { var ( - configure *cfg.Gameglobal + configure *cfg.GameGlobal ok bool ) if v, err := this.GetConfigure(game_global); err != nil { log.Errorf("get global conf err:%v", err) } else { - if configure, ok = v.(*cfg.Gameglobal); !ok { + if configure, ok = v.(*cfg.GameGlobal); !ok { log.Errorf("%T no is *cfg.Game_global", v) } } return configure.GetDataList()[0] // 返回对象信息 } -func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Gameinitial, err error) { +func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.GameInitial, err error) { var ( v interface{} ok bool @@ -77,7 +77,7 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Gameinitial, err if v, err = this.GetConfigure(game_initial); err != nil { return } else { - if configure, ok = v.(*cfg.Gameinitial); !ok { + if configure, ok = v.(*cfg.GameInitial); !ok { err = fmt.Errorf("%T no is *cfg.Game_comInitial", v) return } @@ -86,11 +86,11 @@ func (this *MCompConfigure) GetGlobalInitConf() (configure *cfg.Gameinitial, err } // 主角等级经验配置列表 -func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GameplayerlvData) { +func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GamePlayerlvData) { if v, err := this.GetConfigure(game_playerlv); err != nil { return } else { - if configure, ok := v.(*cfg.Gameplayerlv); !ok { + if configure, ok := v.(*cfg.GamePlayerlv); !ok { err = fmt.Errorf("%T no is *cfg.Game_playerlv", v) return } else { @@ -103,11 +103,11 @@ func (this *MCompConfigure) GetPlayerlvConfList() (list []*cfg.GameplayerlvData) } // 玩家等级经验配置表 -func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.GameplayerlvData) { +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.Gameplayerlv); !ok { + if configure, ok := v.(*cfg.GamePlayerlv); !ok { err = fmt.Errorf("%T no is *cfg.Game_playerlv", v) return } else { @@ -120,11 +120,11 @@ func (this *MCompConfigure) GetPlayerlvConf(lv int32) (data *cfg.GameplayerlvDat } // 玩家形象预设配置 -func (this *MCompConfigure) GetPlayerFigureConf() (list []*cfg.GamefacemodData) { +func (this *MCompConfigure) GetPlayerFigureConf() (list []*cfg.GameFacemodData) { if v, err := this.GetConfigure(game_facemod); err != nil { return } else { - if configure, ok := v.(*cfg.Gamefacemod); !ok { + if configure, ok := v.(*cfg.GameFacemod); !ok { err = fmt.Errorf("%T no is *cfg.Game_playerlv", v) return } else { diff --git a/modules/equipment/api_equip.go b/modules/equipment/api_equip.go index 2c46db421..630b943d6 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.GameequipData + 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.GameequipData, 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 b3beab476..e656c36e0 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.GameequipData - intensify *cfg.GameequipIntensifyData + 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 be82e3cbb..1a80671d7 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.NewGameequip) - this.LoadConfigure(equip_attrlibrary, cfg.NewGameequipAttrlibrary) - this.LoadConfigure(equip_intensify, cfg.NewGameequipIntensify) - this.LoadConfigure(equip_suit, cfg.NewGameequipSuit) + 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.Gameequip, 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.Gameequip, er this.module.Errorf("err:%v", err) return } else { - if configure, ok = v.(*cfg.Gameequip); !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.Gameequip, er } //获取装备配置数据 -func (this *configureComp) GetEquipmentConfigureById(equipmentId string) (configure *cfg.GameequipData, 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.Gameequip).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.GameequipAttrlibrary, 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.GameequipAttrlibrary); !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.GameequipAttrlibraryData, 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.GameequipAttrlibrary).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.GameequipAttrlibraryData, 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.GameequipAttrlibraryData, 0) - for _, v1 := range v.(*cfg.GameequipAttrlibrary).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.GameequipIntensify, 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.GameequipIntensify); !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.GameequipIntensifyData, 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.GameequipIntensify).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 466a9fbb7..7cfa99372 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.Gameequip + 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.GameequipData, 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.GameequipAttrlibraryData - sattr []*cfg.GameequipAttrlibraryData + mattr []*cfg.GameEquipAttrlibraryData + sattr []*cfg.GameEquipAttrlibraryData total int satterNum int32 ) @@ -193,7 +193,7 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameequipData } //升级武器 -func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equip *cfg.GameequipData, intensify *cfg.GameequipIntensifyData) (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.GameequipAttrlibraryData - var sattr []*cfg.GameequipAttrlibraryData + 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.GameequipAttrlibraryData + var attrlibrary *cfg.GameEquipAttrlibraryData r := rand.New(rand.NewSource(time.Now().Unix())) index := r.Perm(len(equipment.AdverbEntry))[0] diff --git a/modules/gateway/configure_comp.go b/modules/gateway/configure_comp.go index 13b879c22..fdc9cab50 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.NewGamemsgdistrib) + 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.GamemsgdistribData + item *cfg.GameMsgdistribData ) if v, err = this.GetConfigure(game_msgdistrib); err != nil { ok = false return } else { - if item, ok = v.(*cfg.Gamemsgdistrib).GetDataMap()[msgid]; ok { + if item, ok = v.(*cfg.GameMsgdistrib).GetDataMap()[msgid]; ok { rule = item.Routrules } } diff --git a/modules/hero/api_awaken.go b/modules/hero/api_awaken.go index 34f52a672..9e1a782e8 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.GameheroAwakenData + 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 7106ed0fe..909221422 100644 --- a/modules/hero/api_drawCard.go +++ b/modules/hero/api_drawCard.go @@ -24,7 +24,7 @@ func (this *apiComp) DrawCard(session comm.IUserSession, req *pb.HeroDrawCardReq costRes []*cfg.Gameatn star4Max int32 // 10连抽最大4星数量 star5Max int32 // 10连抽最大5星数量 - cfgDraw *cfg.GameglobalData + cfgDraw *cfg.GameGlobalData costAtn *cfg.Gameatn heroRecord *pb.DBHeroRecord pool string diff --git a/modules/hero/api_strengthenUpStar.go b/modules/hero/api_strengthenUpStar.go index d066f854a..eeb98a9ee 100644 --- a/modules/hero/api_strengthenUpStar.go +++ b/modules/hero/api_strengthenUpStar.go @@ -33,7 +33,7 @@ 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.GameheroStarupData // 配置表目标升星英雄信息 + target *cfg.GameHeroStarupData // 配置表目标升星英雄信息 costNeedHeroCount int32 // 消耗指定英雄的数量 costRaceHeroCount int32 // 消耗种族英雄的数量 _hero *pb.DBHero // 目标英雄 diff --git a/modules/hero/configure_comp.go b/modules/hero/configure_comp.go index b88f23993..85f3d3eca 100644 --- a/modules/hero/configure_comp.go +++ b/modules/hero/configure_comp.go @@ -29,7 +29,7 @@ const ( ///配置管理组件 type configureComp struct { modules.MCompConfigure - drawCardCfg map[string]map[int32][]*cfg.GamedrawCardData // 第一个key 卡池id 第二个key 星级 + drawCardCfg map[string]map[int32][]*cfg.GameDrawCardData // 第一个key 卡池id 第二个key 星级 //map["base_pool1"]map[3]*cfg.Game_drawCardData } @@ -38,22 +38,22 @@ 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.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, + 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, }) - this.drawCardCfg = make(map[string]map[int32][]*cfg.GamedrawCardData, 0) + this.drawCardCfg = make(map[string]map[int32][]*cfg.GameDrawCardData, 0) - configure.RegisterConfigure(hero_drawcard, cfg.NewGamedrawCard, func() { + configure.RegisterConfigure(hero_drawcard, cfg.NewGameDrawCard, func() { this.SetHeroDrawConfig() }) return @@ -65,16 +65,16 @@ func (this *configureComp) SetHeroDrawConfig() (err error) { v interface{} ) if v, err = this.GetConfigure(hero_drawcard); err == nil { - if _configure, ok := v.(*cfg.GamedrawCard); !ok { + 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) + 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] = make([]*cfg.GameDrawCardData, 0) } this.drawCardCfg[v.CardPoolType][v.Star] = append(this.drawCardCfg[v.CardPoolType][v.Star], v) } @@ -85,12 +85,12 @@ func (this *configureComp) SetHeroDrawConfig() (err error) { return } -func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GamedrawCardData { +func (this *configureComp) GetPollByType(poosType string) map[int32][]*cfg.GameDrawCardData { return this.drawCardCfg[poosType] } //获取英雄配置数据 -func (this *configureComp) getHeroConfigure() (configure *cfg.Gamehero, err error) { +func (this *configureComp) getHeroConfigure() (configure *cfg.GameHero, err error) { var ( v interface{} ok bool @@ -99,40 +99,40 @@ func (this *configureComp) getHeroConfigure() (configure *cfg.Gamehero, err erro if v, err = this.GetConfigure(new_hero); err != nil { return } else { - if configure, ok = v.(*cfg.Gamehero); !ok { - err = fmt.Errorf("%T no is *cfg.Gamehero", v) + if configure, ok = v.(*cfg.GameHero); !ok { + err = fmt.Errorf("%T no is *cfg.GameHero", v) } } return } // 获取英雄强化增加属性配置数据 -func (this *configureComp) GetHeroStargrowConfig() (configure *cfg.GameheroStargrow, 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.GameheroStargrow); !ok { - err = fmt.Errorf("%T no is *cfg.Gamehero", 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.Gamehero", v) + err = fmt.Errorf("%T no is *cfg.GameHero", v) } return } // 获取英雄升级属性变化相关配置数据 -func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.GameheroLevelgrow, 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.GameheroLevelgrow); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroLevelgrow", v) + if configure, ok = v.(*cfg.GameHeroLevelgrow); !ok { + err = fmt.Errorf("%T no is *cfg.GameHeroLevelgrow", v) return } @@ -141,71 +141,71 @@ func (this *configureComp) GetHeroLevelgrowConfig() (configure *cfg.GameheroLeve } // 获取英雄升星相关配置数据 -func (this *configureComp) GetHeroStarupConfig() (configure *cfg.GameheroStarup, 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.GameheroStarup); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroStarup", 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.GameheroStarup", v) + err = fmt.Errorf("%T no is *cfg.GameHeroStarup", v) } return } // 获取英雄升级相关配置数据 -func (this *configureComp) GetHeroLevelUpConfig() (configure *cfg.GameheroLevelup, 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.GameheroLevelup); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroLevelup", 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.GameheroLevelup", v) + err = fmt.Errorf("%T no is *cfg.GameHeroLevelup", v) } return } -func (this *configureComp) GetHeroExpConfig() (configure *cfg.GameheroExp, 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.GameheroExp); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroExp", 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.GameheroExp", v) + err = fmt.Errorf("%T no is *cfg.GameHeroExp", v) } return } -func (this *configureComp) GetHeroExp(hid string) *cfg.GameheroExpData { +func (this *configureComp) GetHeroExp(hid string) *cfg.GameHeroExpData { if v, err := this.GetConfigure(hero_exp); err == nil { - if configure, ok := v.(*cfg.GameheroExp); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroExp", 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.GameheroExp", v) + err = fmt.Errorf("%T no is *cfg.GameHeroExp", v) } return nil } //英雄等级基础属性 -func (this *configureComp) GetHeroLevelup() (configure *cfg.GameheroLevelup, err error) { +func (this *configureComp) GetHeroLevelup() (configure *cfg.GameHeroLevelup, err error) { var ( v interface{} ok bool @@ -213,8 +213,8 @@ func (this *configureComp) GetHeroLevelup() (configure *cfg.GameheroLevelup, err if v, err = this.GetConfigure(hero_levelup); err != nil { return } else { - if configure, ok = v.(*cfg.GameheroLevelup); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroLevelup", v) + if configure, ok = v.(*cfg.GameHeroLevelup); !ok { + err = fmt.Errorf("%T no is *cfg.GameHeroLevelup", v) return } } @@ -222,7 +222,7 @@ func (this *configureComp) GetHeroLevelup() (configure *cfg.GameheroLevelup, err } //英雄品质系数 -func (this *configureComp) GetHeroStargrow() (configure *cfg.GameheroStargrow, err error) { +func (this *configureComp) GetHeroStargrow() (configure *cfg.GameHeroStargrow, err error) { var ( v interface{} ok bool @@ -230,8 +230,8 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.GameheroStargrow, e if v, err = this.GetConfigure(hero_stargrow); err != nil { return } else { - if configure, ok = v.(*cfg.GameheroStargrow); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroStargrow", v) + if configure, ok = v.(*cfg.GameHeroStargrow); !ok { + err = fmt.Errorf("%T no is *cfg.GameHeroStargrow", v) return } } @@ -239,7 +239,7 @@ func (this *configureComp) GetHeroStargrow() (configure *cfg.GameheroStargrow, e } //获取英雄配置 -func (this *configureComp) GetHero(heroCfgId string) *cfg.GameheroData { +func (this *configureComp) GetHero(heroCfgId string) *cfg.GameHeroData { cfg, err := this.getHeroConfigure() if err != nil { return nil @@ -251,7 +251,7 @@ func (this *configureComp) GetHero(heroCfgId string) *cfg.GameheroData { } //获取英雄星级配置 -func (this *configureComp) GetHeroStar(star int32) *cfg.GameheroStargrowData { +func (this *configureComp) GetHeroStar(star int32) *cfg.GameHeroStargrowData { cfg, err := this.GetHeroStargrow() if err != nil { return nil @@ -264,7 +264,7 @@ func (this *configureComp) GetHeroStar(star int32) *cfg.GameheroStargrowData { } //获取英雄等级配置 -func (this *configureComp) GetHeroLv(lv int32) *cfg.GameheroLevelupData { +func (this *configureComp) GetHeroLv(lv int32) *cfg.GameHeroLevelupData { cfg, err := this.GetHeroLevelup() if err != nil { return nil @@ -276,7 +276,7 @@ func (this *configureComp) GetHeroLv(lv int32) *cfg.GameheroLevelupData { } // 英雄成长系数 -func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameheroLevelgrow, err error) { +func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameHeroLevelgrow, err error) { var ( v interface{} ok bool @@ -284,8 +284,8 @@ func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameheroLevelgrow, if v, err = this.GetConfigure(hero_levelgrow); err != nil { return } else { - if configure, ok = v.(*cfg.GameheroLevelgrow); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroLevelgrow", v) + if configure, ok = v.(*cfg.GameHeroLevelgrow); !ok { + err = fmt.Errorf("%T no is *cfg.GameHeroLevelgrow", v) return } } @@ -293,7 +293,7 @@ func (this *configureComp) GetHeroLevelgrow() (configure *cfg.GameheroLevelgrow, } //英雄成长配置 -func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.GameheroLevelgrowData { +func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.GameHeroLevelgrowData { cfg, err := this.GetHeroLevelgrow() if err != nil { return nil @@ -305,10 +305,10 @@ func (this *configureComp) GetHeroLvgrow(heroId string) *cfg.GameheroLevelgrowDa } // 获取英雄技能升级相关信息 -func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.GameheroSkillLevelData) { +func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.GameHeroSkillLevelData) { if v, err := this.GetConfigure(hero_skillup); err == nil { - if conf, ok := v.(*cfg.GameheroSkillLevel); ok { + if conf, ok := v.(*cfg.GameHeroSkillLevel); ok { data = conf.Get(skillid) return } @@ -321,7 +321,7 @@ func (this *configureComp) GetHeroSkillUpConfig(skillid int32) (data *cfg.Gamehe func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 { if v, err := this.GetConfigure(game_skillatk); err == nil { - if configure, ok := v.(*cfg.GameskillAtk); ok { + if configure, ok := v.(*cfg.GameSkillAtk); ok { return configure.Get(int32(skillId)).MaxLV } } @@ -330,30 +330,30 @@ func (this *configureComp) GetHeroSkillMaxLvConfig(skillId uint32) int32 { } // 通过英雄配置ID获取共鸣配置信息 -func (this *configureComp) GetHeroResonanceConfig(cardConfigID string) (data *cfg.GameheroResonanceData, 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.GameheroResonance); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroResonance", 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.GameheroResonance", v) + err = fmt.Errorf("%T no is *cfg.GameHeroResonance", v) } return } -func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GamecomAtnData, 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.GamecomAtn); !ok { + if configure, ok := v.(*cfg.GameComAtn); !ok { err = fmt.Errorf("%T no is *cfg.GamecomAtn", v) return } else { @@ -365,18 +365,18 @@ func (this *configureComp) GetHeroResonanceRestConfig() (data *cfg.GamecomAtnDat return } -func (this *configureComp) GetHeroAwakenConfig() (configure *cfg.GameheroAwaken, 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.GameheroAwaken); !ok { - err = fmt.Errorf("%T no is *cfg.GameheroAwaken", 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.GameheroAwaken", v) + err = fmt.Errorf("%T no is *cfg.GameHeroAwaken", v) } return diff --git a/modules/hero/model_hero.go b/modules/hero/model_hero.go index f1c4220b1..db9da9775 100644 --- a/modules/hero/model_hero.go +++ b/modules/hero/model_hero.go @@ -550,7 +550,7 @@ func (this *ModelHero) FloorDrawCard(Cardpool int32) (cardId string) { return } -func (this *ModelHero) CheckPool(drawCount int32, config *cfg.GameglobalData) (pools string) { +func (this *ModelHero) CheckPool(drawCount int32, config *cfg.GameGlobalData) (pools string) { if config.BasePool1.S <= drawCount && config.BasePool1.E >= drawCount { return config.BasePool1.P } else if config.BasePool2.S <= drawCount && config.BasePool2.E >= drawCount { diff --git a/modules/items/api_sellItem.go b/modules/items/api_sellItem.go index 3e710e4b5..525c230c3 100644 --- a/modules/items/api_sellItem.go +++ b/modules/items/api_sellItem.go @@ -21,7 +21,7 @@ func (this *apiComp) SellItem(session comm.IUserSession, req *pb.ItemsSellItemRe var ( err error item *pb.DB_UserItemData - itemcf *cfg.GameitemData + itemcf *cfg.GameItemData sale []*cfg.Gameatn ) if code = this.SellItemCheck(session, req); code != pb.ErrorCode_Success { diff --git a/modules/items/api_useItem.go b/modules/items/api_useItem.go index 968f3feba..f824b9e3d 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.GameitemData - prop []*cfg.GamepropsgroupData + itemcf *cfg.GameItemData + prop []*cfg.GamePropsgroupData ) if code = this.UseitemCheck(session, req); code != pb.ErrorCode_Success { return diff --git a/modules/items/configure.go b/modules/items/configure.go index 6b878c735..bf81b8e8b 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.GamepropsgroupData + 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.GamepropsgroupData) - err = this.LoadConfigure(game_item, cfg.NewGameitem) - err = configure.RegisterConfigure(game_propsgroup, cfg.NewGamepropsgroup, 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.Gamepropsgroup); 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.GamepropsgroupData, 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.GameitemData, 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.GameitemDa this.module.Errorf("err:%v", err) return } else { - items = v.(*cfg.Gameitem).GetDataMap() + items = v.(*cfg.GameItem).GetDataMap() } return } //读取物品配置 -func (this *ConfigureComp) GetItemConfigure(id string) (item *cfg.GameitemData, 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.GameitemData, this.module.Errorf("err:%v", err) return } else { - if item, ok = v.(*cfg.Gameitem).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.Gameitem - item *cfg.GameitemData + 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.Gameitem) + 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.GamepropsgroupData, 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 f12586f62..882e25b83 100644 --- a/modules/items/core.go +++ b/modules/items/core.go @@ -27,7 +27,7 @@ var ( ) //随机权重宝箱 -func RandomProps(group []*cfg.GamepropsgroupData) (prop *cfg.GamepropsgroupData) { +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 5b6099d37..a25742d56 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.GameitemData + 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.GameitemData + conf *cfg.GameItemData num int64 isNew bool ) diff --git a/modules/mainline/comp_configure.go b/modules/mainline/comp_configure.go index 70308ab6d..45c5b92ae 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.NewGamemainlineChapter, - game_mainlineeasy: cfg.NewGamemainlineEasy, - game_mainlinehard: cfg.NewGamemainlineHard, - game_mainlinepurgatory: cfg.NewGamemainlinePurgatory, + game_mainlinechapter: cfg.NewGameMainlineChapter, + game_mainlineeasy: cfg.NewGameMainlineEasy, + game_mainlinehard: cfg.NewGameMainlineHard, + game_mainlinepurgatory: cfg.NewGameMainlinePurgatory, }) return @@ -39,17 +39,17 @@ func (this *configureComp) GetConfigure(name string) (v interface{}, err error) return configure.GetConfigure(name) } -func (this *configureComp) GetMainlineChapter(id int32) (data *cfg.GamemainlineChapterData) { +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.GamemainlineChapter + configure *cfg.GameMainlineChapter ok bool ) - if configure, ok = v.(*cfg.GamemainlineChapter); !ok { - this.module.Errorf("%T no is *cfg.Game_mainlineChapterData", v) + if configure, ok = v.(*cfg.GameMainlineChapter); !ok { + this.module.Errorf("%T no is *cfg.Game_MainlineChapterData", v) return } @@ -61,17 +61,17 @@ func (this *configureComp) GetMainlineChapter(id int32) (data *cfg.GamemainlineC } // 获取简单的关卡配置信息 -func (this *configureComp) GetMainlineEasyChapter(id int32) (data *cfg.GamemainlineEasyData) { +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.GamemainlineEasy + configure *cfg.GameMainlineEasy ok bool ) - if configure, ok = v.(*cfg.GamemainlineEasy); !ok { - this.module.Errorf("%T no is *cfg.Game_mainlineEasyData", v) + if configure, ok = v.(*cfg.GameMainlineEasy); !ok { + this.module.Errorf("%T no is *cfg.Game_MainlineEasyData", v) return } @@ -83,17 +83,17 @@ func (this *configureComp) GetMainlineEasyChapter(id int32) (data *cfg.Gamemainl } // 获取炼狱级别难度的关卡配置 -func (this *configureComp) GetMainlinePurgatoryChapter(id int32) (data *cfg.GamemainlinePurgatoryData) { +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.GamemainlinePurgatory + configure *cfg.GameMainlinePurgatory ok bool ) - if configure, ok = v.(*cfg.GamemainlinePurgatory); !ok { - this.module.Errorf("%T no is *cfg.Game_mainlinePurgatoryData", v) + if configure, ok = v.(*cfg.GameMainlinePurgatory); !ok { + this.module.Errorf("%T no is *cfg.Game_MainlinePurgatoryData", v) return } @@ -105,17 +105,17 @@ func (this *configureComp) GetMainlinePurgatoryChapter(id int32) (data *cfg.Game } // 获取困难的关卡配置 -func (this *configureComp) GetMainlineHardChapter(id int32) (data *cfg.GamemainlineHardData) { +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.GamemainlineHard + configure *cfg.GameMainlineHard ok bool ) - if configure, ok = v.(*cfg.GamemainlineHard); !ok { - this.module.Errorf("%T no is *cfg.Game_mainlineHardData", v) + if configure, ok = v.(*cfg.GameMainlineHard); !ok { + this.module.Errorf("%T no is *cfg.Game_MainlineHardData", v) return } diff --git a/modules/martialhall/api_info.go b/modules/martialhall/api_info.go index 25a4a8609..2630a67a0 100644 --- a/modules/martialhall/api_info.go +++ b/modules/martialhall/api_info.go @@ -19,7 +19,7 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.MartialhallInfoReq) var ( err error mart *pb.DBMartialhall - mdata *cfg.Gamekungfu_masterworkerData + mdata *cfg.GameKungfuMasterworkerData ) if mart, err = this.module.modelMartialhall.queryUserMartialhall(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError diff --git a/modules/martialhall/api_practice.go b/modules/martialhall/api_practice.go index cd6dda87a..6ce89ad22 100644 --- a/modules/martialhall/api_practice.go +++ b/modules/martialhall/api_practice.go @@ -21,7 +21,7 @@ func (this *apiComp) Practice(session comm.IUserSession, req *pb.MartialhallPrac err error mart *pb.DBMartialhall pillar *pb.DBPillar - mdata *cfg.Gamekungfu_masterworkerData + mdata *cfg.GameKungfuMasterworkerData filed string ) if mart, err = this.module.modelMartialhall.queryUserMartialhall(session.GetUserId()); err != nil { diff --git a/modules/martialhall/api_receive.go b/modules/martialhall/api_receive.go index f95a2d72b..f6b4c45e2 100644 --- a/modules/martialhall/api_receive.go +++ b/modules/martialhall/api_receive.go @@ -20,7 +20,7 @@ func (this *apiComp) Receive(session comm.IUserSession, req *pb.MartialhallRecei err error mart *pb.DBMartialhall pillar *pb.DBPillar - mdata *cfg.Gamekungfu_masterworkerData + mdata *cfg.GameKungfuMasterworkerData filed string ) if mart, err = this.module.modelMartialhall.queryUserMartialhall(session.GetUserId()); err != nil { diff --git a/modules/martialhall/api_unlock.go b/modules/martialhall/api_unlock.go index 5bbb94872..f8201efac 100644 --- a/modules/martialhall/api_unlock.go +++ b/modules/martialhall/api_unlock.go @@ -19,7 +19,7 @@ func (this *apiComp) UnLock(session comm.IUserSession, req *pb.MartialhallUnLock var ( err error mart *pb.DBMartialhall - mdata *cfg.Gamekungfu_unlockData + mdata *cfg.GameKungfuUnlockData pillar *pb.DBPillar filed string ) diff --git a/modules/martialhall/api_upgrade.go b/modules/martialhall/api_upgrade.go index d3671d940..632ee3f4e 100644 --- a/modules/martialhall/api_upgrade.go +++ b/modules/martialhall/api_upgrade.go @@ -19,7 +19,7 @@ func (this *apiComp) Upgrade(session comm.IUserSession, req *pb.MartialhallUpgra var ( err error mart *pb.DBMartialhall - mdata *cfg.Gamekungfu_masterworkerData + mdata *cfg.GameKungfuMasterworkerData ) if mart, err = this.module.modelMartialhall.queryUserMartialhall(session.GetUserId()); err != nil { code = pb.ErrorCode_DBError diff --git a/modules/martialhall/configure.go b/modules/martialhall/configure.go index ac0af004e..aa722181b 100644 --- a/modules/martialhall/configure.go +++ b/modules/martialhall/configure.go @@ -23,12 +23,12 @@ type configureComp struct { 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.(*Martialhall) - this.LoadConfigure(game_kungfu_unlock, cfg.NewGamekungfu_unlock) - this.LoadConfigure(game_kungfu_masterworker, cfg.NewGamekungfu_masterworker) + this.LoadConfigure(game_kungfu_unlock, cfg.NewGameKungfuUnlock) + this.LoadConfigure(game_kungfu_masterworker, cfg.NewGameKungfuMasterworker) return } -func (this *configureComp) getMasterworker(lv int32) (result *cfg.Gamekungfu_masterworkerData, err error) { +func (this *configureComp) getMasterworker(lv int32) (result *cfg.GameKungfuMasterworkerData, err error) { var ( v interface{} ok bool @@ -37,7 +37,7 @@ func (this *configureComp) getMasterworker(lv int32) (result *cfg.Gamekungfu_mas this.module.Errorln(err) return } else { - if result, ok = v.(*cfg.Gamekungfu_masterworker).GetDataMap()[lv]; !ok { + if result, ok = v.(*cfg.GameKungfuMasterworker).GetDataMap()[lv]; !ok { err = fmt.Errorf("not found:%d ", lv) this.module.Errorln(err) return @@ -46,7 +46,7 @@ func (this *configureComp) getMasterworker(lv int32) (result *cfg.Gamekungfu_mas return } -func (this *configureComp) getunlock(pillar int32) (result *cfg.Gamekungfu_unlockData, err error) { +func (this *configureComp) getunlock(pillar int32) (result *cfg.GameKungfuUnlockData, err error) { var ( v interface{} ok bool @@ -55,7 +55,7 @@ func (this *configureComp) getunlock(pillar int32) (result *cfg.Gamekungfu_unloc this.module.Errorln(err) return } else { - if result, ok = v.(*cfg.Gamekungfu_unlock).GetDataMap()[pillar]; !ok { + if result, ok = v.(*cfg.GameKungfuUnlock).GetDataMap()[pillar]; !ok { err = fmt.Errorf("not found:%d ", pillar) this.module.Errorln(err) return diff --git a/modules/martialhall/core.go b/modules/martialhall/core.go index e48aa07b0..4eb4aedb2 100644 --- a/modules/martialhall/core.go +++ b/modules/martialhall/core.go @@ -7,7 +7,7 @@ import ( ) //结算 -func settlement(pillar *pb.DBPillar, mdata *cfg.Gamekungfu_masterworkerData) { +func settlement(pillar *pb.DBPillar, mdata *cfg.GameKungfuMasterworkerData) { if pillar == nil || pillar.State != pb.PillarState_Useing { return } @@ -19,7 +19,7 @@ func settlement(pillar *pb.DBPillar, mdata *cfg.Gamekungfu_masterworkerData) { } //结算 -func check(pillar *pb.DBPillar, mdata *cfg.Gamekungfu_masterworkerData) { +func check(pillar *pb.DBPillar, mdata *cfg.GameKungfuMasterworkerData) { if pillar == nil || pillar.State != pb.PillarState_Useing { return } diff --git a/modules/pagoda/comp_configure.go b/modules/pagoda/comp_configure.go index a045e06cc..6b094859a 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.GamepagodaData + _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.NewGamepagodaSeasonReward, - game_pagodataskreward: cfg.NewGamepagodaTaskReward, + game_pagodaseasonreward: cfg.NewGamePagodaSeasonReward, + game_pagodataskreward: cfg.NewGamePagodaTaskReward, }) - this._pagodaMap = make(map[int64]*cfg.GamepagodaData, 0) - configure.RegisterConfigure(game_pagoda, cfg.NewGamepagoda, 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.Gamepagoda); 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.GamepagodaData) { +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.GamepagodaData) { +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.Gamepagoda + configure *cfg.GamePagoda ok bool ) - if configure, ok = v.(*cfg.Gamepagoda); !ok { + if configure, ok = v.(*cfg.GamePagoda); !ok { log.Errorf("%T no is *cfg.Game_pagodaData", v) return } @@ -95,13 +95,13 @@ func (this *configureComp) GetPagodaconfig(id int32) (data *cfg.GamepagodaData) } // 爬塔奖励 -func (this *configureComp) GetPagodaRewardconfig(id int32) (data *cfg.GamepagodaTaskRewardData) { +func (this *configureComp) GetPagodaRewardconfig(id int32) (data *cfg.GamePagodaTaskRewardData) { if v, err := this.GetConfigure(game_pagodataskreward); err == nil { var ( - configure *cfg.GamepagodaTaskReward + configure *cfg.GamePagodaTaskReward ok bool ) - if configure, ok = v.(*cfg.GamepagodaTaskReward); !ok { + if configure, ok = v.(*cfg.GamePagodaTaskReward); !ok { log.Errorf("%T no is *cfg.Game_pagodaData", v) return } diff --git a/modules/rtask/config.go b/modules/rtask/config.go index 5b6d6a980..c596a0ee4 100644 --- a/modules/rtask/config.go +++ b/modules/rtask/config.go @@ -107,7 +107,7 @@ func (this *configureComp) getFirstTask() *cfg.GameRdtaskAllData { } if cfg != nil { for _, v := range cfg.GetDataList() { - if v.Aftertaks == 0 { + if v.Aftertask == 0 { return v } } diff --git a/modules/rtask/model_rtask.go b/modules/rtask/model_rtask.go index d4c57e34f..f93ffe911 100644 --- a/modules/rtask/model_rtask.go +++ b/modules/rtask/model_rtask.go @@ -41,7 +41,7 @@ func (this *ModelRtask) doRtaskHandle(uid string, param *pb.RtaskParam) (rtaskId if len(rtask.FrtaskIds) == 0 { conf := this.moduleRtask.configure.getFirstTask() if conf != nil { - taskId = conf.Aftertaks + taskId = conf.Aftertask } } else { //TODO diff --git a/modules/rtask/module.go b/modules/rtask/module.go index 48beb246b..f1c9e6767 100644 --- a/modules/rtask/module.go +++ b/modules/rtask/module.go @@ -73,7 +73,7 @@ func (this *ModuleRtask) initRtaskHandle() { } //遍历任务的限定条件 - for _, rtaskTypeId := range v.RdtaksNum { + for _, rtaskTypeId := range v.Rdtasknum { // 获取每个限定条件配置 if typeCfg, err2 := this.configure.getRtaskTypeById(rtaskTypeId); err2 == nil { if typeCfg != nil { diff --git a/modules/shop/api_buy.go b/modules/shop/api_buy.go index 58373cf43..21c6eb538 100644 --- a/modules/shop/api_buy.go +++ b/modules/shop/api_buy.go @@ -24,7 +24,7 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.ShopBuyReq) (code pb var ( err error ok bool - conf *cfg.GameshopitemData + conf *cfg.GameShopitemData shopitem *pb.DBShopItem need []*cfg.Gameatn give []*cfg.Gameatn diff --git a/modules/shop/api_getlist.go b/modules/shop/api_getlist.go index 7db41f356..3bb70a39c 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.GameshopData + shopconf *cfg.GameShopData shopData *pb.DBShop udata *pb.DBUser sdata *pb.UserShopData - items []*cfg.GameshopitemData + 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.GameshopitemData + 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.GameshopitemData + 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 fbd59f097..832bf5aee 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.NewGameshop) - this.LoadConfigure(game_shopitem, cfg.NewGameshopitem) + this.LoadConfigure(game_shop, cfg.NewGameShop) + this.LoadConfigure(game_shopitem, cfg.NewGameShopitem) return } //获取装备配置数据 -func (this *configureComp) GetShopConfigure(id int32) (configure *cfg.GameshopData, 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.GameshopDa this.module.Errorf("err:%v", err) return } else { - if configure, ok = v.(*cfg.Gameshop).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.GameshopDa } //读取商品 -func (this *configureComp) GetShopItemsConfigure(key int32) (result *cfg.GameshopitemData, 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.Gamesho this.module.Errorf("err:%v", err) return } else { - if result, ok = v.(*cfg.Gameshopitem).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.Gamesho } //读取商品组 -func (this *configureComp) GetShopItemsConfigureByGroups(groupid int32, user *pb.DBUser) (result []*cfg.GameshopitemData, err error) { - result = make([]*cfg.GameshopitemData, 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.Gameshopitem + table *cfg.GameShopitem ) if v, err = this.GetConfigure(game_shopitem); err != nil { this.module.Errorf("err:%v", err) return } else { - table = v.(*cfg.Gameshopitem) + 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.GameshopitemData, err error) { - result = make([]*cfg.GameshopitemData, 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.Gameshopitem - item *cfg.GameshopitemData + 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.Gameshopitem) + 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 f43e44324..87c1a5755 100644 --- a/modules/shop/core.go +++ b/modules/shop/core.go @@ -9,7 +9,7 @@ import ( ) //随机商品列表 -func randomGoods(goods []*cfg.GameshopitemData) (result *cfg.GameshopitemData) { +func randomGoods(goods []*cfg.GameShopitemData) (result *cfg.GameShopitemData) { var ( totle int64 curr int64 @@ -31,7 +31,7 @@ func randomGoods(goods []*cfg.GameshopitemData) (result *cfg.GameshopitemData) { } //转换商品对象 -func transGoods(stype pb.ShopType, goods []*cfg.GameshopitemData, 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 3c3c0385a..a2dc15305 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.NewGametaskRound, - gameActiveReward: cfg.NewGameactiveReward, + gameTaskRound: cfg.NewGameTaskRound, + gameActiveReward: cfg.NewGameActiveReward, }) return } //获取活跃度奖励配置 -func (this *configureComp) getActiveRewardCfg() (data *cfg.GameactiveReward, 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.GameactiveReward, err if v, err = this.GetConfigure(gameActiveReward); err != nil { return } else { - if data, ok = v.(*cfg.GameactiveReward); !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.GameactiveReward, err } //获取任务配置 -func (this *configureComp) getTaskRoundCfg() (data *cfg.GametaskRound, 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.GametaskRound, err error if v, err = this.GetConfigure(gameTaskRound); err != nil { return } else { - if data, ok = v.(*cfg.GametaskRound); !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.GametaskRound, err error } //根据taskId获取配置 -func (this *configureComp) getTaskById(taskId int32) (data *cfg.GametaskRoundData) { +func (this *configureComp) getTaskById(taskId int32) (data *cfg.GameTaskRoundData) { cfg, err := this.getTaskRoundCfg() if err != nil { log.Errorf("%v", err) @@ -90,7 +90,7 @@ func (this *configureComp) isFirstTask(taskId int32) (ok bool) { } // 上一个任务 -func (this *configureComp) getPreTask(preTaskId int32) *cfg.GametaskRoundData { +func (this *configureComp) getPreTask(preTaskId int32) *cfg.GameTaskRoundData { data := this.getTaskByTag(int32(comm.TASK_ACHIEVE)) for _, v := range data { if v.IdAfter == preTaskId { @@ -101,7 +101,7 @@ func (this *configureComp) getPreTask(preTaskId int32) *cfg.GametaskRoundData { } //获取任务配置列表 -func (this *configureComp) getTaskList() (data []*cfg.GametaskRoundData, err error) { +func (this *configureComp) getTaskList() (data []*cfg.GameTaskRoundData, err error) { cfg, err := this.getTaskRoundCfg() if err != nil { log.Errorf("%v", err) @@ -114,7 +114,7 @@ func (this *configureComp) getTaskList() (data []*cfg.GametaskRoundData, err err } //根据任务类型获取任务列表 -func (this *configureComp) getTasks(taskType int32) (data []*cfg.GametaskRoundData, err error) { +func (this *configureComp) getTasks(taskType int32) (data []*cfg.GameTaskRoundData, err error) { list, err := this.getTaskList() if err != nil { log.Errorf("%v", err) @@ -131,7 +131,7 @@ func (this *configureComp) getTasks(taskType int32) (data []*cfg.GametaskRoundDa } //任务列表 正序 -func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.GametaskRoundData, err error) { +func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.GameTaskRoundData, err error) { if data, err = this.getTasks(taskType); err != nil { return nil, err } @@ -142,7 +142,7 @@ func (this *configureComp) getSortedTasks(taskType int32) (data []*cfg.GametaskR } //获取任务配置 条件 tasktag -func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.GametaskRoundData) { +func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.GameTaskRoundData) { list, err := this.getTaskList() if err != nil { log.Errorf("%v", err) @@ -156,7 +156,7 @@ func (this *configureComp) getTaskByTag(taskTag int32) (data []*cfg.GametaskRoun return } -func (this *configureComp) getTaskActiveList() (data []*cfg.GameactiveRewardData) { +func (this *configureComp) getTaskActiveList() (data []*cfg.GameActiveRewardData) { conf, err := this.getActiveRewardCfg() if err != nil { log.Errorf("get conf err:%v", err) @@ -169,7 +169,7 @@ func (this *configureComp) getTaskActiveList() (data []*cfg.GameactiveRewardData } //获取活跃度奖励list -func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.GameactiveRewardData, 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) @@ -187,7 +187,7 @@ func (this *configureComp) getTaskActiveByTag(taskTag int32) (data []*cfg.Gameac } // 获取活跃度配置map -func (this *configureComp) getTaskActiveById(id int32) (data *cfg.GameactiveRewardData) { +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/sys/configure/structs/Game.KungfuMasterworker.go b/sys/configure/structs/Game.KungfuMasterworker.go new file mode 100644 index 000000000..1425b9d11 --- /dev/null +++ b/sys/configure/structs/Game.KungfuMasterworker.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameKungfuMasterworker struct { + _dataMap map[int32]*GameKungfuMasterworkerData + _dataList []*GameKungfuMasterworkerData +} + +func NewGameKungfuMasterworker(_buf []map[string]interface{}) (*GameKungfuMasterworker, error) { + _dataList := make([]*GameKungfuMasterworkerData, 0, len(_buf)) + dataMap := make(map[int32]*GameKungfuMasterworkerData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameKungfuMasterworkerData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Level] = _v + } + } + return &GameKungfuMasterworker{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameKungfuMasterworker) GetDataMap() map[int32]*GameKungfuMasterworkerData { + return table._dataMap +} + +func (table *GameKungfuMasterworker) GetDataList() []*GameKungfuMasterworkerData { + return table._dataList +} + +func (table *GameKungfuMasterworker) Get(key int32) *GameKungfuMasterworkerData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.kungfu_masterworkerData.go b/sys/configure/structs/Game.KungfuMasterworkerData.go similarity index 91% rename from sys/configure/structs/game.kungfu_masterworkerData.go rename to sys/configure/structs/Game.KungfuMasterworkerData.go index 69b92d496..f14474234 100644 --- a/sys/configure/structs/game.kungfu_masterworkerData.go +++ b/sys/configure/structs/Game.KungfuMasterworkerData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type Gamekungfu_masterworkerData struct { +type GameKungfuMasterworkerData struct { Level int32 Star int32 Quality int32 @@ -26,13 +26,13 @@ type Gamekungfu_masterworkerData struct { Deplete []*Gameatn } -const TypeId_Gamekungfu_masterworkerData = -2026478053 +const TypeId_GameKungfuMasterworkerData = -203564424 -func (*Gamekungfu_masterworkerData) GetTypeId() int32 { - return -2026478053 +func (*GameKungfuMasterworkerData) GetTypeId() int32 { + return -203564424 } -func (_v *Gamekungfu_masterworkerData)Deserialize(_buf map[string]interface{}) (err error) { +func (_v *GameKungfuMasterworkerData)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 _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["quality"].(float64); !_ok_ { err = errors.New("quality error"); return }; _v.Quality = int32(_tempNum_) } @@ -75,8 +75,8 @@ func (_v *Gamekungfu_masterworkerData)Deserialize(_buf map[string]interface{}) ( return } -func DeserializeGamekungfu_masterworkerData(_buf map[string]interface{}) (*Gamekungfu_masterworkerData, error) { - v := &Gamekungfu_masterworkerData{} +func DeserializeGameKungfuMasterworkerData(_buf map[string]interface{}) (*GameKungfuMasterworkerData, error) { + v := &GameKungfuMasterworkerData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/Game.KungfuUnlock.go b/sys/configure/structs/Game.KungfuUnlock.go new file mode 100644 index 000000000..c4fbf49f0 --- /dev/null +++ b/sys/configure/structs/Game.KungfuUnlock.go @@ -0,0 +1,42 @@ +//------------------------------------------------------------------------------ +// +// 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 GameKungfuUnlock struct { + _dataMap map[int32]*GameKungfuUnlockData + _dataList []*GameKungfuUnlockData +} + +func NewGameKungfuUnlock(_buf []map[string]interface{}) (*GameKungfuUnlock, error) { + _dataList := make([]*GameKungfuUnlockData, 0, len(_buf)) + dataMap := make(map[int32]*GameKungfuUnlockData) + for _, _ele_ := range _buf { + if _v, err2 := DeserializeGameKungfuUnlockData(_ele_); err2 != nil { + return nil, err2 + } else { + _dataList = append(_dataList, _v) + dataMap[_v.Id] = _v + } + } + return &GameKungfuUnlock{_dataList:_dataList, _dataMap:dataMap}, nil +} + +func (table *GameKungfuUnlock) GetDataMap() map[int32]*GameKungfuUnlockData { + return table._dataMap +} + +func (table *GameKungfuUnlock) GetDataList() []*GameKungfuUnlockData { + return table._dataList +} + +func (table *GameKungfuUnlock) Get(key int32) *GameKungfuUnlockData { + return table._dataMap[key] +} + + diff --git a/sys/configure/structs/game.kungfu_unlockData.go b/sys/configure/structs/Game.KungfuUnlockData.go similarity index 82% rename from sys/configure/structs/game.kungfu_unlockData.go rename to sys/configure/structs/Game.KungfuUnlockData.go index c0d90cda5..289c34efc 100644 --- a/sys/configure/structs/game.kungfu_unlockData.go +++ b/sys/configure/structs/Game.KungfuUnlockData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type Gamekungfu_unlockData struct { +type GameKungfuUnlockData struct { Id int32 Type int32 Area int32 Consume []*Gameatn } -const TypeId_Gamekungfu_unlockData = -515174465 +const TypeId_GameKungfuUnlockData = 1816415708 -func (*Gamekungfu_unlockData) GetTypeId() int32 { - return -515174465 +func (*GameKungfuUnlockData) GetTypeId() int32 { + return 1816415708 } -func (_v *Gamekungfu_unlockData)Deserialize(_buf map[string]interface{}) (err error) { +func (_v *GameKungfuUnlockData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["area"].(float64); !_ok_ { err = errors.New("area error"); return }; _v.Area = int32(_tempNum_) } @@ -44,8 +44,8 @@ func (_v *Gamekungfu_unlockData)Deserialize(_buf map[string]interface{}) (err er return } -func DeserializeGamekungfu_unlockData(_buf map[string]interface{}) (*Gamekungfu_unlockData, error) { - v := &Gamekungfu_unlockData{} +func DeserializeGameKungfuUnlockData(_buf map[string]interface{}) (*GameKungfuUnlockData, error) { + v := &GameKungfuUnlockData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/Tables.go b/sys/configure/structs/Tables.go index 2734d2c0d..ef29acecd 100644 --- a/sys/configure/structs/Tables.go +++ b/sys/configure/structs/Tables.go @@ -11,70 +11,69 @@ package cfg type JsonLoader func(string) ([]map[string]interface{}, error) type Tables struct { - 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 - pagodaseasonLoop *GamepagodaseasonLoop + Global *GameGlobal + 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 + Opencond *GameOpencond + Stroy *GameStroy + Pagoda *GamePagoda + PagodaTaskReward *GamePagodaTaskReward + PagodaSeasonReward *GamePagodaSeasonReward + PagodaseasonLoop *GamePagodaseasonLoop RdtaskAll *GameRdtaskAll RdtaskType *GameRdtaskType RdtaskChoose *GameRdtaskChoose - kungfu_unlock *Gamekungfu_unlock - kungfu_masterworker *Gamekungfu_masterworker + KungfuUnlock *GameKungfuUnlock + KungfuMasterworker *GameKungfuMasterworker Gourmet *GameGourmet GourmetSkill *GameGourmetSkill + Drop *GameDrop } func NewTables(loader JsonLoader) (*Tables, error) { @@ -85,343 +84,331 @@ func NewTables(loader JsonLoader) (*Tables, error) { if buf, err = loader("game_global") ; err != nil { return nil, err } - 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 = NewGameui(buf) ; err != nil { + if tables.Global, err = NewGameGlobal(buf) ; err != nil { return nil, err } if buf, err = loader("game_plot") ; err != nil { return nil, err } - if tables.plot, err = NewGameplot(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 = NewGameextservers(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 = NewGameskillAtk(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 = NewGameskillAfteratk(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 = NewGameskillBuff(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 = NewGameskillPassive(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 = NewGamehero(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 = NewGameheroStargrow(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 = NewGameheroLevelgrow(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 = NewGameheroStarup(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 = NewGameheroExp(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 = NewGameheroLevelup(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 = NewGameequip(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 = NewGameequipAttrlibrary(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 = NewGameequipSuit(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 = NewGameequipColor(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 = NewGameequipIntensify(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 = NewGameitem(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 = NewGameheroSkillLevel(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 = NewGameheroResonance(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 = NewGamecomAtn(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 = NewGameheroAwaken(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 = NewGameheroMethod(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 = NewGameshop(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 = NewGameshopitem(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 = NewGameactiveReward(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 = NewGamecom(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 = NewGameskill(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 = NewGamemodel(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 = NewGamemainlineChapter(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 = NewGamemainlineEasy(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 = NewGamemainlineHard(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 = NewGamemainlinePurgatory(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 = NewGamedrawCard(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 = NewGamechatChannel(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 = NewGamechatSystem(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 = NewGamechatServerGroup(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 = NewGamechatChannelCom(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 = NewGametaskRound(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 = NewGametaskActiveReward(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 = NewGamecoin(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 = NewGameinitial(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 = NewGamemonster(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 = NewGameequipPos(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 = NewGameplayerlv(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 = NewGamepropsgroup(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 = NewGamefacemod(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 = NewGamemsgdistrib(buf) ; err != nil { - return nil, err - } - if buf, err = loader("game_language") ; err != nil { - return nil, err - } - if tables.language, err = NewGamelanguage(buf) ; err != nil { + if tables.Msgdistrib, err = NewGameMsgdistrib(buf) ; err != nil { return nil, err } if buf, err = loader("game_opencond") ; err != nil { return nil, err } - if tables.opencond, err = NewGameopencond(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 = NewGamestroy(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 = NewGamepagoda(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 = NewGamepagodaTaskReward(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 = NewGamepagodaSeasonReward(buf) ; err != nil { + if tables.PagodaSeasonReward, err = NewGamePagodaSeasonReward(buf) ; err != nil { return nil, err } if buf, err = loader("game_pagodaseasonloop") ; err != nil { return nil, err } - if tables.pagodaseasonLoop, err = NewGamepagodaseasonLoop(buf) ; err != nil { + if tables.PagodaseasonLoop, err = NewGamePagodaseasonLoop(buf) ; err != nil { return nil, err } if buf, err = loader("game_rdtaskall") ; err != nil { @@ -442,16 +429,16 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.RdtaskChoose, err = NewGameRdtaskChoose(buf) ; err != nil { return nil, err } - if buf, err = loader("game_kungfu_unlock") ; err != nil { + if buf, err = loader("game_kungfuunlock") ; err != nil { return nil, err } - if tables.kungfu_unlock, err = NewGamekungfu_unlock(buf) ; err != nil { + if tables.KungfuUnlock, err = NewGameKungfuUnlock(buf) ; err != nil { return nil, err } - if buf, err = loader("game_kungfu_masterworker") ; err != nil { + if buf, err = loader("game_kungfumasterworker") ; err != nil { return nil, err } - if tables.kungfu_masterworker, err = NewGamekungfu_masterworker(buf) ; err != nil { + if tables.KungfuMasterworker, err = NewGameKungfuMasterworker(buf) ; err != nil { return nil, err } if buf, err = loader("game_gourmet") ; err != nil { @@ -466,5 +453,11 @@ func NewTables(loader JsonLoader) (*Tables, error) { if tables.GourmetSkill, err = NewGameGourmetSkill(buf) ; err != nil { return nil, err } + if buf, err = loader("game_drop") ; err != nil { + return nil, err + } + if tables.Drop, err = NewGameDrop(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 b84c9b753..d92bc3616 100644 --- a/sys/configure/structs/game.ChildSkills.go +++ b/sys/configure/structs/game.ChildSkills.go @@ -14,10 +14,10 @@ type GameChildSkills struct { Id []int32 } -const TypeId_GameChildSkills = -1958253470 +const TypeId_GameChildSkills = 1493938306 func (*GameChildSkills) GetTypeId() int32 { - return -1958253470 + return 1493938306 } func (_v *GameChildSkills)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.DropData.go b/sys/configure/structs/game.DropData.go index 0dff2f37e..f27a0510c 100644 --- a/sys/configure/structs/game.DropData.go +++ b/sys/configure/structs/game.DropData.go @@ -18,10 +18,10 @@ type GameDropData struct { P int32 } -const TypeId_GameDropData = 901242325 +const TypeId_GameDropData = 1700203957 func (*GameDropData) GetTypeId() int32 { - return 901242325 + return 1700203957 } func (_v *GameDropData)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.Figure.go b/sys/configure/structs/game.Figure.go index 8d05ed784..d2800e8d0 100644 --- a/sys/configure/structs/game.Figure.go +++ b/sys/configure/structs/game.Figure.go @@ -21,10 +21,10 @@ type GameFigure struct { Icon string } -const TypeId_GameFigure = -1818502016 +const TypeId_GameFigure = -150633376 func (*GameFigure) GetTypeId() int32 { - return -1818502016 + return -150633376 } func (_v *GameFigure)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.GourmetData.go b/sys/configure/structs/game.GourmetData.go index d80a51008..4fc757e3a 100644 --- a/sys/configure/structs/game.GourmetData.go +++ b/sys/configure/structs/game.GourmetData.go @@ -23,10 +23,10 @@ type GameGourmetData struct { Propsgroup int32 } -const TypeId_GameGourmetData = -359286171 +const TypeId_GameGourmetData = -1202061691 func (*GameGourmetData) GetTypeId() int32 { - return -359286171 + return -1202061691 } func (_v *GameGourmetData)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.GourmetSkillData.go b/sys/configure/structs/game.GourmetSkillData.go index bdaebdf28..2e6048363 100644 --- a/sys/configure/structs/game.GourmetSkillData.go +++ b/sys/configure/structs/game.GourmetSkillData.go @@ -29,10 +29,10 @@ type GameGourmetSkillData struct { Consume []*Gameatn } -const TypeId_GameGourmetSkillData = 235491264 +const TypeId_GameGourmetSkillData = 2062196640 func (*GameGourmetSkillData) GetTypeId() int32 { - return 235491264 + return 2062196640 } func (_v *GameGourmetSkillData)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.activeReward.go b/sys/configure/structs/game.activeReward.go index f7bee6f74..ab625c32d 100644 --- a/sys/configure/structs/game.activeReward.go +++ b/sys/configure/structs/game.activeReward.go @@ -8,34 +8,34 @@ package cfg -type GameactiveReward struct { - _dataMap map[int32]*GameactiveRewardData - _dataList []*GameactiveRewardData +type GameActiveReward struct { + _dataMap map[int32]*GameActiveRewardData + _dataList []*GameActiveRewardData } -func NewGameactiveReward(_buf []map[string]interface{}) (*GameactiveReward, error) { - _dataList := make([]*GameactiveRewardData, 0, len(_buf)) - dataMap := make(map[int32]*GameactiveRewardData) +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 := DeserializeGameactiveRewardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameActiveRewardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GameactiveReward{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameActiveReward{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameactiveReward) GetDataMap() map[int32]*GameactiveRewardData { +func (table *GameActiveReward) GetDataMap() map[int32]*GameActiveRewardData { return table._dataMap } -func (table *GameactiveReward) GetDataList() []*GameactiveRewardData { +func (table *GameActiveReward) GetDataList() []*GameActiveRewardData { return table._dataList } -func (table *GameactiveReward) Get(key int32) *GameactiveRewardData { +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 d17ed3caf..1b741d60e 100644 --- a/sys/configure/structs/game.activeRewardData.go +++ b/sys/configure/structs/game.activeRewardData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type GameactiveRewardData struct { +type GameActiveRewardData struct { Key int32 IdTag int32 Active int32 Reword []*Gameatn } -const TypeId_GameactiveRewardData = -41023077 +const TypeId_GameActiveRewardData = 942906779 -func (*GameactiveRewardData) GetTypeId() int32 { - return -41023077 +func (*GameActiveRewardData) GetTypeId() int32 { + return 942906779 } -func (_v *GameactiveRewardData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -44,8 +44,8 @@ func (_v *GameactiveRewardData)Deserialize(_buf map[string]interface{}) (err err return } -func DeserializeGameactiveRewardData(_buf map[string]interface{}) (*GameactiveRewardData, error) { - v := &GameactiveRewardData{} +func DeserializeGameActiveRewardData(_buf map[string]interface{}) (*GameActiveRewardData, error) { + v := &GameActiveRewardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.atn.go b/sys/configure/structs/game.atn.go index b0401181b..154c5cab6 100644 --- a/sys/configure/structs/game.atn.go +++ b/sys/configure/structs/game.atn.go @@ -16,10 +16,10 @@ type Gameatn struct { N int32 } -const TypeId_Gameatn = -1770297697 +const TypeId_Gameatn = -1705653569 func (*Gameatn) GetTypeId() int32 { - return -1770297697 + return -1705653569 } func (_v *Gameatn)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.basepool.go b/sys/configure/structs/game.basepool.go index 440c2e5a7..7ed123a17 100644 --- a/sys/configure/structs/game.basepool.go +++ b/sys/configure/structs/game.basepool.go @@ -16,10 +16,10 @@ type Gamebasepool struct { P string } -const TypeId_Gamebasepool = -451033879 +const TypeId_Gamebasepool = 347927753 func (*Gamebasepool) GetTypeId() int32 { - return -451033879 + return 347927753 } func (_v *Gamebasepool)Deserialize(_buf map[string]interface{}) (err error) { diff --git a/sys/configure/structs/game.chatChannel.go b/sys/configure/structs/game.chatChannel.go index 6731a816d..dd3dfda4b 100644 --- a/sys/configure/structs/game.chatChannel.go +++ b/sys/configure/structs/game.chatChannel.go @@ -8,34 +8,34 @@ package cfg -type GamechatChannel struct { - _dataMap map[string]*GamechatChannelData - _dataList []*GamechatChannelData +type GameChatChannel struct { + _dataMap map[string]*GameChatChannelData + _dataList []*GameChatChannelData } -func NewGamechatChannel(_buf []map[string]interface{}) (*GamechatChannel, error) { - _dataList := make([]*GamechatChannelData, 0, len(_buf)) - dataMap := make(map[string]*GamechatChannelData) +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 := DeserializeGamechatChannelData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameChatChannelData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamechatChannel{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameChatChannel{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamechatChannel) GetDataMap() map[string]*GamechatChannelData { +func (table *GameChatChannel) GetDataMap() map[string]*GameChatChannelData { return table._dataMap } -func (table *GamechatChannel) GetDataList() []*GamechatChannelData { +func (table *GameChatChannel) GetDataList() []*GameChatChannelData { return table._dataList } -func (table *GamechatChannel) Get(key string) *GamechatChannelData { +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 fed9fad27..8e217e5ba 100644 --- a/sys/configure/structs/game.chatChannelCom.go +++ b/sys/configure/structs/game.chatChannelCom.go @@ -8,34 +8,34 @@ package cfg -type GamechatChannelCom struct { - _dataMap map[string]*GamechatChannelComData - _dataList []*GamechatChannelComData +type GameChatChannelCom struct { + _dataMap map[string]*GameChatChannelComData + _dataList []*GameChatChannelComData } -func NewGamechatChannelCom(_buf []map[string]interface{}) (*GamechatChannelCom, error) { - _dataList := make([]*GamechatChannelComData, 0, len(_buf)) - dataMap := make(map[string]*GamechatChannelComData) +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 := DeserializeGamechatChannelComData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameChatChannelComData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamechatChannelCom{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameChatChannelCom{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamechatChannelCom) GetDataMap() map[string]*GamechatChannelComData { +func (table *GameChatChannelCom) GetDataMap() map[string]*GameChatChannelComData { return table._dataMap } -func (table *GamechatChannelCom) GetDataList() []*GamechatChannelComData { +func (table *GameChatChannelCom) GetDataList() []*GameChatChannelComData { return table._dataList } -func (table *GamechatChannelCom) Get(key string) *GamechatChannelComData { +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 51078cbf0..743bef39d 100644 --- a/sys/configure/structs/game.chatChannelComData.go +++ b/sys/configure/structs/game.chatChannelComData.go @@ -10,27 +10,27 @@ package cfg import "errors" -type GamechatChannelComData struct { +type GameChatChannelComData struct { Key string Value int32 Dec string } -const TypeId_GamechatChannelComData = 1284108092 +const TypeId_GameChatChannelComData = 1947894588 -func (*GamechatChannelComData) GetTypeId() int32 { - return 1284108092 +func (*GameChatChannelComData) GetTypeId() int32 { + return 1947894588 } -func (_v *GamechatChannelComData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGameChatChannelComData(_buf map[string]interface{}) (*GameChatChannelComData, error) { + v := &GameChatChannelComData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.chatChannelData.go b/sys/configure/structs/game.chatChannelData.go index f60942f35..e0cd37e51 100644 --- a/sys/configure/structs/game.chatChannelData.go +++ b/sys/configure/structs/game.chatChannelData.go @@ -10,27 +10,27 @@ package cfg import "errors" -type GamechatChannelData struct { +type GameChatChannelData struct { Key string TagList int32 SpeakCd int32 } -const TypeId_GamechatChannelData = -19547431 +const TypeId_GameChatChannelData = -819091751 -func (*GamechatChannelData) GetTypeId() int32 { - return -19547431 +func (*GameChatChannelData) GetTypeId() int32 { + return -819091751 } -func (_v *GamechatChannelData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGameChatChannelData(_buf map[string]interface{}) (*GameChatChannelData, error) { + v := &GameChatChannelData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.chatServerGroup.go b/sys/configure/structs/game.chatServerGroup.go index 0b8e3af09..c50d3894b 100644 --- a/sys/configure/structs/game.chatServerGroup.go +++ b/sys/configure/structs/game.chatServerGroup.go @@ -8,34 +8,34 @@ package cfg -type GamechatServerGroup struct { - _dataMap map[string]*GamechatServerGroupData - _dataList []*GamechatServerGroupData +type GameChatServerGroup struct { + _dataMap map[string]*GameChatServerGroupData + _dataList []*GameChatServerGroupData } -func NewGamechatServerGroup(_buf []map[string]interface{}) (*GamechatServerGroup, error) { - _dataList := make([]*GamechatServerGroupData, 0, len(_buf)) - dataMap := make(map[string]*GamechatServerGroupData) +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 := DeserializeGamechatServerGroupData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameChatServerGroupData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Server] = _v } } - return &GamechatServerGroup{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameChatServerGroup{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamechatServerGroup) GetDataMap() map[string]*GamechatServerGroupData { +func (table *GameChatServerGroup) GetDataMap() map[string]*GameChatServerGroupData { return table._dataMap } -func (table *GamechatServerGroup) GetDataList() []*GamechatServerGroupData { +func (table *GameChatServerGroup) GetDataList() []*GameChatServerGroupData { return table._dataList } -func (table *GamechatServerGroup) Get(key string) *GamechatServerGroupData { +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 2ff6241b5..3e3d122cf 100644 --- a/sys/configure/structs/game.chatServerGroupData.go +++ b/sys/configure/structs/game.chatServerGroupData.go @@ -10,25 +10,25 @@ package cfg import "errors" -type GamechatServerGroupData struct { +type GameChatServerGroupData struct { Server string Group int32 } -const TypeId_GamechatServerGroupData = 825941074 +const TypeId_GameChatServerGroupData = -71514030 -func (*GamechatServerGroupData) GetTypeId() int32 { - return 825941074 +func (*GameChatServerGroupData) GetTypeId() int32 { + return -71514030 } -func (_v *GamechatServerGroupData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGameChatServerGroupData(_buf map[string]interface{}) (*GameChatServerGroupData, error) { + v := &GameChatServerGroupData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.chatSystem.go b/sys/configure/structs/game.chatSystem.go index 83432332c..aae06a1d8 100644 --- a/sys/configure/structs/game.chatSystem.go +++ b/sys/configure/structs/game.chatSystem.go @@ -8,34 +8,34 @@ package cfg -type GamechatSystem struct { - _dataMap map[int32]*GamechatSystemData - _dataList []*GamechatSystemData +type GameChatSystem struct { + _dataMap map[int32]*GameChatSystemData + _dataList []*GameChatSystemData } -func NewGamechatSystem(_buf []map[string]interface{}) (*GamechatSystem, error) { - _dataList := make([]*GamechatSystemData, 0, len(_buf)) - dataMap := make(map[int32]*GamechatSystemData) +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 := DeserializeGamechatSystemData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameChatSystemData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamechatSystem{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameChatSystem{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamechatSystem) GetDataMap() map[int32]*GamechatSystemData { +func (table *GameChatSystem) GetDataMap() map[int32]*GameChatSystemData { return table._dataMap } -func (table *GamechatSystem) GetDataList() []*GamechatSystemData { +func (table *GameChatSystem) GetDataList() []*GameChatSystemData { return table._dataList } -func (table *GamechatSystem) Get(key int32) *GamechatSystemData { +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 c4d03e8b5..126c576d4 100644 --- a/sys/configure/structs/game.chatSystemData.go +++ b/sys/configure/structs/game.chatSystemData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamechatSystemData struct { +type GameChatSystemData struct { Key int32 Type int32 Title string @@ -22,13 +22,13 @@ type GamechatSystemData struct { TimeM int32 } -const TypeId_GamechatSystemData = -198348435 +const TypeId_GameChatSystemData = 52954477 -func (*GamechatSystemData) GetTypeId() int32 { - return -198348435 +func (*GameChatSystemData) GetTypeId() int32 { + return 52954477 } -func (_v *GamechatSystemData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -54,8 +54,8 @@ func (_v *GamechatSystemData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGamechatSystemData(_buf map[string]interface{}) (*GamechatSystemData, error) { - v := &GamechatSystemData{} +func DeserializeGameChatSystemData(_buf map[string]interface{}) (*GameChatSystemData, error) { + v := &GameChatSystemData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.coin.go b/sys/configure/structs/game.coin.go index 644c1c3df..157a53126 100644 --- a/sys/configure/structs/game.coin.go +++ b/sys/configure/structs/game.coin.go @@ -8,34 +8,34 @@ package cfg -type Gamecoin struct { - _dataMap map[string]*GamecoinData - _dataList []*GamecoinData +type GameCoin struct { + _dataMap map[string]*GameCoinData + _dataList []*GameCoinData } -func NewGamecoin(_buf []map[string]interface{}) (*Gamecoin, error) { - _dataList := make([]*GamecoinData, 0, len(_buf)) - dataMap := make(map[string]*GamecoinData) +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 := DeserializeGamecoinData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameCoinData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &Gamecoin{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameCoin{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamecoin) GetDataMap() map[string]*GamecoinData { +func (table *GameCoin) GetDataMap() map[string]*GameCoinData { return table._dataMap } -func (table *Gamecoin) GetDataList() []*GamecoinData { +func (table *GameCoin) GetDataList() []*GameCoinData { return table._dataList } -func (table *Gamecoin) Get(key string) *GamecoinData { +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 6b1e594bd..8d535b8e9 100644 --- a/sys/configure/structs/game.coinData.go +++ b/sys/configure/structs/game.coinData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamecoinData struct { +type GameCoinData struct { Key string Name string Color int32 @@ -23,13 +23,13 @@ type GamecoinData struct { Intr string } -const TypeId_GamecoinData = 552622167 +const TypeId_GameCoinData = 1416227927 -func (*GamecoinData) GetTypeId() int32 { - return 552622167 +func (*GameCoinData) GetTypeId() int32 { + return 1416227927 } -func (_v *GamecoinData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -43,8 +43,8 @@ func (_v *GamecoinData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamecoinData(_buf map[string]interface{}) (*GamecoinData, error) { - v := &GamecoinData{} +func DeserializeGameCoinData(_buf map[string]interface{}) (*GameCoinData, error) { + v := &GameCoinData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.com.go b/sys/configure/structs/game.com.go index 3f51a249f..1031d36a5 100644 --- a/sys/configure/structs/game.com.go +++ b/sys/configure/structs/game.com.go @@ -8,34 +8,34 @@ package cfg -type Gamecom struct { - _dataMap map[int32]*GamecomData - _dataList []*GamecomData +type GameCom struct { + _dataMap map[int32]*GameComData + _dataList []*GameComData } -func NewGamecom(_buf []map[string]interface{}) (*Gamecom, error) { - _dataList := make([]*GamecomData, 0, len(_buf)) - dataMap := make(map[int32]*GamecomData) +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 := DeserializeGamecomData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameComData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.MaxChar] = _v } } - return &Gamecom{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameCom{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamecom) GetDataMap() map[int32]*GamecomData { +func (table *GameCom) GetDataMap() map[int32]*GameComData { return table._dataMap } -func (table *Gamecom) GetDataList() []*GamecomData { +func (table *GameCom) GetDataList() []*GameComData { return table._dataList } -func (table *Gamecom) Get(key int32) *GamecomData { +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 9d2097ede..7317c611f 100644 --- a/sys/configure/structs/game.comAtn.go +++ b/sys/configure/structs/game.comAtn.go @@ -8,34 +8,34 @@ package cfg -type GamecomAtn struct { - _dataMap map[string]*GamecomAtnData - _dataList []*GamecomAtnData +type GameComAtn struct { + _dataMap map[string]*GameComAtnData + _dataList []*GameComAtnData } -func NewGamecomAtn(_buf []map[string]interface{}) (*GamecomAtn, error) { - _dataList := make([]*GamecomAtnData, 0, len(_buf)) - dataMap := make(map[string]*GamecomAtnData) +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 := DeserializeGamecomAtnData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameComAtnData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Index] = _v } } - return &GamecomAtn{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameComAtn{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamecomAtn) GetDataMap() map[string]*GamecomAtnData { +func (table *GameComAtn) GetDataMap() map[string]*GameComAtnData { return table._dataMap } -func (table *GamecomAtn) GetDataList() []*GamecomAtnData { +func (table *GameComAtn) GetDataList() []*GameComAtnData { return table._dataList } -func (table *GamecomAtn) Get(key string) *GamecomAtnData { +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 6ddb1ca67..d5e7f2084 100644 --- a/sys/configure/structs/game.comAtnData.go +++ b/sys/configure/structs/game.comAtnData.go @@ -10,18 +10,18 @@ package cfg import "errors" -type GamecomAtnData struct { +type GameComAtnData struct { Index string Var []*Gameatn } -const TypeId_GamecomAtnData = 1272050592 +const TypeId_GameComAtnData = -2026469472 -func (*GamecomAtnData) GetTypeId() int32 { - return 1272050592 +func (*GameComAtnData) GetTypeId() int32 { + return -2026469472 } -func (_v *GamecomAtnData)Deserialize(_buf map[string]interface{}) (err error) { +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{} @@ -40,8 +40,8 @@ func (_v *GamecomAtnData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamecomAtnData(_buf map[string]interface{}) (*GamecomAtnData, error) { - v := &GamecomAtnData{} +func DeserializeGameComAtnData(_buf map[string]interface{}) (*GameComAtnData, error) { + v := &GameComAtnData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.comData.go b/sys/configure/structs/game.comData.go index 746ed7f86..7fe7b7444 100644 --- a/sys/configure/structs/game.comData.go +++ b/sys/configure/structs/game.comData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamecomData struct { +type GameComData struct { MaxChar int32 TaskReset int32 InitGold int32 @@ -73,13 +73,13 @@ type GamecomData struct { SmithyMaxtime int32 } -const TypeId_GamecomData = -395344177 +const TypeId_GameComData = 1433629391 -func (*GamecomData) GetTypeId() int32 { - return -395344177 +func (*GameComData) GetTypeId() int32 { + return 1433629391 } -func (_v *GamecomData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -208,8 +208,8 @@ func (_v *GamecomData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamecomData(_buf map[string]interface{}) (*GamecomData, error) { - v := &GamecomData{} +func DeserializeGameComData(_buf map[string]interface{}) (*GameComData, error) { + v := &GameComData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.drawCard.go b/sys/configure/structs/game.drawCard.go index 3d94955de..6cc1b319b 100644 --- a/sys/configure/structs/game.drawCard.go +++ b/sys/configure/structs/game.drawCard.go @@ -8,34 +8,34 @@ package cfg -type GamedrawCard struct { - _dataMap map[int32]*GamedrawCardData - _dataList []*GamedrawCardData +type GameDrawCard struct { + _dataMap map[int32]*GameDrawCardData + _dataList []*GameDrawCardData } -func NewGamedrawCard(_buf []map[string]interface{}) (*GamedrawCard, error) { - _dataList := make([]*GamedrawCardData, 0, len(_buf)) - dataMap := make(map[int32]*GamedrawCardData) +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 := DeserializeGamedrawCardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameDrawCardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamedrawCard{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameDrawCard{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamedrawCard) GetDataMap() map[int32]*GamedrawCardData { +func (table *GameDrawCard) GetDataMap() map[int32]*GameDrawCardData { return table._dataMap } -func (table *GamedrawCard) GetDataList() []*GamedrawCardData { +func (table *GameDrawCard) GetDataList() []*GameDrawCardData { return table._dataList } -func (table *GamedrawCard) Get(key int32) *GamedrawCardData { +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 220a9c09f..b51cd8208 100644 --- a/sys/configure/structs/game.drawCardData.go +++ b/sys/configure/structs/game.drawCardData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamedrawCardData struct { +type GameDrawCardData struct { Key int32 RecruitmentType int32 CardPoolType string @@ -20,13 +20,13 @@ type GamedrawCardData struct { Weight int32 } -const TypeId_GamedrawCardData = -179684166 +const TypeId_GameDrawCardData = -371601222 -func (*GamedrawCardData) GetTypeId() int32 { - return -179684166 +func (*GameDrawCardData) GetTypeId() int32 { + return -371601222 } -func (_v *GamedrawCardData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -37,8 +37,8 @@ func (_v *GamedrawCardData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGamedrawCardData(_buf map[string]interface{}) (*GamedrawCardData, error) { - v := &GamedrawCardData{} +func DeserializeGameDrawCardData(_buf map[string]interface{}) (*GameDrawCardData, error) { + v := &GameDrawCardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equip.go b/sys/configure/structs/game.equip.go index 637ecd327..f4a1dd773 100644 --- a/sys/configure/structs/game.equip.go +++ b/sys/configure/structs/game.equip.go @@ -8,34 +8,34 @@ package cfg -type Gameequip struct { - _dataMap map[string]*GameequipData - _dataList []*GameequipData +type GameEquip struct { + _dataMap map[string]*GameEquipData + _dataList []*GameEquipData } -func NewGameequip(_buf []map[string]interface{}) (*Gameequip, error) { - _dataList := make([]*GameequipData, 0, len(_buf)) - dataMap := make(map[string]*GameequipData) +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 := DeserializeGameequipData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gameequip{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquip{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameequip) GetDataMap() map[string]*GameequipData { +func (table *GameEquip) GetDataMap() map[string]*GameEquipData { return table._dataMap } -func (table *Gameequip) GetDataList() []*GameequipData { +func (table *GameEquip) GetDataList() []*GameEquipData { return table._dataList } -func (table *Gameequip) Get(key string) *GameequipData { +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 5e83b9d22..a6f783bec 100644 --- a/sys/configure/structs/game.equipAttrlibrary.go +++ b/sys/configure/structs/game.equipAttrlibrary.go @@ -8,34 +8,34 @@ package cfg -type GameequipAttrlibrary struct { - _dataMap map[int32]*GameequipAttrlibraryData - _dataList []*GameequipAttrlibraryData +type GameEquipAttrlibrary struct { + _dataMap map[int32]*GameEquipAttrlibraryData + _dataList []*GameEquipAttrlibraryData } -func NewGameequipAttrlibrary(_buf []map[string]interface{}) (*GameequipAttrlibrary, error) { - _dataList := make([]*GameequipAttrlibraryData, 0, len(_buf)) - dataMap := make(map[int32]*GameequipAttrlibraryData) +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 := DeserializeGameequipAttrlibraryData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipAttrlibraryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GameequipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquipAttrlibrary{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameequipAttrlibrary) GetDataMap() map[int32]*GameequipAttrlibraryData { +func (table *GameEquipAttrlibrary) GetDataMap() map[int32]*GameEquipAttrlibraryData { return table._dataMap } -func (table *GameequipAttrlibrary) GetDataList() []*GameequipAttrlibraryData { +func (table *GameEquipAttrlibrary) GetDataList() []*GameEquipAttrlibraryData { return table._dataList } -func (table *GameequipAttrlibrary) Get(key int32) *GameequipAttrlibraryData { +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 7b4721825..65a6e4eb3 100644 --- a/sys/configure/structs/game.equipAttrlibraryData.go +++ b/sys/configure/structs/game.equipAttrlibraryData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameequipAttrlibraryData struct { +type GameEquipAttrlibraryData struct { Key int32 Libraryid int32 Attrkey string @@ -19,13 +19,13 @@ type GameequipAttrlibraryData struct { Addition []int32 } -const TypeId_GameequipAttrlibraryData = -437457248 +const TypeId_GameEquipAttrlibraryData = 1806205600 -func (*GameequipAttrlibraryData) GetTypeId() int32 { - return -437457248 +func (*GameEquipAttrlibraryData) GetTypeId() int32 { + return 1806205600 } -func (_v *GameequipAttrlibraryData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -48,8 +48,8 @@ func (_v *GameequipAttrlibraryData)Deserialize(_buf map[string]interface{}) (err return } -func DeserializeGameequipAttrlibraryData(_buf map[string]interface{}) (*GameequipAttrlibraryData, error) { - v := &GameequipAttrlibraryData{} +func DeserializeGameEquipAttrlibraryData(_buf map[string]interface{}) (*GameEquipAttrlibraryData, error) { + v := &GameEquipAttrlibraryData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equipColor.go b/sys/configure/structs/game.equipColor.go index feaa289a4..8422439ba 100644 --- a/sys/configure/structs/game.equipColor.go +++ b/sys/configure/structs/game.equipColor.go @@ -8,34 +8,34 @@ package cfg -type GameequipColor struct { - _dataMap map[int32]*GameequipColorData - _dataList []*GameequipColorData +type GameEquipColor struct { + _dataMap map[int32]*GameEquipColorData + _dataList []*GameEquipColorData } -func NewGameequipColor(_buf []map[string]interface{}) (*GameequipColor, error) { - _dataList := make([]*GameequipColorData, 0, len(_buf)) - dataMap := make(map[int32]*GameequipColorData) +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 := DeserializeGameequipColorData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipColorData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Num] = _v } } - return &GameequipColor{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquipColor{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameequipColor) GetDataMap() map[int32]*GameequipColorData { +func (table *GameEquipColor) GetDataMap() map[int32]*GameEquipColorData { return table._dataMap } -func (table *GameequipColor) GetDataList() []*GameequipColorData { +func (table *GameEquipColor) GetDataList() []*GameEquipColorData { return table._dataList } -func (table *GameequipColor) Get(key int32) *GameequipColorData { +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 6b3583cf2..309c62749 100644 --- a/sys/configure/structs/game.equipColorData.go +++ b/sys/configure/structs/game.equipColorData.go @@ -10,25 +10,25 @@ package cfg import "errors" -type GameequipColorData struct { +type GameEquipColorData struct { Num int32 Color string } -const TypeId_GameequipColorData = 2132033753 +const TypeId_GameEquipColorData = -1911630631 -func (*GameequipColorData) GetTypeId() int32 { - return 2132033753 +func (*GameEquipColorData) GetTypeId() int32 { + return -1911630631 } -func (_v *GameequipColorData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGameEquipColorData(_buf map[string]interface{}) (*GameEquipColorData, error) { + v := &GameEquipColorData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equipData.go b/sys/configure/structs/game.equipData.go index 14397d8cc..b3a2e8163 100644 --- a/sys/configure/structs/game.equipData.go +++ b/sys/configure/structs/game.equipData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameequipData struct { +type GameEquipData struct { Id string Name string Suittype int32 @@ -27,13 +27,13 @@ type GameequipData struct { Sale []*Gameatn } -const TypeId_GameequipData = 1778846974 +const TypeId_GameEquipData = -1514145538 -func (*GameequipData) GetTypeId() int32 { - return 1778846974 +func (*GameEquipData) GetTypeId() int32 { + return -1514145538 } -func (_v *GameequipData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -90,8 +90,8 @@ func (_v *GameequipData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameequipData(_buf map[string]interface{}) (*GameequipData, error) { - v := &GameequipData{} +func DeserializeGameEquipData(_buf map[string]interface{}) (*GameEquipData, error) { + v := &GameEquipData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equipIntensify.go b/sys/configure/structs/game.equipIntensify.go index 9584812de..2aa27f277 100644 --- a/sys/configure/structs/game.equipIntensify.go +++ b/sys/configure/structs/game.equipIntensify.go @@ -8,34 +8,34 @@ package cfg -type GameequipIntensify struct { - _dataMap map[int32]*GameequipIntensifyData - _dataList []*GameequipIntensifyData +type GameEquipIntensify struct { + _dataMap map[int32]*GameEquipIntensifyData + _dataList []*GameEquipIntensifyData } -func NewGameequipIntensify(_buf []map[string]interface{}) (*GameequipIntensify, error) { - _dataList := make([]*GameequipIntensifyData, 0, len(_buf)) - dataMap := make(map[int32]*GameequipIntensifyData) +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 := DeserializeGameequipIntensifyData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipIntensifyData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GameequipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquipIntensify{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameequipIntensify) GetDataMap() map[int32]*GameequipIntensifyData { +func (table *GameEquipIntensify) GetDataMap() map[int32]*GameEquipIntensifyData { return table._dataMap } -func (table *GameequipIntensify) GetDataList() []*GameequipIntensifyData { +func (table *GameEquipIntensify) GetDataList() []*GameEquipIntensifyData { return table._dataList } -func (table *GameequipIntensify) Get(key int32) *GameequipIntensifyData { +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 e92a11dce..0cf199050 100644 --- a/sys/configure/structs/game.equipIntensifyData.go +++ b/sys/configure/structs/game.equipIntensifyData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameequipIntensifyData struct { +type GameEquipIntensifyData struct { Key int32 Star int32 Level int32 @@ -21,13 +21,13 @@ type GameequipIntensifyData struct { Num int32 } -const TypeId_GameequipIntensifyData = 1687417591 +const TypeId_GameEquipIntensifyData = -1943763209 -func (*GameequipIntensifyData) GetTypeId() int32 { - return 1687417591 +func (*GameEquipIntensifyData) GetTypeId() int32 { + return -1943763209 } -func (_v *GameequipIntensifyData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -52,8 +52,8 @@ func (_v *GameequipIntensifyData)Deserialize(_buf map[string]interface{}) (err e return } -func DeserializeGameequipIntensifyData(_buf map[string]interface{}) (*GameequipIntensifyData, error) { - v := &GameequipIntensifyData{} +func DeserializeGameEquipIntensifyData(_buf map[string]interface{}) (*GameEquipIntensifyData, error) { + v := &GameEquipIntensifyData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equipPos.go b/sys/configure/structs/game.equipPos.go index f85e2822b..ca53817fd 100644 --- a/sys/configure/structs/game.equipPos.go +++ b/sys/configure/structs/game.equipPos.go @@ -8,34 +8,34 @@ package cfg -type GameequipPos struct { - _dataMap map[int32]*GameequipPosData - _dataList []*GameequipPosData +type GameEquipPos struct { + _dataMap map[int32]*GameEquipPosData + _dataList []*GameEquipPosData } -func NewGameequipPos(_buf []map[string]interface{}) (*GameequipPos, error) { - _dataList := make([]*GameequipPosData, 0, len(_buf)) - dataMap := make(map[int32]*GameequipPosData) +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 := DeserializeGameequipPosData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipPosData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Pos] = _v } } - return &GameequipPos{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquipPos{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameequipPos) GetDataMap() map[int32]*GameequipPosData { +func (table *GameEquipPos) GetDataMap() map[int32]*GameEquipPosData { return table._dataMap } -func (table *GameequipPos) GetDataList() []*GameequipPosData { +func (table *GameEquipPos) GetDataList() []*GameEquipPosData { return table._dataList } -func (table *GameequipPos) Get(key int32) *GameequipPosData { +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 794fd4bd2..99715adba 100644 --- a/sys/configure/structs/game.equipPosData.go +++ b/sys/configure/structs/game.equipPosData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type GameequipPosData struct { +type GameEquipPosData struct { Pos int32 Suitnum int32 Leadlibrary []string Addlibrary []string } -const TypeId_GameequipPosData = 487964234 +const TypeId_GameEquipPosData = 296047178 -func (*GameequipPosData) GetTypeId() int32 { - return 487964234 +func (*GameEquipPosData) GetTypeId() int32 { + return 296047178 } -func (_v *GameequipPosData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } { @@ -57,8 +57,8 @@ func (_v *GameequipPosData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameequipPosData(_buf map[string]interface{}) (*GameequipPosData, error) { - v := &GameequipPosData{} +func DeserializeGameEquipPosData(_buf map[string]interface{}) (*GameEquipPosData, error) { + v := &GameEquipPosData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.equipSuit.go b/sys/configure/structs/game.equipSuit.go index c26d343a6..e22d4d2b6 100644 --- a/sys/configure/structs/game.equipSuit.go +++ b/sys/configure/structs/game.equipSuit.go @@ -8,34 +8,34 @@ package cfg -type GameequipSuit struct { - _dataMap map[int32]*GameequipSuitData - _dataList []*GameequipSuitData +type GameEquipSuit struct { + _dataMap map[int32]*GameEquipSuitData + _dataList []*GameEquipSuitData } -func NewGameequipSuit(_buf []map[string]interface{}) (*GameequipSuit, error) { - _dataList := make([]*GameequipSuitData, 0, len(_buf)) - dataMap := make(map[int32]*GameequipSuitData) +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 := DeserializeGameequipSuitData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameEquipSuitData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Suittype] = _v } } - return &GameequipSuit{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameEquipSuit{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameequipSuit) GetDataMap() map[int32]*GameequipSuitData { +func (table *GameEquipSuit) GetDataMap() map[int32]*GameEquipSuitData { return table._dataMap } -func (table *GameequipSuit) GetDataList() []*GameequipSuitData { +func (table *GameEquipSuit) GetDataList() []*GameEquipSuitData { return table._dataList } -func (table *GameequipSuit) Get(key int32) *GameequipSuitData { +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 a0cef2cb5..2f83efbfa 100644 --- a/sys/configure/structs/game.equipSuitData.go +++ b/sys/configure/structs/game.equipSuitData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameequipSuitData struct { +type GameEquipSuitData struct { Suittype int32 Suitnum int32 Skill int32 @@ -18,13 +18,13 @@ type GameequipSuitData struct { Skillintr string } -const TypeId_GameequipSuitData = -332303445 +const TypeId_GameEquipSuitData = -1986764885 -func (*GameequipSuitData) GetTypeId() int32 { - return -332303445 +func (*GameEquipSuitData) GetTypeId() int32 { + return -1986764885 } -func (_v *GameequipSuitData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -33,8 +33,8 @@ func (_v *GameequipSuitData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameequipSuitData(_buf map[string]interface{}) (*GameequipSuitData, error) { - v := &GameequipSuitData{} +func DeserializeGameEquipSuitData(_buf map[string]interface{}) (*GameEquipSuitData, error) { + v := &GameEquipSuitData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.extservers.go b/sys/configure/structs/game.extservers.go index 3d923d1ff..88f730c74 100644 --- a/sys/configure/structs/game.extservers.go +++ b/sys/configure/structs/game.extservers.go @@ -8,34 +8,34 @@ package cfg -type Gameextservers struct { - _dataMap map[int32]*GameextserversData - _dataList []*GameextserversData +type GameExtservers struct { + _dataMap map[int32]*GameExtserversData + _dataList []*GameExtserversData } -func NewGameextservers(_buf []map[string]interface{}) (*Gameextservers, error) { - _dataList := make([]*GameextserversData, 0, len(_buf)) - dataMap := make(map[int32]*GameextserversData) +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 := DeserializeGameextserversData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameExtserversData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Index] = _v } } - return &Gameextservers{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameExtservers{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameextservers) GetDataMap() map[int32]*GameextserversData { +func (table *GameExtservers) GetDataMap() map[int32]*GameExtserversData { return table._dataMap } -func (table *Gameextservers) GetDataList() []*GameextserversData { +func (table *GameExtservers) GetDataList() []*GameExtserversData { return table._dataList } -func (table *Gameextservers) Get(key int32) *GameextserversData { +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 a76cf3ec7..82d2b4f25 100644 --- a/sys/configure/structs/game.extserversData.go +++ b/sys/configure/structs/game.extserversData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameextserversData struct { +type GameExtserversData struct { Index int32 Name string Ips string @@ -18,13 +18,13 @@ type GameextserversData struct { Sid string } -const TypeId_GameextserversData = -245856747 +const TypeId_GameExtserversData = 5446165 -func (*GameextserversData) GetTypeId() int32 { - return -245856747 +func (*GameExtserversData) GetTypeId() int32 { + return 5446165 } -func (_v *GameextserversData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -33,8 +33,8 @@ func (_v *GameextserversData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGameextserversData(_buf map[string]interface{}) (*GameextserversData, error) { - v := &GameextserversData{} +func DeserializeGameExtserversData(_buf map[string]interface{}) (*GameExtserversData, error) { + v := &GameExtserversData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.facemod.go b/sys/configure/structs/game.facemod.go index 172370f02..83281f007 100644 --- a/sys/configure/structs/game.facemod.go +++ b/sys/configure/structs/game.facemod.go @@ -8,34 +8,34 @@ package cfg -type Gamefacemod struct { - _dataMap map[int32]*GamefacemodData - _dataList []*GamefacemodData +type GameFacemod struct { + _dataMap map[int32]*GameFacemodData + _dataList []*GameFacemodData } -func NewGamefacemod(_buf []map[string]interface{}) (*Gamefacemod, error) { - _dataList := make([]*GamefacemodData, 0, len(_buf)) - dataMap := make(map[int32]*GamefacemodData) +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 := DeserializeGamefacemodData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameFacemodData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gamefacemod{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameFacemod{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamefacemod) GetDataMap() map[int32]*GamefacemodData { +func (table *GameFacemod) GetDataMap() map[int32]*GameFacemodData { return table._dataMap } -func (table *Gamefacemod) GetDataList() []*GamefacemodData { +func (table *GameFacemod) GetDataList() []*GameFacemodData { return table._dataList } -func (table *Gamefacemod) Get(key int32) *GamefacemodData { +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 50067518d..58c772028 100644 --- a/sys/configure/structs/game.facemodData.go +++ b/sys/configure/structs/game.facemodData.go @@ -10,19 +10,19 @@ package cfg import "errors" -type GamefacemodData struct { +type GameFacemodData struct { Id int32 Suitintr string Figure []*GameFigure } -const TypeId_GamefacemodData = -214755117 +const TypeId_GameFacemodData = 610338003 -func (*GamefacemodData) GetTypeId() int32 { - return -214755117 +func (*GameFacemodData) GetTypeId() int32 { + return 610338003 } -func (_v *GamefacemodData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } { @@ -42,8 +42,8 @@ func (_v *GamefacemodData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamefacemodData(_buf map[string]interface{}) (*GamefacemodData, error) { - v := &GamefacemodData{} +func DeserializeGameFacemodData(_buf map[string]interface{}) (*GameFacemodData, error) { + v := &GameFacemodData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.global.go b/sys/configure/structs/game.global.go index 2233d0ae4..def52cfd1 100644 --- a/sys/configure/structs/game.global.go +++ b/sys/configure/structs/game.global.go @@ -8,34 +8,34 @@ package cfg -type Gameglobal struct { - _dataMap map[int32]*GameglobalData - _dataList []*GameglobalData +type GameGlobal struct { + _dataMap map[int32]*GameGlobalData + _dataList []*GameGlobalData } -func NewGameglobal(_buf []map[string]interface{}) (*Gameglobal, error) { - _dataList := make([]*GameglobalData, 0, len(_buf)) - dataMap := make(map[int32]*GameglobalData) +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 := DeserializeGameglobalData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameGlobalData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.MaxChar] = _v } } - return &Gameglobal{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameGlobal{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameglobal) GetDataMap() map[int32]*GameglobalData { +func (table *GameGlobal) GetDataMap() map[int32]*GameGlobalData { return table._dataMap } -func (table *Gameglobal) GetDataList() []*GameglobalData { +func (table *GameGlobal) GetDataList() []*GameGlobalData { return table._dataList } -func (table *Gameglobal) Get(key int32) *GameglobalData { +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 27d2ddb76..2a01f08a7 100644 --- a/sys/configure/structs/game.globalData.go +++ b/sys/configure/structs/game.globalData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameglobalData struct { +type GameGlobalData struct { MaxChar int32 TaskReset int32 InitGold int32 @@ -73,13 +73,13 @@ type GameglobalData struct { SmithyMaxtime int32 } -const TypeId_GameglobalData = -518904471 +const TypeId_GameGlobalData = 477542761 -func (*GameglobalData) GetTypeId() int32 { - return -518904471 +func (*GameGlobalData) GetTypeId() int32 { + return 477542761 } -func (_v *GameglobalData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -208,8 +208,8 @@ func (_v *GameglobalData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameglobalData(_buf map[string]interface{}) (*GameglobalData, error) { - v := &GameglobalData{} +func DeserializeGameGlobalData(_buf map[string]interface{}) (*GameGlobalData, error) { + v := &GameGlobalData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.hero.go b/sys/configure/structs/game.hero.go index a491cbcd9..65b85fee4 100644 --- a/sys/configure/structs/game.hero.go +++ b/sys/configure/structs/game.hero.go @@ -8,34 +8,34 @@ package cfg -type Gamehero struct { - _dataMap map[string]*GameheroData - _dataList []*GameheroData +type GameHero struct { + _dataMap map[string]*GameHeroData + _dataList []*GameHeroData } -func NewGamehero(_buf []map[string]interface{}) (*Gamehero, error) { - _dataList := make([]*GameheroData, 0, len(_buf)) - dataMap := make(map[string]*GameheroData) +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 := DeserializeGameheroData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Hid] = _v } } - return &Gamehero{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHero{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamehero) GetDataMap() map[string]*GameheroData { +func (table *GameHero) GetDataMap() map[string]*GameHeroData { return table._dataMap } -func (table *Gamehero) GetDataList() []*GameheroData { +func (table *GameHero) GetDataList() []*GameHeroData { return table._dataList } -func (table *Gamehero) Get(key string) *GameheroData { +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 4905f19e4..5f74eff6e 100644 --- a/sys/configure/structs/game.heroAwaken.go +++ b/sys/configure/structs/game.heroAwaken.go @@ -8,34 +8,34 @@ package cfg -type GameheroAwaken struct { - _dataMap map[int32]*GameheroAwakenData - _dataList []*GameheroAwakenData +type GameHeroAwaken struct { + _dataMap map[int32]*GameHeroAwakenData + _dataList []*GameHeroAwakenData } -func NewGameheroAwaken(_buf []map[string]interface{}) (*GameheroAwaken, error) { - _dataList := make([]*GameheroAwakenData, 0, len(_buf)) - dataMap := make(map[int32]*GameheroAwakenData) +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 := DeserializeGameheroAwakenData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroAwakenData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GameheroAwaken{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroAwaken{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroAwaken) GetDataMap() map[int32]*GameheroAwakenData { +func (table *GameHeroAwaken) GetDataMap() map[int32]*GameHeroAwakenData { return table._dataMap } -func (table *GameheroAwaken) GetDataList() []*GameheroAwakenData { +func (table *GameHeroAwaken) GetDataList() []*GameHeroAwakenData { return table._dataList } -func (table *GameheroAwaken) Get(key int32) *GameheroAwakenData { +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 d2dfd90cb..5366f5e7b 100644 --- a/sys/configure/structs/game.heroAwakenData.go +++ b/sys/configure/structs/game.heroAwakenData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroAwakenData struct { +type GameHeroAwakenData struct { Key int32 Hid string Phase int32 @@ -20,13 +20,13 @@ type GameheroAwakenData struct { Phaseneed []*Gameatn } -const TypeId_GameheroAwakenData = -1396976663 +const TypeId_GameHeroAwakenData = -1145673751 -func (*GameheroAwakenData) GetTypeId() int32 { - return -1396976663 +func (*GameHeroAwakenData) GetTypeId() int32 { + return -1145673751 } -func (_v *GameheroAwakenData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -63,8 +63,8 @@ func (_v *GameheroAwakenData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGameheroAwakenData(_buf map[string]interface{}) (*GameheroAwakenData, error) { - v := &GameheroAwakenData{} +func DeserializeGameHeroAwakenData(_buf map[string]interface{}) (*GameHeroAwakenData, error) { + v := &GameHeroAwakenData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroData.go b/sys/configure/structs/game.heroData.go index d60a9d4d4..f33cdb920 100644 --- a/sys/configure/structs/game.heroData.go +++ b/sys/configure/structs/game.heroData.go @@ -11,7 +11,7 @@ package cfg import "errors" import "bright/serialization" -type GameheroData struct { +type GameHeroData struct { Hid string Name string Star int32 @@ -39,13 +39,13 @@ type GameheroData struct { Camerainterval float32 } -const TypeId_GameheroData = 650222912 +const TypeId_GameHeroData = 1513828672 -func (*GameheroData) GetTypeId() int32 { - return 650222912 +func (*GameHeroData) GetTypeId() int32 { + return 1513828672 } -func (_v *GameheroData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -107,8 +107,8 @@ func (_v *GameheroData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameheroData(_buf map[string]interface{}) (*GameheroData, error) { - v := &GameheroData{} +func DeserializeGameHeroData(_buf map[string]interface{}) (*GameHeroData, error) { + v := &GameHeroData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroExp.go b/sys/configure/structs/game.heroExp.go index e9bcf06b9..d25d07f38 100644 --- a/sys/configure/structs/game.heroExp.go +++ b/sys/configure/structs/game.heroExp.go @@ -8,34 +8,34 @@ package cfg -type GameheroExp struct { - _dataMap map[string]*GameheroExpData - _dataList []*GameheroExpData +type GameHeroExp struct { + _dataMap map[string]*GameHeroExpData + _dataList []*GameHeroExpData } -func NewGameheroExp(_buf []map[string]interface{}) (*GameheroExp, error) { - _dataList := make([]*GameheroExpData, 0, len(_buf)) - dataMap := make(map[string]*GameheroExpData) +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 := DeserializeGameheroExpData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroExpData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Hid] = _v } } - return &GameheroExp{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroExp{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroExp) GetDataMap() map[string]*GameheroExpData { +func (table *GameHeroExp) GetDataMap() map[string]*GameHeroExpData { return table._dataMap } -func (table *GameheroExp) GetDataList() []*GameheroExpData { +func (table *GameHeroExp) GetDataList() []*GameHeroExpData { return table._dataList } -func (table *GameheroExp) Get(key string) *GameheroExpData { +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 59a0cf1cf..0a2780c8d 100644 --- a/sys/configure/structs/game.heroExpData.go +++ b/sys/configure/structs/game.heroExpData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroExpData struct { +type GameHeroExpData struct { Hid string Name string Star int32 @@ -20,13 +20,13 @@ type GameheroExpData struct { Needgold int32 } -const TypeId_GameheroExpData = 2029779473 +const TypeId_GameHeroExpData = -1440094703 -func (*GameheroExpData) GetTypeId() int32 { - return 2029779473 +func (*GameHeroExpData) GetTypeId() int32 { + return -1440094703 } -func (_v *GameheroExpData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -37,8 +37,8 @@ func (_v *GameheroExpData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameheroExpData(_buf map[string]interface{}) (*GameheroExpData, error) { - v := &GameheroExpData{} +func DeserializeGameHeroExpData(_buf map[string]interface{}) (*GameHeroExpData, error) { + v := &GameHeroExpData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroLevelgrow.go b/sys/configure/structs/game.heroLevelgrow.go index ef187b27d..207f69c73 100644 --- a/sys/configure/structs/game.heroLevelgrow.go +++ b/sys/configure/structs/game.heroLevelgrow.go @@ -8,34 +8,34 @@ package cfg -type GameheroLevelgrow struct { - _dataMap map[string]*GameheroLevelgrowData - _dataList []*GameheroLevelgrowData +type GameHeroLevelgrow struct { + _dataMap map[string]*GameHeroLevelgrowData + _dataList []*GameHeroLevelgrowData } -func NewGameheroLevelgrow(_buf []map[string]interface{}) (*GameheroLevelgrow, error) { - _dataList := make([]*GameheroLevelgrowData, 0, len(_buf)) - dataMap := make(map[string]*GameheroLevelgrowData) +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 := DeserializeGameheroLevelgrowData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroLevelgrowData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameheroLevelgrow{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroLevelgrow{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroLevelgrow) GetDataMap() map[string]*GameheroLevelgrowData { +func (table *GameHeroLevelgrow) GetDataMap() map[string]*GameHeroLevelgrowData { return table._dataMap } -func (table *GameheroLevelgrow) GetDataList() []*GameheroLevelgrowData { +func (table *GameHeroLevelgrow) GetDataList() []*GameHeroLevelgrowData { return table._dataList } -func (table *GameheroLevelgrow) Get(key string) *GameheroLevelgrowData { +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 499ac0d44..2a1409b85 100644 --- a/sys/configure/structs/game.heroLevelgrowData.go +++ b/sys/configure/structs/game.heroLevelgrowData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroLevelgrowData struct { +type GameHeroLevelgrowData struct { Id string Hp int32 Atk int32 @@ -26,13 +26,13 @@ type GameheroLevelgrowData struct { Speedgrow int32 } -const TypeId_GameheroLevelgrowData = 939442443 +const TypeId_GameHeroLevelgrowData = 1376496907 -func (*GameheroLevelgrowData) GetTypeId() int32 { - return 939442443 +func (*GameHeroLevelgrowData) GetTypeId() int32 { + return 1376496907 } -func (_v *GameheroLevelgrowData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -49,8 +49,8 @@ func (_v *GameheroLevelgrowData)Deserialize(_buf map[string]interface{}) (err er return } -func DeserializeGameheroLevelgrowData(_buf map[string]interface{}) (*GameheroLevelgrowData, error) { - v := &GameheroLevelgrowData{} +func DeserializeGameHeroLevelgrowData(_buf map[string]interface{}) (*GameHeroLevelgrowData, error) { + v := &GameHeroLevelgrowData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroLevelup.go b/sys/configure/structs/game.heroLevelup.go index 5eb2ae194..9510b8537 100644 --- a/sys/configure/structs/game.heroLevelup.go +++ b/sys/configure/structs/game.heroLevelup.go @@ -8,34 +8,34 @@ package cfg -type GameheroLevelup struct { - _dataMap map[int32]*GameheroLevelupData - _dataList []*GameheroLevelupData +type GameHeroLevelup struct { + _dataMap map[int32]*GameHeroLevelupData + _dataList []*GameHeroLevelupData } -func NewGameheroLevelup(_buf []map[string]interface{}) (*GameheroLevelup, error) { - _dataList := make([]*GameheroLevelupData, 0, len(_buf)) - dataMap := make(map[int32]*GameheroLevelupData) +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 := DeserializeGameheroLevelupData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroLevelupData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Level] = _v } } - return &GameheroLevelup{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroLevelup{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroLevelup) GetDataMap() map[int32]*GameheroLevelupData { +func (table *GameHeroLevelup) GetDataMap() map[int32]*GameHeroLevelupData { return table._dataMap } -func (table *GameheroLevelup) GetDataList() []*GameheroLevelupData { +func (table *GameHeroLevelup) GetDataList() []*GameHeroLevelupData { return table._dataList } -func (table *GameheroLevelup) Get(key int32) *GameheroLevelupData { +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 c043f49c9..529b8e1b9 100644 --- a/sys/configure/structs/game.heroLevelupData.go +++ b/sys/configure/structs/game.heroLevelupData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroLevelupData struct { +type GameHeroLevelupData struct { Level int32 Heroexp []*Gameatn Hp float32 @@ -18,13 +18,13 @@ type GameheroLevelupData struct { Def float32 } -const TypeId_GameheroLevelupData = 1582994195 +const TypeId_GameHeroLevelupData = 783449875 -func (*GameheroLevelupData) GetTypeId() int32 { - return 1582994195 +func (*GameHeroLevelupData) GetTypeId() int32 { + return 783449875 } -func (_v *GameheroLevelupData)Deserialize(_buf map[string]interface{}) (err error) { +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{} @@ -46,8 +46,8 @@ func (_v *GameheroLevelupData)Deserialize(_buf map[string]interface{}) (err erro return } -func DeserializeGameheroLevelupData(_buf map[string]interface{}) (*GameheroLevelupData, error) { - v := &GameheroLevelupData{} +func DeserializeGameHeroLevelupData(_buf map[string]interface{}) (*GameHeroLevelupData, error) { + v := &GameHeroLevelupData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroMethod.go b/sys/configure/structs/game.heroMethod.go index e1dd565f9..294f3f4f2 100644 --- a/sys/configure/structs/game.heroMethod.go +++ b/sys/configure/structs/game.heroMethod.go @@ -8,34 +8,34 @@ package cfg -type GameheroMethod struct { - _dataMap map[string]*GameheroMethodData - _dataList []*GameheroMethodData +type GameHeroMethod struct { + _dataMap map[string]*GameHeroMethodData + _dataList []*GameHeroMethodData } -func NewGameheroMethod(_buf []map[string]interface{}) (*GameheroMethod, error) { - _dataList := make([]*GameheroMethodData, 0, len(_buf)) - dataMap := make(map[string]*GameheroMethodData) +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 := DeserializeGameheroMethodData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroMethodData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Hid] = _v } } - return &GameheroMethod{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroMethod{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroMethod) GetDataMap() map[string]*GameheroMethodData { +func (table *GameHeroMethod) GetDataMap() map[string]*GameHeroMethodData { return table._dataMap } -func (table *GameheroMethod) GetDataList() []*GameheroMethodData { +func (table *GameHeroMethod) GetDataList() []*GameHeroMethodData { return table._dataList } -func (table *GameheroMethod) Get(key string) *GameheroMethodData { +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 5a3bac595..12835a9dc 100644 --- a/sys/configure/structs/game.heroMethodData.go +++ b/sys/configure/structs/game.heroMethodData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroMethodData struct { +type GameHeroMethodData struct { Hid string Herointr string EquipSuit1 []int32 @@ -21,13 +21,13 @@ type GameheroMethodData struct { Pro3 int32 } -const TypeId_GameheroMethodData = -622558911 +const TypeId_GameHeroMethodData = -371255999 -func (*GameheroMethodData) GetTypeId() int32 { - return -622558911 +func (*GameHeroMethodData) GetTypeId() int32 { + return -371255999 } -func (_v *GameheroMethodData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } } { @@ -78,8 +78,8 @@ func (_v *GameheroMethodData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGameheroMethodData(_buf map[string]interface{}) (*GameheroMethodData, error) { - v := &GameheroMethodData{} +func DeserializeGameHeroMethodData(_buf map[string]interface{}) (*GameHeroMethodData, error) { + v := &GameHeroMethodData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroResonance.go b/sys/configure/structs/game.heroResonance.go index 250c3a2ab..6cbf0e978 100644 --- a/sys/configure/structs/game.heroResonance.go +++ b/sys/configure/structs/game.heroResonance.go @@ -8,34 +8,34 @@ package cfg -type GameheroResonance struct { - _dataMap map[string]*GameheroResonanceData - _dataList []*GameheroResonanceData +type GameHeroResonance struct { + _dataMap map[string]*GameHeroResonanceData + _dataList []*GameHeroResonanceData } -func NewGameheroResonance(_buf []map[string]interface{}) (*GameheroResonance, error) { - _dataList := make([]*GameheroResonanceData, 0, len(_buf)) - dataMap := make(map[string]*GameheroResonanceData) +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 := DeserializeGameheroResonanceData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroResonanceData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Hid] = _v } } - return &GameheroResonance{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroResonance{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroResonance) GetDataMap() map[string]*GameheroResonanceData { +func (table *GameHeroResonance) GetDataMap() map[string]*GameHeroResonanceData { return table._dataMap } -func (table *GameheroResonance) GetDataList() []*GameheroResonanceData { +func (table *GameHeroResonance) GetDataList() []*GameHeroResonanceData { return table._dataList } -func (table *GameheroResonance) Get(key string) *GameheroResonanceData { +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 5ce87643c..9169b39cc 100644 --- a/sys/configure/structs/game.heroResonanceData.go +++ b/sys/configure/structs/game.heroResonanceData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroResonanceData struct { +type GameHeroResonanceData struct { Hid string Star int32 Energy int32 @@ -26,13 +26,13 @@ type GameheroResonanceData struct { Maxnum int32 } -const TypeId_GameheroResonanceData = 1802653762 +const TypeId_GameHeroResonanceData = -2055259070 -func (*GameheroResonanceData) GetTypeId() int32 { - return 1802653762 +func (*GameHeroResonanceData) GetTypeId() int32 { + return -2055259070 } -func (_v *GameheroResonanceData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -88,8 +88,8 @@ func (_v *GameheroResonanceData)Deserialize(_buf map[string]interface{}) (err er return } -func DeserializeGameheroResonanceData(_buf map[string]interface{}) (*GameheroResonanceData, error) { - v := &GameheroResonanceData{} +func DeserializeGameHeroResonanceData(_buf map[string]interface{}) (*GameHeroResonanceData, error) { + v := &GameHeroResonanceData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroSkillLevel.go b/sys/configure/structs/game.heroSkillLevel.go index 97cfe2904..1295c97bf 100644 --- a/sys/configure/structs/game.heroSkillLevel.go +++ b/sys/configure/structs/game.heroSkillLevel.go @@ -8,34 +8,34 @@ package cfg -type GameheroSkillLevel struct { - _dataMap map[int32]*GameheroSkillLevelData - _dataList []*GameheroSkillLevelData +type GameHeroSkillLevel struct { + _dataMap map[int32]*GameHeroSkillLevelData + _dataList []*GameHeroSkillLevelData } -func NewGameheroSkillLevel(_buf []map[string]interface{}) (*GameheroSkillLevel, error) { - _dataList := make([]*GameheroSkillLevelData, 0, len(_buf)) - dataMap := make(map[int32]*GameheroSkillLevelData) +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 := DeserializeGameheroSkillLevelData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroSkillLevelData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameheroSkillLevel{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroSkillLevel{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroSkillLevel) GetDataMap() map[int32]*GameheroSkillLevelData { +func (table *GameHeroSkillLevel) GetDataMap() map[int32]*GameHeroSkillLevelData { return table._dataMap } -func (table *GameheroSkillLevel) GetDataList() []*GameheroSkillLevelData { +func (table *GameHeroSkillLevel) GetDataList() []*GameHeroSkillLevelData { return table._dataList } -func (table *GameheroSkillLevel) Get(key int32) *GameheroSkillLevelData { +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 b320c3e47..5a6950f1b 100644 --- a/sys/configure/structs/game.heroSkillLevelData.go +++ b/sys/configure/structs/game.heroSkillLevelData.go @@ -10,18 +10,18 @@ package cfg import "errors" -type GameheroSkillLevelData struct { +type GameHeroSkillLevelData struct { Id int32 Probability []int32 } -const TypeId_GameheroSkillLevelData = -1505023981 +const TypeId_GameHeroSkillLevelData = -841237485 -func (*GameheroSkillLevelData) GetTypeId() int32 { - return -1505023981 +func (*GameHeroSkillLevelData) GetTypeId() int32 { + return -841237485 } -func (_v *GameheroSkillLevelData)Deserialize(_buf map[string]interface{}) (err error) { +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{} @@ -40,8 +40,8 @@ func (_v *GameheroSkillLevelData)Deserialize(_buf map[string]interface{}) (err e return } -func DeserializeGameheroSkillLevelData(_buf map[string]interface{}) (*GameheroSkillLevelData, error) { - v := &GameheroSkillLevelData{} +func DeserializeGameHeroSkillLevelData(_buf map[string]interface{}) (*GameHeroSkillLevelData, error) { + v := &GameHeroSkillLevelData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroStargrow.go b/sys/configure/structs/game.heroStargrow.go index e269d7565..9a8d64f0e 100644 --- a/sys/configure/structs/game.heroStargrow.go +++ b/sys/configure/structs/game.heroStargrow.go @@ -8,34 +8,34 @@ package cfg -type GameheroStargrow struct { - _dataMap map[int32]*GameheroStargrowData - _dataList []*GameheroStargrowData +type GameHeroStargrow struct { + _dataMap map[int32]*GameHeroStargrowData + _dataList []*GameHeroStargrowData } -func NewGameheroStargrow(_buf []map[string]interface{}) (*GameheroStargrow, error) { - _dataList := make([]*GameheroStargrowData, 0, len(_buf)) - dataMap := make(map[int32]*GameheroStargrowData) +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 := DeserializeGameheroStargrowData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroStargrowData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Star] = _v } } - return &GameheroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroStargrow{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroStargrow) GetDataMap() map[int32]*GameheroStargrowData { +func (table *GameHeroStargrow) GetDataMap() map[int32]*GameHeroStargrowData { return table._dataMap } -func (table *GameheroStargrow) GetDataList() []*GameheroStargrowData { +func (table *GameHeroStargrow) GetDataList() []*GameHeroStargrowData { return table._dataList } -func (table *GameheroStargrow) Get(key int32) *GameheroStargrowData { +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 7f7825245..5bbb33397 100644 --- a/sys/configure/structs/game.heroStargrowData.go +++ b/sys/configure/structs/game.heroStargrowData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroStargrowData struct { +type GameHeroStargrowData struct { Star int32 Level int32 Maxlevel int32 @@ -20,13 +20,13 @@ type GameheroStargrowData struct { StarupSpeed float32 } -const TypeId_GameheroStargrowData = 882965061 +const TypeId_GameHeroStargrowData = 1866894917 -func (*GameheroStargrowData) GetTypeId() int32 { - return 882965061 +func (*GameHeroStargrowData) GetTypeId() int32 { + return 1866894917 } -func (_v *GameheroStargrowData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -37,8 +37,8 @@ func (_v *GameheroStargrowData)Deserialize(_buf map[string]interface{}) (err err return } -func DeserializeGameheroStargrowData(_buf map[string]interface{}) (*GameheroStargrowData, error) { - v := &GameheroStargrowData{} +func DeserializeGameHeroStargrowData(_buf map[string]interface{}) (*GameHeroStargrowData, error) { + v := &GameHeroStargrowData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.heroStarup.go b/sys/configure/structs/game.heroStarup.go index 1243b3db6..fa7823c34 100644 --- a/sys/configure/structs/game.heroStarup.go +++ b/sys/configure/structs/game.heroStarup.go @@ -8,34 +8,34 @@ package cfg -type GameheroStarup struct { - _dataMap map[int32]*GameheroStarupData - _dataList []*GameheroStarupData +type GameHeroStarup struct { + _dataMap map[int32]*GameHeroStarupData + _dataList []*GameHeroStarupData } -func NewGameheroStarup(_buf []map[string]interface{}) (*GameheroStarup, error) { - _dataList := make([]*GameheroStarupData, 0, len(_buf)) - dataMap := make(map[int32]*GameheroStarupData) +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 := DeserializeGameheroStarupData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameHeroStarupData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GameheroStarup{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameHeroStarup{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameheroStarup) GetDataMap() map[int32]*GameheroStarupData { +func (table *GameHeroStarup) GetDataMap() map[int32]*GameHeroStarupData { return table._dataMap } -func (table *GameheroStarup) GetDataList() []*GameheroStarupData { +func (table *GameHeroStarup) GetDataList() []*GameHeroStarupData { return table._dataList } -func (table *GameheroStarup) Get(key int32) *GameheroStarupData { +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 40b86754d..31309d35d 100644 --- a/sys/configure/structs/game.heroStarupData.go +++ b/sys/configure/structs/game.heroStarupData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameheroStarupData struct { +type GameHeroStarupData struct { Key int32 Id string Star int32 @@ -23,13 +23,13 @@ type GameheroStarupData struct { Gold int32 } -const TypeId_GameheroStarupData = -1429351731 +const TypeId_GameHeroStarupData = -1178048819 -func (*GameheroStarupData) GetTypeId() int32 { - return -1429351731 +func (*GameHeroStarupData) GetTypeId() int32 { + return -1178048819 } -func (_v *GameheroStarupData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -56,8 +56,8 @@ func (_v *GameheroStarupData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGameheroStarupData(_buf map[string]interface{}) (*GameheroStarupData, error) { - v := &GameheroStarupData{} +func DeserializeGameHeroStarupData(_buf map[string]interface{}) (*GameHeroStarupData, error) { + v := &GameHeroStarupData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.initial.go b/sys/configure/structs/game.initial.go index aa67771f6..54c5afb4d 100644 --- a/sys/configure/structs/game.initial.go +++ b/sys/configure/structs/game.initial.go @@ -8,34 +8,34 @@ package cfg -type Gameinitial struct { - _dataMap map[string]*GameinitialData - _dataList []*GameinitialData +type GameInitial struct { + _dataMap map[string]*GameInitialData + _dataList []*GameInitialData } -func NewGameinitial(_buf []map[string]interface{}) (*Gameinitial, error) { - _dataList := make([]*GameinitialData, 0, len(_buf)) - dataMap := make(map[string]*GameinitialData) +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 := DeserializeGameinitialData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameInitialData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Index] = _v } } - return &Gameinitial{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameInitial{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameinitial) GetDataMap() map[string]*GameinitialData { +func (table *GameInitial) GetDataMap() map[string]*GameInitialData { return table._dataMap } -func (table *Gameinitial) GetDataList() []*GameinitialData { +func (table *GameInitial) GetDataList() []*GameInitialData { return table._dataList } -func (table *Gameinitial) Get(key string) *GameinitialData { +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 53d0c30ff..7e179f1f1 100644 --- a/sys/configure/structs/game.initialData.go +++ b/sys/configure/structs/game.initialData.go @@ -10,18 +10,18 @@ package cfg import "errors" -type GameinitialData struct { +type GameInitialData struct { Index string Var []*Gameatn } -const TypeId_GameinitialData = -1101258478 +const TypeId_GameInitialData = -276165358 -func (*GameinitialData) GetTypeId() int32 { - return -1101258478 +func (*GameInitialData) GetTypeId() int32 { + return -276165358 } -func (_v *GameinitialData)Deserialize(_buf map[string]interface{}) (err error) { +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{} @@ -40,8 +40,8 @@ func (_v *GameinitialData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameinitialData(_buf map[string]interface{}) (*GameinitialData, error) { - v := &GameinitialData{} +func DeserializeGameInitialData(_buf map[string]interface{}) (*GameInitialData, error) { + v := &GameInitialData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.item.go b/sys/configure/structs/game.item.go index c1a3cf3ff..9c385c8bb 100644 --- a/sys/configure/structs/game.item.go +++ b/sys/configure/structs/game.item.go @@ -8,34 +8,34 @@ package cfg -type Gameitem struct { - _dataMap map[string]*GameitemData - _dataList []*GameitemData +type GameItem struct { + _dataMap map[string]*GameItemData + _dataList []*GameItemData } -func NewGameitem(_buf []map[string]interface{}) (*Gameitem, error) { - _dataList := make([]*GameitemData, 0, len(_buf)) - dataMap := make(map[string]*GameitemData) +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 := DeserializeGameitemData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameItemData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gameitem{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameItem{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameitem) GetDataMap() map[string]*GameitemData { +func (table *GameItem) GetDataMap() map[string]*GameItemData { return table._dataMap } -func (table *Gameitem) GetDataList() []*GameitemData { +func (table *GameItem) GetDataList() []*GameItemData { return table._dataList } -func (table *Gameitem) Get(key string) *GameitemData { +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 78a60e366..9d07d193c 100644 --- a/sys/configure/structs/game.itemData.go +++ b/sys/configure/structs/game.itemData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameitemData struct { +type GameItemData struct { Id string Name string Usetype int32 @@ -36,13 +36,13 @@ type GameitemData struct { SynthetizeDeplete []*Gameatn } -const TypeId_GameitemData = -1848306727 +const TypeId_GameItemData = -984700967 -func (*GameitemData) GetTypeId() int32 { - return -1848306727 +func (*GameItemData) GetTypeId() int32 { + return -984700967 } -func (_v *GameitemData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -95,8 +95,8 @@ func (_v *GameitemData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameitemData(_buf map[string]interface{}) (*GameitemData, error) { - v := &GameitemData{} +func DeserializeGameItemData(_buf map[string]interface{}) (*GameItemData, error) { + v := &GameItemData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.kungfu_masterworker.go b/sys/configure/structs/game.kungfu_masterworker.go deleted file mode 100644 index 618f622e8..000000000 --- a/sys/configure/structs/game.kungfu_masterworker.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 Gamekungfu_masterworker struct { - _dataMap map[int32]*Gamekungfu_masterworkerData - _dataList []*Gamekungfu_masterworkerData -} - -func NewGamekungfu_masterworker(_buf []map[string]interface{}) (*Gamekungfu_masterworker, error) { - _dataList := make([]*Gamekungfu_masterworkerData, 0, len(_buf)) - dataMap := make(map[int32]*Gamekungfu_masterworkerData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGamekungfu_masterworkerData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Level] = _v - } - } - return &Gamekungfu_masterworker{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Gamekungfu_masterworker) GetDataMap() map[int32]*Gamekungfu_masterworkerData { - return table._dataMap -} - -func (table *Gamekungfu_masterworker) GetDataList() []*Gamekungfu_masterworkerData { - return table._dataList -} - -func (table *Gamekungfu_masterworker) Get(key int32) *Gamekungfu_masterworkerData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/game.kungfu_unlock.go b/sys/configure/structs/game.kungfu_unlock.go deleted file mode 100644 index b6ca3e5c0..000000000 --- a/sys/configure/structs/game.kungfu_unlock.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 Gamekungfu_unlock struct { - _dataMap map[int32]*Gamekungfu_unlockData - _dataList []*Gamekungfu_unlockData -} - -func NewGamekungfu_unlock(_buf []map[string]interface{}) (*Gamekungfu_unlock, error) { - _dataList := make([]*Gamekungfu_unlockData, 0, len(_buf)) - dataMap := make(map[int32]*Gamekungfu_unlockData) - for _, _ele_ := range _buf { - if _v, err2 := DeserializeGamekungfu_unlockData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &Gamekungfu_unlock{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Gamekungfu_unlock) GetDataMap() map[int32]*Gamekungfu_unlockData { - return table._dataMap -} - -func (table *Gamekungfu_unlock) GetDataList() []*Gamekungfu_unlockData { - return table._dataList -} - -func (table *Gamekungfu_unlock) Get(key int32) *Gamekungfu_unlockData { - return table._dataMap[key] -} - - diff --git a/sys/configure/structs/game.language.go b/sys/configure/structs/game.language.go deleted file mode 100644 index 1aef1feb2..000000000 --- a/sys/configure/structs/game.language.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 Gamelanguage struct { - _dataMap map[string]*GamelanguageData - _dataList []*GamelanguageData -} - -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 := DeserializeGamelanguageData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Index] = _v - } - } - return &Gamelanguage{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Gamelanguage) GetDataMap() map[string]*GamelanguageData { - return table._dataMap -} - -func (table *Gamelanguage) GetDataList() []*GamelanguageData { - return table._dataList -} - -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 deleted file mode 100644 index f70c5d7b0..000000000 --- a/sys/configure/structs/game.languageData.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 GamelanguageData struct { - Index string - Keycode string -} - -const TypeId_GamelanguageData = -1436621922 - -func (*GamelanguageData) GetTypeId() int32 { - return -1436621922 -} - -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 23bf3db2c..f226e3882 100644 --- a/sys/configure/structs/game.mainlineChapter.go +++ b/sys/configure/structs/game.mainlineChapter.go @@ -8,34 +8,34 @@ package cfg -type GamemainlineChapter struct { - _dataMap map[int32]*GamemainlineChapterData - _dataList []*GamemainlineChapterData +type GameMainlineChapter struct { + _dataMap map[int32]*GameMainlineChapterData + _dataList []*GameMainlineChapterData } -func NewGamemainlineChapter(_buf []map[string]interface{}) (*GamemainlineChapter, error) { - _dataList := make([]*GamemainlineChapterData, 0, len(_buf)) - dataMap := make(map[int32]*GamemainlineChapterData) +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 := DeserializeGamemainlineChapterData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMainlineChapterData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GamemainlineChapter{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMainlineChapter{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamemainlineChapter) GetDataMap() map[int32]*GamemainlineChapterData { +func (table *GameMainlineChapter) GetDataMap() map[int32]*GameMainlineChapterData { return table._dataMap } -func (table *GamemainlineChapter) GetDataList() []*GamemainlineChapterData { +func (table *GameMainlineChapter) GetDataList() []*GameMainlineChapterData { return table._dataList } -func (table *GamemainlineChapter) Get(key int32) *GamemainlineChapterData { +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 9bc2fa3c1..ed0b16720 100644 --- a/sys/configure/structs/game.mainlineChapterData.go +++ b/sys/configure/structs/game.mainlineChapterData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemainlineChapterData struct { +type GameMainlineChapterData struct { Id int32 Name string Intensity string @@ -23,13 +23,13 @@ type GamemainlineChapterData struct { Award []*Gameatn } -const TypeId_GamemainlineChapterData = 35012142 +const TypeId_GameMainlineChapterData = -862442962 -func (*GamemainlineChapterData) GetTypeId() int32 { - return 35012142 +func (*GameMainlineChapterData) GetTypeId() int32 { + return -862442962 } -func (_v *GamemainlineChapterData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -69,8 +69,8 @@ func (_v *GamemainlineChapterData)Deserialize(_buf map[string]interface{}) (err return } -func DeserializeGamemainlineChapterData(_buf map[string]interface{}) (*GamemainlineChapterData, error) { - v := &GamemainlineChapterData{} +func DeserializeGameMainlineChapterData(_buf map[string]interface{}) (*GameMainlineChapterData, error) { + v := &GameMainlineChapterData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.mainlineEasy.go b/sys/configure/structs/game.mainlineEasy.go index f0912cda3..5a9275e10 100644 --- a/sys/configure/structs/game.mainlineEasy.go +++ b/sys/configure/structs/game.mainlineEasy.go @@ -8,34 +8,34 @@ package cfg -type GamemainlineEasy struct { - _dataMap map[int32]*GamemainlineEasyData - _dataList []*GamemainlineEasyData +type GameMainlineEasy struct { + _dataMap map[int32]*GameMainlineEasyData + _dataList []*GameMainlineEasyData } -func NewGamemainlineEasy(_buf []map[string]interface{}) (*GamemainlineEasy, error) { - _dataList := make([]*GamemainlineEasyData, 0, len(_buf)) - dataMap := make(map[int32]*GamemainlineEasyData) +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 := DeserializeGamemainlineEasyData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMainlineEasyData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GamemainlineEasy{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMainlineEasy{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamemainlineEasy) GetDataMap() map[int32]*GamemainlineEasyData { +func (table *GameMainlineEasy) GetDataMap() map[int32]*GameMainlineEasyData { return table._dataMap } -func (table *GamemainlineEasy) GetDataList() []*GamemainlineEasyData { +func (table *GameMainlineEasy) GetDataList() []*GameMainlineEasyData { return table._dataList } -func (table *GamemainlineEasy) Get(key int32) *GamemainlineEasyData { +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 79700f35e..612968c4b 100644 --- a/sys/configure/structs/game.mainlineEasyData.go +++ b/sys/configure/structs/game.mainlineEasyData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemainlineEasyData struct { +type GameMainlineEasyData struct { Id int32 Previoustage int32 Order int32 @@ -42,13 +42,13 @@ type GamemainlineEasyData struct { Condition []int32 } -const TypeId_GamemainlineEasyData = 1212270997 +const TypeId_GameMainlineEasyData = -2098766443 -func (*GamemainlineEasyData) GetTypeId() int32 { - return 1212270997 +func (*GameMainlineEasyData) GetTypeId() int32 { + return -2098766443 } -func (_v *GamemainlineEasyData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -159,8 +159,8 @@ func (_v *GamemainlineEasyData)Deserialize(_buf map[string]interface{}) (err err return } -func DeserializeGamemainlineEasyData(_buf map[string]interface{}) (*GamemainlineEasyData, error) { - v := &GamemainlineEasyData{} +func DeserializeGameMainlineEasyData(_buf map[string]interface{}) (*GameMainlineEasyData, error) { + v := &GameMainlineEasyData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.mainlineHard.go b/sys/configure/structs/game.mainlineHard.go index c8cb39291..834e0b590 100644 --- a/sys/configure/structs/game.mainlineHard.go +++ b/sys/configure/structs/game.mainlineHard.go @@ -8,34 +8,34 @@ package cfg -type GamemainlineHard struct { - _dataMap map[int32]*GamemainlineHardData - _dataList []*GamemainlineHardData +type GameMainlineHard struct { + _dataMap map[int32]*GameMainlineHardData + _dataList []*GameMainlineHardData } -func NewGamemainlineHard(_buf []map[string]interface{}) (*GamemainlineHard, error) { - _dataList := make([]*GamemainlineHardData, 0, len(_buf)) - dataMap := make(map[int32]*GamemainlineHardData) +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 := DeserializeGamemainlineHardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMainlineHardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GamemainlineHard{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMainlineHard{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamemainlineHard) GetDataMap() map[int32]*GamemainlineHardData { +func (table *GameMainlineHard) GetDataMap() map[int32]*GameMainlineHardData { return table._dataMap } -func (table *GamemainlineHard) GetDataList() []*GamemainlineHardData { +func (table *GameMainlineHard) GetDataList() []*GameMainlineHardData { return table._dataList } -func (table *GamemainlineHard) Get(key int32) *GamemainlineHardData { +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 0f3915ee2..b95303c54 100644 --- a/sys/configure/structs/game.mainlineHardData.go +++ b/sys/configure/structs/game.mainlineHardData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemainlineHardData struct { +type GameMainlineHardData struct { Id int32 Previoustage int32 Order int32 @@ -40,13 +40,13 @@ type GamemainlineHardData struct { Desc string } -const TypeId_GamemainlineHardData = 2097711614 +const TypeId_GameMainlineHardData = -1213325826 -func (*GamemainlineHardData) GetTypeId() int32 { - return 2097711614 +func (*GameMainlineHardData) GetTypeId() int32 { + return -1213325826 } -func (_v *GamemainlineHardData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -129,8 +129,8 @@ func (_v *GamemainlineHardData)Deserialize(_buf map[string]interface{}) (err err return } -func DeserializeGamemainlineHardData(_buf map[string]interface{}) (*GamemainlineHardData, error) { - v := &GamemainlineHardData{} +func DeserializeGameMainlineHardData(_buf map[string]interface{}) (*GameMainlineHardData, error) { + v := &GameMainlineHardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.mainlinePurgatory.go b/sys/configure/structs/game.mainlinePurgatory.go index d44298155..93492874d 100644 --- a/sys/configure/structs/game.mainlinePurgatory.go +++ b/sys/configure/structs/game.mainlinePurgatory.go @@ -8,34 +8,34 @@ package cfg -type GamemainlinePurgatory struct { - _dataMap map[int32]*GamemainlinePurgatoryData - _dataList []*GamemainlinePurgatoryData +type GameMainlinePurgatory struct { + _dataMap map[int32]*GameMainlinePurgatoryData + _dataList []*GameMainlinePurgatoryData } -func NewGamemainlinePurgatory(_buf []map[string]interface{}) (*GamemainlinePurgatory, error) { - _dataList := make([]*GamemainlinePurgatoryData, 0, len(_buf)) - dataMap := make(map[int32]*GamemainlinePurgatoryData) +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 := DeserializeGamemainlinePurgatoryData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMainlinePurgatoryData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GamemainlinePurgatory{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMainlinePurgatory{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamemainlinePurgatory) GetDataMap() map[int32]*GamemainlinePurgatoryData { +func (table *GameMainlinePurgatory) GetDataMap() map[int32]*GameMainlinePurgatoryData { return table._dataMap } -func (table *GamemainlinePurgatory) GetDataList() []*GamemainlinePurgatoryData { +func (table *GameMainlinePurgatory) GetDataList() []*GameMainlinePurgatoryData { return table._dataList } -func (table *GamemainlinePurgatory) Get(key int32) *GamemainlinePurgatoryData { +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 b5bbc8ceb..80c012487 100644 --- a/sys/configure/structs/game.mainlinePurgatoryData.go +++ b/sys/configure/structs/game.mainlinePurgatoryData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemainlinePurgatoryData struct { +type GameMainlinePurgatoryData struct { Id int32 Previoustage int32 Order int32 @@ -40,13 +40,13 @@ type GamemainlinePurgatoryData struct { Desc string } -const TypeId_GamemainlinePurgatoryData = 1760368970 +const TypeId_GameMainlinePurgatoryData = -1700526774 -func (*GamemainlinePurgatoryData) GetTypeId() int32 { - return 1760368970 +func (*GameMainlinePurgatoryData) GetTypeId() int32 { + return -1700526774 } -func (_v *GamemainlinePurgatoryData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -129,8 +129,8 @@ func (_v *GamemainlinePurgatoryData)Deserialize(_buf map[string]interface{}) (er return } -func DeserializeGamemainlinePurgatoryData(_buf map[string]interface{}) (*GamemainlinePurgatoryData, error) { - v := &GamemainlinePurgatoryData{} +func DeserializeGameMainlinePurgatoryData(_buf map[string]interface{}) (*GameMainlinePurgatoryData, error) { + v := &GameMainlinePurgatoryData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.model.go b/sys/configure/structs/game.model.go index c144ab0a3..2f7258f86 100644 --- a/sys/configure/structs/game.model.go +++ b/sys/configure/structs/game.model.go @@ -8,34 +8,34 @@ package cfg -type Gamemodel struct { - _dataMap map[int32]*GamemodelData - _dataList []*GamemodelData +type GameModel struct { + _dataMap map[int32]*GameModelData + _dataList []*GameModelData } -func NewGamemodel(_buf []map[string]interface{}) (*Gamemodel, error) { - _dataList := make([]*GamemodelData, 0, len(_buf)) - dataMap := make(map[int32]*GamemodelData) +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 := DeserializeGamemodelData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameModelData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gamemodel{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameModel{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamemodel) GetDataMap() map[int32]*GamemodelData { +func (table *GameModel) GetDataMap() map[int32]*GameModelData { return table._dataMap } -func (table *Gamemodel) GetDataList() []*GamemodelData { +func (table *GameModel) GetDataList() []*GameModelData { return table._dataList } -func (table *Gamemodel) Get(key int32) *GamemodelData { +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 70bb3a2cc..7194d3cfd 100644 --- a/sys/configure/structs/game.modelData.go +++ b/sys/configure/structs/game.modelData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemodelData struct { +type GameModelData struct { Id int32 Preson string Presonshow string @@ -22,13 +22,13 @@ type GamemodelData struct { Postxyz []float32 } -const TypeId_GamemodelData = -1307411593 +const TypeId_GameModelData = -305436809 -func (*GamemodelData) GetTypeId() int32 { - return -1307411593 +func (*GameModelData) GetTypeId() int32 { + return -305436809 } -func (_v *GamemodelData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -54,8 +54,8 @@ func (_v *GamemodelData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamemodelData(_buf map[string]interface{}) (*GamemodelData, error) { - v := &GamemodelData{} +func DeserializeGameModelData(_buf map[string]interface{}) (*GameModelData, error) { + v := &GameModelData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.monster.go b/sys/configure/structs/game.monster.go index 4a3a49a40..aaedeba01 100644 --- a/sys/configure/structs/game.monster.go +++ b/sys/configure/structs/game.monster.go @@ -8,34 +8,34 @@ package cfg -type Gamemonster struct { - _dataMap map[int32]*GamemonsterData - _dataList []*GamemonsterData +type GameMonster struct { + _dataMap map[int32]*GameMonsterData + _dataList []*GameMonsterData } -func NewGamemonster(_buf []map[string]interface{}) (*Gamemonster, error) { - _dataList := make([]*GamemonsterData, 0, len(_buf)) - dataMap := make(map[int32]*GamemonsterData) +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 := DeserializeGamemonsterData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMonsterData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.MonsterId] = _v } } - return &Gamemonster{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMonster{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamemonster) GetDataMap() map[int32]*GamemonsterData { +func (table *GameMonster) GetDataMap() map[int32]*GameMonsterData { return table._dataMap } -func (table *Gamemonster) GetDataList() []*GamemonsterData { +func (table *GameMonster) GetDataList() []*GameMonsterData { return table._dataList } -func (table *Gamemonster) Get(key int32) *GamemonsterData { +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 e1d154d5d..1ae728e22 100644 --- a/sys/configure/structs/game.monsterData.go +++ b/sys/configure/structs/game.monsterData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamemonsterData struct { +type GameMonsterData struct { MonsterId int32 HeroId string Name string @@ -18,13 +18,13 @@ type GamemonsterData struct { Equip string } -const TypeId_GamemonsterData = -793127256 +const TypeId_GameMonsterData = 31965864 -func (*GamemonsterData) GetTypeId() int32 { - return -793127256 +func (*GameMonsterData) GetTypeId() int32 { + return 31965864 } -func (_v *GamemonsterData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } } @@ -33,8 +33,8 @@ func (_v *GamemonsterData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamemonsterData(_buf map[string]interface{}) (*GamemonsterData, error) { - v := &GamemonsterData{} +func DeserializeGameMonsterData(_buf map[string]interface{}) (*GameMonsterData, error) { + v := &GameMonsterData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.msgDistrib.go b/sys/configure/structs/game.msgDistrib.go index 15b4b58cc..3a5331073 100644 --- a/sys/configure/structs/game.msgDistrib.go +++ b/sys/configure/structs/game.msgDistrib.go @@ -8,34 +8,34 @@ package cfg -type Gamemsgdistrib struct { - _dataMap map[string]*GamemsgdistribData - _dataList []*GamemsgdistribData +type GameMsgdistrib struct { + _dataMap map[string]*GameMsgdistribData + _dataList []*GameMsgdistribData } -func NewGamemsgdistrib(_buf []map[string]interface{}) (*Gamemsgdistrib, error) { - _dataList := make([]*GamemsgdistribData, 0, len(_buf)) - dataMap := make(map[string]*GamemsgdistribData) +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 := DeserializeGamemsgdistribData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameMsgdistribData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Msgid] = _v } } - return &Gamemsgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameMsgdistrib{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamemsgdistrib) GetDataMap() map[string]*GamemsgdistribData { +func (table *GameMsgdistrib) GetDataMap() map[string]*GameMsgdistribData { return table._dataMap } -func (table *Gamemsgdistrib) GetDataList() []*GamemsgdistribData { +func (table *GameMsgdistrib) GetDataList() []*GameMsgdistribData { return table._dataList } -func (table *Gamemsgdistrib) Get(key string) *GamemsgdistribData { +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 c9f21386e..d931deb78 100644 --- a/sys/configure/structs/game.msgDistribData.go +++ b/sys/configure/structs/game.msgDistribData.go @@ -10,27 +10,27 @@ package cfg import "errors" -type GamemsgdistribData struct { +type GameMsgdistribData struct { Msgid string Routrules string Describe string } -const TypeId_GamemsgdistribData = 1868137034 +const TypeId_GameMsgdistribData = 2119439946 -func (*GamemsgdistribData) GetTypeId() int32 { - return 1868137034 +func (*GameMsgdistribData) GetTypeId() int32 { + return 2119439946 } -func (_v *GamemsgdistribData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGameMsgdistribData(_buf map[string]interface{}) (*GameMsgdistribData, error) { + v := &GameMsgdistribData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.opencond.go b/sys/configure/structs/game.opencond.go index 213a306f8..c585a06a5 100644 --- a/sys/configure/structs/game.opencond.go +++ b/sys/configure/structs/game.opencond.go @@ -8,34 +8,34 @@ package cfg -type Gameopencond struct { - _dataMap map[string]*GameopencondData - _dataList []*GameopencondData +type GameOpencond struct { + _dataMap map[string]*GameOpencondData + _dataList []*GameOpencondData } -func NewGameopencond(_buf []map[string]interface{}) (*Gameopencond, error) { - _dataList := make([]*GameopencondData, 0, len(_buf)) - dataMap := make(map[string]*GameopencondData) +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 := DeserializeGameopencondData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameOpencondData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gameopencond{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameOpencond{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameopencond) GetDataMap() map[string]*GameopencondData { +func (table *GameOpencond) GetDataMap() map[string]*GameOpencondData { return table._dataMap } -func (table *Gameopencond) GetDataList() []*GameopencondData { +func (table *GameOpencond) GetDataList() []*GameOpencondData { return table._dataList } -func (table *Gameopencond) Get(key string) *GameopencondData { +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 522de5b05..2dfc9c4ba 100644 --- a/sys/configure/structs/game.opencondData.go +++ b/sys/configure/structs/game.opencondData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameopencondData struct { +type GameOpencondData struct { Id string Name string Main string @@ -21,13 +21,13 @@ type GameopencondData struct { Prompt string } -const TypeId_GameopencondData = -1798682958 +const TypeId_GameOpencondData = -1990600014 -func (*GameopencondData) GetTypeId() int32 { - return -1798682958 +func (*GameOpencondData) GetTypeId() int32 { + return -1990600014 } -func (_v *GameopencondData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -39,8 +39,8 @@ func (_v *GameopencondData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameopencondData(_buf map[string]interface{}) (*GameopencondData, error) { - v := &GameopencondData{} +func DeserializeGameOpencondData(_buf map[string]interface{}) (*GameOpencondData, error) { + v := &GameOpencondData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.pagoda.go b/sys/configure/structs/game.pagoda.go index 7afce38fa..91003d398 100644 --- a/sys/configure/structs/game.pagoda.go +++ b/sys/configure/structs/game.pagoda.go @@ -8,34 +8,34 @@ package cfg -type Gamepagoda struct { - _dataMap map[int32]*GamepagodaData - _dataList []*GamepagodaData +type GamePagoda struct { + _dataMap map[int32]*GamePagodaData + _dataList []*GamePagodaData } -func NewGamepagoda(_buf []map[string]interface{}) (*Gamepagoda, error) { - _dataList := make([]*GamepagodaData, 0, len(_buf)) - dataMap := make(map[int32]*GamepagodaData) +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 := DeserializeGamepagodaData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePagodaData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &Gamepagoda{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePagoda{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamepagoda) GetDataMap() map[int32]*GamepagodaData { +func (table *GamePagoda) GetDataMap() map[int32]*GamePagodaData { return table._dataMap } -func (table *Gamepagoda) GetDataList() []*GamepagodaData { +func (table *GamePagoda) GetDataList() []*GamePagodaData { return table._dataList } -func (table *Gamepagoda) Get(key int32) *GamepagodaData { +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 5f3dd4fd0..39529db64 100644 --- a/sys/configure/structs/game.pagodaData.go +++ b/sys/configure/structs/game.pagodaData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamepagodaData struct { +type GamePagodaData struct { Key int32 PagodaType int32 LevelType int32 @@ -32,13 +32,13 @@ type GamepagodaData struct { ModelDisplay int32 } -const TypeId_GamepagodaData = -1914602212 +const TypeId_GamePagodaData = -918154980 -func (*GamepagodaData) GetTypeId() int32 { - return -1914602212 +func (*GamePagodaData) GetTypeId() int32 { + return -918154980 } -func (_v *GamepagodaData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -204,8 +204,8 @@ func (_v *GamepagodaData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamepagodaData(_buf map[string]interface{}) (*GamepagodaData, error) { - v := &GamepagodaData{} +func DeserializeGamePagodaData(_buf map[string]interface{}) (*GamePagodaData, error) { + v := &GamePagodaData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.pagodaSeasonReward.go b/sys/configure/structs/game.pagodaSeasonReward.go index e3e80a9ed..1b582fccb 100644 --- a/sys/configure/structs/game.pagodaSeasonReward.go +++ b/sys/configure/structs/game.pagodaSeasonReward.go @@ -8,34 +8,34 @@ package cfg -type GamepagodaSeasonReward struct { - _dataMap map[int32]*GamepagodaSeasonRewardData - _dataList []*GamepagodaSeasonRewardData +type GamePagodaSeasonReward struct { + _dataMap map[int32]*GamePagodaSeasonRewardData + _dataList []*GamePagodaSeasonRewardData } -func NewGamepagodaSeasonReward(_buf []map[string]interface{}) (*GamepagodaSeasonReward, error) { - _dataList := make([]*GamepagodaSeasonRewardData, 0, len(_buf)) - dataMap := make(map[int32]*GamepagodaSeasonRewardData) +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 := DeserializeGamepagodaSeasonRewardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePagodaSeasonRewardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamepagodaSeasonReward{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePagodaSeasonReward{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamepagodaSeasonReward) GetDataMap() map[int32]*GamepagodaSeasonRewardData { +func (table *GamePagodaSeasonReward) GetDataMap() map[int32]*GamePagodaSeasonRewardData { return table._dataMap } -func (table *GamepagodaSeasonReward) GetDataList() []*GamepagodaSeasonRewardData { +func (table *GamePagodaSeasonReward) GetDataList() []*GamePagodaSeasonRewardData { return table._dataList } -func (table *GamepagodaSeasonReward) Get(key int32) *GamepagodaSeasonRewardData { +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 364249f04..3a8a37f28 100644 --- a/sys/configure/structs/game.pagodaSeasonRewardData.go +++ b/sys/configure/structs/game.pagodaSeasonRewardData.go @@ -10,19 +10,19 @@ package cfg import "errors" -type GamepagodaSeasonRewardData struct { +type GamePagodaSeasonRewardData struct { Key int32 Ranking []int32 Reward []*Gameatn } -const TypeId_GamepagodaSeasonRewardData = -1585398482 +const TypeId_GamePagodaSeasonRewardData = -1498984146 -func (*GamepagodaSeasonRewardData) GetTypeId() int32 { - return -1585398482 +func (*GamePagodaSeasonRewardData) GetTypeId() int32 { + return -1498984146 } -func (_v *GamepagodaSeasonRewardData)Deserialize(_buf map[string]interface{}) (err error) { +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{} @@ -55,8 +55,8 @@ func (_v *GamepagodaSeasonRewardData)Deserialize(_buf map[string]interface{}) (e return } -func DeserializeGamepagodaSeasonRewardData(_buf map[string]interface{}) (*GamepagodaSeasonRewardData, error) { - v := &GamepagodaSeasonRewardData{} +func DeserializeGamePagodaSeasonRewardData(_buf map[string]interface{}) (*GamePagodaSeasonRewardData, error) { + v := &GamePagodaSeasonRewardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.pagodaTaskReward.go b/sys/configure/structs/game.pagodaTaskReward.go index 6a078a153..a9c5c62df 100644 --- a/sys/configure/structs/game.pagodaTaskReward.go +++ b/sys/configure/structs/game.pagodaTaskReward.go @@ -8,34 +8,34 @@ package cfg -type GamepagodaTaskReward struct { - _dataMap map[int32]*GamepagodaTaskRewardData - _dataList []*GamepagodaTaskRewardData +type GamePagodaTaskReward struct { + _dataMap map[int32]*GamePagodaTaskRewardData + _dataList []*GamePagodaTaskRewardData } -func NewGamepagodaTaskReward(_buf []map[string]interface{}) (*GamepagodaTaskReward, error) { - _dataList := make([]*GamepagodaTaskRewardData, 0, len(_buf)) - dataMap := make(map[int32]*GamepagodaTaskRewardData) +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 := DeserializeGamepagodaTaskRewardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePagodaTaskRewardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamepagodaTaskReward{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePagodaTaskReward{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamepagodaTaskReward) GetDataMap() map[int32]*GamepagodaTaskRewardData { +func (table *GamePagodaTaskReward) GetDataMap() map[int32]*GamePagodaTaskRewardData { return table._dataMap } -func (table *GamepagodaTaskReward) GetDataList() []*GamepagodaTaskRewardData { +func (table *GamePagodaTaskReward) GetDataList() []*GamePagodaTaskRewardData { return table._dataList } -func (table *GamepagodaTaskReward) Get(key int32) *GamepagodaTaskRewardData { +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 b2973d9c4..99e710e75 100644 --- a/sys/configure/structs/game.pagodaTaskRewardData.go +++ b/sys/configure/structs/game.pagodaTaskRewardData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type GamepagodaTaskRewardData struct { +type GamePagodaTaskRewardData struct { Key int32 PagodaType int32 LayerNum int32 Reward []*Gameatn } -const TypeId_GamepagodaTaskRewardData = 530520528 +const TypeId_GamePagodaTaskRewardData = -1520783920 -func (*GamepagodaTaskRewardData) GetTypeId() int32 { - return 530520528 +func (*GamePagodaTaskRewardData) GetTypeId() int32 { + return -1520783920 } -func (_v *GamepagodaTaskRewardData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -44,8 +44,8 @@ func (_v *GamepagodaTaskRewardData)Deserialize(_buf map[string]interface{}) (err return } -func DeserializeGamepagodaTaskRewardData(_buf map[string]interface{}) (*GamepagodaTaskRewardData, error) { - v := &GamepagodaTaskRewardData{} +func DeserializeGamePagodaTaskRewardData(_buf map[string]interface{}) (*GamePagodaTaskRewardData, error) { + v := &GamePagodaTaskRewardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.pagodaseasonLoop.go b/sys/configure/structs/game.pagodaseasonLoop.go index db23c348d..b36b5542e 100644 --- a/sys/configure/structs/game.pagodaseasonLoop.go +++ b/sys/configure/structs/game.pagodaseasonLoop.go @@ -8,34 +8,34 @@ package cfg -type GamepagodaseasonLoop struct { - _dataMap map[int32]*GamepagodaseasonLoopData - _dataList []*GamepagodaseasonLoopData +type GamePagodaseasonLoop struct { + _dataMap map[int32]*GamePagodaseasonLoopData + _dataList []*GamePagodaseasonLoopData } -func NewGamepagodaseasonLoop(_buf []map[string]interface{}) (*GamepagodaseasonLoop, error) { - _dataList := make([]*GamepagodaseasonLoopData, 0, len(_buf)) - dataMap := make(map[int32]*GamepagodaseasonLoopData) +func NewGamePagodaseasonLoop(_buf []map[string]interface{}) (*GamePagodaseasonLoop, error) { + _dataList := make([]*GamePagodaseasonLoopData, 0, len(_buf)) + dataMap := make(map[int32]*GamePagodaseasonLoopData) for _, _ele_ := range _buf { - if _v, err2 := DeserializeGamepagodaseasonLoopData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePagodaseasonLoopData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GamepagodaseasonLoop{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePagodaseasonLoop{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GamepagodaseasonLoop) GetDataMap() map[int32]*GamepagodaseasonLoopData { +func (table *GamePagodaseasonLoop) GetDataMap() map[int32]*GamePagodaseasonLoopData { return table._dataMap } -func (table *GamepagodaseasonLoop) GetDataList() []*GamepagodaseasonLoopData { +func (table *GamePagodaseasonLoop) GetDataList() []*GamePagodaseasonLoopData { return table._dataList } -func (table *GamepagodaseasonLoop) Get(key int32) *GamepagodaseasonLoopData { +func (table *GamePagodaseasonLoop) Get(key int32) *GamePagodaseasonLoopData { return table._dataMap[key] } diff --git a/sys/configure/structs/game.pagodaseasonLoopData.go b/sys/configure/structs/game.pagodaseasonLoopData.go index bcbf62ca5..2ead5c2f2 100644 --- a/sys/configure/structs/game.pagodaseasonLoopData.go +++ b/sys/configure/structs/game.pagodaseasonLoopData.go @@ -10,19 +10,19 @@ package cfg import "errors" -type GamepagodaseasonLoopData struct { +type GamePagodaseasonLoopData struct { Key int32 DisposableLoop []int32 FixedLoop []int32 } -const TypeId_GamepagodaseasonLoopData = -1606971581 +const TypeId_GamePagodaseasonLoopData = 636691267 -func (*GamepagodaseasonLoopData) GetTypeId() int32 { - return -1606971581 +func (*GamePagodaseasonLoopData) GetTypeId() int32 { + return 636691267 } -func (_v *GamepagodaseasonLoopData)Deserialize(_buf map[string]interface{}) (err error) { +func (_v *GamePagodaseasonLoopData)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{} @@ -55,8 +55,8 @@ func (_v *GamepagodaseasonLoopData)Deserialize(_buf map[string]interface{}) (err return } -func DeserializeGamepagodaseasonLoopData(_buf map[string]interface{}) (*GamepagodaseasonLoopData, error) { - v := &GamepagodaseasonLoopData{} +func DeserializeGamePagodaseasonLoopData(_buf map[string]interface{}) (*GamePagodaseasonLoopData, error) { + v := &GamePagodaseasonLoopData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.playerlv.go b/sys/configure/structs/game.playerlv.go index 57a51297e..a50f7b090 100644 --- a/sys/configure/structs/game.playerlv.go +++ b/sys/configure/structs/game.playerlv.go @@ -8,34 +8,34 @@ package cfg -type Gameplayerlv struct { - _dataMap map[int32]*GameplayerlvData - _dataList []*GameplayerlvData +type GamePlayerlv struct { + _dataMap map[int32]*GamePlayerlvData + _dataList []*GamePlayerlvData } -func NewGameplayerlv(_buf []map[string]interface{}) (*Gameplayerlv, error) { - _dataList := make([]*GameplayerlvData, 0, len(_buf)) - dataMap := make(map[int32]*GameplayerlvData) +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 := DeserializeGameplayerlvData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePlayerlvData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Lv] = _v } } - return &Gameplayerlv{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePlayerlv{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameplayerlv) GetDataMap() map[int32]*GameplayerlvData { +func (table *GamePlayerlv) GetDataMap() map[int32]*GamePlayerlvData { return table._dataMap } -func (table *Gameplayerlv) GetDataList() []*GameplayerlvData { +func (table *GamePlayerlv) GetDataList() []*GamePlayerlvData { return table._dataList } -func (table *Gameplayerlv) Get(key int32) *GameplayerlvData { +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 3d9d38f4d..853d2bc63 100644 --- a/sys/configure/structs/game.playerlvData.go +++ b/sys/configure/structs/game.playerlvData.go @@ -10,25 +10,25 @@ package cfg import "errors" -type GameplayerlvData struct { +type GamePlayerlvData struct { Lv int32 Exp int32 } -const TypeId_GameplayerlvData = 1119691505 +const TypeId_GamePlayerlvData = 927774449 -func (*GameplayerlvData) GetTypeId() int32 { - return 1119691505 +func (*GamePlayerlvData) GetTypeId() int32 { + return 927774449 } -func (_v *GameplayerlvData)Deserialize(_buf map[string]interface{}) (err error) { +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{} +func DeserializeGamePlayerlvData(_buf map[string]interface{}) (*GamePlayerlvData, error) { + v := &GamePlayerlvData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.plot.go b/sys/configure/structs/game.plot.go index 1b7179339..a6db562b3 100644 --- a/sys/configure/structs/game.plot.go +++ b/sys/configure/structs/game.plot.go @@ -8,34 +8,34 @@ package cfg -type Gameplot struct { - _dataMap map[int32]*GameplotData - _dataList []*GameplotData +type GamePlot struct { + _dataMap map[int32]*GamePlotData + _dataList []*GamePlotData } -func NewGameplot(_buf []map[string]interface{}) (*Gameplot, error) { - _dataList := make([]*GameplotData, 0, len(_buf)) - dataMap := make(map[int32]*GameplotData) +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 := DeserializeGameplotData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePlotData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Sameid] = _v } } - return &Gameplot{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePlot{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameplot) GetDataMap() map[int32]*GameplotData { +func (table *GamePlot) GetDataMap() map[int32]*GamePlotData { return table._dataMap } -func (table *Gameplot) GetDataList() []*GameplotData { +func (table *GamePlot) GetDataList() []*GamePlotData { return table._dataList } -func (table *Gameplot) Get(key int32) *GameplotData { +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 597769215..5d0e3c46f 100644 --- a/sys/configure/structs/game.plotData.go +++ b/sys/configure/structs/game.plotData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type GameplotData struct { +type GamePlotData struct { Sameid int32 Skip bool Name string Describe string } -const TypeId_GameplotData = -750874969 +const TypeId_GamePlotData = 112730791 -func (*GameplotData) GetTypeId() int32 { - return -750874969 +func (*GamePlotData) GetTypeId() int32 { + return 112730791 } -func (_v *GameplotData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -31,8 +31,8 @@ func (_v *GameplotData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameplotData(_buf map[string]interface{}) (*GameplotData, error) { - v := &GameplotData{} +func DeserializeGamePlotData(_buf map[string]interface{}) (*GamePlotData, error) { + v := &GamePlotData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.propsgroup.go b/sys/configure/structs/game.propsgroup.go index f252e8dd1..f4e578709 100644 --- a/sys/configure/structs/game.propsgroup.go +++ b/sys/configure/structs/game.propsgroup.go @@ -8,34 +8,34 @@ package cfg -type Gamepropsgroup struct { - _dataMap map[int32]*GamepropsgroupData - _dataList []*GamepropsgroupData +type GamePropsgroup struct { + _dataMap map[int32]*GamePropsgroupData + _dataList []*GamePropsgroupData } -func NewGamepropsgroup(_buf []map[string]interface{}) (*Gamepropsgroup, error) { - _dataList := make([]*GamepropsgroupData, 0, len(_buf)) - dataMap := make(map[int32]*GamepropsgroupData) +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 := DeserializeGamepropsgroupData(_ele_); err2 != nil { + if _v, err2 := DeserializeGamePropsgroupData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &Gamepropsgroup{_dataList:_dataList, _dataMap:dataMap}, nil + return &GamePropsgroup{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamepropsgroup) GetDataMap() map[int32]*GamepropsgroupData { +func (table *GamePropsgroup) GetDataMap() map[int32]*GamePropsgroupData { return table._dataMap } -func (table *Gamepropsgroup) GetDataList() []*GamepropsgroupData { +func (table *GamePropsgroup) GetDataList() []*GamePropsgroupData { return table._dataList } -func (table *Gamepropsgroup) Get(key int32) *GamepropsgroupData { +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 51ce91206..0c582728f 100644 --- a/sys/configure/structs/game.propsgroupData.go +++ b/sys/configure/structs/game.propsgroupData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GamepropsgroupData struct { +type GamePropsgroupData struct { Key int32 Group int32 Star int32 @@ -18,13 +18,13 @@ type GamepropsgroupData struct { P int32 } -const TypeId_GamepropsgroupData = -1658257195 +const TypeId_GamePropsgroupData = -1406954283 -func (*GamepropsgroupData) GetTypeId() int32 { - return -1658257195 +func (*GamePropsgroupData) GetTypeId() int32 { + return -1406954283 } -func (_v *GamepropsgroupData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -46,8 +46,8 @@ func (_v *GamepropsgroupData)Deserialize(_buf map[string]interface{}) (err error return } -func DeserializeGamepropsgroupData(_buf map[string]interface{}) (*GamepropsgroupData, error) { - v := &GamepropsgroupData{} +func DeserializeGamePropsgroupData(_buf map[string]interface{}) (*GamePropsgroupData, error) { + v := &GamePropsgroupData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.rdtaskAllData.go b/sys/configure/structs/game.rdtaskAllData.go index 2ded0d1fa..d8678448d 100644 --- a/sys/configure/structs/game.rdtaskAllData.go +++ b/sys/configure/structs/game.rdtaskAllData.go @@ -13,10 +13,10 @@ import "errors" type GameRdtaskAllData struct { Id int32 Type int32 - Lastend int32 - RdtaksNum []int32 - Aftertaks int32 - Icetime int32 + Lasttask int32 + Rdtasknum []int32 + Aftertask int32 + Taskcd int32 Tag int32 Story int32 Completetask int32 @@ -24,32 +24,32 @@ type GameRdtaskAllData struct { Reword []*Gameatn } -const TypeId_GameRdtaskAllData = 1561697560 +const TypeId_GameRdtaskAllData = -891725512 func (*GameRdtaskAllData) GetTypeId() int32 { - return 1561697560 + return -891725512 } func (_v *GameRdtaskAllData)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["type"].(float64); !_ok_ { err = errors.New("type error"); return }; _v.Type = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lastend"].(float64); !_ok_ { err = errors.New("lastend error"); return }; _v.Lastend = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["lasttask"].(float64); !_ok_ { err = errors.New("lasttask error"); return }; _v.Lasttask = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool - if _arr_, _ok_ = _buf["rdtaks_num"].([]interface{}); !_ok_ { err = errors.New("rdtaks_num error"); return } + if _arr_, _ok_ = _buf["rdtasknum"].([]interface{}); !_ok_ { err = errors.New("rdtasknum error"); return } - _v.RdtaksNum = make([]int32, 0, len(_arr_)) + _v.Rdtasknum = 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.RdtaksNum = append(_v.RdtaksNum, _list_v_) + _v.Rdtasknum = append(_v.Rdtasknum, _list_v_) } } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["aftertaks"].(float64); !_ok_ { err = errors.New("aftertaks error"); return }; _v.Aftertaks = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["icetime"].(float64); !_ok_ { err = errors.New("icetime error"); return }; _v.Icetime = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["aftertask"].(float64); !_ok_ { err = errors.New("aftertask error"); return }; _v.Aftertask = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["taskcd"].(float64); !_ok_ { err = errors.New("taskcd error"); return }; _v.Taskcd = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["tag"].(float64); !_ok_ { err = errors.New("tag error"); return }; _v.Tag = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["story"].(float64); !_ok_ { err = errors.New("story error"); return }; _v.Story = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["completetask"].(float64); !_ok_ { err = errors.New("completetask error"); return }; _v.Completetask = int32(_tempNum_) } diff --git a/sys/configure/structs/game.rdtaskChooseData.go b/sys/configure/structs/game.rdtaskChooseData.go index 6a72027a8..08819f11b 100644 --- a/sys/configure/structs/game.rdtaskChooseData.go +++ b/sys/configure/structs/game.rdtaskChooseData.go @@ -13,20 +13,20 @@ import "errors" type GameRdtaskChooseData struct { Chooseid int32 Num int32 - RdtaksNum int32 + Rdtaksnum int32 Need []int32 } -const TypeId_GameRdtaskChooseData = 635237140 +const TypeId_GameRdtaskChooseData = -1833024780 func (*GameRdtaskChooseData) GetTypeId() int32 { - return 635237140 + return -1833024780 } func (_v *GameRdtaskChooseData)Deserialize(_buf map[string]interface{}) (err error) { { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["chooseid"].(float64); !_ok_ { err = errors.New("chooseid error"); return }; _v.Chooseid = int32(_tempNum_) } { 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 _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaksnum"].(float64); !_ok_ { err = errors.New("rdtaksnum error"); return }; _v.Rdtaksnum = int32(_tempNum_) } { var _arr_ []interface{} var _ok_ bool diff --git a/sys/configure/structs/game.rdtaskType.go b/sys/configure/structs/game.rdtaskType.go index b1ec19cb7..e9eae488e 100644 --- a/sys/configure/structs/game.rdtaskType.go +++ b/sys/configure/structs/game.rdtaskType.go @@ -21,7 +21,7 @@ func NewGameRdtaskType(_buf []map[string]interface{}) (*GameRdtaskType, error) { return nil, err2 } else { _dataList = append(_dataList, _v) - dataMap[_v.RdtaksNum] = _v + dataMap[_v.Rdtaksnum] = _v } } return &GameRdtaskType{_dataList:_dataList, _dataMap:dataMap}, nil diff --git a/sys/configure/structs/game.rdtaskTypeData.go b/sys/configure/structs/game.rdtaskTypeData.go index a779729f6..05da03257 100644 --- a/sys/configure/structs/game.rdtaskTypeData.go +++ b/sys/configure/structs/game.rdtaskTypeData.go @@ -11,26 +11,26 @@ package cfg import "errors" type GameRdtaskTypeData struct { - RdtaksNum int32 + Rdtaksnum int32 Typdes int32 Datatime int32 - TyptaskId int32 + Typtaskid int32 Data1 int32 Data2 int32 Data3 int32 } -const TypeId_GameRdtaskTypeData = -1281600649 +const TypeId_GameRdtaskTypeData = -28304553 func (*GameRdtaskTypeData) GetTypeId() int32 { - return -1281600649 + return -28304553 } func (_v *GameRdtaskTypeData)Deserialize(_buf map[string]interface{}) (err error) { - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaks_num"].(float64); !_ok_ { err = errors.New("rdtaks_num error"); return }; _v.RdtaksNum = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["rdtaksnum"].(float64); !_ok_ { err = errors.New("rdtaksnum error"); return }; _v.Rdtaksnum = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typdes"].(float64); !_ok_ { err = errors.New("typdes error"); return }; _v.Typdes = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["datatime"].(float64); !_ok_ { err = errors.New("datatime error"); return }; _v.Datatime = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typtask_id"].(float64); !_ok_ { err = errors.New("typtask_id error"); return }; _v.TyptaskId = int32(_tempNum_) } + { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["typtaskid"].(float64); !_ok_ { err = errors.New("typtaskid error"); return }; _v.Typtaskid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data1"].(float64); !_ok_ { err = errors.New("data1 error"); return }; _v.Data1 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data2"].(float64); !_ok_ { err = errors.New("data2 error"); return }; _v.Data2 = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["data3"].(float64); !_ok_ { err = errors.New("data3 error"); return }; _v.Data3 = int32(_tempNum_) } diff --git a/sys/configure/structs/game.shop.go b/sys/configure/structs/game.shop.go index 7facd9144..f0f78a41e 100644 --- a/sys/configure/structs/game.shop.go +++ b/sys/configure/structs/game.shop.go @@ -8,34 +8,34 @@ package cfg -type Gameshop struct { - _dataMap map[int32]*GameshopData - _dataList []*GameshopData +type GameShop struct { + _dataMap map[int32]*GameShopData + _dataList []*GameShopData } -func NewGameshop(_buf []map[string]interface{}) (*Gameshop, error) { - _dataList := make([]*GameshopData, 0, len(_buf)) - dataMap := make(map[int32]*GameshopData) +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 := DeserializeGameshopData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameShopData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Shopid] = _v } } - return &Gameshop{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameShop{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameshop) GetDataMap() map[int32]*GameshopData { +func (table *GameShop) GetDataMap() map[int32]*GameShopData { return table._dataMap } -func (table *Gameshop) GetDataList() []*GameshopData { +func (table *GameShop) GetDataList() []*GameShopData { return table._dataList } -func (table *Gameshop) Get(key int32) *GameshopData { +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 48f1f66f5..6298ecf0f 100644 --- a/sys/configure/structs/game.shopData.go +++ b/sys/configure/structs/game.shopData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameshopData struct { +type GameShopData struct { Shopid int32 Tab int32 Shopname string @@ -23,13 +23,13 @@ type GameshopData struct { Shopitem []int32 } -const TypeId_GameshopData = 923847228 +const TypeId_GameShopData = 1787452988 -func (*GameshopData) GetTypeId() int32 { - return 923847228 +func (*GameShopData) GetTypeId() int32 { + return 1787452988 } -func (_v *GameshopData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -82,8 +82,8 @@ func (_v *GameshopData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameshopData(_buf map[string]interface{}) (*GameshopData, error) { - v := &GameshopData{} +func DeserializeGameShopData(_buf map[string]interface{}) (*GameShopData, error) { + v := &GameShopData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.shopitem.go b/sys/configure/structs/game.shopitem.go index 4484ad6c5..4664dc512 100644 --- a/sys/configure/structs/game.shopitem.go +++ b/sys/configure/structs/game.shopitem.go @@ -8,34 +8,34 @@ package cfg -type Gameshopitem struct { - _dataMap map[int32]*GameshopitemData - _dataList []*GameshopitemData +type GameShopitem struct { + _dataMap map[int32]*GameShopitemData + _dataList []*GameShopitemData } -func NewGameshopitem(_buf []map[string]interface{}) (*Gameshopitem, error) { - _dataList := make([]*GameshopitemData, 0, len(_buf)) - dataMap := make(map[int32]*GameshopitemData) +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 := DeserializeGameshopitemData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameShopitemData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &Gameshopitem{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameShopitem{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameshopitem) GetDataMap() map[int32]*GameshopitemData { +func (table *GameShopitem) GetDataMap() map[int32]*GameShopitemData { return table._dataMap } -func (table *Gameshopitem) GetDataList() []*GameshopitemData { +func (table *GameShopitem) GetDataList() []*GameShopitemData { return table._dataList } -func (table *Gameshopitem) Get(key int32) *GameshopitemData { +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 201c8d4ba..d7eaa3b4b 100644 --- a/sys/configure/structs/game.shopitemData.go +++ b/sys/configure/structs/game.shopitemData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameshopitemData struct { +type GameShopitemData struct { Key int32 Id int32 Iteminfo []*Gameatn @@ -27,13 +27,13 @@ type GameshopitemData struct { Mapidmax int32 } -const TypeId_GameshopitemData = 683408079 +const TypeId_GameShopitemData = 491491023 -func (*GameshopitemData) GetTypeId() int32 { - return 683408079 +func (*GameShopitemData) GetTypeId() int32 { + return 491491023 } -func (_v *GameshopitemData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } { @@ -90,8 +90,8 @@ func (_v *GameshopitemData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameshopitemData(_buf map[string]interface{}) (*GameshopitemData, error) { - v := &GameshopitemData{} +func DeserializeGameShopitemData(_buf map[string]interface{}) (*GameShopitemData, error) { + v := &GameShopitemData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.skill.go b/sys/configure/structs/game.skill.go index 3336e16db..b6a31dbda 100644 --- a/sys/configure/structs/game.skill.go +++ b/sys/configure/structs/game.skill.go @@ -8,34 +8,34 @@ package cfg -type Gameskill struct { - _dataMap map[int32]*GameskillData - _dataList []*GameskillData +type GameSkill struct { + _dataMap map[int32]*GameSkillData + _dataList []*GameSkillData } -func NewGameskill(_buf []map[string]interface{}) (*Gameskill, error) { - _dataList := make([]*GameskillData, 0, len(_buf)) - dataMap := make(map[int32]*GameskillData) +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 := DeserializeGameskillData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameSkillData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gameskill{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameSkill{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gameskill) GetDataMap() map[int32]*GameskillData { +func (table *GameSkill) GetDataMap() map[int32]*GameSkillData { return table._dataMap } -func (table *Gameskill) GetDataList() []*GameskillData { +func (table *GameSkill) GetDataList() []*GameSkillData { return table._dataList } -func (table *Gameskill) Get(key int32) *GameskillData { +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 e62cb9204..c97874e37 100644 --- a/sys/configure/structs/game.skillAfteratk.go +++ b/sys/configure/structs/game.skillAfteratk.go @@ -8,34 +8,34 @@ package cfg -type GameskillAfteratk struct { - _dataMap map[int32]*GameskillAfteratkData - _dataList []*GameskillAfteratkData +type GameSkillAfteratk struct { + _dataMap map[int32]*GameSkillAfteratkData + _dataList []*GameSkillAfteratkData } -func NewGameskillAfteratk(_buf []map[string]interface{}) (*GameskillAfteratk, error) { - _dataList := make([]*GameskillAfteratkData, 0, len(_buf)) - dataMap := make(map[int32]*GameskillAfteratkData) +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 := DeserializeGameskillAfteratkData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameSkillAfteratkData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameskillAfteratk{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameSkillAfteratk{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameskillAfteratk) GetDataMap() map[int32]*GameskillAfteratkData { +func (table *GameSkillAfteratk) GetDataMap() map[int32]*GameSkillAfteratkData { return table._dataMap } -func (table *GameskillAfteratk) GetDataList() []*GameskillAfteratkData { +func (table *GameSkillAfteratk) GetDataList() []*GameSkillAfteratkData { return table._dataList } -func (table *GameskillAfteratk) Get(key int32) *GameskillAfteratkData { +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 340bf2215..262a7e7d3 100644 --- a/sys/configure/structs/game.skillAfteratkData.go +++ b/sys/configure/structs/game.skillAfteratkData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameskillAfteratkData struct { +type GameSkillAfteratkData struct { Id int32 Desc string From int32 @@ -31,13 +31,13 @@ type GameskillAfteratkData struct { NoRelyTags []string } -const TypeId_GameskillAfteratkData = -718176517 +const TypeId_GameSkillAfteratkData = -281122053 -func (*GameskillAfteratkData) GetTypeId() int32 { - return -718176517 +func (*GameSkillAfteratkData) GetTypeId() int32 { + return -281122053 } -func (_v *GameskillAfteratkData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -163,8 +163,8 @@ func (_v *GameskillAfteratkData)Deserialize(_buf map[string]interface{}) (err er return } -func DeserializeGameskillAfteratkData(_buf map[string]interface{}) (*GameskillAfteratkData, error) { - v := &GameskillAfteratkData{} +func DeserializeGameSkillAfteratkData(_buf map[string]interface{}) (*GameSkillAfteratkData, error) { + v := &GameSkillAfteratkData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.skillAtk.go b/sys/configure/structs/game.skillAtk.go index 10fdac4e8..22916c462 100644 --- a/sys/configure/structs/game.skillAtk.go +++ b/sys/configure/structs/game.skillAtk.go @@ -8,34 +8,34 @@ package cfg -type GameskillAtk struct { - _dataMap map[int32]*GameskillAtkData - _dataList []*GameskillAtkData +type GameSkillAtk struct { + _dataMap map[int32]*GameSkillAtkData + _dataList []*GameSkillAtkData } -func NewGameskillAtk(_buf []map[string]interface{}) (*GameskillAtk, error) { - _dataList := make([]*GameskillAtkData, 0, len(_buf)) - dataMap := make(map[int32]*GameskillAtkData) +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 := DeserializeGameskillAtkData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameSkillAtkData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameskillAtk{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameSkillAtk{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameskillAtk) GetDataMap() map[int32]*GameskillAtkData { +func (table *GameSkillAtk) GetDataMap() map[int32]*GameSkillAtkData { return table._dataMap } -func (table *GameskillAtk) GetDataList() []*GameskillAtkData { +func (table *GameSkillAtk) GetDataList() []*GameSkillAtkData { return table._dataList } -func (table *GameskillAtk) Get(key int32) *GameskillAtkData { +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 59152c8b6..0497e2e39 100644 --- a/sys/configure/structs/game.skillAtkData.go +++ b/sys/configure/structs/game.skillAtkData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameskillAtkData struct { +type GameSkillAtkData struct { Id int32 Name string Ico string @@ -24,13 +24,13 @@ type GameskillAtkData struct { Buffid []int32 } -const TypeId_GameskillAtkData = -1545475251 +const TypeId_GameSkillAtkData = -1737392307 -func (*GameskillAtkData) GetTypeId() int32 { - return -1545475251 +func (*GameSkillAtkData) GetTypeId() int32 { + return -1737392307 } -func (_v *GameskillAtkData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -97,8 +97,8 @@ func (_v *GameskillAtkData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameskillAtkData(_buf map[string]interface{}) (*GameskillAtkData, error) { - v := &GameskillAtkData{} +func DeserializeGameSkillAtkData(_buf map[string]interface{}) (*GameSkillAtkData, error) { + v := &GameSkillAtkData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.skillBuff.go b/sys/configure/structs/game.skillBuff.go index 77d4ea1fa..24b3be5b8 100644 --- a/sys/configure/structs/game.skillBuff.go +++ b/sys/configure/structs/game.skillBuff.go @@ -8,34 +8,34 @@ package cfg -type GameskillBuff struct { - _dataMap map[int32]*GameskillBuffData - _dataList []*GameskillBuffData +type GameSkillBuff struct { + _dataMap map[int32]*GameSkillBuffData + _dataList []*GameSkillBuffData } -func NewGameskillBuff(_buf []map[string]interface{}) (*GameskillBuff, error) { - _dataList := make([]*GameskillBuffData, 0, len(_buf)) - dataMap := make(map[int32]*GameskillBuffData) +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 := DeserializeGameskillBuffData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameSkillBuffData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameskillBuff{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameSkillBuff{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameskillBuff) GetDataMap() map[int32]*GameskillBuffData { +func (table *GameSkillBuff) GetDataMap() map[int32]*GameSkillBuffData { return table._dataMap } -func (table *GameskillBuff) GetDataList() []*GameskillBuffData { +func (table *GameSkillBuff) GetDataList() []*GameSkillBuffData { return table._dataList } -func (table *GameskillBuff) Get(key int32) *GameskillBuffData { +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 848a6ef25..a33300d83 100644 --- a/sys/configure/structs/game.skillBuffData.go +++ b/sys/configure/structs/game.skillBuffData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameskillBuffData struct { +type GameSkillBuffData struct { Id int32 Type string Name string @@ -25,13 +25,13 @@ type GameskillBuffData struct { Buffpos string } -const TypeId_GameskillBuffData = 1852593938 +const TypeId_GameSkillBuffData = 198132498 -func (*GameskillBuffData) GetTypeId() int32 { - return 1852593938 +func (*GameSkillBuffData) GetTypeId() int32 { + return 198132498 } -func (_v *GameskillBuffData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } } @@ -86,8 +86,8 @@ func (_v *GameskillBuffData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGameskillBuffData(_buf map[string]interface{}) (*GameskillBuffData, error) { - v := &GameskillBuffData{} +func DeserializeGameSkillBuffData(_buf map[string]interface{}) (*GameSkillBuffData, error) { + v := &GameSkillBuffData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.skillData.go b/sys/configure/structs/game.skillData.go index 69b83f186..9319fe124 100644 --- a/sys/configure/structs/game.skillData.go +++ b/sys/configure/structs/game.skillData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameskillData struct { +type GameSkillData struct { Id int32 Name string Ico string @@ -24,13 +24,13 @@ type GameskillData struct { Buffid []int32 } -const TypeId_GameskillData = -1600555361 +const TypeId_GameSkillData = -598580577 -func (*GameskillData) GetTypeId() int32 { - return -1600555361 +func (*GameSkillData) GetTypeId() int32 { + return -598580577 } -func (_v *GameskillData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -97,8 +97,8 @@ func (_v *GameskillData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGameskillData(_buf map[string]interface{}) (*GameskillData, error) { - v := &GameskillData{} +func DeserializeGameSkillData(_buf map[string]interface{}) (*GameSkillData, error) { + v := &GameSkillData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.skillPassive.go b/sys/configure/structs/game.skillPassive.go index 662ee64fb..9b4106be0 100644 --- a/sys/configure/structs/game.skillPassive.go +++ b/sys/configure/structs/game.skillPassive.go @@ -8,34 +8,34 @@ package cfg -type GameskillPassive struct { - _dataMap map[int32]*GameskillPassiveData - _dataList []*GameskillPassiveData +type GameSkillPassive struct { + _dataMap map[int32]*GameSkillPassiveData + _dataList []*GameSkillPassiveData } -func NewGameskillPassive(_buf []map[string]interface{}) (*GameskillPassive, error) { - _dataList := make([]*GameskillPassiveData, 0, len(_buf)) - dataMap := make(map[int32]*GameskillPassiveData) +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 := DeserializeGameskillPassiveData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameSkillPassiveData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &GameskillPassive{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameSkillPassive{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GameskillPassive) GetDataMap() map[int32]*GameskillPassiveData { +func (table *GameSkillPassive) GetDataMap() map[int32]*GameSkillPassiveData { return table._dataMap } -func (table *GameskillPassive) GetDataList() []*GameskillPassiveData { +func (table *GameSkillPassive) GetDataList() []*GameSkillPassiveData { return table._dataList } -func (table *GameskillPassive) Get(key int32) *GameskillPassiveData { +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 3066b58d2..fc4ab800c 100644 --- a/sys/configure/structs/game.skillPassiveData.go +++ b/sys/configure/structs/game.skillPassiveData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GameskillPassiveData struct { +type GameSkillPassiveData struct { Id int32 Desc string When string @@ -25,13 +25,13 @@ type GameskillPassiveData struct { NoRelyTags []string } -const TypeId_GameskillPassiveData = -1231842596 +const TypeId_GameSkillPassiveData = -247912740 -func (*GameskillPassiveData) GetTypeId() int32 { - return -1231842596 +func (*GameSkillPassiveData) GetTypeId() int32 { + return -247912740 } -func (_v *GameskillPassiveData)Deserialize(_buf map[string]interface{}) (err error) { +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 } } @@ -99,8 +99,8 @@ func (_v *GameskillPassiveData)Deserialize(_buf map[string]interface{}) (err err return } -func DeserializeGameskillPassiveData(_buf map[string]interface{}) (*GameskillPassiveData, error) { - v := &GameskillPassiveData{} +func DeserializeGameSkillPassiveData(_buf map[string]interface{}) (*GameSkillPassiveData, error) { + v := &GameSkillPassiveData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.stroy.go b/sys/configure/structs/game.stroy.go index cb13c3d7d..a6fa0afff 100644 --- a/sys/configure/structs/game.stroy.go +++ b/sys/configure/structs/game.stroy.go @@ -8,34 +8,34 @@ package cfg -type Gamestroy struct { - _dataMap map[int32]*GamestroyData - _dataList []*GamestroyData +type GameStroy struct { + _dataMap map[int32]*GameStroyData + _dataList []*GameStroyData } -func NewGamestroy(_buf []map[string]interface{}) (*Gamestroy, error) { - _dataList := make([]*GamestroyData, 0, len(_buf)) - dataMap := make(map[int32]*GamestroyData) +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 := DeserializeGamestroyData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameStroyData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Id] = _v } } - return &Gamestroy{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameStroy{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *Gamestroy) GetDataMap() map[int32]*GamestroyData { +func (table *GameStroy) GetDataMap() map[int32]*GameStroyData { return table._dataMap } -func (table *Gamestroy) GetDataList() []*GamestroyData { +func (table *GameStroy) GetDataList() []*GameStroyData { return table._dataList } -func (table *Gamestroy) Get(key int32) *GamestroyData { +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 1f02d08e7..7255ccc85 100644 --- a/sys/configure/structs/game.stroyData.go +++ b/sys/configure/structs/game.stroyData.go @@ -11,7 +11,7 @@ package cfg import "errors" import "bright/serialization" -type GamestroyData struct { +type GameStroyData struct { Id int32 Groupid int32 Before int32 @@ -36,13 +36,13 @@ type GamestroyData struct { Skip int32 } -const TypeId_GamestroyData = 695327529 +const TypeId_GameStroyData = 1697302313 -func (*GamestroyData) GetTypeId() int32 { - return 695327529 +func (*GameStroyData) GetTypeId() int32 { + return 1697302313 } -func (_v *GamestroyData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -102,8 +102,8 @@ func (_v *GamestroyData)Deserialize(_buf map[string]interface{}) (err error) { return } -func DeserializeGamestroyData(_buf map[string]interface{}) (*GamestroyData, error) { - v := &GamestroyData{} +func DeserializeGameStroyData(_buf map[string]interface{}) (*GameStroyData, error) { + v := &GameStroyData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.taskActiveReward.go b/sys/configure/structs/game.taskActiveReward.go index d5ef3615a..bdb6dbb40 100644 --- a/sys/configure/structs/game.taskActiveReward.go +++ b/sys/configure/structs/game.taskActiveReward.go @@ -8,34 +8,34 @@ package cfg -type GametaskActiveReward struct { - _dataMap map[int32]*GametaskActiveRewardData - _dataList []*GametaskActiveRewardData +type GameTaskActiveReward struct { + _dataMap map[int32]*GameTaskActiveRewardData + _dataList []*GameTaskActiveRewardData } -func NewGametaskActiveReward(_buf []map[string]interface{}) (*GametaskActiveReward, error) { - _dataList := make([]*GametaskActiveRewardData, 0, len(_buf)) - dataMap := make(map[int32]*GametaskActiveRewardData) +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 := DeserializeGametaskActiveRewardData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameTaskActiveRewardData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GametaskActiveReward{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameTaskActiveReward{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GametaskActiveReward) GetDataMap() map[int32]*GametaskActiveRewardData { +func (table *GameTaskActiveReward) GetDataMap() map[int32]*GameTaskActiveRewardData { return table._dataMap } -func (table *GametaskActiveReward) GetDataList() []*GametaskActiveRewardData { +func (table *GameTaskActiveReward) GetDataList() []*GameTaskActiveRewardData { return table._dataList } -func (table *GametaskActiveReward) Get(key int32) *GametaskActiveRewardData { +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 c944ccbb3..b6cff4ed7 100644 --- a/sys/configure/structs/game.taskActiveRewardData.go +++ b/sys/configure/structs/game.taskActiveRewardData.go @@ -10,20 +10,20 @@ package cfg import "errors" -type GametaskActiveRewardData struct { +type GameTaskActiveRewardData struct { Key int32 IdTag int32 Active int32 Reword []*Gameatn } -const TypeId_GametaskActiveRewardData = -660260032 +const TypeId_GameTaskActiveRewardData = 1583402816 -func (*GametaskActiveRewardData) GetTypeId() int32 { - return -660260032 +func (*GameTaskActiveRewardData) GetTypeId() int32 { + return 1583402816 } -func (_v *GametaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -44,8 +44,8 @@ func (_v *GametaskActiveRewardData)Deserialize(_buf map[string]interface{}) (err return } -func DeserializeGametaskActiveRewardData(_buf map[string]interface{}) (*GametaskActiveRewardData, error) { - v := &GametaskActiveRewardData{} +func DeserializeGameTaskActiveRewardData(_buf map[string]interface{}) (*GameTaskActiveRewardData, error) { + v := &GameTaskActiveRewardData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.taskRound.go b/sys/configure/structs/game.taskRound.go index 8ea4524a7..b6a077773 100644 --- a/sys/configure/structs/game.taskRound.go +++ b/sys/configure/structs/game.taskRound.go @@ -8,34 +8,34 @@ package cfg -type GametaskRound struct { - _dataMap map[int32]*GametaskRoundData - _dataList []*GametaskRoundData +type GameTaskRound struct { + _dataMap map[int32]*GameTaskRoundData + _dataList []*GameTaskRoundData } -func NewGametaskRound(_buf []map[string]interface{}) (*GametaskRound, error) { - _dataList := make([]*GametaskRoundData, 0, len(_buf)) - dataMap := make(map[int32]*GametaskRoundData) +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 := DeserializeGametaskRoundData(_ele_); err2 != nil { + if _v, err2 := DeserializeGameTaskRoundData(_ele_); err2 != nil { return nil, err2 } else { _dataList = append(_dataList, _v) dataMap[_v.Key] = _v } } - return &GametaskRound{_dataList:_dataList, _dataMap:dataMap}, nil + return &GameTaskRound{_dataList:_dataList, _dataMap:dataMap}, nil } -func (table *GametaskRound) GetDataMap() map[int32]*GametaskRoundData { +func (table *GameTaskRound) GetDataMap() map[int32]*GameTaskRoundData { return table._dataMap } -func (table *GametaskRound) GetDataList() []*GametaskRoundData { +func (table *GameTaskRound) GetDataList() []*GameTaskRoundData { return table._dataList } -func (table *GametaskRound) Get(key int32) *GametaskRoundData { +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 204614aba..41e1843af 100644 --- a/sys/configure/structs/game.taskRoundData.go +++ b/sys/configure/structs/game.taskRoundData.go @@ -10,7 +10,7 @@ package cfg import "errors" -type GametaskRoundData struct { +type GameTaskRoundData struct { Key int32 IdList int32 IdTag int32 @@ -25,13 +25,13 @@ type GametaskRoundData struct { Reword []*Gameatn } -const TypeId_GametaskRoundData = 768648535 +const TypeId_GameTaskRoundData = -885812905 -func (*GametaskRoundData) GetTypeId() int32 { - return 768648535 +func (*GameTaskRoundData) GetTypeId() int32 { + return -885812905 } -func (_v *GametaskRoundData)Deserialize(_buf map[string]interface{}) (err error) { +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_) } @@ -60,8 +60,8 @@ func (_v *GametaskRoundData)Deserialize(_buf map[string]interface{}) (err error) return } -func DeserializeGametaskRoundData(_buf map[string]interface{}) (*GametaskRoundData, error) { - v := &GametaskRoundData{} +func DeserializeGameTaskRoundData(_buf map[string]interface{}) (*GameTaskRoundData, error) { + v := &GameTaskRoundData{} if err := v.Deserialize(_buf); err == nil { return v, nil } else { diff --git a/sys/configure/structs/game.ui.go b/sys/configure/structs/game.ui.go deleted file mode 100644 index 15658b31e..000000000 --- a/sys/configure/structs/game.ui.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 Gameui struct { - _dataMap map[string]*GameuiData - _dataList []*GameuiData -} - -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 := DeserializeGameuiData(_ele_); err2 != nil { - return nil, err2 - } else { - _dataList = append(_dataList, _v) - dataMap[_v.Id] = _v - } - } - return &Gameui{_dataList:_dataList, _dataMap:dataMap}, nil -} - -func (table *Gameui) GetDataMap() map[string]*GameuiData { - return table._dataMap -} - -func (table *Gameui) GetDataList() []*GameuiData { - return table._dataList -} - -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 deleted file mode 100644 index 778c0c09b..000000000 --- a/sys/configure/structs/game.uiData.go +++ /dev/null @@ -1,53 +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 GameuiData struct { - Id string - File string - Unloadpkg int32 - Loadtype int32 - Full int32 - Blur int32 - Package string - Packagename string - Comname string - Des string -} - -const TypeId_GameuiData = -473993766 - -func (*GameuiData) GetTypeId() int32 { - return -473993766 -} - -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_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["loadtype"].(float64); !_ok_ { err = errors.New("loadtype error"); return }; _v.Loadtype = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["full"].(float64); !_ok_ { err = errors.New("full error"); return }; _v.Full = int32(_tempNum_) } - { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["blur"].(float64); !_ok_ { err = errors.New("blur error"); return }; _v.Blur = int32(_tempNum_) } - { var _ok_ bool; if _v.Package, _ok_ = _buf["package"].(string); !_ok_ { err = errors.New("package error"); return } } - { var _ok_ bool; if _v.Packagename, _ok_ = _buf["packagename"].(string); !_ok_ { err = errors.New("packagename error"); return } } - { var _ok_ bool; if _v.Comname, _ok_ = _buf["comname"].(string); !_ok_ { err = errors.New("comname error"); return } } - { 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 - } -}