liwei_3d/go_dreamfactory
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev' of http://git.legu.cc/liwei_3d/go_dreamfactory into dev

Browse Source
This commit is contained in:
meixiongfeng 2024-02-19 17:40:53 +08:00
commit 531376dfb5
27 changed files with 994 additions and 314 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bin/json/game_battleready.json
View File

@ -4354,7 +4354,7 @@
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 102611,
"DefaultHero": 102612,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
@ -4393,7 +4393,7 @@
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 102621,
"DefaultHero": 102622,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
@ -4432,7 +4432,7 @@
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 102631,
"DefaultHero": 102632,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
@ -4471,7 +4471,7 @@
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 102641,
"DefaultHero": 102642,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],
@ -4510,7 +4510,7 @@
"disableAiCamera": false,
"ChoseCamp": [],
"DisableCamp": [],
"DefaultHero": 102651,
"DefaultHero": 102652,
"ChoseHero": [],
"DisableHero": [],
"LockSlots": [],

15
bin/json/game_buriedcondi.json
View File

@ -5038,7 +5038,8 @@
},
"value": 3,
"filter": [
1
1,
3
],
"filter2": [
"页签id",
@ -5959,7 +5960,8 @@
},
"value": 5,
"filter": [
1
1,
5
],
"filter2": [
"剧情ID",
@ -6929,7 +6931,8 @@
},
"value": 5,
"filter": [
1
1,
5
],
"filter2": [
"页签id",
@ -7417,7 +7420,8 @@
},
"value": 10,
"filter": [
1
1,
10
],
"filter2": [
"页签id",
@ -8006,7 +8010,8 @@
},
"value": 10,
"filter": [
2
2,
20
],
"filter2": [
"页签id",

3
bin/json/game_global.json
View File

@ -808,6 +808,7 @@
"pvp_endtime": 3,
"pvp_maintenancetime": 2,
"pvp_integraltool": "pvpintegral",
"sx_returnspeed": 0.15
"sx_returnspeed": 0.15,
"puggsy_buy": 2001
}
]

2
bin/json/game_huntingopentime.json
View File

@ -43,7 +43,7 @@
"key": "hunting_opentime_opentimetext_2",
"text": "开启时间：周一，周三，周五，周日"
},
"bg": "fb_pt_hl",
"bg": "hl_img_bg",
"icon": "hkz_wftj_sl04",
"bossIcon": "gl_img_55001"
},

10
bin/json/game_initial.json
View File

@ -88,5 +88,15 @@
"n": 60
}
]
},
{
"index": "362",
"var": [
{
"a": "per",
"t": "16010104",
"n": 1
}
]
}
]

54
bin/json/game_loading.json
View File

@ -489,17 +489,31 @@
"text": "这里是博克岛。维京人的领地。</br>而我们维京人的族长，在这里，发起了新的改革……"
}
},
{
"scene": "MainLineScene",
"subScene": "12002",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_36",
"text": "「伊路向前」"
},
"prompt": {
"key": "loading_Sheet1_prompt_36",
"text": "原始人的生活原本丰富而安稳，但如今小伊似乎有一些新的想法。"
}
},
{
"scene": "LoginScene",
"subScene": "",
"image": "ld_mh_bg_zc02",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_36",
"key": "loading_Sheet1_title_37",
"text": "「中轴城」"
},
"prompt": {
"key": "loading_Sheet1_prompt_36",
"key": "loading_Sheet1_prompt_37",
"text": "终极之战后，月中人陷入沉睡，为了更好地守护月之大陆，守护者们把力量集中起来，建立了中轴城。</br>这是一座用火球煮咖啡，用扫描仪复制魔法卷轴的神奇城市，坐落于月之大陆的中心，是世界文明交流的枢纽。"
}
},
@ -509,11 +523,11 @@
"image": "ld_mh_bg_sd",
"icon": "loading_icon_jgsd",
"title": {
"key": "loading_Sheet1_title_37",
"key": "loading_Sheet1_title_38",
"text": "「商队列车」"
},
"prompt": {
"key": "loading_Sheet1_prompt_37",
"key": "loading_Sheet1_prompt_38",
"text": "星辰之下，飞驰的列车在各区间自由穿梭着。"
}
},
@ -522,20 +536,6 @@
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_38",
"text": "「石阵秘境」"
},
"prompt": {
"key": "loading_Sheet1_prompt_38",
"text": "走出这里其实很简单，只要先右拐再前进再右拐再左拐……不好意思，是先右拐两次……不，不对，好像是先左拐？呃，算了，给骇客蛛发消息吧……"
}
},
{
"scene": "StonehengeScene2",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_39",
"text": "「石阵秘境」"
@ -546,7 +546,7 @@
}
},
{
"scene": "StonehengeScene3",
"scene": "StonehengeScene2",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
@ -560,7 +560,7 @@
}
},
{
"scene": "StonehengeScene4",
"scene": "StonehengeScene3",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
@ -572,5 +572,19 @@
"key": "loading_Sheet1_prompt_41",
"text": "走出这里其实很简单，只要先右拐再前进再右拐再左拐……不好意思，是先右拐两次……不，不对，好像是先左拐？呃，算了，给骇客蛛发消息吧……"
}
},
{
"scene": "StonehengeScene4",
"subScene": "",
"image": "ld_mh_bg_fc",
"icon": "loading_icon_fc",
"title": {
"key": "loading_Sheet1_title_42",
"text": "「石阵秘境」"
},
"prompt": {
"key": "loading_Sheet1_prompt_42",
"text": "走出这里其实很简单，只要先右拐再前进再右拐再左拐……不好意思，是先右拐两次……不，不对，好像是先左拐？呃，算了，给骇客蛛发消息吧……"
}
}
]

92
bin/json/game_playerinfor_barrage.json
View File

@ -9,7 +9,7 @@
"text": "这好像不是熊猫？"
},
"time": 90,
"speed": 12124
"speed": 10080
},
{
"id": "2",
@ -20,8 +20,8 @@
"key": "playerinfor_barrage_2",
"text": "看起来像个画家。"
},
"time": 322,
"speed": 11499
"time": 223,
"speed": 7791
},
{
"id": "3",
@ -32,8 +32,8 @@
"key": "playerinfor_barrage_3",
"text": "为什么会觉得是熊猫啊？"
},
"time": 427,
"speed": 8430
"time": 415,
"speed": 8397
},
{
"id": "4",
@ -44,8 +44,8 @@
"key": "playerinfor_barrage_4",
"text": "从石头里蹦出来的人？怎么感觉有点熟悉……"
},
"time": 661,
"speed": 8707
"time": 575,
"speed": 9162
},
{
"id": "5",
@ -56,8 +56,8 @@
"key": "playerinfor_barrage_5",
"text": "你可能是听说过从石头里蹦出来的猴子。"
},
"time": 768,
"speed": 12416
"time": 709,
"speed": 7943
},
{
"id": "6",
@ -68,8 +68,8 @@
"key": "playerinfor_barrage_6",
"text": "你是从石头里蹦出来的？！"
},
"time": 869,
"speed": 12155
"time": 894,
"speed": 9842
},
{
"id": "7",
@ -80,8 +80,8 @@
"key": "playerinfor_barrage_7",
"text": "不！那不是我！"
},
"time": 1097,
"speed": 12574
"time": 1098,
"speed": 11034
},
{
"id": "8",
@ -92,8 +92,8 @@
"key": "playerinfor_barrage_8",
"text": "哦，传承之人……"
},
"time": 1199,
"speed": 10322
"time": 1230,
"speed": 8619
},
{
"id": "9",
@ -104,8 +104,8 @@
"key": "playerinfor_barrage_9",
"text": "月光能量都汇集在他身上了！"
},
"time": 1415,
"speed": 8219
"time": 1374,
"speed": 10631
},
{
"id": "10",
@ -116,8 +116,8 @@
"key": "playerinfor_barrage_10",
"text": "那应该不会爆炸吧？"
},
"time": 1619,
"speed": 8309
"time": 1569,
"speed": 7183
},
{
"id": "11",
@ -128,8 +128,8 @@
"key": "playerinfor_barrage_11",
"text": "阿宝，你为什么站那么远？"
},
"time": 1786,
"speed": 11466
"time": 1774,
"speed": 12959
},
{
"id": "312",
@ -141,7 +141,7 @@
"text": "哦！那是什么？"
},
"time": 90,
"speed": 12304
"speed": 11287
},
{
"id": "313",
@ -152,8 +152,8 @@
"key": "playerinfor_barrage_313",
"text": "我有种被她注视的感觉……"
},
"time": 286,
"speed": 9332
"time": 277,
"speed": 8670
},
{
"id": "314",
@ -164,8 +164,8 @@
"key": "playerinfor_barrage_314",
"text": "好像是一种叫做“照相”的魔法……"
},
"time": 426,
"speed": 9093
"time": 446,
"speed": 9631
},
{
"id": "315",
@ -176,8 +176,8 @@
"key": "playerinfor_barrage_315",
"text": "我看这魔法不是很疼。"
},
"time": 635,
"speed": 11823
"time": 630,
"speed": 10499
},
{
"id": "316",
@ -188,8 +188,8 @@
"key": "playerinfor_barrage_316",
"text": "据说它的作用是封印灵魂？"
},
"time": 825,
"speed": 12174
"time": 762,
"speed": 9107
},
{
"id": "317",
@ -200,8 +200,8 @@
"key": "playerinfor_barrage_317",
"text": "月中人的传承居然这么可怕？！"
},
"time": 969,
"speed": 12599
"time": 888,
"speed": 12822
},
{
"id": "318",
@ -212,8 +212,8 @@
"key": "playerinfor_barrage_318",
"text": "哦！你们真是够了！"
},
"time": 1103,
"speed": 8799
"time": 1000,
"speed": 10927
},
{
"id": "319",
@ -224,8 +224,8 @@
"key": "playerinfor_barrage_319",
"text": "照相不是魔法！也不能封印灵魂！"
},
"time": 1232,
"speed": 8349
"time": 1187,
"speed": 12386
},
{
"id": "320",
@ -236,8 +236,8 @@
"key": "playerinfor_barrage_320",
"text": "那她是在干什么？"
},
"time": 1448,
"speed": 7055
"time": 1420,
"speed": 12063
},
{
"id": "321",
@ -248,8 +248,8 @@
"key": "playerinfor_barrage_321",
"text": "……别问。"
},
"time": 1576,
"speed": 12474
"time": 1549,
"speed": 7769
},
{
"id": "322",
@ -260,8 +260,8 @@
"key": "playerinfor_barrage_322",
"text": "那可以教我吗？"
},
"time": 1810,
"speed": 10859
"time": 1744,
"speed": 10521
},
{
"id": "323",
@ -272,8 +272,8 @@
"key": "playerinfor_barrage_323",
"text": "我也想学。"
},
"time": 1977,
"speed": 8454
"time": 1975,
"speed": 12186
},
{
"id": "324",
@ -284,7 +284,7 @@
"key": "playerinfor_barrage_324",
"text": "要不你们问问这个传承者？"
},
"time": 2163,
"speed": 8357
"time": 2170,
"speed": 10406
}
]

