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

英雄属性修改

Browse Source
This commit is contained in:
meixiongfeng 2024-01-11 16:45:06 +08:00
parent 8e56bebc1b
commit 2879162249
47 changed files with 11601 additions and 6632 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

408
bin/json/game_breakingbad.json
View File

@ -14,8 +14,8 @@
"delicacies": "14020001", "delicacies": "14020001",
"recipe": [ "recipe": [
{ {
"a": "14010001", "s": "14010001",
"n": 20 "d": 20
} }
], ],
"Type": 5, "Type": 5,
@ -30,8 +30,8 @@
"delicacies": "14020002", "delicacies": "14020002",
"recipe": [ "recipe": [
{ {
"a": "14010011", "s": "14010011",
"n": 20 "d": 20
} }
], ],
"Type": 5, "Type": 5,
@ -46,8 +46,8 @@
"delicacies": "14020020", "delicacies": "14020020",
"recipe": [ "recipe": [
{ {
"a": "14010014", "s": "14010014",
"n": 20 "d": 20
} }
], ],
"Type": 3, "Type": 3,
@ -62,8 +62,8 @@
"delicacies": "14020005", "delicacies": "14020005",
"recipe": [ "recipe": [
{ {
"a": "14010008", "s": "14010008",
"n": 20 "d": 20
} }
], ],
"Type": 1, "Type": 1,
@ -78,8 +78,8 @@
"delicacies": "14020024", "delicacies": "14020024",
"recipe": [ "recipe": [
{ {
"a": "14010012", "s": "14010012",
"n": 20 "d": 20
} }
], ],
"Type": 5, "Type": 5,
@ -94,8 +94,8 @@
"delicacies": "14020025", "delicacies": "14020025",
"recipe": [ "recipe": [
{ {
"a": "14010016", "s": "14010016",
"n": 20 "d": 20
} }
], ],
"Type": 2, "Type": 2,
@ -110,8 +110,8 @@
"delicacies": "14020036", "delicacies": "14020036",
"recipe": [ "recipe": [
{ {
"a": "14010006", "s": "14010006",
"n": 20 "d": 20
} }
], ],
"Type": 4, "Type": 4,
@ -126,8 +126,8 @@
"delicacies": "14020040", "delicacies": "14020040",
"recipe": [ "recipe": [
{ {
"a": "14010009", "s": "14010009",
"n": 20 "d": 20
} }
], ],
"Type": 5, "Type": 5,
@ -142,8 +142,8 @@
"delicacies": "14020045", "delicacies": "14020045",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 20 "d": 20
} }
], ],
"Type": 3, "Type": 3,
@ -158,8 +158,8 @@
"delicacies": "14020048", "delicacies": "14020048",
"recipe": [ "recipe": [
{ {
"a": "14010003", "s": "14010003",
"n": 20 "d": 20
} }
], ],
"Type": 5, "Type": 5,
@ -174,12 +174,12 @@
"delicacies": "14020046", "delicacies": "14020046",
"recipe": [ "recipe": [
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
}, },
{ {
"a": "14010011", "s": "14010011",
"n": 10 "d": 10
} }
], ],
"Type": 6, "Type": 6,
@ -194,12 +194,12 @@
"delicacies": "14020004", "delicacies": "14020004",
"recipe": [ "recipe": [
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
}, },
{ {
"a": "14010012", "s": "14010012",
"n": 10 "d": 10
} }
], ],
"Type": 6, "Type": 6,
@ -214,12 +214,12 @@
"delicacies": "14020022", "delicacies": "14020022",
"recipe": [ "recipe": [
{ {
"a": "14010016", "s": "14010016",
"n": 10 "d": 10
}, },
{ {
"a": "14010002", "s": "14010002",
"n": 10 "d": 10
} }
], ],
"Type": 2, "Type": 2,
@ -234,12 +234,12 @@
"delicacies": "14020003", "delicacies": "14020003",
"recipe": [ "recipe": [
{ {
"a": "14010011", "s": "14010011",
"n": 10 "d": 10
}, },
{ {
"a": "14010002", "s": "14010002",
"n": 10 "d": 10
} }
], ],
"Type": 5, "Type": 5,
@ -254,12 +254,12 @@
"delicacies": "14020006", "delicacies": "14020006",
"recipe": [ "recipe": [
{ {
"a": "14010014", "s": "14010014",
"n": 10 "d": 10
}, },
{ {
"a": "14010011", "s": "14010011",
"n": 10 "d": 10
} }
], ],
"Type": 3, "Type": 3,
@ -274,12 +274,12 @@
"delicacies": "14020010", "delicacies": "14020010",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 10 "d": 10
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
} }
], ],
"Type": 6, "Type": 6,
@ -294,12 +294,12 @@
"delicacies": "14020021", "delicacies": "14020021",
"recipe": [ "recipe": [
{ {
"a": "14010014", "s": "14010014",
"n": 10 "d": 10
}, },
{ {
"a": "14010004", "s": "14010004",
"n": 10 "d": 10
} }
], ],
"Type": 3, "Type": 3,
@ -314,12 +314,12 @@
"delicacies": "14020016", "delicacies": "14020016",
"recipe": [ "recipe": [
{ {
"a": "14010013", "s": "14010013",
"n": 10 "d": 10
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
} }
], ],
"Type": 6, "Type": 6,
@ -334,12 +334,12 @@
"delicacies": "14020026", "delicacies": "14020026",
"recipe": [ "recipe": [
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
}, },
{ {
"a": "14010013", "s": "14010013",
"n": 10 "d": 10
} }
], ],
"Type": 1, "Type": 1,
@ -354,12 +354,12 @@
"delicacies": "14020028", "delicacies": "14020028",
"recipe": [ "recipe": [
{ {
"a": "14010004", "s": "14010004",
"n": 10 "d": 10
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
} }
], ],
"Type": 4, "Type": 4,
@ -374,12 +374,12 @@
"delicacies": "14020030", "delicacies": "14020030",
"recipe": [ "recipe": [
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
} }
], ],
"Type": 5, "Type": 5,
@ -394,12 +394,12 @@
"delicacies": "14020031", "delicacies": "14020031",
"recipe": [ "recipe": [
{ {
"a": "14010002", "s": "14010002",
"n": 10 "d": 10
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
} }
], ],
"Type": 1, "Type": 1,
@ -414,12 +414,12 @@
"delicacies": "14020032", "delicacies": "14020032",
"recipe": [ "recipe": [
{ {
"a": "14010006", "s": "14010006",
"n": 10 "d": 10
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
} }
], ],
"Type": 3, "Type": 3,
@ -434,12 +434,12 @@
"delicacies": "14020033", "delicacies": "14020033",
"recipe": [ "recipe": [
{ {
"a": "14010006", "s": "14010006",
"n": 10 "d": 10
}, },
{ {
"a": "14010011", "s": "14010011",
"n": 10 "d": 10
} }
], ],
"Type": 3, "Type": 3,
@ -454,12 +454,12 @@
"delicacies": "14020034", "delicacies": "14020034",
"recipe": [ "recipe": [
{ {
"a": "14010001", "s": "14010001",
"n": 10 "d": 10
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
} }
], ],
"Type": 6, "Type": 6,
@ -474,12 +474,12 @@
"delicacies": "14020035", "delicacies": "14020035",
"recipe": [ "recipe": [
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
}, },
{ {
"a": "14010012", "s": "14010012",
"n": 10 "d": 10
} }
], ],
"Type": 1, "Type": 1,
@ -494,12 +494,12 @@
"delicacies": "14020042", "delicacies": "14020042",
"recipe": [ "recipe": [
{ {
"a": "14010007", "s": "14010007",
"n": 10 "d": 10
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 10 "d": 10
} }
], ],
"Type": 4, "Type": 4,
@ -514,12 +514,12 @@
"delicacies": "14020043", "delicacies": "14020043",
"recipe": [ "recipe": [
{ {
"a": "14010010", "s": "14010010",
"n": 10 "d": 10
}, },
{ {
"a": "14010015", "s": "14010015",
"n": 10 "d": 10
} }
], ],
"Type": 2, "Type": 2,
@ -534,12 +534,12 @@
"delicacies": "14020049", "delicacies": "14020049",
"recipe": [ "recipe": [
{ {
"a": "14010014", "s": "14010014",
"n": 10 "d": 10
}, },
{ {
"a": "14010007", "s": "14010007",
"n": 10 "d": 10
} }
], ],
"Type": 4, "Type": 4,
@ -554,16 +554,16 @@
"delicacies": "14020007", "delicacies": "14020007",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010011", "s": "14010011",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -578,16 +578,16 @@
"delicacies": "14020017", "delicacies": "14020017",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010006", "s": "14010006",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -602,16 +602,16 @@
"delicacies": "14020018", "delicacies": "14020018",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010010", "s": "14010010",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -626,16 +626,16 @@
"delicacies": "14020019", "delicacies": "14020019",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010004", "s": "14010004",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -650,16 +650,16 @@
"delicacies": "14020023", "delicacies": "14020023",
"recipe": [ "recipe": [
{ {
"a": "14010013", "s": "14010013",
"n": 7 "d": 7
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 6 "d": 6
} }
], ],
"Type": 1, "Type": 1,
@ -674,16 +674,16 @@
"delicacies": "14020008", "delicacies": "14020008",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010013", "s": "14010013",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -698,16 +698,16 @@
"delicacies": "14020009", "delicacies": "14020009",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010002", "s": "14010002",
"n": 7 "d": 7
}, },
{ {
"a": "14010011", "s": "14010011",
"n": 6 "d": 6
} }
], ],
"Type": 3, "Type": 3,
@ -722,16 +722,16 @@
"delicacies": "14020011", "delicacies": "14020011",
"recipe": [ "recipe": [
{ {
"a": "14010011", "s": "14010011",
"n": 7 "d": 7
}, },
{ {
"a": "14010013", "s": "14010013",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 6 "d": 6
} }
], ],
"Type": 1, "Type": 1,
@ -746,16 +746,16 @@
"delicacies": "14020012", "delicacies": "14020012",
"recipe": [ "recipe": [
{ {
"a": "14010007", "s": "14010007",
"n": 7 "d": 7
}, },
{ {
"a": "14010006", "s": "14010006",
"n": 7 "d": 7
}, },
{ {
"a": "14010015", "s": "14010015",
"n": 6 "d": 6
} }
], ],
"Type": 4, "Type": 4,
@ -770,16 +770,16 @@
"delicacies": "14020013", "delicacies": "14020013",
"recipe": [ "recipe": [
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010016", "s": "14010016",
"n": 7 "d": 7
}, },
{ {
"a": "14010004", "s": "14010004",
"n": 6 "d": 6
} }
], ],
"Type": 3, "Type": 3,
@ -794,16 +794,16 @@
"delicacies": "14020014", "delicacies": "14020014",
"recipe": [ "recipe": [
{ {
"a": "14010015", "s": "14010015",
"n": 7 "d": 7
}, },
{ {
"a": "14010005", "s": "14010005",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 6 "d": 6
} }
], ],
"Type": 3, "Type": 3,
@ -818,16 +818,16 @@
"delicacies": "14020015", "delicacies": "14020015",
"recipe": [ "recipe": [
{ {
"a": "14010016", "s": "14010016",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010006", "s": "14010006",
"n": 6 "d": 6
} }
], ],
"Type": 6, "Type": 6,
@ -842,16 +842,16 @@
"delicacies": "14020037", "delicacies": "14020037",
"recipe": [ "recipe": [
{ {
"a": "14010007", "s": "14010007",
"n": 7 "d": 7
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 6 "d": 6
} }
], ],
"Type": 2, "Type": 2,
@ -866,16 +866,16 @@
"delicacies": "14020038", "delicacies": "14020038",
"recipe": [ "recipe": [
{ {
"a": "14010007", "s": "14010007",
"n": 7 "d": 7
}, },
{ {
"a": "14010009", "s": "14010009",
"n": 7 "d": 7
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 6 "d": 6
} }
], ],
"Type": 4, "Type": 4,
@ -890,16 +890,16 @@
"delicacies": "14020039", "delicacies": "14020039",
"recipe": [ "recipe": [
{ {
"a": "14010010", "s": "14010010",
"n": 7 "d": 7
}, },
{ {
"a": "14010001", "s": "14010001",
"n": 7 "d": 7
}, },
{ {
"a": "14010008", "s": "14010008",
"n": 6 "d": 6
} }
], ],
"Type": 3, "Type": 3,
@ -914,16 +914,16 @@
"delicacies": "14020041", "delicacies": "14020041",
"recipe": [ "recipe": [
{ {
"a": "14010011", "s": "14010011",
"n": 7 "d": 7
}, },
{ {
"a": "14010016", "s": "14010016",
"n": 7 "d": 7
}, },
{ {
"a": "14010012", "s": "14010012",
"n": 6 "d": 6
} }
], ],
"Type": 3, "Type": 3,
@ -938,16 +938,16 @@
"delicacies": "14020044", "delicacies": "14020044",
"recipe": [ "recipe": [
{ {
"a": "14010010", "s": "14010010",
"n": 7 "d": 7
}, },
{ {
"a": "14010005", "s": "14010005",
"n": 7 "d": 7
}, },
{ {
"a": "14010006", "s": "14010006",
"n": 6 "d": 6
} }
], ],
"Type": 4, "Type": 4,
@ -962,16 +962,16 @@
"delicacies": "14020047", "delicacies": "14020047",
"recipe": [ "recipe": [
{ {
"a": "14010013", "s": "14010013",
"n": 7 "d": 7
}, },
{ {
"a": "14010010", "s": "14010010",
"n": 7 "d": 7
}, },
{ {
"a": "14010005", "s": "14010005",
"n": 6 "d": 6
} }
], ],
"Type": 2, "Type": 2,

108
bin/json/game_buriedcondi.json
View File

@ -22577,5 +22577,113 @@
"value": 6, "value": 6,
"filter": [], "filter": [],
"filter2": [] "filter2": []
},
{
"id": 19000001,
"rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_748",
"text": "传承者达到25级"
},
"type": 20,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"Npc_event_type": 0,
"NPC": 0,
"tipstxt": {
"key": "",
"text": ""
},
"value": 25,
"filter": [],
"filter2": []
},
{
"id": 19000002,
"rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_749",
"text": "传承者达到30级"
},
"type": 20,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"Npc_event_type": 0,
"NPC": 0,
"tipstxt": {
"key": "",
"text": ""
},
"value": 30,
"filter": [],
"filter2": []
},
{
"id": 19000003,
"rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_750",
"text": "传承者达到35级"
},
"type": 20,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"Npc_event_type": 0,
"NPC": 0,
"tipstxt": {
"key": "",
"text": ""
},
"value": 35,
"filter": [],
"filter2": []
},
{
"id": 19000004,
"rtype": 1,
"ctype": 1,
"notify": [],
"type_sp": 1,
"tasktxt": {
"key": "buried_buried_condi_tasktxt_751",
"text": "传承者达到40级"
},
"type": 20,
"valid": 0,
"head": {
"a": "attr",
"t": "gold",
"n": 1
},
"Npc_event_type": 0,
"NPC": 0,
"tipstxt": {
"key": "",
"text": ""
},
"value": 40,
"filter": [],
"filter2": []
} }
] ]

120
bin/json/game_dragonlvitem.json
View File

