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:
wh_zcy 2023-06-20 14:41:57 +08:00
commit a4752a9521
9 changed files with 8585 additions and 8297 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
bin/json/game_buriedcondi.json
View File

@ -16972,7 +16972,7 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_726",
"text": "击败豺狼小怪"
"text": "击败恐惧灵"
},
"type": 70,
"valid": 0,
@ -17259,7 +17259,7 @@
},
"type": 169,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 1,
"filter": [
1
@ -17283,7 +17283,7 @@
},
"type": 43,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 3,
"filter": [
3
@ -17519,7 +17519,7 @@
},
"type": 41,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 6,
"filter": [
3
@ -17543,7 +17543,7 @@
},
"type": 43,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 3,
"filter": [
6
@ -17712,7 +17712,7 @@
},
"type": 43,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 6,
"filter": [
6
@ -17785,7 +17785,7 @@
},
"type": 43,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 8,
"filter": [
3
@ -17809,7 +17809,7 @@
},
"type": 169,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 1,
"filter": [
10
@ -17952,7 +17952,7 @@
},
"type": 43,
"valid": 0,
"NPC": -102,
"NPC": 0,
"value": 9,
"filter": [
6
@ -18767,7 +18767,7 @@
"key": "buried_buried_condi_tasktxt_801",
"text": "守护者回响解锁次数10次"
},
"type": 199,
"type": 173,
"valid": 0,
"NPC": 10754,
"value": 10,
@ -18789,7 +18789,7 @@
"key": "buried_buried_condi_tasktxt_802",
"text": "守护者回响解锁次数15次"
},
"type": 199,
"type": 173,
"valid": 0,
"NPC": 10764,
"value": 15,
@ -18904,12 +18904,12 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_807",
"text": "守护者回响解锁解锁20次"
"text": "守护者回响解锁解锁30次"
},
"type": 199,
"type": 173,
"valid": 0,
"NPC": 10814,
"value": 20,
"value": 30,
"filter": [],
"filter2": [
"0",
@ -19095,12 +19095,12 @@
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_815",
"text": "守护者回响解锁25次"
"text": "守护者回响解锁50次"
},
"type": 199,
"type": 173,
"valid": 0,
"NPC": 10894,
"value": 25,
"value": 50,
"filter": [],
"filter2": [
"0",

2
bin/json/game_mainstartype.json
View File

@ -10,7 +10,7 @@
"id": 2,
"starName": {
"key": "mainchapter_main_startype_starName_2",
"text": "被击败人数不超过{0}人"
"text": "死亡人数不超过{0}人"
}
},
{

15604
bin/json/game_monsterformat.json
View File

File diff suppressed because it is too large Load Diff

486
bin/json/game_newsmithy.json
View File

@ -23,21 +23,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2
@ -73,21 +79,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2,
@ -124,21 +136,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3
@ -174,21 +192,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3,
@ -225,21 +249,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4
@ -275,21 +305,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4,
@ -326,21 +362,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5
@ -376,21 +418,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5,
@ -427,21 +475,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
5,
6
@ -477,21 +531,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2
@ -527,21 +587,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2,
@ -578,21 +644,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3
@ -628,21 +700,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3,
@ -679,21 +757,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4
@ -729,21 +813,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4,
@ -780,21 +870,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5
@ -830,21 +926,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5,
@ -881,21 +983,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
5,
6
@ -931,21 +1039,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2
@ -981,21 +1095,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
1,
2,
@ -1032,21 +1152,27 @@
}
],
"temperature_cos": 30,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 1
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3
@ -1082,21 +1208,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
2,
3,
@ -1133,21 +1265,27 @@
}
],
"temperature_cos": 40,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 2
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4
@ -1183,21 +1321,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
3,
4,
@ -1234,21 +1378,27 @@
}
],
"temperature_cos": 50,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 3
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5
@ -1284,21 +1434,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
4,
5,
@ -1335,21 +1491,27 @@
}
],
"temperature_cos": 60,
"refine_cos": {
"refine_cos": [
{
"a": "item",
"t": "13000001",
"n": 4
},
"customized_cos1": {
}
],
"customized_cos1": [
{
"a": "item",
"t": "13000002",
"n": 10
},
"customized_cos2": {
}
],
"customized_cos2": [
{
"a": "item",
"t": "13000002",
"n": 40
},
}
],
"customized_lv": [
5,
6

154
bin/json/game_smithytask.json
View File

@ -4,7 +4,7 @@
"id_list": 1,
"task_display": {
"key": "newsmithy_task_task_display_1",
"text": "累计18次普通招募"
"text": "进行1次普通招募"
},
"type_id": 2018001,
"reword": [
@ -25,7 +25,7 @@
"id_list": 2,
"task_display": {
"key": "newsmithy_task_task_display_2",
"text": "任意守护者提升24次等级"
"text": "为任意守护者提升1次等级"
},
"type_id": 2024001,
"reword": [
@ -42,11 +42,11 @@
]
},
{
"key": 10003,
"id_list": 3,
"key": 10004,
"id_list": 4,
"task_display": {
"key": "newsmithy_task_task_display_3",
"text": "累计强化装备成功47次"
"text": "强化任意装备成功1次"
},
"type_id": 2047001,
"reword": [
@ -63,13 +63,13 @@
]
},
{
"key": 10004,
"id_list": 4,
"key": 10006,
"id_list": 6,
"task_display": {
"key": "newsmithy_task_task_display_4",
"text": "世界聊天发言62次"
"text": "在商店购买任意1件商品"
},
"type_id": 2062001,
"type_id": 2064001,
"reword": [
{
"a": "attr",
@ -84,13 +84,13 @@
]
},
{
"key": 10005,
"id_list": 5,
"key": 10007,
"id_list": 7,
"task_display": {
"key": "newsmithy_task_task_display_5",
"text": "任意商品购买64次"
"text": "使用好友助战守护者战斗1次"
},
"type_id": 2064001,
"type_id": 2012001,
"reword": [
{
"a": "attr",
@ -105,11 +105,11 @@
]
},
{
"key": 10006,
"id_list": 6,
"key": 10008,
"id_list": 8,
"task_display": {
"key": "newsmithy_task_task_display_6",
"text": "进行130次竞技场挑战"
"text": "进行竞技场挑战1次"
},
"type_id": 2130001,
"reword": [
@ -126,13 +126,13 @@
]
},
{
"key": 10007,
"id_list": 7,
"key": 10009,
"id_list": 9,
"task_display": {
"key": "newsmithy_task_task_display_7",
"text": "累计登录8天"
"text": "进行10次普通招募"
},
"type_id": 3008001,
"type_id": 3018001,
"reword": [
{
"a": "attr",
@ -147,13 +147,13 @@
]
},
{
"key": 10008,
"id_list": 8,
"key": 10010,
"id_list": 10,
"task_display": {
"key": "newsmithy_task_task_display_8",
"text": "使用好友助战12次"
"text": "为任意守护者提升10次等级"
},
"type_id": 3012001,
"type_id": 3024001,
"reword": [
{
"a": "attr",
@ -163,18 +163,18 @@
{
"a": "attr",
"t": "diamond",
"n": 11
"n": 10
}
]
},
{
"key": 10009,
"id_list": 9,
"key": 10011,
"id_list": 12,
"task_display": {
"key": "newsmithy_task_task_display_9",
"text": "累计18次普通招募"
"text": "强化任意装备成功6次"
},
"type_id": 3018001,
"type_id": 3047001,
"reword": [
{
"a": "attr",
@ -184,18 +184,18 @@
{
"a": "attr",
"t": "diamond",
"n": 12
"n": 10
}
]
},
{
"key": 10010,
"id_list": 10,
"key": 10012,
"id_list": 14,
"task_display": {
"key": "newsmithy_task_task_display_10",
"text": "任意守护者提升24次等级"
"text": "在商店购买任意7件商品"
},
"type_id": 3024001,
"type_id": 3064001,
"reword": [
{
"a": "attr",
@ -205,7 +205,91 @@
{
"a": "attr",
"t": "diamond",
"n": 13
"n": 10
}
]
},
{
"key": 10013,
"id_list": 15,
"task_display": {
"key": "newsmithy_task_task_display_11",
"text": "使用好友助战守护者战斗7次"
},
"type_id": 3012001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 20
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10014,
"id_list": 17,
"task_display": {
"key": "newsmithy_task_task_display_12",
"text": "刷新商店10次"
},
"type_id": 3105001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 21
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10015,
"id_list": 18,
"task_display": {
"key": "newsmithy_task_task_display_13",
"text": "消费1000颗钻石"
},
"type_id": 3104001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 22
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
},
{
"key": 10016,
"id_list": 19,
"task_display": {
"key": "newsmithy_task_task_display_14",
"text": "进行30场竞技场挑战"
},
"type_id": 3130001,
"reword": [
{
"a": "attr",
"t": "gold",
"n": 23
},
{
"a": "attr",
"t": "diamond",
"n": 10
}
]
}

4
modules/mline/comp_configure.go
View File

@ -170,12 +170,12 @@ func (this *configureComp) GMGetPreStage(chapterID int32) (chapter []int32) {
if v, err := this.GetConfigure(game_mainchapter); err == nil {
if configure, ok := v.(*cfg.GameMainChapter); ok {
for _, conf := range configure.GetDataList() {
if conf.ChapterType == curChapter.ChapterType {
//if conf.ChapterType == curChapter.ChapterType {
if chapterID == conf.Id {
break
}
chapter = append(chapter, conf.Id)
}
//}
}
}
}

45
modules/mline/module.go
View File

@ -95,6 +95,9 @@ func (this *Mline) CheckPoint(uid string) bool {
// 参数 难度 + 章节id
func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32) (errdata *pb.ErrorData) {
var del []string
var newChapter []int32
var _mp map[int32]int32
_mp = make(map[int32]int32)
connf, err := this.configure.GetMainStageConf(id)
if err != nil {
errdata = &pb.ErrorData{
@ -120,7 +123,6 @@ func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32)
this.modelMline.cleanChapterDataById(session.GetUserId(), del...)
_data := this.configure.GetAllStageByChapterID(connf.Chapterid)
newData := &pb.DBMline{
Id: primitive.NewObjectID().Hex(),
Uid: session.GetUserId(),
@ -136,6 +138,16 @@ func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32)
newData.Star[v] = 7
}
}
itype := this.configure.GetMainChapterConf(connf.Chapterid).ChapterType
if _, ok := _mp[itype]; !ok {
_mp[itype] = newData.StageId
}
for k, v := range _mp {
if k == itype && v <= newData.StageId {
_mp[itype] = newData.StageId
}
}
newChapter = append(newChapter, connf.Chapterid) // 更新
this.modelMline.addNewChapter(session.GetUserId(), newData)
// 获取之前的章节数据
for _, v := range this.configure.GMGetPreStage(connf.Chapterid) {
@ -156,30 +168,21 @@ func (this *Mline) ModifyMlineDataByNanduID(session comm.IUserSession, id int32)
newData.StageId = v
}
}
itype := this.configure.GetMainChapterConf(v).ChapterType
if _, ok := _mp[itype]; !ok {
_mp[itype] = newData.StageId
}
for k, v := range _mp {
if k == itype && v <= newData.StageId {
_mp[itype] = newData.StageId
}
}
newChapter = append(newChapter, v) // 更新
this.modelMline.addNewChapter(session.GetUserId(), newData)
}
// 修改扩展数据
if rst, err := this.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度
_mp := rst.Mline
var cType int32
conf := this.configure.GetMainChapterConf(connf.Chapterid)
if conf != nil {
cType = conf.ChapterType
}
if _mp == nil {
_mp = make(map[int32]int32, 1)
_mp[cType] = id
} else {
if v, ok := _mp[cType]; ok {
if v <= id {
_mp[cType] = id
}
} else {
_mp[cType] = id
}
}
if _, err := this.ModuleUser.GetUserExpand(session.GetUserId()); err == nil { // 统计主线进度
this.ModuleUser.ChangeUserExpand(session.GetUserId(), map[string]interface{}{
"mline": _mp,
})

10
modules/smithy/api_forgeequip.go
View File

@ -79,21 +79,21 @@ func (this *apiComp) ForgeEquip(session comm.IUserSession, req *pb.SmithyForgeEq
}
// 是否是精益打造
if req.Quality > 0 {
costRes = append(costRes, reelcfg.RefineCos)
costRes = append(costRes, reelcfg.RefineCos...)
bQuality = true
}
// 校验是不是装备定制打造
if req.SuiteId != 0 {
if req.Position == -1 {
if errdata = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos1}); errdata != nil {
if errdata = this.module.CheckRes(session, reelcfg.CustomizedCos1); errdata != nil {
return
}
costRes = append(costRes, reelcfg.CustomizedCos1)
costRes = append(costRes, reelcfg.CustomizedCos1...)
} else {
if errdata = this.module.CheckRes(session, []*cfg.Gameatn{reelcfg.CustomizedCos2}); errdata != nil {
if errdata = this.module.CheckRes(session, reelcfg.CustomizedCos2); errdata != nil {
return
}
costRes = append(costRes, reelcfg.CustomizedCos2)
costRes = append(costRes, reelcfg.CustomizedCos2...)
}
// 随机权重 获取等级
index := this.module.modelStove.GetRandEquipLv(reelcfg.CustomizedLvDistribution)

51
sys/configure/structs/Game.NewSmithyData.go
View File

@ -22,9 +22,9 @@ type GameNewSmithyData struct {
BasicDrop int32
BasicCos []*Gameatn
TemperatureCos int32
RefineCos *Gameatn
CustomizedCos1 *Gameatn
CustomizedCos2 *Gameatn
RefineCos []*Gameatn
CustomizedCos1 []*Gameatn
CustomizedCos2 []*Gameatn
CustomizedLv []int32
CustomizedLvDistribution []int32
LightVelocity int32
@ -61,9 +61,48 @@ func (_v *GameNewSmithyData)Deserialize(_buf map[string]interface{}) (err error)
}
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["temperature_cos"].(float64); !_ok_ { err = errors.New("temperature_cos error"); return }; _v.TemperatureCos = int32(_tempNum_) }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["refine_cos"].(map[string]interface{}); !_ok_ { err = errors.New("refine_cos error"); return }; if _v.RefineCos, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos1"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos1 error"); return }; if _v.CustomizedCos1, err = DeserializeGameatn(_x_); err != nil { return } }
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["customized_cos2"].(map[string]interface{}); !_ok_ { err = errors.New("customized_cos2 error"); return }; if _v.CustomizedCos2, err = DeserializeGameatn(_x_); err != nil { return } }
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["refine_cos"].([]interface{}); !_ok_ { err = errors.New("refine_cos error"); return }
_v.RefineCos = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.RefineCos = append(_v.RefineCos, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["customized_cos1"].([]interface{}); !_ok_ { err = errors.New("customized_cos1 error"); return }
_v.CustomizedCos1 = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.CustomizedCos1 = append(_v.CustomizedCos1, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool
if _arr_, _ok_ = _buf["customized_cos2"].([]interface{}); !_ok_ { err = errors.New("customized_cos2 error"); return }
_v.CustomizedCos2 = make([]*Gameatn, 0, len(_arr_))
for _, _e_ := range _arr_ {
var _list_v_ *Gameatn
{ var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _e_.(map[string]interface{}); !_ok_ { err = errors.New("_list_v_ error"); return }; if _list_v_, err = DeserializeGameatn(_x_); err != nil { return } }
_v.CustomizedCos2 = append(_v.CustomizedCos2, _list_v_)
}
}
{
var _arr_ []interface{}
var _ok_ bool