94
bin/json/game_playerinfor_overview.json
View File

@ -16,7 +16,7 @@
"mainq": "Person/10000/10000M_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_1",
"text": "陈旧服饰"
"text": "阿宝"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_1",
@ -40,7 +40,7 @@
"mainq": "Person/10000/10000M_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_2",
"text": "陈旧服饰"
"text": "白人男-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_2",
@ -64,7 +64,55 @@
"mainq": "Person/10000/10000W_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_3",
"text": "陈旧服饰"
"text": "白人女-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_3",
"text": ""
}
},
{
"id": "16010104",
"translate": 1,
"sex": 1,
"type": 1,
"icon": "tx_js_25001",
"playerhead": "tx_js_25001",
"tujing": [
107
],
"url": "",
"tips": 10000,
"resources": "Person/10000/25001M.prefab",
"pvpAnimator": "Person/10000/10000_MPvp.controller",
"mainq": "Person/10000/10000M_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_4",
"text": "白人男-测试皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_2",
"text": ""
}
},
{
"id": "16010104",
"translate": 1,
"sex": 2,
"type": 1,
"icon": "tx_js_25001",
"playerhead": "tx_js_25001",
"tujing": [
107
],
"url": "",
"tips": 10000,
"resources": "Person/10000/25001M.prefab",
"pvpAnimator": "Person/10000/10000_WPvp.controller",
"mainq": "Person/10000/10000W_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_5",
"text": "白人女-测试皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_3",
@ -87,8 +135,8 @@
"pvpAnimator": "Person/10001/10001_MPvp.controller",
"mainq": "Person/10000/10000M_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_4",
"text": "陈旧服饰"
"key": "playerinfor_playerinfor_overview_name_6",
"text": "黑人男-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_4",
@ -111,8 +159,8 @@
"pvpAnimator": "Person/10001/10001_WPvp.controller",
"mainq": "Person/10000/10000W_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_5",
"text": "陈旧服饰"
"key": "playerinfor_playerinfor_overview_name_7",
"text": "黑人女-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_5",
@ -135,8 +183,8 @@
"pvpAnimator": "Person/10002/10002_MPvp.controller",
"mainq": "Person/10000/10000M_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_6",
"text": "陈旧服饰"
"key": "playerinfor_playerinfor_overview_name_8",
"text": "黄人男-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_6",
@ -159,8 +207,8 @@
"pvpAnimator": "Person/10002/10002_WPvp.controller",
"mainq": "Person/10000/10000W_q.prefab",
"name": {
"key": "playerinfor_playerinfor_overview_name_7",
"text": "陈旧服饰"
"key": "playerinfor_playerinfor_overview_name_9",
"text": "黄人女-默认皮肤"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_7",
@ -183,8 +231,8 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_8",
"text": "陈述观念"
"key": "playerinfor_playerinfor_overview_name_10",
"text": "男角色默认动作"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_8",
@ -207,8 +255,8 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_9",
"text": "讲解原理"
"key": "playerinfor_playerinfor_overview_name_11",
"text": "女角色默认动作"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_9",
@ -231,8 +279,8 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_10",
"text": "虚无星空"
"key": "playerinfor_playerinfor_overview_name_12",
"text": "男角色默认背景"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_10",
@ -255,8 +303,8 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_11",
"text": "虚无星空"
"key": "playerinfor_playerinfor_overview_name_13",
"text": "女角色默认背景"
},
"txt": {
"key": "playerinfor_playerinfor_overview_txt_11",
@ -279,7 +327,7 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_12",
"key": "playerinfor_playerinfor_overview_name_14",
"text": "翠绿竹林"
},
"txt": {
@ -303,7 +351,7 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_13",
"key": "playerinfor_playerinfor_overview_name_15",
"text": "清凉夏日"
},
"txt": {
@ -327,7 +375,7 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_14",
"key": "playerinfor_playerinfor_overview_name_16",
"text": "童话世界"
},
"txt": {
@ -351,7 +399,7 @@
"pvpAnimator": "",
"mainq": "",
"name": {
"key": "playerinfor_playerinfor_overview_name_15",
"key": "playerinfor_playerinfor_overview_name_17",
"text": "深入龙穴"
},
"txt": {

24
bin/json/game_puggsyfight.json
View File

@ -2,11 +2,11 @@
{
"boss_id": 810301,
"boss_name": {
"key": "guild_guild_boss_boss_name_1",
"key": "puggsy_puggsy_fight_boss_name_1",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_1",
"key": "puggsy_puggsy_fight_boss_text_1",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,
@ -23,11 +23,11 @@
{
"boss_id": 810302,
"boss_name": {
"key": "guild_guild_boss_boss_name_2",
"key": "puggsy_puggsy_fight_boss_name_2",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_2",
"key": "puggsy_puggsy_fight_boss_text_2",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,
@ -44,11 +44,11 @@
{
"boss_id": 810303,
"boss_name": {
"key": "guild_guild_boss_boss_name_3",
"key": "puggsy_puggsy_fight_boss_name_3",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_3",
"key": "puggsy_puggsy_fight_boss_text_3",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,
@ -65,11 +65,11 @@
{
"boss_id": 810304,
"boss_name": {
"key": "guild_guild_boss_boss_name_4",
"key": "puggsy_puggsy_fight_boss_name_4",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_4",
"key": "puggsy_puggsy_fight_boss_text_4",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,
@ -86,11 +86,11 @@
{
"boss_id": 810305,
"boss_name": {
"key": "guild_guild_boss_boss_name_5",
"key": "puggsy_puggsy_fight_boss_name_5",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_5",
"key": "puggsy_puggsy_fight_boss_text_5",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,
@ -107,11 +107,11 @@
{
"boss_id": 810306,
"boss_name": {
"key": "guild_guild_boss_boss_name_6",
"key": "puggsy_puggsy_fight_boss_name_6",
"text": "胡德先生"
},
"boss_text": {
"key": "guild_guild_boss_boss_name_6",
"key": "puggsy_puggsy_fight_boss_text_6",
"text": "他是一名懦弱的战士"
},
"BattleReadyID": 20111001,

36
bin/json/game_puggsyisland.json
View File

@ -17,7 +17,11 @@
"text": "航行抵达伯克岛"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
},
{
"node_id": 2,
@ -37,7 +41,11 @@
"text": "航行抵达战栗海岸"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
},
{
"node_id": 3,
@ -57,7 +65,11 @@
"text": "航行抵达西西伯利亚"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
},
{
"node_id": 4,
@ -77,7 +89,11 @@
"text": "航行抵达巴尔干半岛"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
},
{
"node_id": 5,
@ -97,7 +113,11 @@
"text": "航行抵达新加坡海峡"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
},
{
"node_id": 6,
@ -117,6 +137,10 @@
"text": "航行抵达马奇洛"
},
"scene": 10011,
"png": []
"png": [
"item_treasure",
"item_treasure",
"item_treasure"
]
}
]

213
bin/json/game_worldall.json
View File

@ -1,9 +1,13 @@
[
{
"id": 10,
"id": 9,
"name": {
"key": "worldtask_world_all_name_1",
"text": "章节1:预言之声"
"key": "worldtask_world_all_name_0",
"text": "预言之声"
},
"titlename": {
"key": "worldtask_world_all_titlename_0",
"text": "序章"
},
"task_icon": "",
"task_txt": {
@ -19,16 +23,43 @@
]
},
{
"id": 20,
"id": 10,
"name": {
"key": "worldtask_world_all_name_2",
"text": "章节2:大龙归来"
"key": "worldtask_world_all_name_1",
"text": "极北营救"
},
"titlename": {
"key": "worldtask_world_all_titlename_1",
"text": "第一章"
},
"task_icon": "",
"task_txt": {
"key": "worldtask_world_all_task_txt_2",
"text": "完成所有任务有可以领取额外奖励"
},
"reword": [
{
"a": "item",
"t": "10000001",
"n": 5
}
]
},
{
"id": 20,
"name": {
"key": "worldtask_world_all_name_2",
"text": "原石危机"
},
"titlename": {
"key": "worldtask_world_all_titlename_2",
"text": "第二章"
},
"task_icon": "",
"task_txt": {
"key": "worldtask_world_all_task_txt_3",
"text": "完成所有任务有可以领取额外奖励"
},
"reword": [
{
"a": "item",
@ -41,11 +72,15 @@
"id": 30,
"name": {
"key": "worldtask_world_all_name_3",
"text": "章节3:小偷与大盗"
"text": "小偷与大盗"
},
"titlename": {
"key": "worldtask_world_all_titlename_3",
"text": "第三章"
},
"task_icon": "",
"task_txt": {
"key": "worldtask_world_all_task_txt_3",
"key": "worldtask_world_all_task_txt_4",
"text": "完成所有任务有可以领取额外奖励"
},
"reword": [
@ -60,11 +95,15 @@
"id": 40,
"name": {
"key": "worldtask_world_all_name_4",
"text": "章节4:交易所风波(上)"
"text": "黑市风波"
},
"titlename": {
"key": "worldtask_world_all_titlename_4",
"text": "第四章"
},
"task_icon": "",
"task_txt": {
"key": "worldtask_world_all_task_txt_4",
"key": "worldtask_world_all_task_txt_5",
"text": "完成所有任务有可以领取额外奖励"
},
"reword": [
@ -81,9 +120,13 @@
"key": "worldtask_world_all_name_5",
"text": "章节5:交易所风波(下)"
},
"titlename": {
"key": "worldtask_world_all_titlename_5",
"text": "第五章"
},
"task_icon": "",
"task_txt": {
"key": "worldtask_world_all_task_txt_5",
"key": "worldtask_world_all_task_txt_6",
"text": "完成所有任务有可以领取额外奖励"
},
"reword": [
@ -100,6 +143,10 @@
"key": "worldtask_world_all_name_6",
"text": "酋长蜕变"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "rw_img_xlgs",
"task_txt": {
"key": "",
@ -113,6 +160,10 @@
"key": "worldtask_world_all_name_7",
"text": "\"伊\"路向前"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "rw_img_fkysr",
"task_txt": {
"key": "",
@ -126,6 +177,10 @@
"key": "worldtask_world_all_name_8",
"text": "坏蛋艺术家"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "rw_img_hdlm",
"task_txt": {
"key": "",
@ -139,6 +194,10 @@
"key": "worldtask_world_all_name_42",
"text": "隐藏"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -152,6 +211,10 @@
"key": "worldtask_world_all_name_9",
"text": "日常测试1"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -165,6 +228,10 @@
"key": "worldtask_world_all_name_10",
"text": "日常测试2"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -178,6 +245,10 @@
"key": "worldtask_world_all_name_11",
"text": "日常测试3"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -191,6 +262,10 @@
"key": "worldtask_world_all_name_12",
"text": "日常测试4"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -204,6 +279,10 @@
"key": "worldtask_world_all_name_13",
"text": "日常测试5"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -217,6 +296,10 @@
"key": "worldtask_world_all_name_14",
"text": "日常测试6"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -230,6 +313,10 @@
"key": "worldtask_world_all_name_15",
"text": "日常测试7"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -243,6 +330,10 @@
"key": "worldtask_world_all_name_16",
"text": "日常测试8"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -256,6 +347,10 @@
"key": "worldtask_world_all_name_17",
"text": "日常测试9"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -269,6 +364,10 @@
"key": "worldtask_world_all_name_18",
"text": "日常测试10"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -282,6 +381,10 @@
"key": "worldtask_world_all_name_19",
"text": "日常测试11"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -295,6 +398,10 @@
"key": "worldtask_world_all_name_20",
"text": "日常测试12"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -308,6 +415,10 @@
"key": "worldtask_world_all_name_21",
"text": "日常测试13"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -321,6 +432,10 @@
"key": "worldtask_world_all_name_22",
"text": "日常测试14"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -334,6 +449,10 @@
"key": "worldtask_world_all_name_23",
"text": "日常测试15"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -347,6 +466,10 @@
"key": "worldtask_world_all_name_24",
"text": "日常测试16"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -360,6 +483,10 @@
"key": "worldtask_world_all_name_25",
"text": "日常测试17"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -373,6 +500,10 @@
"key": "worldtask_world_all_name_26",
"text": "日常测试18"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -386,6 +517,10 @@
"key": "worldtask_world_all_name_27",
"text": "日常测试19"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -399,6 +534,10 @@
"key": "worldtask_world_all_name_28",
"text": "日常测试20"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -412,6 +551,10 @@
"key": "worldtask_world_all_name_29",
"text": "日常测试21"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -425,6 +568,10 @@
"key": "worldtask_world_all_name_30",
"text": "日常测试22"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -438,6 +585,10 @@
"key": "worldtask_world_all_name_31",
"text": "日常测试23"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -451,6 +602,10 @@
"key": "worldtask_world_all_name_32",
"text": "日常测试24"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -464,6 +619,10 @@
"key": "worldtask_world_all_name_33",
"text": "日常测试25"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -477,6 +636,10 @@
"key": "worldtask_world_all_name_34",
"text": "日常测试26"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -490,6 +653,10 @@
"key": "worldtask_world_all_name_35",
"text": "日常测试27"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -503,6 +670,10 @@
"key": "worldtask_world_all_name_36",
"text": "日常测试28"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -516,6 +687,10 @@
"key": "worldtask_world_all_name_37",
"text": "日常测试29"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -529,6 +704,10 @@
"key": "worldtask_world_all_name_38",
"text": "日常测试30"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -542,6 +721,10 @@
"key": "worldtask_world_all_name_39",
"text": "日常测试31"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -555,6 +738,10 @@
"key": "worldtask_world_all_name_40",
"text": "日常测试32"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",
@ -568,6 +755,10 @@
"key": "worldtask_world_all_name_41",
"text": "日常测试33"
},
"titlename": {
"key": "",
"text": ""
},
"task_icon": "",
"task_txt": {
"key": "",

20
bin/json/game_worldtask.json
View File

@ -6,7 +6,7 @@
"lockend": 999,
"ontxe": 0,
"id_after": 20011,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25001",
@ -66,7 +66,7 @@
"lockend": 999,
"ontxe": 20010,
"id_after": 20012,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25001",
@ -109,7 +109,7 @@
"lockend": 999,
"ontxe": 20011,
"id_after": 20020,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25001",
@ -178,7 +178,7 @@
"lockend": 999,
"ontxe": 20012,
"id_after": 20030,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25002",
@ -237,7 +237,7 @@
"lockend": 999,
"ontxe": 20020,
"id_after": 20031,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25003",
@ -292,7 +292,7 @@
"lockend": 999,
"ontxe": 20030,
"id_after": 20032,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25005",
@ -344,7 +344,7 @@
"lockend": 999,
"ontxe": 20031,
"id_after": 20033,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25005",
@ -398,7 +398,7 @@
"lockend": 999,
"ontxe": 20032,
"id_after": 20034,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25005",
@ -455,7 +455,7 @@
"lockend": 999,
"ontxe": 20033,
"id_after": 20035,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25005",
@ -514,7 +514,7 @@
"lockend": 999,
"ontxe": 20034,
"id_after": 20042,
"group": 10,
"group": 9,
"exgroup": 210,
"des": 2,
"icon": "25005",

14
modules/arena/module.go
View File

@ -100,12 +100,22 @@ func (this *Arena) Rpc_ModuleArenaRaceSettlement(ctx context.Context, args *pb.E
// 修改用户积分
func (this *Arena) Rpc_ModuleArenaModifyIntegral(ctx context.Context, args *pb.RPCModifyIntegralReq, reply *pb.EmptyResp) (err error) {
this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "args", Value: args.String()})
var (
info *pb.DBArenaUser
)
//防止数据未初始化就修改数据
if _, err = this.modelArena.queryPlayerInfo(args.Uid); err != nil && err != mgo.MongodbNil {
if info, err = this.modelArena.queryPlayerInfo(args.Uid); err != nil && err != mgo.MongodbNil {
this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "err", Value: err.Error()})
return
}
err = this.modelArena.modifyIntegral(args.Uid, args.Integral)
if err = this.modelArena.modifyIntegral(args.Uid, args.Integral); err != nil {
this.Debug("Rpc_ModuleArenaModifyIntegral", log.Field{Key: "err", Value: err.Error()})
return
}
err = this.modelRank.updateArenaRank(&pb.ArenaPlayer{
Uinfo: info.Uinfo,
Integral: args.Integral,
})
return
}

35
modules/equipment/api_inscribe.go
View File

@ -1,6 +1,7 @@
package equipment
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
@ -21,11 +22,12 @@ func (this *apiComp) InscribeCheck(session comm.IUserSession, req *pb.EquipmentI
// 铭刻
func (this *apiComp) Inscribe(session comm.IUserSession, req *pb.EquipmentInscribeReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
hero *pb.DBHero
conf *cfg.GameEquipData
heroconf *cfg.GameHeroData
err error
equip *pb.DB_Equipment
hero *pb.DBHero
conf *cfg.GameEquipData
heroconf *cfg.GameHeroData
equipments []*pb.DB_Equipment
err error
)
if errdata = this.InscribeCheck(session, req); errdata != nil {
@ -85,6 +87,29 @@ func (this *apiComp) Inscribe(session comm.IUserSession, req *pb.EquipmentInscri
equip.Inscribe = req.Heroid
equip.Inscribevalue = int32(math.Floor(float64(equip.MainEntry.Value) * float64(conf.EngravingBonus) / float64(1000.0)))
if equip.HeroId == hero.Id {
equipments = make([]*pb.DB_Equipment, 8)
for i, v := range hero.EquipID {
if v != "" {
if v != equip.Id {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("装备唯一 id:%s", v),
}
return
}
} else {
equipments[i] = equip
}
}
}
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
return
}
}
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
"inscribe": equip.Inscribe,
"inscribevalue": equip.Inscribevalue,

108
modules/equipment/api_uninscribe.go Normal file
View File

@ -0,0 +1,108 @@
package equipment
import (
"fmt"
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
func (this *apiComp) UnInscribeCheck(session comm.IUserSession, req *pb.EquipmentUnInscribeReq) (errdata *pb.ErrorData) {
if req.Eid == "" || req.Heroid == "" {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: "ReqParameter is null",
}
}
return
}
// 铭刻
func (this *apiComp) UnInscribe(session comm.IUserSession, req *pb.EquipmentUnInscribeReq) (errdata *pb.ErrorData) {
var (
equip *pb.DB_Equipment
hero *pb.DBHero
conf *cfg.GameEquipData
equipments []*pb.DB_Equipment
err error
)
if errdata = this.UnInscribeCheck(session, req); errdata != nil {
return
}
if equip, err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), req.Eid); err != nil {
this.module.Errorf("Equip_Check err:%v", err)
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: err.Error(),
}
return
}
if equip.Inscribe == "" {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: "equie Inscribe no activation!",
}
return
}
if conf, err = this.module.configure.GetEquipmentConfigureById(equip.CId); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
//消耗
if errdata = this.module.ConsumeRes(session, conf.ResetNeed, true); errdata != nil {
return
}
targethero := equip.Inscribe
equip.Inscribe = ""
equip.Inscribevalue = 0
if targethero == equip.HeroId {
equipments = make([]*pb.DB_Equipment, 8)
if hero, errdata = this.module.ModuleHero.GetHeroByObjID(session.GetUserId(), equip.HeroId); errdata != nil {
return
}
for i, v := range hero.EquipID {
if v != "" {
if v != equip.Id {
if equipments[i], err = this.module.modelEquipment.QueryUserEquipmentsById(session.GetUserId(), v); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_EquipmentOnFoundEquipment,
Title: pb.ErrorCode_EquipmentOnFoundEquipment.ToString(),
Message: fmt.Sprintf("装备唯一 id:%s", v),
}
return
}
} else {
equipments[i] = equip
}
}
}
if errdata = this.module.ModuleHero.UpdateEquipment(session, hero, equipments); errdata != nil {
return
}
}
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{
"inscribe": equip.Inscribe,
"inscribevalue": equip.Inscribevalue,
}); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
session.SendMsg(string(this.module.GetType()), "uninscribe", &pb.EquipmentUnInscribeResp{})
return
}

5
modules/hero/model_hero.go
View File

@ -430,6 +430,9 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
}
hero.EquipID[i] = v.Id
addProperty[v.MainEntry.AttrName] += v.MainEntry.Value //主属性
if v.Inscribe == hero.Id { //铭刻生效
addProperty[v.MainEntry.AttrName] += v.Inscribevalue
}
for _, v := range v.AdverbEntry {
addProperty[v.AttrName] += v.Value + v.EnchValue //附加属性
}
@ -484,6 +487,8 @@ func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[in
"addProperty": data,
"equipSkill": skills,
"fightvalue": hero.Fightvalue,
"suits": hero.Suits,
"equipID": hero.EquipID,
}); err != nil {
this.module.Errorf("mergeAddProperty err %v", err)
}

22
modules/hero/module.go
View File

@ -116,17 +116,17 @@ func (this *Hero) UpdateEquipment(session comm.IUserSession, hero *pb.DBHero, eq
}
list := make([]*pb.DBHero, 0)
if newHero, err := this.modelHero.setEquipment(session.GetUserId(), hero); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_HeroEquipUpdate,
Title: pb.ErrorCode_HeroEquipUpdate.ToString(),
}
return
} else {
if newHero != nil {
list = append(list, newHero)
}
}
// if newHero, err := this.modelHero.setEquipment(session.GetUserId(), hero); err != nil {
// errdata = &pb.ErrorData{
// Code: pb.ErrorCode_HeroEquipUpdate,
// Title: pb.ErrorCode_HeroEquipUpdate.ToString(),
// }
// return
// } else {
// if newHero != nil {
// list = append(list, newHero)
// }
// }
list = append(list, hero)
this.modelHero.setEquipProperty(hero, equip)

8
modules/island/api_Info.go
View File

@ -42,8 +42,12 @@ func (this *apiComp) Info(session comm.IUserSession, req *pb.IsLandInfoReq) (err
}
return
}
for _, v := range cards {
info.Heroshop[v] = 0
info.Heroshop = make([]*pb.DBIslandShopItem, 5)
for i, v := range cards {
info.Heroshop[i] = &pb.DBIslandShopItem{
Cid: v,
Buy: 0,
}
}
this.module.model.Change(session.GetUserId(), map[string]interface{}{
"heroshop": info.Heroshop,

38
modules/island/api_buy.go
View File

@ -10,27 +10,41 @@ import (
// 参数校验
func (this *apiComp) BuyCheck(session comm.IUserSession, req *pb.IsLandBuyReq) (errdata *pb.ErrorData) {
if req.Index < 0 || req.Index >= 5 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Title: pb.ErrorCode_ReqParameterError.ToString(),
Message: "index out range",
}
}
return
}
// /获取自己的排行榜信息
func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errdata *pb.ErrorData) {
var (
shopitem *pb.DBIslandShopItem
conf *cfg.GameHeroData
coinconf *cfg.GamePuggsyRecruitData
info *pb.DBIsland
heros []*pb.DBHero
hero *pb.DBHero
buynum int32
ok bool
err error
)
if errdata = this.BuyCheck(session, req); errdata != nil {
return
}
if conf, err = this.module.ModuleTools.GetHeroConfig(req.Cids); err != nil {
if info, err = this.module.model.getmodel(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
shopitem = info.Heroshop[req.Index]
if conf, err = this.module.ModuleTools.GetHeroConfig(shopitem.Cid); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Message: err.Error(),
@ -46,26 +60,18 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errda
return
}
if info, err = this.module.model.getmodel(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
Message: err.Error(),
}
return
}
if errdata = this.module.ConsumeRes(session, coinconf.Need, true); errdata != nil {
return
}
if buynum, ok = info.Heroshop[req.Cids]; ok && buynum > 0 {
if shopitem.Buy > 0 {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ReqParameterError,
Message: "Purchased !",
}
return
}
info.Heroshop[req.Cids] = 1
shopitem.Buy = 1
if heros, err = this.module.modelhero.getHeroList(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -75,9 +81,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errda
}
for _, v := range heros {
if v.HeroID == req.Cids {
if v.HeroID == shopitem.Cid {
hero = v
if hero.Star <= 6 {
if hero.Star < 6 {
hero.Star++
hero.Lv = hero.Star * 10
} else {

31
modules/island/api_refresheroshop.go
View File

@ -3,6 +3,7 @@ package island
import (
"go_dreamfactory/comm"
"go_dreamfactory/pb"
cfg "go_dreamfactory/sys/configure/structs"
)
// 参数校验
@ -14,14 +15,15 @@ func (this *apiComp) RefresHeroShopCheck(session comm.IUserSession, req *pb.IsLa
//刷新商店
func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRefresHeroShopReq) (errdata *pb.ErrorData) {
var (
need []*cfg.Gameatn
info *pb.DBIsland
cards []string
err error
err error
)
if errdata = this.RefresHeroShopCheck(session, req); errdata != nil {
return
}
if info, err = this.module.model.getmodel(session.GetUserId()); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -30,6 +32,22 @@ func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRef
return
}
info.Refreshed++
pricekey := this.module.ModuleTools.GetGlobalConf().PuggsyBuy
if res, err := this.module.ModuleTools.GetPriceGroupCost(pricekey, info.Refreshed); len(res) > 0 {
need = append(need, res...)
} else {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_ConfigNoFound,
Title: pb.ErrorCode_ConfigNoFound.ToString(),
Message: err.Error(),
}
return
}
if errdata = this.module.ConsumeRes(session, need, true); errdata != nil {
return
}
if cards, err = this.module.hero.GetRandomCardByCardPool(session.GetUserId(), 5); err != nil {
errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError,
@ -37,9 +55,12 @@ func (this *apiComp) RefresHeroShop(session comm.IUserSession, req *pb.IsLandRef
}
return
}
info.Heroshop = make(map[string]int32)
for _, v := range cards {
info.Heroshop[v] = 0
info.Heroshop = make([]*pb.DBIslandShopItem, 5)
for i, v := range cards {
info.Heroshop[i] = &pb.DBIslandShopItem{
Cid: v,
Buy: 0,
}
}
this.module.model.Change(session.GetUserId(), map[string]interface{}{
"heroshop": info.Heroshop,

2
modules/island/model.go
View File

@ -43,7 +43,7 @@ func (this *modelComp) getmodel(uid string) (result *pb.DBIsland, err error) {
Uid: uid,
Opentime: utils.GetMonthStart(),
Endtime: utils.GetMonthEnd(configure.Now().Unix()),
Heroshop: make(map[string]int32),
Heroshop: make([]*pb.DBIslandShopItem, 0),
Islands: make(map[int32]*pb.DBIslandItem),
Nodes: make(map[int32]int32),
}

18
modules/shop/api_getlist.go
View File

@ -110,7 +110,23 @@ func (this *apiComp) Getlist(session comm.IUserSession, req *pb.ShopGetListReq)
}
sdata.ManualRefreshNum++
}
//重新计算刷新时间点
switch shopconf.Rtype {
case -1: //一百年不刷新
sdata.LastRefreshTime = 0
case 1:
sdata.LastRefreshTime = configure.Now().Add(time.Hour * time.Duration(shopconf.Rtime)).Unix()
break
case 2:
sdata.LastRefreshTime = utils.GetZeroTime(configure.Now().Unix())
break
case 3:
sdata.LastRefreshTime = utils.WeekIntervalTime(configure.Now().Unix())
break
case 4:
sdata.LastRefreshTime = utils.GetMonthEnd(configure.Now().Unix())
break
}
var _items []*cfg.GameShopitemData
for _, v := range shopconf.Shopitem {
if _items, err = this.module.configure.GetShopItemsConfigureByGroups(v, udata); err != nil || len(_items) == 0 {

165
pb/equipment_msg.pb.go
View File

@ -1169,6 +1169,101 @@ func (*EquipmentInscribeResp) Descriptor() ([]byte, []int) {
return file_equipment_equipment_msg_proto_rawDescGZIP(), []int{20}
}
//装备铭刻 请求
type EquipmentUnInscribeReq struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Eid string `protobuf:"bytes,1,opt,name=eid,proto3" json:"eid"`
Heroid string `protobuf:"bytes,2,opt,name=heroid,proto3" json:"heroid"`
}
func (x *EquipmentUnInscribeReq) Reset() {
*x = EquipmentUnInscribeReq{}
if protoimpl.UnsafeEnabled {
mi := &file_equipment_equipment_msg_proto_msgTypes[21]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EquipmentUnInscribeReq) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EquipmentUnInscribeReq) ProtoMessage() {}
func (x *EquipmentUnInscribeReq) ProtoReflect() protoreflect.Message {
mi := &file_equipment_equipment_msg_proto_msgTypes[21]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EquipmentUnInscribeReq.ProtoReflect.Descriptor instead.
func (*EquipmentUnInscribeReq) Descriptor() ([]byte, []int) {
return file_equipment_equipment_msg_proto_rawDescGZIP(), []int{21}
}
func (x *EquipmentUnInscribeReq) GetEid() string {
if x != nil {
return x.Eid
}
return ""
}
func (x *EquipmentUnInscribeReq) GetHeroid() string {
if x != nil {
return x.Heroid
}
return ""
}
//装备铭刻 请求回应
type EquipmentUnInscribeResp struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
}
func (x *EquipmentUnInscribeResp) Reset() {
*x = EquipmentUnInscribeResp{}
if protoimpl.UnsafeEnabled {
mi := &file_equipment_equipment_msg_proto_msgTypes[22]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *EquipmentUnInscribeResp) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*EquipmentUnInscribeResp) ProtoMessage() {}
func (x *EquipmentUnInscribeResp) ProtoReflect() protoreflect.Message {
mi := &file_equipment_equipment_msg_proto_msgTypes[22]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use EquipmentUnInscribeResp.ProtoReflect.Descriptor instead.
func (*EquipmentUnInscribeResp) Descriptor() ([]byte, []int) {
return file_equipment_equipment_msg_proto_rawDescGZIP(), []int{22}
}
var File_equipment_equipment_msg_proto protoreflect.FileDescriptor
var file_equipment_equipment_msg_proto_rawDesc = []byte{
@ -1278,8 +1373,14 @@ var file_equipment_equipment_msg_proto_rawDesc = []byte{
0x01, 0x28, 0x09, 0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f,
0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64,
0x22, 0x17, 0x0a, 0x15, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x49, 0x6e, 0x73,
0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70,
0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x63, 0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x73, 0x70, 0x22, 0x42, 0x0a, 0x16, 0x45, 0x71, 0x75,
0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x49, 0x6e, 0x73, 0x63, 0x72, 0x69, 0x62, 0x65,
0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x65, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,
0x52, 0x03, 0x65, 0x69, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x18,
0x02, 0x20, 0x01, 0x28, 0x09, 0x52, 0x06, 0x68, 0x65, 0x72, 0x6f, 0x69, 0x64, 0x22, 0x19, 0x0a,
0x17, 0x45, 0x71, 0x75, 0x69, 0x70, 0x6d, 0x65, 0x6e, 0x74, 0x55, 0x6e, 0x49, 0x6e, 0x73, 0x63,
0x72, 0x69, 0x62, 0x65, 0x52, 0x65, 0x73, 0x70, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62,
0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -1294,7 +1395,7 @@ func file_equipment_equipment_msg_proto_rawDescGZIP() []byte {
return file_equipment_equipment_msg_proto_rawDescData
}
var file_equipment_equipment_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 21)
var file_equipment_equipment_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 23)
var file_equipment_equipment_msg_proto_goTypes = []interface{}{
(*EquipmentGetListReq)(nil), // 0: EquipmentGetListReq
(*EquipmentGetListResp)(nil), // 1: EquipmentGetListResp
@ -1317,23 +1418,25 @@ var file_equipment_equipment_msg_proto_goTypes = []interface{}{
(*EquipmentEnchResp)(nil), // 18: EquipmentEnchResp
(*EquipmentInscribeReq)(nil), // 19: EquipmentInscribeReq
(*EquipmentInscribeResp)(nil), // 20: EquipmentInscribeResp
(*DB_Equipment)(nil), // 21: DB_Equipment
(*DB_EquipmentSuit)(nil), // 22: DB_EquipmentSuit
(*UserAtno)(nil), // 23: UserAtno
(*EquipmentAttributeEntry)(nil), // 24: EquipmentAttributeEntry
(*EquipmentSkillEntry)(nil), // 25: EquipmentSkillEntry
(*EquipmentUnInscribeReq)(nil), // 21: EquipmentUnInscribeReq
(*EquipmentUnInscribeResp)(nil), // 22: EquipmentUnInscribeResp
(*DB_Equipment)(nil), // 23: DB_Equipment
(*DB_EquipmentSuit)(nil), // 24: DB_EquipmentSuit
(*UserAtno)(nil), // 25: UserAtno
(*EquipmentAttributeEntry)(nil), // 26: EquipmentAttributeEntry
(*EquipmentSkillEntry)(nil), // 27: EquipmentSkillEntry
}
var file_equipment_equipment_msg_proto_depIdxs = []int32{
21, // 0: EquipmentGetListResp.Equipments:type_name -> DB_Equipment
21, // 1: EquipmentChangePush.Equipments:type_name -> DB_Equipment
21, // 2: EquipmentEquipResp.Equipments:type_name -> DB_Equipment
22, // 3: EquipmentEquipResp.Suits:type_name -> DB_EquipmentSuit
21, // 4: EquipmentUpgradeResp.Equipment:type_name -> DB_Equipment
22, // 5: EquipmentUpgradeResp.Suits:type_name -> DB_EquipmentSuit
23, // 6: EquipmentSellResp.reward:type_name -> UserAtno
23, // 7: EquipmentForgResp.reward:type_name -> UserAtno
24, // 8: EquipmentWashResp.adverbEntry:type_name -> EquipmentAttributeEntry
25, // 9: EquipmentWashResp.adverbSkill:type_name -> EquipmentSkillEntry
23, // 0: EquipmentGetListResp.Equipments:type_name -> DB_Equipment
23, // 1: EquipmentChangePush.Equipments:type_name -> DB_Equipment
23, // 2: EquipmentEquipResp.Equipments:type_name -> DB_Equipment
24, // 3: EquipmentEquipResp.Suits:type_name -> DB_EquipmentSuit
23, // 4: EquipmentUpgradeResp.Equipment:type_name -> DB_Equipment
24, // 5: EquipmentUpgradeResp.Suits:type_name -> DB_EquipmentSuit
25, // 6: EquipmentSellResp.reward:type_name -> UserAtno
25, // 7: EquipmentForgResp.reward:type_name -> UserAtno
26, // 8: EquipmentWashResp.adverbEntry:type_name -> EquipmentAttributeEntry
27, // 9: EquipmentWashResp.adverbSkill:type_name -> EquipmentSkillEntry
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
@ -1601,6 +1704,30 @@ func file_equipment_equipment_msg_proto_init() {
return nil
}
}
file_equipment_equipment_msg_proto_msgTypes[21].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EquipmentUnInscribeReq); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_equipment_equipment_msg_proto_msgTypes[22].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*EquipmentUnInscribeResp); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
}
type x struct{}
out := protoimpl.TypeBuilder{
@ -1608,7 +1735,7 @@ func file_equipment_equipment_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_equipment_equipment_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 21,
NumMessages: 23,
NumExtensions: 0,
NumServices: 0,
},

176
pb/island_db.pb.go
View File

@ -29,10 +29,10 @@ type DBIsland struct {
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
Opentime int64 `protobuf:"varint,3,opt,name=opentime,proto3" json:"opentime"` //开启时间
Endtime int64 `protobuf:"varint,4,opt,name=endtime,proto3" json:"endtime"`
Heroshop map[string]int32 `protobuf:"bytes,5,rep,name=heroshop,proto3" json:"heroshop" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //英雄商店
Islands map[int32]*DBIslandItem `protobuf:"bytes,6,rep,name=islands,proto3" json:"islands" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //岛屿
Nodes map[int32]int32 `protobuf:"bytes,7,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //养成节点
Freeprogress int32 `protobuf:"varint,8,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取天数
Heroshop []*DBIslandShopItem `protobuf:"bytes,5,rep,name=heroshop,proto3" json:"heroshop"` //英雄商店
Islands map[int32]*DBIslandItem `protobuf:"bytes,6,rep,name=islands,proto3" json:"islands" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"bytes,2,opt,name=value,proto3"` //岛屿
Nodes map[int32]int32 `protobuf:"bytes,7,rep,name=nodes,proto3" json:"nodes" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //养成节点
Freeprogress int32 `protobuf:"varint,8,opt,name=freeprogress,proto3" json:"freeprogress"` //已领取天数
Payprogress int32 `protobuf:"varint,9,opt,name=payprogress,proto3" json:"payprogress"`
Vip bool `protobuf:"varint,10,opt,name=vip,proto3" json:"vip"`
Refreshed int32 `protobuf:"varint,11,opt,name=refreshed,proto3" json:"refreshed"` //已刷新
@ -98,7 +98,7 @@ func (x *DBIsland) GetEndtime() int64 {
return 0
}
func (x *DBIsland) GetHeroshop() map[string]int32 {
func (x *DBIsland) GetHeroshop() []*DBIslandShopItem {
if x != nil {
return x.Heroshop
}
@ -147,6 +147,61 @@ func (x *DBIsland) GetRefreshed() int32 {
return 0
}
type DBIslandShopItem struct {
state protoimpl.MessageState
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Cid string `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid"`
Buy int32 `protobuf:"varint,2,opt,name=buy,proto3" json:"buy"`
}
func (x *DBIslandShopItem) Reset() {
*x = DBIslandShopItem{}
if protoimpl.UnsafeEnabled {
mi := &file_island_island_db_proto_msgTypes[1]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
}
func (x *DBIslandShopItem) String() string {
return protoimpl.X.MessageStringOf(x)
}
func (*DBIslandShopItem) ProtoMessage() {}
func (x *DBIslandShopItem) ProtoReflect() protoreflect.Message {
mi := &file_island_island_db_proto_msgTypes[1]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
ms.StoreMessageInfo(mi)
}
return ms
}
return mi.MessageOf(x)
}
// Deprecated: Use DBIslandShopItem.ProtoReflect.Descriptor instead.
func (*DBIslandShopItem) Descriptor() ([]byte, []int) {
return file_island_island_db_proto_rawDescGZIP(), []int{1}
}
func (x *DBIslandShopItem) GetCid() string {
if x != nil {
return x.Cid
}
return ""
}
func (x *DBIslandShopItem) GetBuy() int32 {
if x != nil {
return x.Buy
}
return 0
}
//海岛地图
type DBIslandItem struct {
state protoimpl.MessageState
@ -161,7 +216,7 @@ type DBIslandItem struct {
func (x *DBIslandItem) Reset() {
*x = DBIslandItem{}
if protoimpl.UnsafeEnabled {
mi := &file_island_island_db_proto_msgTypes[1]
mi := &file_island_island_db_proto_msgTypes[2]
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
ms.StoreMessageInfo(mi)
}
@ -174,7 +229,7 @@ func (x *DBIslandItem) String() string {
func (*DBIslandItem) ProtoMessage() {}
func (x *DBIslandItem) ProtoReflect() protoreflect.Message {
mi := &file_island_island_db_proto_msgTypes[1]
mi := &file_island_island_db_proto_msgTypes[2]
if protoimpl.UnsafeEnabled && x != nil {
ms := protoimpl.X.MessageStateOf(protoimpl.Pointer(x))
if ms.LoadMessageInfo() == nil {
@ -187,7 +242,7 @@ func (x *DBIslandItem) ProtoReflect() protoreflect.Message {
// Deprecated: Use DBIslandItem.ProtoReflect.Descriptor instead.
func (*DBIslandItem) Descriptor() ([]byte, []int) {
return file_island_island_db_proto_rawDescGZIP(), []int{1}
return file_island_island_db_proto_rawDescGZIP(), []int{2}
}
func (x *DBIslandItem) GetId() int32 {
@ -215,53 +270,52 @@ var File_island_island_db_proto protoreflect.FileDescriptor
var file_island_island_db_proto_rawDesc = []byte{
0x0a, 0x16, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2f, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x5f,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xad, 0x04, 0x0a, 0x08, 0x44, 0x42, 0x49,
0x64, 0x62, 0x2e, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x22, 0xea, 0x03, 0x0a, 0x08, 0x44, 0x42, 0x49,
0x73, 0x6c, 0x61, 0x6e, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28,
0x09, 0x52, 0x02, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x75, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01,
0x28, 0x09, 0x52, 0x03, 0x75, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
0x69, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x03, 0x52, 0x08, 0x6f, 0x70, 0x65, 0x6e, 0x74,
0x69, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x18, 0x04,
0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x33, 0x0a,
0x20, 0x01, 0x28, 0x03, 0x52, 0x07, 0x65, 0x6e, 0x64, 0x74, 0x69, 0x6d, 0x65, 0x12, 0x2d, 0x0a,
0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18, 0x05, 0x20, 0x03, 0x28, 0x0b, 0x32,
0x17, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73,
0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68,
0x6f, 0x70, 0x12, 0x30, 0x0a, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x49,
0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x69, 0x73, 0x6c,
0x61, 0x6e, 0x64, 0x73, 0x12, 0x2a, 0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x4e,
0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73,
0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73,
0x18, 0x08, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67,
0x72, 0x65, 0x73, 0x73, 0x12, 0x20, 0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72,
0x65, 0x73, 0x73, 0x18, 0x09, 0x20, 0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72,
0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x0a, 0x20,
0x01, 0x28, 0x08, 0x52, 0x03, 0x76, 0x69, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x72,
0x65, 0x73, 0x68, 0x65, 0x64, 0x18, 0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x66,
0x72, 0x65, 0x73, 0x68, 0x65, 0x64, 0x1a, 0x3b, 0x0a, 0x0d, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x68,
0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x1a, 0x49, 0x0a, 0x0c, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02,
0x20, 0x01, 0x28, 0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49,
0x74, 0x65, 0x6d, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38,
0x0a, 0x0a, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03,
0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14,
0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x9a, 0x01, 0x0a, 0x0c, 0x44, 0x42, 0x49,
0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18,
0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e, 0x0a, 0x05, 0x6c, 0x65, 0x76,
0x65, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c,
0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10, 0x0a, 0x03, 0x70, 0x6f, 0x73,
0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73, 0x1a, 0x38, 0x0a, 0x0a, 0x4c,
0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x11, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74,
0x65, 0x6d, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x12, 0x30, 0x0a, 0x07,
0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x18, 0x06, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x16, 0x2e,
0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x07, 0x69, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x12, 0x2a,
0x0a, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x18, 0x07, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x14, 0x2e,
0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x2e, 0x4e, 0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x52, 0x05, 0x6e, 0x6f, 0x64, 0x65, 0x73, 0x12, 0x22, 0x0a, 0x0c, 0x66, 0x72,
0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x08, 0x20, 0x01, 0x28, 0x05,
0x52, 0x0c, 0x66, 0x72, 0x65, 0x65, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x12, 0x20,
0x0a, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73, 0x18, 0x09, 0x20,
0x01, 0x28, 0x05, 0x52, 0x0b, 0x70, 0x61, 0x79, 0x70, 0x72, 0x6f, 0x67, 0x72, 0x65, 0x73, 0x73,
0x12, 0x10, 0x0a, 0x03, 0x76, 0x69, 0x70, 0x18, 0x0a, 0x20, 0x01, 0x28, 0x08, 0x52, 0x03, 0x76,
0x69, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x65, 0x64, 0x18,
0x0b, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68, 0x65, 0x64,
0x1a, 0x49, 0x0a, 0x0c, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b,
0x65, 0x79, 0x12, 0x23, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x0b, 0x32, 0x0d, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d,
0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x38, 0x0a, 0x0a, 0x4e,
0x6f, 0x64, 0x65, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79,
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76,
0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70,
0x72, 0x6f, 0x74, 0x6f, 0x33,
0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x36, 0x0a, 0x10, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e,
0x64, 0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x10, 0x0a, 0x03, 0x63, 0x69, 0x64,
0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x63, 0x69, 0x64, 0x12, 0x10, 0x0a, 0x03, 0x62,
0x75, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x62, 0x75, 0x79, 0x22, 0x9a, 0x01,
0x0a, 0x0c, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x12, 0x0e,
0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x69, 0x64, 0x12, 0x2e,
0x0a, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x18, 0x2e,
0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x49, 0x74, 0x65, 0x6d, 0x2e, 0x4c, 0x65, 0x76,
0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52, 0x05, 0x6c, 0x65, 0x76, 0x65, 0x6c, 0x12, 0x10,
0x0a, 0x03, 0x70, 0x6f, 0x73, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x70, 0x6f, 0x73,
0x1a, 0x38, 0x0a, 0x0a, 0x4c, 0x65, 0x76, 0x65, 0x6c, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6b, 0x65, 0x79,
0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x42, 0x06, 0x5a, 0x04, 0x2e, 0x3b,
0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -278,19 +332,19 @@ func file_island_island_db_proto_rawDescGZIP() []byte {
var file_island_island_db_proto_msgTypes = make([]protoimpl.MessageInfo, 6)
var file_island_island_db_proto_goTypes = []interface{}{
(*DBIsland)(nil), // 0: DBIsland
(*DBIslandItem)(nil), // 1: DBIslandItem
nil, // 2: DBIsland.HeroshopEntry
nil, // 3: DBIsland.IslandsEntry
nil, // 4: DBIsland.NodesEntry
nil, // 5: DBIslandItem.LevelEntry
(*DBIsland)(nil), // 0: DBIsland
(*DBIslandShopItem)(nil), // 1: DBIslandShopItem
(*DBIslandItem)(nil), // 2: DBIslandItem
nil, // 3: DBIsland.IslandsEntry
nil, // 4: DBIsland.NodesEntry
nil, // 5: DBIslandItem.LevelEntry
}
var file_island_island_db_proto_depIdxs = []int32{
2, // 0: DBIsland.heroshop:type_name -> DBIsland.HeroshopEntry
1, // 0: DBIsland.heroshop:type_name -> DBIslandShopItem
3, // 1: DBIsland.islands:type_name -> DBIsland.IslandsEntry
4, // 2: DBIsland.nodes:type_name -> DBIsland.NodesEntry
5, // 3: DBIslandItem.level:type_name -> DBIslandItem.LevelEntry
1, // 4: DBIsland.IslandsEntry.value:type_name -> DBIslandItem
2, // 4: DBIsland.IslandsEntry.value:type_name -> DBIslandItem
5, // [5:5] is the sub-list for method output_type
5, // [5:5] is the sub-list for method input_type
5, // [5:5] is the sub-list for extension type_name
@ -317,6 +371,18 @@ func file_island_island_db_proto_init() {
}
}
file_island_island_db_proto_msgTypes[1].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBIslandShopItem); i {
case 0:
return &v.state
case 1:
return &v.sizeCache
case 2:
return &v.unknownFields
default:
return nil
}
}
file_island_island_db_proto_msgTypes[2].Exporter = func(v interface{}, i int) interface{} {
switch v := v.(*DBIslandItem); i {
case 0:
return &v.state

109
pb/island_msg.pb.go
View File

@ -406,8 +406,8 @@ type IsLandRefresHeroShopResp struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Refreshed int32 `protobuf:"varint,1,opt,name=refreshed,proto3" json:"refreshed"` //已刷新
Heroshop map[string]int32 `protobuf:"bytes,2,rep,name=heroshop,proto3" json:"heroshop" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //英雄商店
Refreshed int32 `protobuf:"varint,1,opt,name=refreshed,proto3" json:"refreshed"` //已刷新
Heroshop []*DBIslandShopItem `protobuf:"bytes,2,rep,name=heroshop,proto3" json:"heroshop"` //英雄商店
}
func (x *IsLandRefresHeroShopResp) Reset() {
@ -449,7 +449,7 @@ func (x *IsLandRefresHeroShopResp) GetRefreshed() int32 {
return 0
}
func (x *IsLandRefresHeroShopResp) GetHeroshop() map[string]int32 {
func (x *IsLandRefresHeroShopResp) GetHeroshop() []*DBIslandShopItem {
if x != nil {
return x.Heroshop
}
@ -462,7 +462,7 @@ type IsLandBuyReq struct {
sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields
Cids string `protobuf:"bytes,1,opt,name=cids,proto3" json:"cids"`
Index int32 `protobuf:"varint,1,opt,name=index,proto3" json:"index"`
}
func (x *IsLandBuyReq) Reset() {
@ -497,11 +497,11 @@ func (*IsLandBuyReq) Descriptor() ([]byte, []int) {
return file_island_island_msg_proto_rawDescGZIP(), []int{8}
}
func (x *IsLandBuyReq) GetCids() string {
func (x *IsLandBuyReq) GetIndex() int32 {
if x != nil {
return x.Cids
return x.Index
}
return ""
return 0
}
//购买英雄卡回应
@ -791,37 +791,32 @@ var file_island_island_msg_proto_rawDesc = []byte{
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x22, 0x19,
0x0a, 0x17, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65,
0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0xba, 0x01, 0x0a, 0x18, 0x49, 0x73,
0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68,
0x6f, 0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65,
0x73, 0x68, 0x65, 0x64, 0x12, 0x43, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70,
0x18, 0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x27, 0x2e, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52,
0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x73,
0x70, 0x2e, 0x48, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x52,
0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x1a, 0x3b, 0x0a, 0x0d, 0x48, 0x65, 0x72,
0x6f, 0x73, 0x68, 0x6f, 0x70, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65,
0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05,
0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0x22, 0x0a, 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64,
0x42, 0x75, 0x79, 0x52, 0x65, 0x71, 0x12, 0x12, 0x0a, 0x04, 0x63, 0x69, 0x64, 0x73, 0x18, 0x01,
0x20, 0x01, 0x28, 0x09, 0x52, 0x04, 0x63, 0x69, 0x64, 0x73, 0x22, 0x2c, 0x0a, 0x0d, 0x49, 0x73,
0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68,
0x65, 0x72, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65,
0x72, 0x6f, 0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61,
0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03,
0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x35,
0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52,
0x65, 0x73, 0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05,
0x52, 0x03, 0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x02, 0x6c, 0x76, 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52,
0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x11, 0x49, 0x73, 0x4c,
0x61, 0x6e, 0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d,
0x0a, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44,
0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a,
0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55,
0x73, 0x65, 0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06,
0x5a, 0x04, 0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
0x72, 0x6f, 0x53, 0x68, 0x6f, 0x70, 0x52, 0x65, 0x71, 0x22, 0x67, 0x0a, 0x18, 0x49, 0x73, 0x4c,
0x61, 0x6e, 0x64, 0x52, 0x65, 0x66, 0x72, 0x65, 0x73, 0x48, 0x65, 0x72, 0x6f, 0x53, 0x68, 0x6f,
0x70, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1c, 0x0a, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73, 0x68,
0x65, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x72, 0x65, 0x66, 0x72, 0x65, 0x73,
0x68, 0x65, 0x64, 0x12, 0x2d, 0x0a, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68, 0x6f, 0x70, 0x18,
0x02, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x11, 0x2e, 0x44, 0x42, 0x49, 0x73, 0x6c, 0x61, 0x6e, 0x64,
0x53, 0x68, 0x6f, 0x70, 0x49, 0x74, 0x65, 0x6d, 0x52, 0x08, 0x68, 0x65, 0x72, 0x6f, 0x73, 0x68,
0x6f, 0x70, 0x22, 0x24, 0x0a, 0x0c, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x42, 0x75, 0x79, 0x52,
0x65, 0x71, 0x12, 0x14, 0x0a, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x18, 0x01, 0x20, 0x01, 0x28,
0x05, 0x52, 0x05, 0x69, 0x6e, 0x64, 0x65, 0x78, 0x22, 0x2c, 0x0a, 0x0d, 0x49, 0x73, 0x4c, 0x61,
0x6e, 0x64, 0x42, 0x75, 0x79, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1b, 0x0a, 0x04, 0x68, 0x65, 0x72,
0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x07, 0x2e, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f,
0x52, 0x04, 0x68, 0x65, 0x72, 0x6f, 0x22, 0x24, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64,
0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x71, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69,
0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03, 0x6e, 0x69, 0x64, 0x22, 0x35, 0x0a, 0x11,
0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x55, 0x70, 0x67, 0x72, 0x61, 0x64, 0x65, 0x52, 0x65, 0x73,
0x70, 0x12, 0x10, 0x0a, 0x03, 0x6e, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x03,
0x6e, 0x69, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x6c, 0x76, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52,
0x02, 0x6c, 0x76, 0x22, 0x12, 0x0a, 0x10, 0x49, 0x73, 0x4c, 0x61, 0x6e, 0x64, 0x52, 0x65, 0x63,
0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x71, 0x22, 0x53, 0x0a, 0x11, 0x49, 0x73, 0x4c, 0x61, 0x6e,
0x64, 0x52, 0x65, 0x63, 0x65, 0x69, 0x76, 0x65, 0x52, 0x65, 0x73, 0x70, 0x12, 0x1d, 0x0a, 0x04,
0x69, 0x6e, 0x66, 0x6f, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x44, 0x42, 0x49,
0x73, 0x6c, 0x61, 0x6e, 0x64, 0x52, 0x04, 0x69, 0x6e, 0x66, 0x6f, 0x12, 0x1f, 0x0a, 0x05, 0x61,
0x77, 0x61, 0x72, 0x64, 0x18, 0x04, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x09, 0x2e, 0x55, 0x73, 0x65,
0x72, 0x41, 0x74, 0x6e, 0x6f, 0x52, 0x05, 0x61, 0x77, 0x61, 0x72, 0x64, 0x42, 0x06, 0x5a, 0x04,
0x2e, 0x3b, 0x70, 0x62, 0x62, 0x06, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
}
var (
@ -836,7 +831,7 @@ func file_island_island_msg_proto_rawDescGZIP() []byte {
return file_island_island_msg_proto_rawDescData
}
var file_island_island_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 15)
var file_island_island_msg_proto_msgTypes = make([]protoimpl.MessageInfo, 14)
var file_island_island_msg_proto_goTypes = []interface{}{
(*IsLandInfoReq)(nil), // 0: IsLandInfoReq
(*IsLandInfoResp)(nil), // 1: IsLandInfoResp
@ -852,25 +847,25 @@ var file_island_island_msg_proto_goTypes = []interface{}{
(*IsLandUpgradeResp)(nil), // 11: IsLandUpgradeResp
(*IsLandReceiveReq)(nil), // 12: IsLandReceiveReq
(*IsLandReceiveResp)(nil), // 13: IsLandReceiveResp
nil, // 14: IsLandRefresHeroShopResp.HeroshopEntry
(*DBIsland)(nil), // 15: DBIsland
(*DBHero)(nil), // 16: DBHero
(*BattleFormation)(nil), // 17: BattleFormation
(*BattleInfo)(nil), // 18: BattleInfo
(*BattleReport)(nil), // 19: BattleReport
(*UserAtno)(nil), // 20: UserAtno
(*DBIsland)(nil), // 14: DBIsland
(*DBHero)(nil), // 15: DBHero
(*BattleFormation)(nil), // 16: BattleFormation
(*BattleInfo)(nil), // 17: BattleInfo
(*BattleReport)(nil), // 18: BattleReport
(*UserAtno)(nil), // 19: UserAtno
(*DBIslandShopItem)(nil), // 20: DBIslandShopItem
}
var file_island_island_msg_proto_depIdxs = []int32{
15, // 0: IsLandInfoResp.info:type_name -> DBIsland
16, // 1: IsLandInfoResp.heros:type_name -> DBHero
17, // 2: IsLandBattleReq.battle:type_name -> BattleFormation
18, // 3: IsLandBattleResp.info:type_name -> BattleInfo
19, // 4: IsLandCompleteReq.report:type_name -> BattleReport
20, // 5: IsLandCompleteResp.award:type_name -> UserAtno
14, // 6: IsLandRefresHeroShopResp.heroshop:type_name -> IsLandRefresHeroShopResp.HeroshopEntry
16, // 7: IsLandBuyResp.hero:type_name -> DBHero
15, // 8: IsLandReceiveResp.info:type_name -> DBIsland
20, // 9: IsLandReceiveResp.award:type_name -> UserAtno
14, // 0: IsLandInfoResp.info:type_name -> DBIsland
15, // 1: IsLandInfoResp.heros:type_name -> DBHero
16, // 2: IsLandBattleReq.battle:type_name -> BattleFormation
17, // 3: IsLandBattleResp.info:type_name -> BattleInfo
18, // 4: IsLandCompleteReq.report:type_name -> BattleReport
19, // 5: IsLandCompleteResp.award:type_name -> UserAtno
20, // 6: IsLandRefresHeroShopResp.heroshop:type_name -> DBIslandShopItem
15, // 7: IsLandBuyResp.hero:type_name -> DBHero
14, // 8: IsLandReceiveResp.info:type_name -> DBIsland
19, // 9: IsLandReceiveResp.award:type_name -> UserAtno
10, // [10:10] is the sub-list for method output_type
10, // [10:10] is the sub-list for method input_type
10, // [10:10] is the sub-list for extension type_name
@ -1063,7 +1058,7 @@ func file_island_island_msg_proto_init() {
GoPackagePath: reflect.TypeOf(x{}).PkgPath(),
RawDescriptor: file_island_island_msg_proto_rawDesc,
NumEnums: 0,
NumMessages: 15,
NumMessages: 14,
NumExtensions: 0,
NumServices: 0,
},

2
sys/configure/structs/Game.WorldAllData.go
View File

@ -13,6 +13,7 @@ import "errors"
type GameWorldAllData struct {
Id int32
Name string
Titlename string
TaskIcon string
TaskTxt string
Reword []*Gameatn
@ -27,6 +28,7 @@ func (*GameWorldAllData) GetTypeId() int32 {
func (_v *GameWorldAllData)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; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["titlename"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Titlename error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Titlename, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.TaskIcon, _ok_ = _buf["task_icon"].(string); !_ok_ { err = errors.New("task_icon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["task_txt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.TaskTxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.TaskTxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{

2
sys/configure/structs/game.globalData.go
View File

@ -294,6 +294,7 @@ type GameGlobalData struct {
PvpMaintenancetime int32
PvpIntegraltool string
SxReturnspeed float32
PuggsyBuy int32
}
const TypeId_GameGlobalData = 477542761
@ -1119,6 +1120,7 @@ func (_v *GameGlobalData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["pvp_maintenancetime"].(float64); !_ok_ { err = errors.New("pvp_maintenancetime error"); return }; _v.PvpMaintenancetime = int32(_tempNum_) }
{ var _ok_ bool; if _v.PvpIntegraltool, _ok_ = _buf["pvp_integraltool"].(string); !_ok_ { err = errors.New("pvp_integraltool error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["sx_returnspeed"].(float64); !_ok_ { err = errors.New("sx_returnspeed error"); return }; _v.SxReturnspeed = float32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["puggsy_buy"].(float64); !_ok_ { err = errors.New("puggsy_buy error"); return }; _v.PuggsyBuy = int32(_tempNum_) }
return
}