@ -11,14 +11,8 @@
], ],
"lv": 1, "lv": 1,
"num": [], "num": [],
"item": [ "item": [],
{ "uplv": 19000001
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 2, "key": 2,
@ -38,14 +32,8 @@
2, 2,
2 2
], ],
"item": [ "item": [],
{ "uplv": 19000002
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 3, "key": 3,
@ -65,14 +53,8 @@
4, 4,
4 4
], ],
"item": [ "item": [],
{ "uplv": 19000003
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 4, "key": 4,
@ -92,14 +74,8 @@
6, 6,
6 6
], ],
"item": [ "item": [],
{ "uplv": 19000004
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 5, "key": 5,
@ -134,14 +110,8 @@
], ],
"lv": 1, "lv": 1,
"num": [], "num": [],
"item": [ "item": [],
{ "uplv": 19000001
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 7, "key": 7,
@ -161,14 +131,8 @@
2, 2,
2 2
], ],
"item": [ "item": [],
{ "uplv": 19000002
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 8, "key": 8,
@ -188,14 +152,8 @@
4, 4,
4 4
], ],
"item": [ "item": [],
{ "uplv": 19000003
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 9, "key": 9,
@ -215,14 +173,8 @@
6, 6,
6 6
], ],
"item": [ "item": [],
{ "uplv": 19000004
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 10, "key": 10,
@ -257,14 +209,8 @@
], ],
"lv": 1, "lv": 1,
"num": [], "num": [],
"item": [ "item": [],
{ "uplv": 19000001
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 12, "key": 12,
@ -284,14 +230,8 @@
2, 2,
2 2
], ],
"item": [ "item": [],
{ "uplv": 19000002
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 13, "key": 13,
@ -311,14 +251,8 @@
4, 4,
4 4
], ],
"item": [ "item": [],
{ "uplv": 19000003
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 14, "key": 14,
@ -338,14 +272,8 @@
6, 6,
6 6
], ],
"item": [ "item": [],
{ "uplv": 19000004
"a": "attr",
"t": "gold",
"n": 10000
}
],
"uplv": 0
}, },
{ {
"key": 15, "key": 15,

82
bin/json/game_equipattribute.json
View File

@ -1,6 +1,6 @@
[ [
{ {
"key": "1", "key": 1,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_1", "key": "equip_equip_attribute_attribute_text_1",
@ -20,7 +20,7 @@
] ]
}, },
{ {
"key": "2", "key": 2,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_2", "key": "equip_equip_attribute_attribute_text_2",
@ -40,7 +40,7 @@
] ]
}, },
{ {
"key": "3", "key": 3,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_3", "key": "equip_equip_attribute_attribute_text_3",
@ -60,7 +60,7 @@
] ]
}, },
{ {
"key": "4", "key": 4,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_4", "key": "equip_equip_attribute_attribute_text_4",
@ -80,7 +80,7 @@
] ]
}, },
{ {
"key": "5", "key": 5,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_5", "key": "equip_equip_attribute_attribute_text_5",
@ -100,7 +100,7 @@
] ]
}, },
{ {
"key": "6", "key": 6,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_6", "key": "equip_equip_attribute_attribute_text_6",
@ -120,7 +120,7 @@
] ]
}, },
{ {
"key": "7", "key": 7,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_7", "key": "equip_equip_attribute_attribute_text_7",
@ -140,7 +140,7 @@
] ]
}, },
{ {
"key": "8", "key": 8,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_8", "key": "equip_equip_attribute_attribute_text_8",
@ -160,7 +160,7 @@
] ]
}, },
{ {
"key": "9", "key": 9,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_9", "key": "equip_equip_attribute_attribute_text_9",
@ -180,7 +180,7 @@
] ]
}, },
{ {
"key": "10", "key": 10,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_10", "key": "equip_equip_attribute_attribute_text_10",
@ -200,7 +200,7 @@
] ]
}, },
{ {
"key": "11", "key": 11,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_11", "key": "equip_equip_attribute_attribute_text_11",
@ -220,7 +220,7 @@
] ]
}, },
{ {
"key": "12", "key": 12,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_12", "key": "equip_equip_attribute_attribute_text_12",
@ -240,7 +240,7 @@
] ]
}, },
{ {
"key": "13", "key": 13,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_13", "key": "equip_equip_attribute_attribute_text_13",
@ -260,7 +260,7 @@
] ]
}, },
{ {
"key": "14", "key": 14,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_14", "key": "equip_equip_attribute_attribute_text_14",
@ -280,7 +280,7 @@
] ]
}, },
{ {
"key": "15", "key": 15,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_15", "key": "equip_equip_attribute_attribute_text_15",
@ -300,7 +300,7 @@
] ]
}, },
{ {
"key": "16", "key": 16,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_16", "key": "equip_equip_attribute_attribute_text_16",
@ -320,7 +320,7 @@
] ]
}, },
{ {
"key": "17", "key": 17,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_17", "key": "equip_equip_attribute_attribute_text_17",
@ -340,7 +340,7 @@
] ]
}, },
{ {
"key": "18", "key": 18,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_18", "key": "equip_equip_attribute_attribute_text_18",
@ -360,7 +360,7 @@
] ]
}, },
{ {
"key": "19", "key": 19,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_19", "key": "equip_equip_attribute_attribute_text_19",
@ -380,7 +380,7 @@
] ]
}, },
{ {
"key": "20", "key": 20,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_20", "key": "equip_equip_attribute_attribute_text_20",
@ -400,7 +400,7 @@
] ]
}, },
{ {
"key": "21", "key": 21,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_21", "key": "equip_equip_attribute_attribute_text_21",
@ -420,7 +420,7 @@
] ]
}, },
{ {
"key": "22", "key": 22,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_22", "key": "equip_equip_attribute_attribute_text_22",
@ -440,7 +440,7 @@
] ]
}, },
{ {
"key": "23", "key": 23,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_23", "key": "equip_equip_attribute_attribute_text_23",
@ -460,7 +460,7 @@
] ]
}, },
{ {
"key": "24", "key": 24,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_24", "key": "equip_equip_attribute_attribute_text_24",
@ -480,7 +480,7 @@
] ]
}, },
{ {
"key": "25", "key": 25,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_25", "key": "equip_equip_attribute_attribute_text_25",
@ -500,7 +500,7 @@
] ]
}, },
{ {
"key": "26", "key": 26,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_26", "key": "equip_equip_attribute_attribute_text_26",
@ -520,7 +520,7 @@
] ]
}, },
{ {
"key": "27", "key": 27,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_27", "key": "equip_equip_attribute_attribute_text_27",
@ -540,7 +540,7 @@
] ]
}, },
{ {
"key": "28", "key": 28,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_28", "key": "equip_equip_attribute_attribute_text_28",
@ -560,7 +560,7 @@
] ]
}, },
{ {
"key": "29", "key": 29,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_29", "key": "equip_equip_attribute_attribute_text_29",
@ -580,7 +580,7 @@
] ]
}, },
{ {
"key": "30", "key": 30,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_30", "key": "equip_equip_attribute_attribute_text_30",
@ -600,7 +600,7 @@
] ]
}, },
{ {
"key": "31", "key": 31,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_31", "key": "equip_equip_attribute_attribute_text_31",
@ -620,7 +620,7 @@
] ]
}, },
{ {
"key": "32", "key": 32,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_32", "key": "equip_equip_attribute_attribute_text_32",
@ -640,7 +640,7 @@
] ]
}, },
{ {
"key": "33", "key": 33,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_33", "key": "equip_equip_attribute_attribute_text_33",
@ -660,7 +660,7 @@
] ]
}, },
{ {
"key": "34", "key": 34,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_34", "key": "equip_equip_attribute_attribute_text_34",
@ -680,7 +680,7 @@
] ]
}, },
{ {
"key": "35", "key": 35,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_35", "key": "equip_equip_attribute_attribute_text_35",
@ -700,7 +700,7 @@
] ]
}, },
{ {
"key": "36", "key": 36,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_36", "key": "equip_equip_attribute_attribute_text_36",
@ -720,7 +720,7 @@
] ]
}, },
{ {
"key": "37", "key": 37,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_37", "key": "equip_equip_attribute_attribute_text_37",
@ -740,7 +740,7 @@
] ]
}, },
{ {
"key": "38", "key": 38,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_38", "key": "equip_equip_attribute_attribute_text_38",
@ -760,7 +760,7 @@
] ]
}, },
{ {
"key": "39", "key": 39,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_39", "key": "equip_equip_attribute_attribute_text_39",
@ -780,7 +780,7 @@
] ]
}, },
{ {
"key": "40", "key": 40,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_40", "key": "equip_equip_attribute_attribute_text_40",
@ -800,7 +800,7 @@
] ]
}, },
{ {
"key": "41", "key": 41,
"skill_id": 125004011, "skill_id": 125004011,
"attribute_text": { "attribute_text": {
"key": "equip_equip_attribute_attribute_text_41", "key": "equip_equip_attribute_attribute_text_41",

7168
bin/json/game_equipattrlibrarys.json
View File

File diff suppressed because it is too large Load Diff

38
bin/json/game_equipenchanting.json
View File

@ -2,7 +2,7 @@
{ {
"item": "19001001", "item": "19001001",
"suittype": 1, "suittype": 1,
"attrkey": "atk", "attrkey": 56,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -16,7 +16,7 @@
{ {
"item": "19002001", "item": "19002001",
"suittype": 1, "suittype": 1,
"attrkey": "hppro", "attrkey": 54,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -30,7 +30,7 @@
{ {
"item": "19003001", "item": "19003001",
"suittype": 1, "suittype": 1,
"attrkey": "def", "attrkey": 59,
"attr_mini": 50, "attr_mini": 50,
"attr_max": 150, "attr_max": 150,
"need": [ "need": [
@ -44,7 +44,7 @@
{ {
"item": "19004001", "item": "19004001",
"suittype": 1, "suittype": 1,
"attrkey": "hp", "attrkey": 53,
"attr_mini": 1000, "attr_mini": 1000,
"attr_max": 1500, "attr_max": 1500,
"need": [ "need": [
@ -58,7 +58,7 @@
{ {
"item": "19005001", "item": "19005001",
"suittype": 1, "suittype": 1,
"attrkey": "atkpro", "attrkey": 57,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -72,7 +72,7 @@
{ {
"item": "19001002", "item": "19001002",
"suittype": 1, "suittype": 1,
"attrkey": "defpro", "attrkey": 60,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -86,7 +86,7 @@
{ {
"item": "19002002", "item": "19002002",
"suittype": 1, "suittype": 1,
"attrkey": "speed", "attrkey": 62,
"attr_mini": 10, "attr_mini": 10,
"attr_max": 20, "attr_max": 20,
"need": [ "need": [
@ -100,7 +100,7 @@
{ {
"item": "19003002", "item": "19003002",
"suittype": 1, "suittype": 1,
"attrkey": "cri", "attrkey": 65,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -114,7 +114,7 @@
{ {
"item": "19004002", "item": "19004002",
"suittype": 1, "suittype": 1,
"attrkey": "cridam", "attrkey": 68,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -128,7 +128,7 @@
{ {
"item": "19005002", "item": "19005002",
"suittype": 1, "suittype": 1,
"attrkey": "effhit", "attrkey": 71,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -142,7 +142,7 @@
{ {
"item": "19001003", "item": "19001003",
"suittype": 1, "suittype": 1,
"attrkey": "effre", "attrkey": 74,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -156,7 +156,7 @@
{ {
"item": "19002003", "item": "19002003",
"suittype": 1, "suittype": 1,
"attrkey": "atk", "attrkey": 56,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -170,7 +170,7 @@
{ {
"item": "19003003", "item": "19003003",
"suittype": 1, "suittype": 1,
"attrkey": "hppro", "attrkey": 54,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -184,7 +184,7 @@
{ {
"item": "19004003", "item": "19004003",
"suittype": 1, "suittype": 1,
"attrkey": "def", "attrkey": 59,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -198,7 +198,7 @@
{ {
"item": "19005003", "item": "19005003",
"suittype": 1, "suittype": 1,
"attrkey": "hp", "attrkey": 53,
"attr_mini": 50, "attr_mini": 50,
"attr_max": 150, "attr_max": 150,
"need": [ "need": [
@ -212,7 +212,7 @@
{ {
"item": "19001004", "item": "19001004",
"suittype": 1, "suittype": 1,
"attrkey": "atkpro", "attrkey": 57,
"attr_mini": 1000, "attr_mini": 1000,
"attr_max": 1500, "attr_max": 1500,
"need": [ "need": [
@ -226,7 +226,7 @@
{ {
"item": "19002004", "item": "19002004",
"suittype": 1, "suittype": 1,
"attrkey": "defpro", "attrkey": 60,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -240,7 +240,7 @@
{ {
"item": "19003004", "item": "19003004",
"suittype": 1, "suittype": 1,
"attrkey": "speed", "attrkey": 62,
"attr_mini": 300, "attr_mini": 300,
"attr_max": 500, "attr_max": 500,
"need": [ "need": [
@ -254,7 +254,7 @@
{ {
"item": "19004004", "item": "19004004",
"suittype": 1, "suittype": 1,
"attrkey": "cri", "attrkey": 65,
"attr_mini": 10, "attr_mini": 10,
"attr_max": 20, "attr_max": 20,
"need": [ "need": [

184
bin/json/game_equippos.json
View File

@ -3,140 +3,140 @@
"pos": 1, "pos": 1,
"suitnum": 4, "suitnum": 4,
"leadlibrary": [ "leadlibrary": [
"atk" 56
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
}, },
{ {
"pos": 2, "pos": 2,
"suitnum": 4, "suitnum": 4,
"leadlibrary": [ "leadlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"cri", 65,
"cridam" 68
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
}, },
{ {
"pos": 3, "pos": 3,
"suitnum": 4, "suitnum": 4,
"leadlibrary": [ "leadlibrary": [
"def" 59
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
}, },
{ {
"pos": 4, "pos": 4,
"suitnum": 4, "suitnum": 4,
"leadlibrary": [ "leadlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"effhit", 71,
"effre" 74
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
}, },
{ {
"pos": 5, "pos": 5,
"suitnum": 2, "suitnum": 2,
"leadlibrary": [ "leadlibrary": [
"hp" 53
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
}, },
{ {
"pos": 6, "pos": 6,
"suitnum": 2, "suitnum": 2,
"leadlibrary": [ "leadlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed" 62
], ],
"addlibrary": [ "addlibrary": [
"atk", 56,
"def", 59,
"hp", 53,
"atkpro", 57,
"defpro", 60,
"hppro", 54,
"speed", 62,
"cri", 65,
"cridam", 68,
"effhit", 71,
"effre" 74
] ]
} }
] ]

129
bin/json/game_equipsuit.json
View File

@ -18,10 +18,10 @@
"text": "攻击力+30%" "text": "攻击力+30%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"atkpro", "a": 57,
300 "n": 300
] }
] ]
}, },
{ {
@ -43,10 +43,10 @@
"text": "速度+25%" "text": "速度+25%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"speedpro", "a": 63,
250 "n": 250
] }
] ]
}, },
{ {
@ -67,7 +67,12 @@
"key": "equip_equip_suit_skillintr_3", "key": "equip_equip_suit_skillintr_3",
"text": "受到伤害时，有25%的概率[color=#f2bb496]【冰冻】[/color]目标1回合" "text": "受到伤害时，有25%的概率[color=#f2bb496]【冰冻】[/color]目标1回合"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 4, "suittype": 4,
@ -88,10 +93,10 @@
"text": "+35%吸血" "text": "+35%吸血"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"suckblood", "a": 102,
350 "n": 350
] }
] ]
}, },
{ {
@ -113,10 +118,10 @@
"text": "治疗效果+30%" "text": "治疗效果+30%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"treadd", "a": 15,
300 "n": 300
] }
] ]
}, },
{ {
@ -137,7 +142,12 @@
"key": "equip_equip_suit_skillintr_6", "key": "equip_equip_suit_skillintr_6",
"text": "回合开始时，有35%概率令自身所有技能冷却时间-1回合" "text": "回合开始时，有35%概率令自身所有技能冷却时间-1回合"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 7, "suittype": 7,
@ -157,7 +167,12 @@
"key": "equip_equip_suit_skillintr_7", "key": "equip_equip_suit_skillintr_7",
"text": "造成伤害时，有20%概率[color=#f2bb496]【眩晕】[/color]目标1回合" "text": "造成伤害时，有20%概率[color=#f2bb496]【眩晕】[/color]目标1回合"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 8, "suittype": 8,
@ -178,10 +193,10 @@
"text": "暴击伤害+40%" "text": "暴击伤害+40%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"cridam", "a": 68,
400 "n": 400
] }
] ]
}, },
{ {
@ -202,7 +217,12 @@
"key": "equip_equip_suit_skillintr_10", "key": "equip_equip_suit_skillintr_10",
"text": "我方被施加控制效果的守护者速度提高50点（不可叠加）" "text": "我方被施加控制效果的守护者速度提高50点（不可叠加）"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 10, "suittype": 10,
@ -223,10 +243,10 @@
"text": "生命值+25%" "text": "生命值+25%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"hppro", "a": 54,
250 "n": 250
] }
] ]
}, },
{ {
@ -248,10 +268,10 @@
"text": "防御力+25%" "text": "防御力+25%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"defpro", "a": 60,
250 "n": 250
] }
] ]
}, },
{ {
@ -273,10 +293,10 @@
"text": "效果命中+25%" "text": "效果命中+25%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"effhit", "a": 71,
250 "n": 250
] }
] ]
}, },
{ {
@ -297,7 +317,12 @@
"key": "equip_equip_suit_skillintr_14", "key": "equip_equip_suit_skillintr_14",
"text": "受到伤害时，有25%几率使用技能一反击" "text": "受到伤害时，有25%几率使用技能一反击"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 14, "suittype": 14,
@ -317,7 +342,12 @@
"key": "equip_equip_suit_skillintr_15", "key": "equip_equip_suit_skillintr_15",
"text": "己方全体在战斗开始的时候获得2回合[color=#f2bb496]【护盾】[/color]（数值为最大生命值的15%）" "text": "己方全体在战斗开始的时候获得2回合[color=#f2bb496]【护盾】[/color]（数值为最大生命值的15%）"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 15, "suittype": 15,
@ -338,10 +368,10 @@
"text": "暴击率+20%" "text": "暴击率+20%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"cri", "a": 65,
200 "n": 200
] }
] ]
}, },
{ {
@ -362,7 +392,12 @@
"key": "equip_equip_suit_skillintr_17", "key": "equip_equip_suit_skillintr_17",
"text": "施加中毒、流血效果时，有30%几率令其持续时间增加1回合" "text": "施加中毒、流血效果时，有30%几率令其持续时间增加1回合"
}, },
"SetBonuses": [] "SetBonuses": [
{
"a": 0,
"n": 0
}
]
}, },
{ {
"suittype": 17, "suittype": 17,
@ -383,10 +418,10 @@
"text": "效果抵抗+25%" "text": "效果抵抗+25%"
}, },
"SetBonuses": [ "SetBonuses": [
[ {
"effre", "a": 74,
250 "n": 250
] }
] ]
}, },
{ {

64
bin/json/game_friends.json
View File

@ -19,7 +19,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -48,7 +48,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -77,7 +77,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -106,7 +106,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -135,7 +135,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -164,7 +164,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -193,7 +193,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -222,7 +222,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -251,7 +251,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -280,7 +280,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -309,7 +309,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -338,7 +338,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -367,7 +367,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -396,7 +396,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -425,7 +425,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -454,7 +454,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -483,7 +483,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -512,7 +512,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -541,7 +541,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -570,7 +570,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -599,7 +599,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -628,7 +628,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -657,7 +657,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -686,7 +686,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -715,7 +715,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -744,7 +744,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -773,7 +773,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -802,7 +802,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -831,7 +831,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -860,7 +860,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -889,7 +889,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],
@ -918,7 +918,7 @@
"hidimg": "hgd_role_25001", "hidimg": "hgd_role_25001",
"attribute": [ "attribute": [
{ {
"a": "atk", "a": 56,
"n": 10 "n": 10
} }
], ],

2988
bin/json/game_heroawaken.json
View File

File diff suppressed because it is too large Load Diff

5538
bin/json/game_herotalent.json
View File

File diff suppressed because it is too large Load Diff

178
bin/json/game_horoscope.json
View File

@ -27,7 +27,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -60,7 +60,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 75 "n": 75
} }
] ]
@ -93,7 +93,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 150 "n": 150
} }
] ]
@ -126,7 +126,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 225 "n": 225
} }
] ]
@ -153,7 +153,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 300 "n": 300
} }
] ]
@ -186,7 +186,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -219,7 +219,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -252,7 +252,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -279,7 +279,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -312,7 +312,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -345,7 +345,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -378,7 +378,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -405,7 +405,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -438,7 +438,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -471,7 +471,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -504,7 +504,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -531,7 +531,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -564,7 +564,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -597,7 +597,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -624,7 +624,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -657,7 +657,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -690,7 +690,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -717,7 +717,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -750,7 +750,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -783,7 +783,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -810,7 +810,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -843,7 +843,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -876,7 +876,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -909,7 +909,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -936,7 +936,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -969,7 +969,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -1002,7 +1002,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -1035,7 +1035,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -1062,7 +1062,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -1095,7 +1095,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -1128,7 +1128,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -1161,7 +1161,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -1188,7 +1188,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -1221,7 +1221,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -1254,7 +1254,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -1281,7 +1281,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -1314,7 +1314,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -1347,7 +1347,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -1374,7 +1374,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -1407,7 +1407,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -1440,7 +1440,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -1467,7 +1467,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -1500,7 +1500,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -1533,7 +1533,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -1566,7 +1566,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -1593,7 +1593,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -1626,7 +1626,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -1659,7 +1659,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -1692,7 +1692,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -1719,7 +1719,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -1752,7 +1752,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -1785,7 +1785,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -1818,7 +1818,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -1845,7 +1845,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -1878,7 +1878,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -1911,7 +1911,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -1938,7 +1938,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -1971,7 +1971,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -2004,7 +2004,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -2031,7 +2031,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -2064,7 +2064,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -2097,7 +2097,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -2124,7 +2124,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -2157,7 +2157,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -2190,7 +2190,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -2223,7 +2223,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -2250,7 +2250,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -2283,7 +2283,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -2316,7 +2316,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -2349,7 +2349,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -2376,7 +2376,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -2409,7 +2409,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -2442,7 +2442,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -2475,7 +2475,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -2502,7 +2502,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -2535,7 +2535,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -2568,7 +2568,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -2595,7 +2595,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -2628,7 +2628,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -2661,7 +2661,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -2688,7 +2688,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -2721,7 +2721,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -2754,7 +2754,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -2781,7 +2781,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]

178
bin/json/game_puggsyskill.json
View File

@ -26,7 +26,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -58,7 +58,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 75 "n": 75
} }
] ]
@ -90,7 +90,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 150 "n": 150
} }
] ]
@ -122,7 +122,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 225 "n": 225
} }
] ]
@ -148,7 +148,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 300 "n": 300
} }
] ]
@ -180,7 +180,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -212,7 +212,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -244,7 +244,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -270,7 +270,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -302,7 +302,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -334,7 +334,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -366,7 +366,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -392,7 +392,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -424,7 +424,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -456,7 +456,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -488,7 +488,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -514,7 +514,7 @@
"AddClassify": 1, "AddClassify": 1,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -546,7 +546,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -578,7 +578,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -604,7 +604,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -636,7 +636,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -668,7 +668,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -694,7 +694,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -726,7 +726,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -758,7 +758,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -784,7 +784,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -816,7 +816,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -848,7 +848,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -880,7 +880,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -906,7 +906,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -938,7 +938,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -970,7 +970,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -1002,7 +1002,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -1028,7 +1028,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -1060,7 +1060,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -1092,7 +1092,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -1124,7 +1124,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -1150,7 +1150,7 @@
"AddClassify": 2, "AddClassify": 2,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -1182,7 +1182,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -1214,7 +1214,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -1240,7 +1240,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -1272,7 +1272,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -1304,7 +1304,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -1330,7 +1330,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -1362,7 +1362,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -1394,7 +1394,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -1420,7 +1420,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -1452,7 +1452,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -1484,7 +1484,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -1516,7 +1516,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -1542,7 +1542,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -1574,7 +1574,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -1606,7 +1606,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -1638,7 +1638,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -1664,7 +1664,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -1696,7 +1696,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -1728,7 +1728,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -1760,7 +1760,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -1786,7 +1786,7 @@
"AddClassify": 3, "AddClassify": 3,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -1818,7 +1818,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -1850,7 +1850,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -1876,7 +1876,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -1908,7 +1908,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -1940,7 +1940,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -1966,7 +1966,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -1998,7 +1998,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -2030,7 +2030,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -2056,7 +2056,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]
@ -2088,7 +2088,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 0 "n": 0
} }
] ]
@ -2120,7 +2120,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 20 "n": 20
} }
] ]
@ -2152,7 +2152,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 40 "n": 40
} }
] ]
@ -2178,7 +2178,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "atk", "a": 56,
"n": 60 "n": 60
} }
] ]
@ -2210,7 +2210,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 0 "n": 0
} }
] ]
@ -2242,7 +2242,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 15 "n": 15
} }
] ]
@ -2274,7 +2274,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 30 "n": 30
} }
] ]
@ -2300,7 +2300,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "def", "a": 59,
"n": 45 "n": 45
} }
] ]
@ -2332,7 +2332,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 0 "n": 0
} }
] ]
@ -2364,7 +2364,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 200 "n": 200
} }
] ]
@ -2396,7 +2396,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 400 "n": 400
} }
] ]
@ -2422,7 +2422,7 @@
"AddClassify": 4, "AddClassify": 4,
"upgrade": [ "upgrade": [
{ {
"a": "hp", "a": 53,
"n": 600 "n": 600
} }
] ]
@ -2454,7 +2454,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 0 "n": 0
} }
] ]
@ -2486,7 +2486,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 20 "n": 20
} }
] ]
@ -2512,7 +2512,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "atkpro", "a": 57,
"n": 40 "n": 40
} }
] ]
@ -2544,7 +2544,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 0 "n": 0
} }
] ]
@ -2576,7 +2576,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
] ]
@ -2602,7 +2602,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "defpro", "a": 60,
"n": 40 "n": 40
} }
] ]
@ -2634,7 +2634,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 0 "n": 0
} }
] ]
@ -2666,7 +2666,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 20 "n": 20
} }
] ]
@ -2692,7 +2692,7 @@
"AddClassify": 0, "AddClassify": 0,
"upgrade": [ "upgrade": [
{ {
"a": "hppro", "a": 54,
"n": 40 "n": 40
} }
] ]

66
bin/json/game_stonetalent.json
View File

@ -19,11 +19,11 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 100 "n": 100
}, },
{ {
"a": "Hp", "a": 3,
"n": 1500 "n": 1500
} }
] ]
@ -50,7 +50,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 50 "n": 50
} }
] ]
@ -77,7 +77,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 750 "n": 750
} }
] ]
@ -127,7 +127,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 50 "n": 50
} }
] ]
@ -154,7 +154,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 750 "n": 750
} }
] ]
@ -204,7 +204,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 60 "n": 60
} }
] ]
@ -231,7 +231,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 900 "n": 900
} }
] ]
@ -281,7 +281,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 60 "n": 60
} }
] ]
@ -308,7 +308,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 900 "n": 900
} }
] ]
@ -358,7 +358,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 70 "n": 70
} }
] ]
@ -385,7 +385,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1050 "n": 1050
} }
] ]
@ -435,7 +435,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 70 "n": 70
} }
] ]
@ -462,7 +462,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1050 "n": 1050
} }
] ]
@ -512,7 +512,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 80 "n": 80
} }
] ]
@ -539,7 +539,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1200 "n": 1200
} }
] ]
@ -589,7 +589,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 80 "n": 80
} }
] ]
@ -616,7 +616,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1200 "n": 1200
} }
] ]
@ -644,11 +644,11 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Speed", "a": 6,
"n": 50 "n": 50
}, },
{ {
"a": "Crit", "a": 7,
"n": 50 "n": 50
} }
] ]
@ -675,7 +675,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 80 "n": 80
} }
] ]
@ -702,7 +702,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1200 "n": 1200
} }
] ]
@ -729,7 +729,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "CritDam", "a": 8,
"n": 50 "n": 50
} }
] ]
@ -756,7 +756,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 100 "n": 100
} }
] ]
@ -783,7 +783,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1500 "n": 1500
} }
] ]
@ -810,7 +810,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "CritDam", "a": 8,
"n": 50 "n": 50
} }
] ]
@ -860,7 +860,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 100 "n": 100
} }
] ]
@ -887,7 +887,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1500 "n": 1500
} }
] ]
@ -914,7 +914,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "EffectHit", "a": 9,
"n": 100 "n": 100
} }
] ]
@ -941,7 +941,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Atk", "a": 4,
"n": 100 "n": 100
} }
] ]
@ -968,7 +968,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Hp", "a": 3,
"n": 1500 "n": 1500
} }
] ]
@ -995,7 +995,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "EffectHit", "a": 9,
"n": 100 "n": 100
} }
] ]
@ -1023,7 +1023,7 @@
}, },
"Attribute": [ "Attribute": [
{ {
"a": "Speed", "a": 6,
"n": 50 "n": 50
} }
] ]

60
bin/json/game_talent.json
View File

@ -14,7 +14,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 20 "n": 20
} }
], ],
@ -47,7 +47,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 40 "n": 40
} }
], ],
@ -80,7 +80,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 60 "n": 60
} }
], ],
@ -113,7 +113,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 80 "n": 80
} }
], ],
@ -146,7 +146,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 100 "n": 100
} }
], ],
@ -179,7 +179,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 20 "n": 20
} }
], ],
@ -212,7 +212,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 40 "n": 40
} }
], ],
@ -245,7 +245,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 60 "n": 60
} }
], ],
@ -278,7 +278,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 80 "n": 80
} }
], ],
@ -311,7 +311,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 100 "n": 100
} }
], ],
@ -344,7 +344,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 20 "n": 20
} }
], ],
@ -377,7 +377,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 40 "n": 40
} }
], ],
@ -410,7 +410,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 60 "n": 60
} }
], ],
@ -443,7 +443,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 80 "n": 80
} }
], ],
@ -476,7 +476,7 @@
"disc_pos": 0, "disc_pos": 0,
"attribute": [ "attribute": [
{ {
"a": "hp", "a": 53,
"n": 100 "n": 100
} }
], ],
@ -509,7 +509,7 @@
"disc_pos": 3, "disc_pos": 3,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 2 "n": 2
} }
], ],
@ -542,7 +542,7 @@
"disc_pos": 3, "disc_pos": 3,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 4 "n": 4
} }
], ],
@ -575,7 +575,7 @@
"disc_pos": 3, "disc_pos": 3,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 6 "n": 6
} }
], ],
@ -608,7 +608,7 @@
"disc_pos": 3, "disc_pos": 3,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 8 "n": 8
} }
], ],
@ -641,7 +641,7 @@
"disc_pos": 3, "disc_pos": 3,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 10 "n": 10
} }
], ],
@ -674,7 +674,7 @@
"disc_pos": 2, "disc_pos": 2,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 2 "n": 2
} }
], ],
@ -707,7 +707,7 @@
"disc_pos": 2, "disc_pos": 2,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 4 "n": 4
} }
], ],
@ -740,7 +740,7 @@
"disc_pos": 2, "disc_pos": 2,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 6 "n": 6
} }
], ],
@ -773,7 +773,7 @@
"disc_pos": 2, "disc_pos": 2,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 8 "n": 8
} }
], ],
@ -806,7 +806,7 @@
"disc_pos": 2, "disc_pos": 2,
"attribute": [ "attribute": [
{ {
"a": "def", "a": 59,
"n": 10 "n": 10
} }
], ],
@ -839,7 +839,7 @@
"disc_pos": 1, "disc_pos": 1,
"attribute": [ "attribute": [
{ {
"a": "defpro", "a": 60,
"n": 5 "n": 5
} }
], ],
@ -872,7 +872,7 @@
"disc_pos": 1, "disc_pos": 1,
"attribute": [ "attribute": [
{ {
"a": "defpro", "a": 60,
"n": 10 "n": 10
} }
], ],
@ -905,7 +905,7 @@
"disc_pos": 1, "disc_pos": 1,
"attribute": [ "attribute": [
{ {
"a": "defpro", "a": 60,
"n": 15 "n": 15
} }
], ],
@ -938,7 +938,7 @@
"disc_pos": 1, "disc_pos": 1,
"attribute": [ "attribute": [
{ {
"a": "defpro", "a": 60,
"n": 20 "n": 20
} }
], ],
@ -971,7 +971,7 @@
"disc_pos": 1, "disc_pos": 1,
"attribute": [ "attribute": [
{ {
"a": "defpro", "a": 60,
"n": 25 "n": 25
} }
], ],

42
comm/const.go
View File

@ -562,27 +562,27 @@ const (
DBServiceStatus string = "DBService_status" DBServiceStatus string = "DBService_status"
) )
const ( // const (
Hp string = "hp" //生命 // Hp = iota //生命
Atk string = "atk" //攻击 // Atk //攻击
Def string = "def" //防御 // Def //防御
HpPro string = "hppro" //生命附加值% // HpPro //生命附加值%
AtkPro string = "atkpro" //攻击附加值% // AtkPro //攻击附加值%
DefPro string = "defpro" //防御附加值% // DefPro //防御附加值%
Speed string = "speed" //速度 // Speed //速度
Cri string = "cri" //暴击率% // Cri //暴击率%
Cridam string = "cridam" //暴击伤害% // Cridam //暴击伤害%
Effhit string = "effhit" //效果命中% // Effhit //效果命中%
Effre string = "effre" //效果抵抗% // Effre //效果抵抗%
LostHold string = "losthold" //失手率% // LostHold //失手率%
UnderStand string = "understand" //会心率% // UnderStand //会心率%
DamRe string = "damre" //伤害减免% // DamRe //伤害减免%
CauseDam string = "causedam" //伤害提升% // CauseDam //伤害提升%
TreAdd string = "treadd" //治疗加成% // TreAdd //治疗加成%
BeTreAdd string = "betreadd" //受疗加成% // BeTreAdd //受疗加成%
SuckBlood string = "suckblood" //吸血加成% // SuckBlood //吸血加成%
SpeedPro string = "speedpro" //速度加成% // SpeedPro //速度加成%
) // )
const ( const (
CardTypeHero int32 = 1 //英雄卡 CardTypeHero int32 = 1 //英雄卡

15
modules/arena/api_challengereward.go
View File

@ -2,7 +2,6 @@ package arena
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/modules/battle"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure" "go_dreamfactory/sys/configure"
cfg "go_dreamfactory/sys/configure/structs" cfg "go_dreamfactory/sys/configure/structs"
@ -253,20 +252,12 @@ func (this *apiComp) ChallengeReward(session comm.IUserSession, req *pb.ArenaCha
Cid: v.HeroID, Cid: v.HeroID,
Star: v.Star, Star: v.Star,
Lv: v.Lv, Lv: v.Lv,
Property: make(map[string]int32), Property: make(map[int32]int32),
AddProperty: make(map[string]int32), AddProperty: make(map[int32]int32),
NormalSkill: v.NormalSkill, NormalSkill: v.NormalSkill,
} }
for k, v := range v.Property { for k, v := range v.Property {
attr := battle.AttributesFromBase(k) redrecord.Formt[i].Property[k] = v
if len(attr) > 0 {
redrecord.Formt[i].Property[attr] = v
} else {
attr = battle.AttributesFromExt(k)
if len(attr) > 0 {
redrecord.Formt[i].AddProperty[attr] = v
}
}
} }
} else { } else {
redrecord.Formt[i] = nil redrecord.Formt[i] = nil

12
modules/arena/modelarena.go
View File

@ -248,9 +248,9 @@ func (this *modelArena) matcheAI(dan, num int32) (results []*pb.ArenaPlayer, err
err = fmt.Errorf("CreateMonster 失败") err = fmt.Errorf("CreateMonster 失败")
return return
} }
hero.Property[comm.Hp] = int32(float32(hero.Property[comm.Hp]) * v1.Hppro) hero.Property[cfg.GamePropertyType_Base_MaxHp_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_MaxHp_Base]) * v1.Hppro)
hero.Property[comm.Atk] = int32(float32(hero.Property[comm.Atk]) * v1.Atkpro) hero.Property[cfg.GamePropertyType_Base_Atk_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Atk_Base]) * v1.Atkpro)
hero.Property[comm.Def] = int32(float32(hero.Property[comm.Def]) * v1.Defpro) hero.Property[cfg.GamePropertyType_Base_Def_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Def_Base]) * v1.Defpro)
hero.Suits = make([]*pb.DB_EquipmentSuit, 0) hero.Suits = make([]*pb.DB_EquipmentSuit, 0)
for _, v := range v1.Equip { for _, v := range v1.Equip {
hero.Suits = append(hero.Suits, &pb.DB_EquipmentSuit{ hero.Suits = append(hero.Suits, &pb.DB_EquipmentSuit{
@ -334,9 +334,9 @@ func (this *modelArena) getAI(mformatId int32) (ai *pb.ArenaPlayer, err error) {
err = fmt.Errorf("CreateMonster 失败") err = fmt.Errorf("CreateMonster 失败")
return return
} }
hero.Property[comm.Hp] = int32(float32(hero.Property[comm.Hp]) * v1.Hppro) hero.Property[cfg.GamePropertyType_Base_MaxHp_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_MaxHp_Base]) * v1.Hppro)
hero.Property[comm.Atk] = int32(float32(hero.Property[comm.Atk]) * v1.Atkpro) hero.Property[cfg.GamePropertyType_Base_Atk_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Atk_Base]) * v1.Atkpro)
hero.Property[comm.Def] = int32(float32(hero.Property[comm.Def]) * v1.Defpro) hero.Property[cfg.GamePropertyType_Base_Def_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Def_Base]) * v1.Defpro)
hero.Suits = make([]*pb.DB_EquipmentSuit, 0) hero.Suits = make([]*pb.DB_EquipmentSuit, 0)
for _, v := range v1.Equip { for _, v := range v1.Equip {
hero.Suits = append(hero.Suits, &pb.DB_EquipmentSuit{ hero.Suits = append(hero.Suits, &pb.DB_EquipmentSuit{

229
modules/battle/core.go
View File

@ -77,122 +77,123 @@ func AttributesTransBase(attr string) int32 {
} }
//找寻基础属性 //找寻基础属性
func AttributesFromBase(attr int32) string { // func AttributesFromBase(attr int32) string {
basearrt := "" // basearrt := ""
switch attr { // switch attr {
case 53: // case 53:
basearrt = "hp" // basearrt = "hp"
break // break
case 56: // case 56:
basearrt = "atk" // basearrt = "atk"
break // break
case 59: // case 59:
basearrt = "def" // basearrt = "def"
break // break
case 62: // case 62:
basearrt = "speed" // basearrt = "speed"
break // break
case 65: // case 65:
basearrt = "cri" // basearrt = "cri"
break // break
case 68: // case 68:
basearrt = "cridam" // basearrt = "cridam"
break // break
case 71: // case 71:
basearrt = "effhit" // basearrt = "effhit"
break // break
case 74: // case 74:
basearrt = "effre" // basearrt = "effre"
break // break
case 11: // case 11:
basearrt = "losthold" // basearrt = "losthold"
break // break
case 12: // case 12:
basearrt = "understand" // basearrt = "understand"
break // break
case 13: // case 13:
basearrt = "damre" // basearrt = "damre"
break // break
case 14: // case 14:
basearrt = "causedam" // basearrt = "causedam"
break // break
case 15: // case 15:
basearrt = "treadd" // basearrt = "treadd"
break // break
case 16: // case 16:
basearrt = "betreadd" // basearrt = "betreadd"
break // break
case 102: // case 102:
basearrt = "suckblood" // basearrt = "suckblood"
break // break
default: // default:
log.Errorf("no fund hero attr:%d", basearrt) // log.Errorf("no fund hero attr:%d", basearrt)
} // }
return basearrt // return basearrt
} // }
func AttributesTransExt(attr string) int32 { // func AttributesTransExt(attr string) int32 {
basearrt := int32(0)
switch attr { // basearrt := int32(0)
case "hp": // switch attr {
basearrt = 77 // case "hp":
break // basearrt = 77
case "atk": // break
basearrt = 80 // case "atk":
break // basearrt = 80
case "def": // break
basearrt = 83 // case "def":
break // basearrt = 83
case "hppro": // break
break // case "hppro":
case "atkpro": // break
break // case "atkpro":
case "defpro": // break
break // case "defpro":
case "speed": // break
basearrt = 86 // case "speed":
break // basearrt = 86
case "cri": // break
basearrt = 89 // case "cri":
break // basearrt = 89
case "cridam": // break
basearrt = 92 // case "cridam":
break // basearrt = 92
case "effhit": // break
basearrt = 95 // case "effhit":
break // basearrt = 95
case "effre": // break
basearrt = 98 // case "effre":
break // basearrt = 98
case "losthold": // break
basearrt = 11 // case "losthold":
break // basearrt = 11
case "understand": // break
basearrt = 12 // case "understand":
break // basearrt = 12
case "damre": // break
basearrt = 13 // case "damre":
break // basearrt = 13
case "causedam": // break
basearrt = 14 // case "causedam":
break // basearrt = 14
case "treadd": // break
basearrt = 15 // case "treadd":
break // basearrt = 15
case "betreadd": // break
basearrt = 16 // case "betreadd":
break // basearrt = 16
case "suckblood": // break
basearrt = 102 // case "suckblood":
break // basearrt = 102
case "speedpro": // break
break // case "speedpro":
default: // break
log.Errorf("no fund hero attr:%s", attr) // default:
} // log.Errorf("no fund hero attr:%s", attr)
return basearrt // }
} // return basearrt
// }
func AttributesFromExt(attr int32) string { func AttributesFromExt(attr int32) string {
basearrt := "" basearrt := ""

73
modules/battle/modelBattle.go
View File

@ -813,54 +813,47 @@ func (this *modelBattleComp) createBattleRole(hero *pb.DBHero, vlv int32, tid, p
} }
for k, v := range hero.Property { for k, v := range hero.Property {
arrt := AttributesTransBase(k)
if arrt != 0 { role.Property[k] += v
role.Property[arrt] += v if k == cfg.GamePropertyType_Base_MaxHp_Base {
if k == comm.Hp {
role.Currhp += v role.Currhp += v
}
} }
} }
for k, v := range hero.AddProperty { for k, v := range hero.AddProperty {
switch k { switch k {
case comm.HpPro: case cfg.GamePropertyType_Base_MaxHp_Per:
hero.AddProperty[comm.Hp] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Hp]))) hero.AddProperty[cfg.GamePropertyType_Base_MaxHp_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_MaxHp_Base])))
case comm.AtkPro: case cfg.GamePropertyType_Base_Atk_Per:
hero.AddProperty[comm.Atk] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Atk]))) hero.AddProperty[cfg.GamePropertyType_Base_Atk_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Atk_Base])))
case comm.DefPro: case cfg.GamePropertyType_Base_Def_Per:
hero.AddProperty[comm.Def] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Def]))) hero.AddProperty[cfg.GamePropertyType_Base_Def_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Def_Base])))
case comm.SpeedPro: case cfg.GamePropertyType_Base_Speed_Per:
hero.AddProperty[comm.Speed] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Speed]))) hero.AddProperty[cfg.GamePropertyType_Base_Speed_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Speed_Base])))
} }
} }
for k, v := range hero.AddProperty { for k, v := range hero.AddProperty {
arrt := AttributesTransExt(k) //arrt := AttributesTransExt(k)
if arrt != 0 {
role.Property[arrt] += v role.Property[k] += v
if k == comm.Hp { if k == cfg.GamePropertyType_Base_MaxHp_Base {
role.Currhp += v role.Currhp += v
}
} }
} }
for k, v := range hero.JuexProperty { for k, v := range hero.JuexProperty {
arrt := AttributesTransExt(k)
if arrt != 0 { role.Property[k] += v
role.Property[arrt] += v if k == cfg.GamePropertyType_Base_MaxHp_Base {
if k == comm.Hp { role.Currhp += v
role.Currhp += v
}
} }
} }
for k, v := range hero.HoroscopeProperty { for k, v := range hero.HoroscopeProperty {
arrt := AttributesTransExt(k)
if arrt != 0 { role.Property[k] += v
role.Property[arrt] += v if k == cfg.GamePropertyType_Base_MaxHp_Base {
if k == comm.Hp { role.Currhp += v
role.Currhp += v
}
} }
} }
@ -982,15 +975,15 @@ func (this *modelBattleComp) createMasterRoles(comp, wheel int, fid int32) (capt
} }
} }
hero.Property[comm.Hp] = int32(float32(hero.Property[comm.Hp]) * v.Hppro) hero.Property[cfg.GamePropertyType_Base_MaxHp_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_MaxHp_Base]) * v.Hppro)
hero.Property[comm.Atk] = int32(float32(hero.Property[comm.Atk]) * v.Atkpro) hero.Property[cfg.GamePropertyType_Base_Atk_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Atk_Base]) * v.Atkpro)
hero.Property[comm.Def] = int32(float32(hero.Property[comm.Def]) * v.Defpro) hero.Property[cfg.GamePropertyType_Base_Def_Base] = int32(float32(hero.Property[cfg.GamePropertyType_Base_Def_Base]) * v.Defpro)
hero.Property[comm.Speed] = v.Speed hero.Property[cfg.GamePropertyType_Base_Speed_Base] = v.Speed
for k, v := range hero.Property { for k, v := range hero.Property {
arrt := AttributesTransBase(k) //arrt := AttributesTransBase(k)
roles[i].Property[arrt] = v roles[i].Property[k] = v
} }
roles[i].Currhp = hero.Property[comm.Hp] roles[i].Currhp = hero.Property[cfg.GamePropertyType_Base_MaxHp_Base]
// } // }
} }
} }

8
modules/equipment/api_wash.go
View File

@ -57,7 +57,7 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
return return
} }
for i, v := range attrlibrarys { //移除主属性 for i, v := range attrlibrarys { //移除主属性
if v.Attrkey == equip.MainEntry.AttrName { if v.Attr.A == equip.MainEntry.AttrName {
attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...) attrlibrarys = append(attrlibrarys[0:i], attrlibrarys[i+1:]...)
break break
} }
@ -70,9 +70,9 @@ func (this *apiComp) Wash(session comm.IUserSession, req *pb.EquipmentWashReq) (
Id: attrlibrarys[v].Key, Id: attrlibrarys[v].Key,
Libraryid: attrlibrarys[v].Libraryid, Libraryid: attrlibrarys[v].Libraryid,
Lv: equip.AdverbEntry[i].Lv, Lv: equip.AdverbEntry[i].Lv,
AttrName: attrlibrarys[v].Attrkey, AttrName: attrlibrarys[v].Attr.A,
BaseValue: attrlibrarys[v].Attrvar, BaseValue: attrlibrarys[v].Attr.N,
Value: attrlibrarys[v].Attrvar + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attrvar)), Value: attrlibrarys[v].Attr.N + int32(float64(attrlibrarys[v].Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrarys[v].Attr.N)),
} }
} else { } else {
break break

6
modules/equipment/api_washconfirm.go
View File

@ -61,9 +61,9 @@ func (this *apiComp) WashConfirm(session comm.IUserSession, req *pb.EquipmentWas
Id: attrlibrary.Key, Id: attrlibrary.Key,
Libraryid: attrlibrary.Libraryid, Libraryid: attrlibrary.Libraryid,
Lv: v.Lv, Lv: v.Lv,
AttrName: attrlibrary.Attrkey, AttrName: attrlibrary.Attr.A,
BaseValue: attrlibrary.Attrvar, BaseValue: attrlibrary.Attr.N,
Value: attrlibrary.Attrvar + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attrvar)), Value: attrlibrary.Attr.N + int32(float64(attrlibrary.Addition[equip.AdverbEntry[i].Lv-1])/1000.0*float64(attrlibrary.Attr.N)),
} }
} }
if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{ if err = this.module.modelEquipment.ChangeList(session.GetUserId(), equip.Id, map[string]interface{}{

2
modules/equipment/configure.go
View File

@ -295,7 +295,7 @@ func (this *configureComp) GetEquipCompose(id int32) (result *cfg.GameEquipSComp
} }
// 获取装备锻造数据 // 获取装备锻造数据
func (this *configureComp) getEquipAttribute(sid string) (result *cfg.GameEquipAttributeData, err error) { func (this *configureComp) getEquipAttribute(sid int32) (result *cfg.GameEquipAttributeData, err error) {
var ( var (
v interface{} v interface{}
ok bool ok bool

56
modules/equipment/modelEquipment.go
View File

@ -309,16 +309,16 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
Id: mattr[index].Key, Id: mattr[index].Key,
Libraryid: mattr[index].Libraryid, Libraryid: mattr[index].Libraryid,
Lv: 1, Lv: 1,
AttrName: mattr[index].Attrkey, AttrName: mattr[index].Attr.A,
Value: mattr[index].Attrvar, Value: mattr[index].Attr.N,
BaseValue: mattr[index].Attrvar, BaseValue: mattr[index].Attr.N,
} }
if sattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(mattr) == 0 { if sattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(mattr) == 0 {
return return
} }
for i, v := range sattr { //移除主属性 for i, v := range sattr { //移除主属性
if v.Attrkey == equipment.MainEntry.AttrName { if v.Attr.A == equipment.MainEntry.AttrName {
sattr = append(sattr[0:i], sattr[i+1:]...) sattr = append(sattr[0:i], sattr[i+1:]...)
break break
} }
@ -370,25 +370,25 @@ func (this *modelEquipmentComp) newEquipment(uid string, conf *cfg.GameEquipData
Id: sattr[v].Key, Id: sattr[v].Key,
Libraryid: sattr[v].Libraryid, Libraryid: sattr[v].Libraryid,
Lv: 1, Lv: 1,
AttrName: sattr[v].Attrkey, AttrName: sattr[v].Attr.A,
Value: sattr[v].Attrvar, Value: sattr[v].Attr.N,
BaseValue: sattr[v].Attrvar, BaseValue: sattr[v].Attr.N,
}) })
} }
} else { } else {
equipment.Adverbskill = make([]*pb.EquipmentSkillEntry, 0) equipment.Adverbskill = make([]*pb.EquipmentSkillEntry, 0)
for _, v := range comm.RandShuffle(len(sattr))[:satterNum] { for _, v := range comm.RandShuffle(len(sattr))[:satterNum] {
if equipatt, err = this.module.configure.getEquipAttribute(sattr[v].Attrkey); err != nil { if equipatt, err = this.module.configure.getEquipAttribute(sattr[v].Skill); err != nil { // 看
return return
} }
if equipatt.SkillId == 0 { if equipatt.SkillId == 0 {
err = fmt.Errorf("equipatt:%s skill is 0", sattr[v].Attrkey) err = fmt.Errorf("equipatt:%d skill is 0", sattr[v].Attr.A)
return return
} }
equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{ equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
Id: sattr[v].Key, Id: sattr[v].Key,
Libraryid: sattr[v].Libraryid, Libraryid: sattr[v].Libraryid,
AttrName: sattr[v].Attrkey, AttrName: sattr[v].Attr.A,
SkillId: equipatt.SkillId, SkillId: equipatt.SkillId,
Lv: 1, Lv: 1,
}) })
@ -423,11 +423,11 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
for _, v := range temp { for _, v := range temp {
iskeep := false iskeep := false
for _, v1 := range equipment.AdverbEntry { for _, v1 := range equipment.AdverbEntry {
if v.Attrkey == v1.AttrName { if v.Attr.A == v1.AttrName {
iskeep = true iskeep = true
} }
} }
if v.Attrkey == equipment.MainEntry.AttrName { if v.Attr.A == equipment.MainEntry.AttrName {
iskeep = true iskeep = true
} }
if !iskeep { if !iskeep {
@ -441,23 +441,23 @@ func (this *modelEquipmentComp) upgradeEquipment(equipment *pb.DB_Equipment, equ
Id: sattr[index].Key, Id: sattr[index].Key,
Libraryid: sattr[index].Libraryid, Libraryid: sattr[index].Libraryid,
Lv: 1, Lv: 1,
AttrName: sattr[index].Attrkey, AttrName: sattr[index].Attr.A,
Value: sattr[index].Attrvar, Value: sattr[index].Attr.N,
BaseValue: sattr[index].Attrvar, BaseValue: sattr[index].Attr.N,
}) })
return return
} else { } else {
if equipatt, err = this.module.configure.getEquipAttribute(sattr[index].Attrkey); err != nil { if equipatt, err = this.module.configure.getEquipAttribute(sattr[index].Skill); err != nil {
return return
} }
if equipatt.SkillId == 0 { if equipatt.SkillId == 0 {
err = fmt.Errorf("equipatt:%s skill is 0", sattr[index].Attrkey) err = fmt.Errorf("equipatt:%d skill is 0", sattr[index].Attr.A)
return return
} }
equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{ equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
Id: sattr[index].Key, Id: sattr[index].Key,
Libraryid: sattr[index].Libraryid, Libraryid: sattr[index].Libraryid,
AttrName: sattr[index].Attrkey, AttrName: sattr[index].Attr.A,
SkillId: equipatt.SkillId, SkillId: equipatt.SkillId,
Lv: 1, Lv: 1,
}) })
@ -528,9 +528,9 @@ func (this *modelEquipmentComp) newMaxEquipment(uid string, conf *cfg.GameEquipD
Id: mattr[index].Key, Id: mattr[index].Key,
Libraryid: mattr[index].Libraryid, Libraryid: mattr[index].Libraryid,
Lv: intensify.Level + 1, Lv: intensify.Level + 1,
AttrName: mattr[index].Attrkey, AttrName: mattr[index].Attr.A,
Value: mattr[index].Attrvar, Value: mattr[index].Attr.N,
BaseValue: mattr[index].Attrvar, BaseValue: mattr[index].Attr.N,
} }
equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(math.Floor(float64(equipment.MainEntry.BaseValue*intensify.Bonus)/1000.0)) equipment.MainEntry.Value = equipment.MainEntry.BaseValue + int32(math.Floor(float64(equipment.MainEntry.BaseValue*intensify.Bonus)/1000.0))
if sattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(mattr) == 0 { if sattr, err = this.module.configure.GetEquipmentAttrlibraryConfigureById(conf.Addlibrary); err != nil || len(mattr) == 0 {
@ -538,7 +538,7 @@ func (this *modelEquipmentComp) newMaxEquipment(uid string, conf *cfg.GameEquipD
} }
for i, v := range sattr { //移除主属性 for i, v := range sattr { //移除主属性
if v.Attrkey == equipment.MainEntry.AttrName { if v.Attr.A == equipment.MainEntry.AttrName {
sattr = append(sattr[0:i], sattr[i+1:]...) sattr = append(sattr[0:i], sattr[i+1:]...)
break break
} }
@ -554,9 +554,9 @@ func (this *modelEquipmentComp) newMaxEquipment(uid string, conf *cfg.GameEquipD
Id: sattr[v].Key, Id: sattr[v].Key,
Libraryid: sattr[v].Libraryid, Libraryid: sattr[v].Libraryid,
Lv: 5, Lv: 5,
AttrName: sattr[v].Attrkey, AttrName: sattr[v].Attr.A,
Value: sattr[v].Attrvar, Value: sattr[v].Attr.N,
BaseValue: sattr[v].Attrvar, BaseValue: sattr[v].Attr.N,
} }
value := adverbEntry.BaseValue + int32(float64(sattr[v].Addition[adverbEntry.Lv-1])/1000.0*float64(adverbEntry.BaseValue)) value := adverbEntry.BaseValue + int32(float64(sattr[v].Addition[adverbEntry.Lv-1])/1000.0*float64(adverbEntry.BaseValue))
if adverbEntry.Value < value { if adverbEntry.Value < value {
@ -567,17 +567,17 @@ func (this *modelEquipmentComp) newMaxEquipment(uid string, conf *cfg.GameEquipD
} else { } else {
equipment.Adverbskill = make([]*pb.EquipmentSkillEntry, 0) equipment.Adverbskill = make([]*pb.EquipmentSkillEntry, 0)
for _, v := range comm.RandShuffle(len(sattr))[:satterNum] { for _, v := range comm.RandShuffle(len(sattr))[:satterNum] {
if equipatt, err = this.module.configure.getEquipAttribute(sattr[v].Attrkey); err != nil { if equipatt, err = this.module.configure.getEquipAttribute(sattr[v].Skill); err != nil {
return return
} }
if equipatt.SkillId == 0 { if equipatt.SkillId == 0 {
err = fmt.Errorf("equipatt:%s skill is 0", sattr[v].Attrkey) err = fmt.Errorf("equipatt:%d skill is 0", sattr[v].Attr.A)
return return
} }
equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{ equipment.Adverbskill = append(equipment.Adverbskill, &pb.EquipmentSkillEntry{
Id: sattr[v].Key, Id: sattr[v].Key,
Libraryid: sattr[v].Libraryid, Libraryid: sattr[v].Libraryid,
AttrName: sattr[v].Attrkey, AttrName: sattr[v].Attr.A,
SkillId: equipatt.SkillId, SkillId: equipatt.SkillId,
Lv: 5, Lv: 5,
}) })

4
modules/gourmet/module.go
View File

@ -69,8 +69,8 @@ func (this *Gourmet) GetSuccessRate(m map[string]int32, conf *cfg.GameBreakingba
rate int32 rate int32
) )
for _, v := range conf.Recipe { for _, v := range conf.Recipe {
if v1, ok := m[v.A]; ok { if v1, ok := m[v.S]; ok {
rate += v.N * v1 rate += v.D * v1
} }
} }

103
modules/hero/model_hero.go
View File

@ -36,6 +36,7 @@ func (this *ModelHero) Init(service core.IService, module core.IModule, comp cor
return return
} }
//17
// 初始化英雄 // 初始化英雄
func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero { func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
heroCfg, _ := this.module.configure.GetHeroConfig(heroCfgId) heroCfg, _ := this.module.configure.GetHeroConfig(heroCfgId)
@ -55,12 +56,12 @@ func (this *ModelHero) InitHero(uid string, heroCfgId string) *pb.DBHero {
CardType: heroCfg.Type, //卡片类型 CardType: heroCfg.Type, //卡片类型
Skins: []int32{}, Skins: []int32{},
EquipID: make([]string, 8), //初始装备 EquipID: make([]string, 8), //初始装备
AddProperty: make(map[string]int32), AddProperty: make(map[int32]int32),
Property: make(map[string]int32), Property: make(map[int32]int32),
JuexProperty: make(map[string]int32), JuexProperty: make(map[int32]int32),
TalentProperty: make(map[string]int32), TalentProperty: make(map[int32]int32),
HoroscopeProperty: make(map[string]int32), HoroscopeProperty: make(map[int32]int32),
Fetters: make(map[string]int32), Fetters: make(map[int32]int32),
} }
this.PropertyCompute(newHero) this.PropertyCompute(newHero)
this.initHeroSkill(newHero) this.initHeroSkill(newHero)
@ -205,12 +206,12 @@ func (this *ModelHero) getHeroList(uid string) []*pb.DBHero {
// 重置觉醒属性 // 重置觉醒属性
func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) { func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) {
hero.JuexProperty = make(map[string]int32) hero.JuexProperty = make(map[int32]int32)
for i := 1; i <= int(hero.JuexingLv); i++ { for i := 1; i <= int(hero.JuexingLv); i++ {
awakenData, err := this.module.configure.GetHeroAwakenConfig(hero.HeroID, int32(i)) awakenData, err := this.module.configure.GetHeroAwakenConfig(hero.HeroID, int32(i))
if err == nil { if err == nil {
for _, v := range awakenData.Phasebonus { for _, v := range awakenData.Phasebonus {
hero.JuexProperty[v.S] += int32(v.D) hero.JuexProperty[v.A] += int32(v.N)
} }
} }
} }
@ -219,7 +220,7 @@ func (this *ModelHero) resetJuexingProperty(hero *pb.DBHero) {
// 设置装备属性 // 设置装备属性
func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipment) { func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipment) {
addProperty := make(map[string]int32) //副属性 addProperty := make(map[int32]int32) //副属性
equipSkill := make([]*pb.SkillData, 0) equipSkill := make([]*pb.SkillData, 0)
for i, v := range equip { for i, v := range equip {
if v == nil { if v == nil {
@ -245,8 +246,8 @@ func (this *ModelHero) setEquipProperty(hero *pb.DBHero, equip []*pb.DB_Equipmen
if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil { if configure, err := this.module.configure.GetEquipsuit(v.Suitid); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
} else { } else {
for k, v := range configure.SetBonuses { for _, v := range configure.SetBonuses {
addProperty[k] += v addProperty[v.A] += v.N
} }
} }
} }
@ -272,23 +273,23 @@ func (this *ModelHero) setEquipment(uid string, hero *pb.DBHero) (newHero *pb.DB
} }
// 合并属性即属性值累加 (data 额外加的属性) // 合并属性即属性值累加 (data 额外加的属性)
func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) { // func (this *ModelHero) mergeMainProperty(uid string, hero *pb.DBHero, data map[string]int32) (err error) {
for k, v := range hero.Property { // for k, v := range hero.Property {
if v1, ok := data[k]; ok { // if v1, ok := data[k]; ok {
v += v1 // v += v1
} // }
} // }
if err = this.ChangeList(uid, hero.Id, map[string]interface{}{ // if err = this.ChangeList(uid, hero.Id, map[string]interface{}{
"property": hero.Property, // "property": hero.Property,
}); err != nil { // }); err != nil {
this.module.Errorf("mergeMainProperty err %v", err) // this.module.Errorf("mergeMainProperty err %v", err)
} // }
return // return
} // }
// 合并附加属性 // 合并附加属性
func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[string]int32, skills []*pb.SkillData) { func (this *ModelHero) mergeAddProperty(uid string, hero *pb.DBHero, data map[int32]int32, skills []*pb.SkillData) {
hero.AddProperty = data hero.AddProperty = data
if err := this.ChangeList(uid, hero.Id, map[string]interface{}{ if err := this.ChangeList(uid, hero.Id, map[string]interface{}{
@ -346,22 +347,22 @@ func (this *ModelHero) PropertyCompute(hero *pb.DBHero) {
var def = (this.StarDefAddition(hero.Star) + lvCfg.Def + float32(growCfg.Def)) * (growCfg.Defgrow / 1000.0) var def = (this.StarDefAddition(hero.Star) + lvCfg.Def + float32(growCfg.Def)) * (growCfg.Defgrow / 1000.0)
var hp = (this.StarHpAddition(hero.Star) + lvCfg.Hp + float32(growCfg.Hp)) * (growCfg.Hpgrow / 1000.0) var hp = (this.StarHpAddition(hero.Star) + lvCfg.Hp + float32(growCfg.Hp)) * (growCfg.Hpgrow / 1000.0)
speed := growCfg.Speed speed := growCfg.Speed
hero.Property = map[string]int32{ hero.Property = map[int32]int32{
comm.Hp: int32(math.Floor(float64(hp))), cfg.GamePropertyType_Base_MaxHp_Base: int32(math.Floor(float64(hp))),
comm.Atk: int32(math.Floor(float64(atk))), cfg.GamePropertyType_Base_Atk_Base: int32(math.Floor(float64(atk))),
comm.Def: int32(math.Floor(float64(def))), cfg.GamePropertyType_Base_Def_Base: int32(math.Floor(float64(def))),
comm.Speed: int32(math.Floor(float64(speed))), cfg.GamePropertyType_Base_Speed_Base: int32(math.Floor(float64(speed))),
comm.Cri: int32(growCfg.Cri), //暴击 cfg.GamePropertyType_Base_Crit_Base: int32(growCfg.Cri), //暴击
comm.Cridam: int32(growCfg.Cridam), //暴击伤害 cfg.GamePropertyType_Base_CritDam_Base: int32(growCfg.Cridam), //暴击伤害
comm.Effhit: int32(growCfg.Effhit), //效果命中 cfg.GamePropertyType_Base_EffectHit_Base: int32(growCfg.Effhit), //效果命中
comm.Effre: int32(growCfg.Effre), //效果抵抗 cfg.GamePropertyType_Base_EffectResist_Base: int32(growCfg.Effre), //效果抵抗
comm.LostHold: int32(growCfg.Losthold), //失手率% cfg.GamePropertyType_LostHold: int32(growCfg.Losthold), //失手率%
comm.UnderStand: int32(growCfg.Understand), //会心率% cfg.GamePropertyType_UnderStand: int32(growCfg.Understand), //会心率%
comm.DamRe: int32(growCfg.Damre), //伤害减免% cfg.GamePropertyType_DamRe: int32(growCfg.Damre), //伤害减免%
comm.CauseDam: int32(growCfg.Causedam), //伤害提升% cfg.GamePropertyType_CauseDam: int32(growCfg.Causedam), //伤害提升%
comm.TreAdd: int32(growCfg.Treadd), //治疗加成% cfg.GamePropertyType_TreAdd: int32(growCfg.Treadd), //治疗加成%
comm.BeTreAdd: int32(growCfg.Betreadd), //受疗加成% cfg.GamePropertyType_BeTreAdd: int32(growCfg.Betreadd), //受疗加成%
comm.SuckBlood: int32(growCfg.Suckblood), //吸血加成% cfg.GamePropertyType_SuckBlood_Per: int32(growCfg.Suckblood), //吸血加成%
} }
if hero.Id != "" { // objID 为空表示是怪物对象 不享受天赋属性加成 if hero.Id != "" { // objID 为空表示是怪物对象 不享受天赋属性加成
@ -622,11 +623,11 @@ func (this *ModelHero) InitMonsterHero(heroCfgId string, star, lv int32) *pb.DBH
CardType: heroCfg.Type, //卡片类型 CardType: heroCfg.Type, //卡片类型
Skins: []int32{}, Skins: []int32{},
EquipID: make([]string, 8), //初始装备 EquipID: make([]string, 8), //初始装备
AddProperty: make(map[string]int32), AddProperty: make(map[int32]int32),
Property: make(map[string]int32), Property: make(map[int32]int32),
JuexProperty: make(map[string]int32), JuexProperty: make(map[int32]int32),
TalentProperty: make(map[string]int32), TalentProperty: make(map[int32]int32),
HoroscopeProperty: make(map[string]int32), HoroscopeProperty: make(map[int32]int32),
} }
this.PropertyCompute(newHero) this.PropertyCompute(newHero)
this.initHeroSkill(newHero) this.initHeroSkill(newHero)
@ -640,10 +641,10 @@ func (this *ModelHero) setTalentProperty(hero *pb.DBHero, conf *cfg.GameHeroTale
return return
} }
if hero.TalentProperty == nil { if hero.TalentProperty == nil {
hero.TalentProperty = make(map[string]int32) hero.TalentProperty = make(map[int32]int32)
} }
hero.TalentProperty[conf.Attrkey] += conf.Attrvar hero.TalentProperty[conf.Attr.A] += conf.Attr.N
_heroMap := make(map[string]interface{}, 0) _heroMap := make(map[string]interface{}, 0)
if conf.Skill != 0 { if conf.Skill != 0 {
@ -665,7 +666,7 @@ func (this *ModelHero) cleanTalentProperty(hero *pb.DBHero) {
if hero == nil { if hero == nil {
return return
} }
hero.TalentProperty = map[string]int32{} hero.TalentProperty = map[int32]int32{}
hero.Talentskill = make([]*pb.SkillData, 0) // 重置技能 hero.Talentskill = make([]*pb.SkillData, 0) // 重置技能
_heroMap := make(map[string]interface{}, 0) _heroMap := make(map[string]interface{}, 0)
_heroMap["talentProperty"] = hero.TalentProperty _heroMap["talentProperty"] = hero.TalentProperty
@ -686,7 +687,7 @@ func (this *ModelHero) resetTalentProperty(hero *pb.DBHero) {
if v.HeroId == hero.HeroID { // 找到对应的英雄 if v.HeroId == hero.HeroID { // 找到对应的英雄
for k := range v.Talent { for k := range v.Talent {
if conf, _ := this.module.configure.GetHeroTalent(k); conf != nil { //获取天赋 if conf, _ := this.module.configure.GetHeroTalent(k); conf != nil { //获取天赋
hero.TalentProperty[conf.Attrkey] = conf.Attrvar hero.TalentProperty[conf.Attr.A] = conf.Attr.N
} }
} }
break break
@ -860,7 +861,7 @@ func (this *ModelHero) SetHeroFetterProperty(hero *pb.DBHero, attr []*cfg.Gameat
return return
} }
if hero.Fetters == nil { if hero.Fetters == nil {
hero.Fetters = make(map[string]int32, 0) hero.Fetters = make(map[int32]int32, 0)
} }
for _, key := range attr { for _, key := range attr {
hero.Fetters[key.A] += key.N hero.Fetters[key.A] += key.N

19
modules/horoscope/modelhoroscope.go
View File

@ -106,7 +106,7 @@ func (this *modelHoroscope) compute(info *pb.DBHoroscope, hero *pb.DBHero) (err
heroconf *cfg.GameHeroData heroconf *cfg.GameHeroData
node *cfg.GameHoroscopeData node *cfg.GameHoroscopeData
) )
hero.HoroscopeProperty = make(map[string]int32) hero.HoroscopeProperty = make(map[int32]int32)
if heroconf, err = this.module.configure.getHeroConfig(hero.HeroID); err != nil { if heroconf, err = this.module.configure.getHeroConfig(hero.HeroID); err != nil {
this.module.Errorln(err) this.module.Errorln(err)
return return
@ -138,16 +138,17 @@ func (this *modelHoroscope) compute(info *pb.DBHoroscope, hero *pb.DBHero) (err
break break
} }
} }
for k, v := range hero.HoroscopeProperty { for k, v := range hero.HoroscopeProperty {
switch k { switch k {
case comm.AtkPro: case cfg.GamePropertyType_Base_Atk_Per:
hero.HoroscopeProperty[comm.Atk] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[comm.Atk]))) hero.HoroscopeProperty[cfg.GamePropertyType_Base_Atk_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[cfg.GamePropertyType_Base_Atk_Base])))
case comm.DefPro: case cfg.GamePropertyType_Base_Def_Per:
hero.HoroscopeProperty[comm.Def] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[comm.Def]))) hero.HoroscopeProperty[cfg.GamePropertyType_Base_Def_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[cfg.GamePropertyType_Base_Def_Base])))
case comm.HpPro: case cfg.GamePropertyType_Base_MaxHp_Per:
hero.HoroscopeProperty[comm.Hp] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[comm.Hp]))) hero.HoroscopeProperty[cfg.GamePropertyType_Base_MaxHp_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[cfg.GamePropertyType_Base_MaxHp_Base])))
case comm.SpeedPro: case cfg.GamePropertyType_Base_Speed_Per:
hero.HoroscopeProperty[comm.Speed] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[comm.Speed]))) hero.HoroscopeProperty[cfg.GamePropertyType_Base_Speed_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.HoroscopeProperty[cfg.GamePropertyType_Base_Speed_Base])))
} }
} }
return return

6
modules/island/api_buy.go
View File

@ -99,9 +99,9 @@ func (this *apiComp) Buy(session comm.IUserSession, req *pb.IsLandBuyReq) (errda
HeroID: conf.Hid, HeroID: conf.Hid,
Star: conf.Star, Star: conf.Star,
Lv: conf.Star * 10, Lv: conf.Star * 10,
Property: make(map[string]int32), Property: make(map[int32]int32),
AddProperty: make(map[string]int32), AddProperty: make(map[int32]int32),
JuexProperty: make(map[string]int32), JuexProperty: make(map[int32]int32),
} }
this.module.hero.GetVirtualHero(hero, hero.Lv) this.module.hero.GetVirtualHero(hero, hero.Lv)
this.module.modelhero.addheros(session.GetUserId(), hero) this.module.modelhero.addheros(session.GetUserId(), hero)

18
modules/island/model.go
View File

@ -58,7 +58,7 @@ func (this *modelComp) getmodel(uid string) (result *pb.DBIsland, err error) {
func (this *modelComp) compute(info *pb.DBIsland, heros []*pb.DBHero) (err error) { func (this *modelComp) compute(info *pb.DBIsland, heros []*pb.DBHero) (err error) {
var ( var (
node *cfg.GamePuggsySkillData node *cfg.GamePuggsySkillData
property map[string]int32 = make(map[string]int32) property map[int32]int32 = make(map[int32]int32)
) )
for k, v := range info.Nodes { for k, v := range info.Nodes {
@ -76,14 +76,14 @@ func (this *modelComp) compute(info *pb.DBIsland, heros []*pb.DBHero) (err error
} }
for k, v := range hero.Property { for k, v := range hero.Property {
switch k { switch k {
case comm.AtkPro: case cfg.GamePropertyType_Base_Atk_Per:
hero.Property[comm.Atk] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Atk]))) hero.Property[cfg.GamePropertyType_Base_Atk_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Atk_Base])))
case comm.DefPro: case cfg.GamePropertyType_Base_Def_Per:
hero.Property[comm.Def] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Def]))) hero.Property[cfg.GamePropertyType_Base_Def_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Def_Base])))
case comm.HpPro: case cfg.GamePropertyType_Base_MaxHp_Per:
hero.Property[comm.Hp] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Hp]))) hero.Property[cfg.GamePropertyType_Base_MaxHp_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_MaxHp_Base])))
case comm.SpeedPro: case cfg.GamePropertyType_Base_Speed_Per:
hero.Property[comm.Speed] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[comm.Speed]))) hero.Property[cfg.GamePropertyType_Base_Speed_Base] += int32(math.Floor((float64(v) / 1000) * float64(hero.Property[cfg.GamePropertyType_Base_Speed_Base])))
} }
} }
} }

58
modules/pagoda/api_getrace.go
View File

@ -3,8 +3,6 @@ package pagoda
import ( import (
"go_dreamfactory/comm" "go_dreamfactory/comm"
"go_dreamfactory/pb" "go_dreamfactory/pb"
"go_dreamfactory/sys/configure"
"go_dreamfactory/utils"
) )
//参数校验 //参数校验
@ -16,38 +14,38 @@ func (this *apiComp) GetRaceCheck(session comm.IUserSession, req *pb.PagodaGetRa
///获取阵营爬塔信息 ///获取阵营爬塔信息
func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq) (errdata *pb.ErrorData) { func (this *apiComp) GetRace(session comm.IUserSession, req *pb.PagodaGetRaceReq) (errdata *pb.ErrorData) {
var ( // var (
list *pb.DBPagodaRace // list *pb.DBPagodaRace
err error // err error
update map[string]interface{} // update map[string]interface{}
) // )
update = make(map[string]interface{}, 0) // update = make(map[string]interface{}, 0)
list, err = this.module.modelRacePagoda.getPagodaRaceList(session.GetUserId()) // list, err = this.module.modelRacePagoda.getPagodaRaceList(session.GetUserId())
if err != nil { // if err != nil {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, // Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), // Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(), // Message: err.Error(),
} // }
return // return
} // }
// 初始化每天挑战塔的层数 // // 初始化每天挑战塔的层数
if !utils.IsToday(list.Rtime) { // if !utils.IsToday(list.Rtime) {
list.Rtime = configure.Now().Unix() // list.Rtime = configure.Now().Unix()
update["rtime"] = list.Rtime // update["rtime"] = list.Rtime
} // }
if err = this.module.modelRacePagoda.ModifyPagodaRaceDataByObjId(session.GetUserId(), update); err != nil { // if err = this.module.modelRacePagoda.ModifyPagodaRaceDataByObjId(session.GetUserId(), update); err != nil {
errdata = &pb.ErrorData{ // errdata = &pb.ErrorData{
Code: pb.ErrorCode_DBError, // Code: pb.ErrorCode_DBError,
Title: pb.ErrorCode_DBError.ToString(), // Title: pb.ErrorCode_DBError.ToString(),
Message: err.Error(), // Message: err.Error(),
} // }
} // }
session.SendMsg(string(this.module.GetType()), PagodaGetRaceResp, &pb.PagodaGetRaceResp{Data: list}) session.SendMsg(string(this.module.GetType()), PagodaGetRaceResp, &pb.PagodaGetRaceResp{})
return return
} }

8
modules/reputation/model_reputation.go
View File

@ -67,13 +67,13 @@ func (this *ModelReputation) computeAttr(attr *pb.CampAttr, cfgs []*cfg.Gameatr)
} }
for _, v := range cfgs { for _, v := range cfgs {
switch v.A { switch v.A {
case comm.Hp: case cfg.GamePropertyType_Base_MaxHp_Base:
attr.Hp += v.N attr.Hp += v.N
case comm.Atk: case cfg.GamePropertyType_Base_Atk_Base:
attr.Attack += v.N attr.Attack += v.N
case comm.Def: case cfg.GamePropertyType_Base_Def_Base:
attr.Defense += v.N attr.Defense += v.N
case comm.HpPro: case cfg.GamePropertyType_Base_MaxHp_Per:
attr.HpPer += v.N attr.HpPer += v.N
} }
} }

2
modules/stonehenge/modelStonehenge.go
View File

@ -67,7 +67,7 @@ func (this *MStonehenge) GetStonehengeData(uid string) (info *pb.DBStonehenge, e
Etime: utils.WeekIntervalTime(configure.Now().Unix()), Etime: utils.WeekIntervalTime(configure.Now().Unix()),
Hero: make(map[string]*pb.BattleRole), Hero: make(map[string]*pb.BattleRole),
Talent: make(map[int32]bool), Talent: make(map[int32]bool),
Talentproperty: make(map[string]int32), Talentproperty: make(map[int32]int32),
Privilege: make([]pb.StonehengePrivilege, 0), Privilege: make([]pb.StonehengePrivilege, 0),
Task: make(map[int32]bool), Task: make(map[int32]bool),
Privilegeevent: make(map[int32]int32), Privilegeevent: make(map[int32]int32),

46
pb/arena_db.pb.go
View File

@ -257,17 +257,17 @@ type DBHeroBase struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` //英雄的唯一id Oid string `protobuf:"bytes,1,opt,name=oid,proto3" json:"oid"` //英雄的唯一id
Cid string `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid"` //英雄配置id Cid string `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid"` //英雄配置id
Star int32 `protobuf:"varint,3,opt,name=star,proto3" json:"star"` //英雄星级 Star int32 `protobuf:"varint,3,opt,name=star,proto3" json:"star"` //英雄星级
Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //英雄等级 Lv int32 `protobuf:"varint,4,opt,name=lv,proto3" json:"lv"` //英雄等级
Property map[string]int32 `protobuf:"bytes,5,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关 Property map[int32]int32 `protobuf:"bytes,5,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
AddProperty map[string]int32 `protobuf:"bytes,6,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关 AddProperty map[int32]int32 `protobuf:"bytes,6,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关
JuexProperty map[string]int32 `protobuf:"bytes,7,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////觉醒属性 JuexProperty map[int32]int32 `protobuf:"bytes,7,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////觉醒属性
TalentProperty map[string]int32 `protobuf:"bytes,8,rep,name=talentProperty,proto3" json:"talentProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"talentProperty"` // // 天赋属性 TalentProperty map[int32]int32 `protobuf:"bytes,8,rep,name=talentProperty,proto3" json:"talentProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"talentProperty"` // // 天赋属性
HoroscopeProperty map[string]int32 `protobuf:"bytes,9,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成 HoroscopeProperty map[int32]int32 `protobuf:"bytes,9,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成
Fetters map[string]int32 `protobuf:"bytes,10,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成 Fetters map[int32]int32 `protobuf:"bytes,10,rep,name=fetters,proto3" json:"fetters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成
NormalSkill []*SkillData `protobuf:"bytes,11,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 NormalSkill []*SkillData `protobuf:"bytes,11,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能
} }
func (x *DBHeroBase) Reset() { func (x *DBHeroBase) Reset() {
@ -330,42 +330,42 @@ func (x *DBHeroBase) GetLv() int32 {
return 0 return 0
} }
func (x *DBHeroBase) GetProperty() map[string]int32 { func (x *DBHeroBase) GetProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.Property return x.Property
} }
return nil return nil
} }
func (x *DBHeroBase) GetAddProperty() map[string]int32 { func (x *DBHeroBase) GetAddProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.AddProperty return x.AddProperty
} }
return nil return nil
} }
func (x *DBHeroBase) GetJuexProperty() map[string]int32 { func (x *DBHeroBase) GetJuexProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.JuexProperty return x.JuexProperty
} }
return nil return nil
} }
func (x *DBHeroBase) GetTalentProperty() map[string]int32 { func (x *DBHeroBase) GetTalentProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.TalentProperty return x.TalentProperty
} }
return nil return nil
} }
func (x *DBHeroBase) GetHoroscopeProperty() map[string]int32 { func (x *DBHeroBase) GetHoroscopeProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.HoroscopeProperty return x.HoroscopeProperty
} }
return nil return nil
} }
func (x *DBHeroBase) GetFetters() map[string]int32 { func (x *DBHeroBase) GetFetters() map[int32]int32 {
if x != nil { if x != nil {
return x.Fetters return x.Fetters
} }
@ -906,27 +906,27 @@ var file_arena_arena_db_proto_rawDesc = []byte{
0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x6e, 0x6f,
0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x72, 0x6d, 0x61, 0x6c, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f,
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 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, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f,
0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 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, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c,
0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72,
0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 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, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e,
0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10,
0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 0x65, 0x79, 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, 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, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f,
0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45,
0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 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, 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, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79,
0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 0x6b, 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, 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, 0xae, 0x02, 0x0a, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22, 0xae, 0x02, 0x0a,
0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65, 0x13, 0x44, 0x42, 0x41, 0x72, 0x65, 0x6e, 0x61, 0x42, 0x61, 0x74, 0x74, 0x6c, 0x65, 0x52, 0x65,

36
pb/equipment_db.pb.go
View File

@ -26,13 +26,13 @@ type EquipmentAttributeEntry struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id"` //属性词条主键id 唯一 Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id"` //属性词条主键id 唯一
Libraryid int32 `protobuf:"varint,2,opt,name=libraryid,proto3" json:"libraryid"` //属性词条id 非唯一 Libraryid int32 `protobuf:"varint,2,opt,name=libraryid,proto3" json:"libraryid"` //属性词条id 非唯一
AttrName string `protobuf:"bytes,3,opt,name=AttrName,proto3" json:"AttrName"` //属性名 AttrName int32 `protobuf:"varint,3,opt,name=AttrName,proto3" json:"AttrName"` //属性名
Lv int32 `protobuf:"varint,4,opt,name=Lv,proto3" json:"Lv"` //属性等级 Lv int32 `protobuf:"varint,4,opt,name=Lv,proto3" json:"Lv"` //属性等级
Value int32 `protobuf:"varint,5,opt,name=Value,proto3" json:"Value"` //属性值 Value int32 `protobuf:"varint,5,opt,name=Value,proto3" json:"Value"` //属性值
BaseValue int32 `protobuf:"varint,6,opt,name=BaseValue,proto3" json:"BaseValue"` //基础属性 BaseValue int32 `protobuf:"varint,6,opt,name=BaseValue,proto3" json:"BaseValue"` //基础属性
EnchValue int32 `protobuf:"varint,7,opt,name=EnchValue,proto3" json:"EnchValue"` //附魔属性 EnchValue int32 `protobuf:"varint,7,opt,name=EnchValue,proto3" json:"EnchValue"` //附魔属性
} }
func (x *EquipmentAttributeEntry) Reset() { func (x *EquipmentAttributeEntry) Reset() {
@ -81,11 +81,11 @@ func (x *EquipmentAttributeEntry) GetLibraryid() int32 {
return 0 return 0
} }
func (x *EquipmentAttributeEntry) GetAttrName() string { func (x *EquipmentAttributeEntry) GetAttrName() int32 {
if x != nil { if x != nil {
return x.AttrName return x.AttrName
} }
return "" return 0
} }
func (x *EquipmentAttributeEntry) GetLv() int32 { func (x *EquipmentAttributeEntry) GetLv() int32 {
@ -122,11 +122,11 @@ type EquipmentSkillEntry struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id"` //属性词条主键id 唯一 Id int32 `protobuf:"varint,1,opt,name=Id,proto3" json:"Id"` //属性词条主键id 唯一
Libraryid int32 `protobuf:"varint,2,opt,name=libraryid,proto3" json:"libraryid"` //属性词条id 非唯一 Libraryid int32 `protobuf:"varint,2,opt,name=libraryid,proto3" json:"libraryid"` //属性词条id 非唯一
AttrName string `protobuf:"bytes,3,opt,name=AttrName,proto3" json:"AttrName"` //属性名 AttrName int32 `protobuf:"varint,3,opt,name=AttrName,proto3" json:"AttrName"` //属性名
SkillId int32 `protobuf:"varint,4,opt,name=SkillId,proto3" json:"SkillId"` //技能id SkillId int32 `protobuf:"varint,4,opt,name=SkillId,proto3" json:"SkillId"` //技能id
Lv int32 `protobuf:"varint,5,opt,name=Lv,proto3" json:"Lv"` //属性等级 Lv int32 `protobuf:"varint,5,opt,name=Lv,proto3" json:"Lv"` //属性等级
} }
func (x *EquipmentSkillEntry) Reset() { func (x *EquipmentSkillEntry) Reset() {
@ -175,11 +175,11 @@ func (x *EquipmentSkillEntry) GetLibraryid() int32 {
return 0 return 0
} }
func (x *EquipmentSkillEntry) GetAttrName() string { func (x *EquipmentSkillEntry) GetAttrName() int32 {
if x != nil { if x != nil {
return x.AttrName return x.AttrName
} }
return "" return 0
} }
func (x *EquipmentSkillEntry) GetSkillId() int32 { func (x *EquipmentSkillEntry) GetSkillId() int32 {
@ -430,7 +430,7 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x09, 0x6c, 0x69,
0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x09, 0x6c,
0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x41, 0x74, 0x74, 0x72,
0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72,
0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05,
0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20, 0x52, 0x02, 0x4c, 0x76, 0x12, 0x14, 0x0a, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x05, 0x20,
0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61, 0x01, 0x28, 0x05, 0x52, 0x05, 0x56, 0x61, 0x6c, 0x75, 0x65, 0x12, 0x1c, 0x0a, 0x09, 0x42, 0x61,
@ -442,7 +442,7 @@ var file_equipment_equipment_db_proto_rawDesc = []byte{
0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c, 0x0a, 0x02, 0x49, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x1c,
0x0a, 0x09, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0a, 0x09, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x18, 0x02, 0x20, 0x01, 0x28,
0x05, 0x52, 0x09, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08, 0x05, 0x52, 0x09, 0x6c, 0x69, 0x62, 0x72, 0x61, 0x72, 0x79, 0x69, 0x64, 0x12, 0x1a, 0x0a, 0x08,
0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x09, 0x52, 0x08, 0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x18, 0x03, 0x20, 0x01, 0x28, 0x05, 0x52, 0x08,
0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x41, 0x74, 0x74, 0x72, 0x4e, 0x61, 0x6d, 0x65, 0x12, 0x18, 0x0a, 0x07, 0x53, 0x6b, 0x69, 0x6c,
0x6c, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x6c, 0x49, 0x64, 0x18, 0x04, 0x20, 0x01, 0x28, 0x05, 0x52, 0x07, 0x53, 0x6b, 0x69, 0x6c, 0x6c,
0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02, 0x49, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x4c, 0x76, 0x18, 0x05, 0x20, 0x01, 0x28, 0x05, 0x52, 0x02,

78
pb/hero_db.pb.go
View File

@ -73,33 +73,33 @@ type DBHero struct {
Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID Id string `protobuf:"bytes,1,opt,name=id,proto3" json:"id" bson:"_id"` //ID
Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"` Uid string `protobuf:"bytes,2,opt,name=uid,proto3" json:"uid"`
HeroID string `protobuf:"bytes,3,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` // 英雄的配置表ID HeroID string `protobuf:"bytes,3,opt,name=heroID,proto3" json:"heroID" bson:"heroID"` // 英雄的配置表ID
Star int32 `protobuf:"varint,4,opt,name=star,proto3" json:"star"` // 英雄星级 Star int32 `protobuf:"varint,4,opt,name=star,proto3" json:"star"` // 英雄星级
Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv"` // 英雄等级 Lv int32 `protobuf:"varint,5,opt,name=lv,proto3" json:"lv"` // 英雄等级
Exp int32 `protobuf:"varint,6,opt,name=exp,proto3" json:"exp"` // 英雄经验 Exp int32 `protobuf:"varint,6,opt,name=exp,proto3" json:"exp"` // 英雄经验
JuexingLv int32 `protobuf:"varint,7,opt,name=juexingLv,proto3" json:"juexingLv" bson:"juexingLv"` //觉醒等级 JuexingLv int32 `protobuf:"varint,7,opt,name=juexingLv,proto3" json:"juexingLv" bson:"juexingLv"` //觉醒等级
CaptainSkill int32 `protobuf:"varint,8,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能 CaptainSkill int32 `protobuf:"varint,8,opt,name=captainSkill,proto3" json:"captainSkill" bson:"captainSkill"` //队长技能
NormalSkill []*SkillData `protobuf:"bytes,9,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能 NormalSkill []*SkillData `protobuf:"bytes,9,rep,name=normalSkill,proto3" json:"normalSkill" bson:"normalSkill"` //普通技能
Property map[string]int32 `protobuf:"bytes,10,rep,name=property,proto3" json:"property" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关 Property map[int32]int32 `protobuf:"bytes,10,rep,name=property,proto3" json:"property" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 属性相关
AddProperty map[string]int32 `protobuf:"bytes,11,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关 AddProperty map[int32]int32 `protobuf:"bytes,11,rep,name=addProperty,proto3" json:"addProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"addProperty"` //附加属性相关
CardType int32 `protobuf:"varint,12,opt,name=cardType,proto3" json:"cardType" bson:"cardType"` //卡片类型(升星卡、经验卡、技能升级卡) CardType int32 `protobuf:"varint,12,opt,name=cardType,proto3" json:"cardType" bson:"cardType"` //卡片类型(升星卡、经验卡、技能升级卡)
CurSkin int32 `protobuf:"varint,13,opt,name=curSkin,proto3" json:"curSkin" bson:"curSkin"` //当前装备的皮肤ID CurSkin int32 `protobuf:"varint,13,opt,name=curSkin,proto3" json:"curSkin" bson:"curSkin"` //当前装备的皮肤ID
Skins []int32 `protobuf:"varint,14,rep,packed,name=skins,proto3" json:"skins"` // 所有皮肤ID Skins []int32 `protobuf:"varint,14,rep,packed,name=skins,proto3" json:"skins"` // 所有皮肤ID
Block bool `protobuf:"varint,15,opt,name=block,proto3" json:"block"` // 锁定 Block bool `protobuf:"varint,15,opt,name=block,proto3" json:"block"` // 锁定
EquipID []string `protobuf:"bytes,16,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID EquipID []string `protobuf:"bytes,16,rep,name=equipID,proto3" json:"equipID" bson:"equipID"` //装备 objID
JuexProperty map[string]int32 `protobuf:"bytes,17,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp JuexProperty map[int32]int32 `protobuf:"bytes,17,rep,name=juexProperty,proto3" json:"juexProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"juexProperty"` ////hp
Status HeroType `protobuf:"varint,18,opt,name=status,proto3,enum=HeroType" json:"status" bson:"status"` //状态 (1 练功) Status HeroType `protobuf:"varint,18,opt,name=status,proto3,enum=HeroType" json:"status" bson:"status"` //状态 (1 练功)
Suits []*DB_EquipmentSuit `protobuf:"bytes,19,rep,name=suits,proto3" json:"suits" bson:"suits"` //套装列表 Suits []*DB_EquipmentSuit `protobuf:"bytes,19,rep,name=suits,proto3" json:"suits" bson:"suits"` //套装列表
TalentProperty map[string]int32 `protobuf:"bytes,20,rep,name=talentProperty,proto3" json:"talentProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"talentProperty"` // // 天赋属性 TalentProperty map[int32]int32 `protobuf:"bytes,20,rep,name=talentProperty,proto3" json:"talentProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"talentProperty"` // // 天赋属性
EquipSkill []*SkillData `protobuf:"bytes,21,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //装备技能 EquipSkill []*SkillData `protobuf:"bytes,21,rep,name=equipSkill,proto3" json:"equipSkill" bson:"equipSkill"` //装备技能
HoroscopeProperty map[string]int32 `protobuf:"bytes,22,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成 HoroscopeProperty map[int32]int32 `protobuf:"bytes,22,rep,name=horoscopeProperty,proto3" json:"horoscopeProperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"horoscopeProperty"` ////星座属性加成
Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用 Fulllvenr int32 `protobuf:"varint,23,opt,name=fulllvenr,proto3" json:"fulllvenr" bson:"fulllvenr"` ////满级登记分组 武馆使用
KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功 KongfuUid string `protobuf:"bytes,24,opt,name=kongfuUid,proto3" json:"kongfuUid"` //@go_tags(`bson:"kongfuUid"`)// 英雄在谁家练功
Fetters map[string]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成 Fetters map[int32]int32 `protobuf:"bytes,25,rep,name=fetters,proto3" json:"fetters" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3" bson:"fetters"` ////羁绊属性加成
SameCount int32 `protobuf:"varint,26,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` ////叠加数 SameCount int32 `protobuf:"varint,26,opt,name=sameCount,proto3" json:"sameCount" bson:"sameCount"` ////叠加数
Ispasson bool `protobuf:"varint,27,opt,name=ispasson,proto3" json:"ispasson"` //是否是传功学员 Ispasson bool `protobuf:"varint,27,opt,name=ispasson,proto3" json:"ispasson"` //是否是传功学员
Awakenskill []*SkillData `protobuf:"bytes,28,rep,name=awakenskill,proto3" json:"awakenskill"` // 觉醒技能 Awakenskill []*SkillData `protobuf:"bytes,28,rep,name=awakenskill,proto3" json:"awakenskill"` // 觉醒技能
Talentskill []*SkillData `protobuf:"bytes,29,rep,name=talentskill,proto3" json:"talentskill"` // 回响技能 Talentskill []*SkillData `protobuf:"bytes,29,rep,name=talentskill,proto3" json:"talentskill"` // 回响技能
} }
func (x *DBHero) Reset() { func (x *DBHero) Reset() {
@ -197,14 +197,14 @@ func (x *DBHero) GetNormalSkill() []*SkillData {
return nil return nil
} }
func (x *DBHero) GetProperty() map[string]int32 { func (x *DBHero) GetProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.Property return x.Property
} }
return nil return nil
} }
func (x *DBHero) GetAddProperty() map[string]int32 { func (x *DBHero) GetAddProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.AddProperty return x.AddProperty
} }
@ -246,7 +246,7 @@ func (x *DBHero) GetEquipID() []string {
return nil return nil
} }
func (x *DBHero) GetJuexProperty() map[string]int32 { func (x *DBHero) GetJuexProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.JuexProperty return x.JuexProperty
} }
@ -267,7 +267,7 @@ func (x *DBHero) GetSuits() []*DB_EquipmentSuit {
return nil return nil
} }
func (x *DBHero) GetTalentProperty() map[string]int32 { func (x *DBHero) GetTalentProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.TalentProperty return x.TalentProperty
} }
@ -281,7 +281,7 @@ func (x *DBHero) GetEquipSkill() []*SkillData {
return nil return nil
} }
func (x *DBHero) GetHoroscopeProperty() map[string]int32 { func (x *DBHero) GetHoroscopeProperty() map[int32]int32 {
if x != nil { if x != nil {
return x.HoroscopeProperty return x.HoroscopeProperty
} }
@ -302,7 +302,7 @@ func (x *DBHero) GetKongfuUid() string {
return "" return ""
} }
func (x *DBHero) GetFetters() map[string]int32 { func (x *DBHero) GetFetters() map[int32]int32 {
if x != nil { if x != nil {
return x.Fetters return x.Fetters
} }
@ -803,28 +803,28 @@ var file_hero_hero_db_proto_rawDesc = []byte{
0x6c, 0x18, 0x1d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44, 0x6c, 0x18, 0x1d, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0a, 0x2e, 0x53, 0x6b, 0x69, 0x6c, 0x6c, 0x44,
0x61, 0x74, 0x61, 0x52, 0x0b, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x73, 0x6b, 0x69, 0x6c, 0x6c, 0x61, 0x74, 0x61, 0x52, 0x0b, 0x74, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x73, 0x6b, 0x69, 0x6c, 0x6c,
0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x1a, 0x3b, 0x0a, 0x0d, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 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, 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, 0x3e, 0x0a, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3e, 0x0a,
0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x10, 0x41, 0x64, 0x64, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72,
0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 0x03, 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, 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, 0x3f, 0x0a, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a,
0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x11, 0x4a, 0x75, 0x65, 0x78, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74,
0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x52, 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, 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, 0x41, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41,
0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x50, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79,
0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 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, 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, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38,
0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72, 0x01, 0x1a, 0x44, 0x0a, 0x16, 0x48, 0x6f, 0x72, 0x6f, 0x73, 0x63, 0x6f, 0x70, 0x65, 0x50, 0x72,
0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 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, 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, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61,
0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x3a, 0x0a, 0x0c, 0x46, 0x65, 0x74, 0x74, 0x65,
0x72, 0x73, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x72, 0x73, 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, 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, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x22, 0x8e, 0x0b, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65, 0x02, 0x38, 0x01, 0x22, 0x8e, 0x0b, 0x0a, 0x0c, 0x44, 0x42, 0x48, 0x65, 0x72, 0x6f, 0x52, 0x65,
0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 0x63, 0x6f, 0x72, 0x64, 0x12, 0x0e, 0x0a, 0x02, 0x69, 0x64, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09,

6
pb/stonehenge_db.pb.go
View File

@ -236,7 +236,7 @@ type DBStonehenge struct {
Addweight map[int32]int32 `protobuf:"bytes,11,rep,name=addweight,proto3" json:"addweight" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 选择buff权重增加 key 类型 Addweight map[int32]int32 `protobuf:"bytes,11,rep,name=addweight,proto3" json:"addweight" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` // 选择buff权重增加 key 类型
Etime int64 `protobuf:"varint,12,opt,name=etime,proto3" json:"etime"` // 结算时间 Etime int64 `protobuf:"varint,12,opt,name=etime,proto3" json:"etime"` // 结算时间
Talent map[int32]bool `protobuf:"bytes,13,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树 Talent map[int32]bool `protobuf:"bytes,13,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树
Talentproperty map[string]int32 `protobuf:"bytes,14,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性 Talentproperty map[int32]int32 `protobuf:"bytes,14,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性
Privilege []StonehengePrivilege `protobuf:"varint,15,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权 Privilege []StonehengePrivilege `protobuf:"varint,15,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权
Integral int32 `protobuf:"varint,16,opt,name=integral,proto3" json:"integral"` //积分 Integral int32 `protobuf:"varint,16,opt,name=integral,proto3" json:"integral"` //积分
Weeklyreward map[int32]bool `protobuf:"bytes,17,rep,name=weeklyreward,proto3" json:"weeklyreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取 Weeklyreward map[int32]bool `protobuf:"bytes,17,rep,name=weeklyreward,proto3" json:"weeklyreward" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //周长奖励领取
@ -368,7 +368,7 @@ func (x *DBStonehenge) GetTalent() map[int32]bool {
return nil return nil
} }
func (x *DBStonehenge) GetTalentproperty() map[string]int32 { func (x *DBStonehenge) GetTalentproperty() map[int32]int32 {
if x != nil { if x != nil {
return x.Talentproperty return x.Talentproperty
} }
@ -783,7 +783,7 @@ var file_stonehenge_stonehenge_db_proto_rawDesc = []byte{
0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x02, 0x20, 0x01, 0x28, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01,
0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x1a, 0x41, 0x0a, 0x13, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72,
0x74, 0x79, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x74, 0x79, 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, 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, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a,
0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77, 0x02, 0x38, 0x01, 0x1a, 0x3f, 0x0a, 0x11, 0x57, 0x65, 0x65, 0x6b, 0x6c, 0x79, 0x72, 0x65, 0x77,
0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x61, 0x72, 0x64, 0x45, 0x6e, 0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18,

12
pb/stonehenge_msg.pb.go
View File

@ -1110,10 +1110,10 @@ type StonehengeActivateTalentResp struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` //事件id Node int32 `protobuf:"varint,1,opt,name=node,proto3" json:"node"` //事件id
Talent map[int32]bool `protobuf:"bytes,2,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树 Talent map[int32]bool `protobuf:"bytes,2,rep,name=talent,proto3" json:"talent" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋树
Talentproperty map[string]int32 `protobuf:"bytes,3,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"bytes,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性 Talentproperty map[int32]int32 `protobuf:"bytes,3,rep,name=talentproperty,proto3" json:"talentproperty" protobuf_key:"varint,1,opt,name=key,proto3" protobuf_val:"varint,2,opt,name=value,proto3"` //天赋属性
Privilege []StonehengePrivilege `protobuf:"varint,4,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权 Privilege []StonehengePrivilege `protobuf:"varint,4,rep,packed,name=privilege,proto3,enum=StonehengePrivilege" json:"privilege"` //解锁特权
} }
func (x *StonehengeActivateTalentResp) Reset() { func (x *StonehengeActivateTalentResp) Reset() {
@ -1162,7 +1162,7 @@ func (x *StonehengeActivateTalentResp) GetTalent() map[int32]bool {
return nil return nil
} }
func (x *StonehengeActivateTalentResp) GetTalentproperty() map[string]int32 { func (x *StonehengeActivateTalentResp) GetTalentproperty() map[int32]int32 {
if x != nil { if x != nil {
return x.Talentproperty return x.Talentproperty
} }
@ -1941,7 +1941,7 @@ var file_stonehenge_stonehenge_msg_proto_rawDesc = []byte{
0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x65, 0x79, 0x12, 0x14, 0x0a, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28,
0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13, 0x08, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x1a, 0x41, 0x0a, 0x13,
0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e, 0x54, 0x61, 0x6c, 0x65, 0x6e, 0x74, 0x70, 0x72, 0x6f, 0x70, 0x65, 0x72, 0x74, 0x79, 0x45, 0x6e,
0x74, 0x72, 0x79, 0x12, 0x10, 0x0a, 0x03, 0x6b, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x09, 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, 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, 0x20, 0x01, 0x28, 0x05, 0x52, 0x05, 0x76, 0x61, 0x6c, 0x75, 0x65, 0x3a, 0x02, 0x38, 0x01, 0x22,
0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f, 0x17, 0x0a, 0x15, 0x53, 0x74, 0x6f, 0x6e, 0x65, 0x68, 0x65, 0x6e, 0x67, 0x65, 0x42, 0x6f, 0x6f,

8
sys/configure/structs/Game.BreakingbadData.go
View File

@ -12,7 +12,7 @@ import "errors"
type GameBreakingbadData struct { type GameBreakingbadData struct {
Delicacies string Delicacies string
Recipe []*Gameatr Recipe []*Gamecompare
Type int32 Type int32
Flame int32 Flame int32
Unlockreward *Gameatn Unlockreward *Gameatn
@ -31,11 +31,11 @@ func (_v *GameBreakingbadData)Deserialize(_buf map[string]interface{}) (err erro
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["recipe"].([]interface{}); !_ok_ { err = errors.New("recipe error"); return } if _arr_, _ok_ = _buf["recipe"].([]interface{}); !_ok_ { err = errors.New("recipe error"); return }
_v.Recipe = make([]*Gameatr, 0, len(_arr_)) _v.Recipe = make([]*Gamecompare, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ *Gameatr var _list_v_ *Gamecompare
{ 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 = DeserializeGameatr(_x_); err != nil { return } } { 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 = DeserializeGamecompare(_x_); err != nil { return } }
_v.Recipe = append(_v.Recipe, _list_v_) _v.Recipe = append(_v.Recipe, _list_v_)
} }
} }

8
sys/configure/structs/Game.EquipAttribute.go
View File

@ -9,13 +9,13 @@
package cfg package cfg
type GameEquipAttribute struct { type GameEquipAttribute struct {
_dataMap map[string]*GameEquipAttributeData _dataMap map[int32]*GameEquipAttributeData
_dataList []*GameEquipAttributeData _dataList []*GameEquipAttributeData
} }
func NewGameEquipAttribute(_buf []map[string]interface{}) (*GameEquipAttribute, error) { func NewGameEquipAttribute(_buf []map[string]interface{}) (*GameEquipAttribute, error) {
_dataList := make([]*GameEquipAttributeData, 0, len(_buf)) _dataList := make([]*GameEquipAttributeData, 0, len(_buf))
dataMap := make(map[string]*GameEquipAttributeData) dataMap := make(map[int32]*GameEquipAttributeData)
for _, _ele_ := range _buf { for _, _ele_ := range _buf {
if _v, err2 := DeserializeGameEquipAttributeData(_ele_); err2 != nil { if _v, err2 := DeserializeGameEquipAttributeData(_ele_); err2 != nil {
return nil, err2 return nil, err2
@ -27,7 +27,7 @@ func NewGameEquipAttribute(_buf []map[string]interface{}) (*GameEquipAttribute,
return &GameEquipAttribute{_dataList:_dataList, _dataMap:dataMap}, nil return &GameEquipAttribute{_dataList:_dataList, _dataMap:dataMap}, nil
} }
func (table *GameEquipAttribute) GetDataMap() map[string]*GameEquipAttributeData { func (table *GameEquipAttribute) GetDataMap() map[int32]*GameEquipAttributeData {
return table._dataMap return table._dataMap
} }
@ -35,7 +35,7 @@ func (table *GameEquipAttribute) GetDataList() []*GameEquipAttributeData {
return table._dataList return table._dataList
} }
func (table *GameEquipAttribute) Get(key string) *GameEquipAttributeData { func (table *GameEquipAttribute) Get(key int32) *GameEquipAttributeData {
return table._dataMap[key] return table._dataMap[key]
} }

4
sys/configure/structs/Game.EquipAttributeData.go
View File

@ -11,7 +11,7 @@ package cfg
import "errors" import "errors"
type GameEquipAttributeData struct { type GameEquipAttributeData struct {
Key string Key int32
SkillId int32 SkillId int32
AttributeText string AttributeText string
AttributeTextNovalue string AttributeTextNovalue string
@ -25,7 +25,7 @@ func (*GameEquipAttributeData) GetTypeId() int32 {
} }
func (_v *GameEquipAttributeData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameEquipAttributeData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Key, _ok_ = _buf["key"].(string); !_ok_ { err = errors.New("key error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill_id"].(float64); !_ok_ { err = errors.New("skill_id error"); return }; _v.SkillId = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["attribute_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeText, _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["attribute_text"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeText error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeText, _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["attribute_text_novalue"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeTextNovalue error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeTextNovalue, _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["attribute_text_novalue"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.AttributeTextNovalue error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.AttributeTextNovalue, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }

8
sys/configure/structs/Game.EquipAttrlibrarySData.go
View File

@ -13,8 +13,8 @@ import "errors"
type GameEquipAttrlibrarySData struct { type GameEquipAttrlibrarySData struct {
Key int32 Key int32
Libraryid int32 Libraryid int32
Attrkey string Attr *Gameatr
Attrvar int32 Skill int32
AttrvarCorrect int32 AttrvarCorrect int32
Probability int32 Probability int32
Addition []int32 Addition []int32
@ -29,8 +29,8 @@ func (*GameEquipAttrlibrarySData) GetTypeId() int32 {
func (_v *GameEquipAttrlibrarySData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameEquipAttrlibrarySData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["key"].(float64); !_ok_ { err = errors.New("key error"); return }; _v.Key = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["libraryid"].(float64); !_ok_ { err = errors.New("libraryid error"); return }; _v.Libraryid = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["libraryid"].(float64); !_ok_ { err = errors.New("libraryid error"); return }; _v.Libraryid = int32(_tempNum_) }
{ var _ok_ bool; if _v.Attrkey, _ok_ = _buf["attrkey"].(string); !_ok_ { err = errors.New("attrkey error"); return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["attr"].(map[string]interface{}); !_ok_ { err = errors.New("attr error"); return }; if _v.Attr, err = DeserializeGameatr(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar"].(float64); !_ok_ { err = errors.New("attrvar error"); return }; _v.Attrvar = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["skill"].(float64); !_ok_ { err = errors.New("skill error"); return }; _v.Skill = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar_correct"].(float64); !_ok_ { err = errors.New("attrvar_correct error"); return }; _v.AttrvarCorrect = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar_correct"].(float64); !_ok_ { err = errors.New("attrvar_correct error"); return }; _v.AttrvarCorrect = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["probability"].(float64); !_ok_ { err = errors.New("probability error"); return }; _v.Probability = int32(_tempNum_) }
{ {

4
sys/configure/structs/Game.EquipEnchantingData.go
View File

@ -13,7 +13,7 @@ import "errors"
type GameEquipEnchantingData struct { type GameEquipEnchantingData struct {
Item string Item string
Suittype int32 Suittype int32
Attrkey string Attrkey int32
AttrMini int32 AttrMini int32
AttrMax int32 AttrMax int32
Need []*Gameatn Need []*Gameatn
@ -28,7 +28,7 @@ func (*GameEquipEnchantingData) GetTypeId() int32 {
func (_v *GameEquipEnchantingData)Deserialize(_buf map[string]interface{}) (err error) { func (_v *GameEquipEnchantingData)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.Item, _ok_ = _buf["item"].(string); !_ok_ { err = errors.New("item error"); return } } { var _ok_ bool; if _v.Item, _ok_ = _buf["item"].(string); !_ok_ { err = errors.New("item error"); return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["suittype"].(float64); !_ok_ { err = errors.New("suittype error"); return }; _v.Suittype = int32(_tempNum_) }
{ var _ok_ bool; if _v.Attrkey, _ok_ = _buf["attrkey"].(string); !_ok_ { err = errors.New("attrkey error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrkey"].(float64); !_ok_ { err = errors.New("attrkey error"); return }; _v.Attrkey = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attr_mini"].(float64); !_ok_ { err = errors.New("attr_mini error"); return }; _v.AttrMini = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attr_mini"].(float64); !_ok_ { err = errors.New("attr_mini error"); return }; _v.AttrMini = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attr_max"].(float64); !_ok_ { err = errors.New("attr_max error"); return }; _v.AttrMax = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attr_max"].(float64); !_ok_ { err = errors.New("attr_max error"); return }; _v.AttrMax = int32(_tempNum_) }
{ {

6
sys/configure/structs/Game.HeroTalentData.go
View File

@ -20,8 +20,7 @@ type GameHeroTalentData struct {
Condition int32 Condition int32
Skilltxt string Skilltxt string
Skillicon string Skillicon string
Attrkey string Attr *Gameatr
Attrvar int32
Hp int32 Hp int32
Atk int32 Atk int32
Def int32 Def int32
@ -61,8 +60,7 @@ func (_v *GameHeroTalentData)Deserialize(_buf map[string]interface{}) (err error
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["condition"].(float64); !_ok_ { err = errors.New("condition error"); return }; _v.Condition = int32(_tempNum_) }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skilltxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilltxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilltxt, _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["skilltxt"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skilltxt error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skilltxt, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ var _ok_ bool; if _v.Skillicon, _ok_ = _buf["skillicon"].(string); !_ok_ { err = errors.New("skillicon error"); return } } { var _ok_ bool; if _v.Skillicon, _ok_ = _buf["skillicon"].(string); !_ok_ { err = errors.New("skillicon error"); return } }
{ var _ok_ bool; if _v.Attrkey, _ok_ = _buf["attrkey"].(string); !_ok_ { err = errors.New("attrkey error"); return } } { var _ok_ bool; var _x_ map[string]interface{}; if _x_, _ok_ = _buf["attr"].(map[string]interface{}); !_ok_ { err = errors.New("attr error"); return }; if _v.Attr, err = DeserializeGameatr(_x_); err != nil { return } }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["attrvar"].(float64); !_ok_ { err = errors.New("attrvar error"); return }; _v.Attrvar = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["hp"].(float64); !_ok_ { err = errors.New("hp error"); return }; _v.Hp = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["atk"].(float64); !_ok_ { err = errors.New("atk error"); return }; _v.Atk = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["def"].(float64); !_ok_ { err = errors.New("def error"); return }; _v.Def = int32(_tempNum_) }

4
sys/configure/structs/Game.atr.go
View File

@ -11,7 +11,7 @@ package cfg
import "errors" import "errors"
type Gameatr struct { type Gameatr struct {
A string A int32
N int32 N int32
} }
@ -22,7 +22,7 @@ func (*Gameatr) GetTypeId() int32 {
} }
func (_v *Gameatr)Deserialize(_buf map[string]interface{}) (err error) { func (_v *Gameatr)Deserialize(_buf map[string]interface{}) (err error) {
{ var _ok_ bool; if _v.A, _ok_ = _buf["a"].(string); !_ok_ { err = errors.New("a error"); return } } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["a"].(float64); !_ok_ { err = errors.New("a error"); return }; _v.A = int32(_tempNum_) }
{ var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) } { var _ok_ bool; var _tempNum_ float64; if _tempNum_, _ok_ = _buf["n"].(float64); !_ok_ { err = errors.New("n error"); return }; _v.N = int32(_tempNum_) }
return return
} }

16
sys/configure/structs/game.equipPosData.go
View File

@ -13,8 +13,8 @@ import "errors"
type GameEquipPosData struct { type GameEquipPosData struct {
Pos int32 Pos int32
Suitnum int32 Suitnum int32
Leadlibrary []string Leadlibrary []int32
Addlibrary []string Addlibrary []int32
} }
const TypeId_GameEquipPosData = 296047178 const TypeId_GameEquipPosData = 296047178
@ -31,11 +31,11 @@ func (_v *GameEquipPosData)Deserialize(_buf map[string]interface{}) (err error)
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["leadlibrary"].([]interface{}); !_ok_ { err = errors.New("leadlibrary error"); return } if _arr_, _ok_ = _buf["leadlibrary"].([]interface{}); !_ok_ { err = errors.New("leadlibrary error"); return }
_v.Leadlibrary = make([]string, 0, len(_arr_)) _v.Leadlibrary = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ string var _list_v_ int32
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Leadlibrary = append(_v.Leadlibrary, _list_v_) _v.Leadlibrary = append(_v.Leadlibrary, _list_v_)
} }
} }
@ -45,11 +45,11 @@ func (_v *GameEquipPosData)Deserialize(_buf map[string]interface{}) (err error)
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["addlibrary"].([]interface{}); !_ok_ { err = errors.New("addlibrary error"); return } if _arr_, _ok_ = _buf["addlibrary"].([]interface{}); !_ok_ { err = errors.New("addlibrary error"); return }
_v.Addlibrary = make([]string, 0, len(_arr_)) _v.Addlibrary = make([]int32, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ string var _list_v_ int32
{ if _list_v_, _ok_ = _e_.(string); !_ok_ { err = errors.New("_list_v_ error"); return } } { var _ok_ bool; var _x_ float64; if _x_, _ok_ = _e_.(float64); !_ok_ { err = errors.New("_list_v_ error"); return }; _list_v_ = int32(_x_) }
_v.Addlibrary = append(_v.Addlibrary, _list_v_) _v.Addlibrary = append(_v.Addlibrary, _list_v_)
} }
} }

19
sys/configure/structs/game.equipSuitData.go
View File

@ -19,7 +19,7 @@ type GameEquipSuitData struct {
FloatIcon string FloatIcon string
SimpleSkillintr string SimpleSkillintr string
Skillintr string Skillintr string
SetBonuses map[string]int32 SetBonuses []*Gameatr
} }
const TypeId_GameEquipSuitData = -1986764885 const TypeId_GameEquipSuitData = -1986764885
@ -37,23 +37,20 @@ func (_v *GameEquipSuitData)Deserialize(_buf map[string]interface{}) (err error)
{ var _ok_ bool; if _v.FloatIcon, _ok_ = _buf["FloatIcon"].(string); !_ok_ { err = errors.New("FloatIcon error"); return } } { var _ok_ bool; if _v.FloatIcon, _ok_ = _buf["FloatIcon"].(string); !_ok_ { err = errors.New("FloatIcon error"); return } }
{var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["simple_skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.SimpleSkillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.SimpleSkillintr, _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["simple_skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.SimpleSkillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.SimpleSkillintr, _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["skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } } {var _ok_ bool; var __json_text__ map[string]interface{}; if __json_text__, _ok_ = _buf["skillintr"].(map[string]interface{}) ; !_ok_ { err = errors.New("_v.Skillintr error"); return }; { var _ok_ bool; if _, _ok_ = __json_text__["key"].(string); !_ok_ { err = errors.New("key error"); return } }; { var _ok_ bool; if _v.Skillintr, _ok_ = __json_text__["text"].(string); !_ok_ { err = errors.New("text error"); return } } }
{ {
var _arr_ []interface{} var _arr_ []interface{}
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["SetBonuses"].([]interface{}); !_ok_ { err = errors.New("SetBonuses error"); return } if _arr_, _ok_ = _buf["SetBonuses"].([]interface{}); !_ok_ { err = errors.New("SetBonuses error"); return }
_v.SetBonuses = make(map[string]int32) _v.SetBonuses = make([]*Gameatr, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _kv_ []interface{} var _list_v_ *Gameatr
if _kv_, _ok_ = _e_.([]interface{}); !_ok_ || len(_kv_) != 2 { err = errors.New("SetBonuses error"); return } { 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 = DeserializeGameatr(_x_); err != nil { return } }
var _key_ string _v.SetBonuses = append(_v.SetBonuses, _list_v_)
{ if _key_, _ok_ = _kv_[0].(string); !_ok_ { err = errors.New("_key_ error"); return } }
var _value_ int32
{ var _ok_ bool; var _x_ float64; if _x_, _ok_ = _kv_[1].(float64); !_ok_ { err = errors.New("_value_ error"); return }; _value_ = int32(_x_) }
_v.SetBonuses[_key_] = _value_
}
} }
}
return return
} }

8
sys/configure/structs/game.heroAwakenData.go
View File

@ -15,7 +15,7 @@ type GameHeroAwakenData struct {
Hid string Hid string
Phase int32 Phase int32
Name string Name string
Phasebonus []*Gamecompare Phasebonus []*Gameatr
Skill int32 Skill int32
Describe string Describe string
Icon string Icon string
@ -40,11 +40,11 @@ func (_v *GameHeroAwakenData)Deserialize(_buf map[string]interface{}) (err error
var _ok_ bool var _ok_ bool
if _arr_, _ok_ = _buf["phasebonus"].([]interface{}); !_ok_ { err = errors.New("phasebonus error"); return } if _arr_, _ok_ = _buf["phasebonus"].([]interface{}); !_ok_ { err = errors.New("phasebonus error"); return }
_v.Phasebonus = make([]*Gamecompare, 0, len(_arr_)) _v.Phasebonus = make([]*Gameatr, 0, len(_arr_))
for _, _e_ := range _arr_ { for _, _e_ := range _arr_ {
var _list_v_ *Gamecompare var _list_v_ *Gameatr
{ 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 = DeserializeGamecompare(_x_); err != nil { return } } { 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 = DeserializeGameatr(_x_); err != nil { return } }
_v.Phasebonus = append(_v.Phasebonus, _list_v_) _v.Phasebonus = append(_v.Phasebonus, _list_v_)
} }
} }