fix bug of evolve hero and equip

This commit is contained in:
zhl 2022-01-17 13:38:16 +08:00
parent ce41cca801
commit 6e33fd8ddd
10 changed files with 3930 additions and 4002 deletions

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -18085,7 +18085,7 @@
} }
}, },
"schemaVersion": "3.4.4", "schemaVersion": "3.4.4",
"updatedAt": "2022-01-13T11:14:28.197Z", "updatedAt": "2022-01-17T01:57:21.920Z",
"networkType": "ethereum", "networkType": "ethereum",
"devdoc": { "devdoc": {
"kind": "dev", "kind": "dev",

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@ -9596,7 +9596,7 @@
} }
}, },
"schemaVersion": "3.4.4", "schemaVersion": "3.4.4",
"updatedAt": "2022-01-13T11:14:28.216Z", "updatedAt": "2022-01-17T01:57:21.940Z",
"networkType": "ethereum", "networkType": "ethereum",
"devdoc": { "devdoc": {
"kind": "dev", "kind": "dev",

View File

@ -30656,7 +30656,7 @@
} }
}, },
"schemaVersion": "3.4.4", "schemaVersion": "3.4.4",
"updatedAt": "2022-01-13T11:14:28.185Z", "updatedAt": "2022-01-17T01:57:21.904Z",
"networkType": "ethereum", "networkType": "ethereum",
"devdoc": { "devdoc": {
"kind": "dev", "kind": "dev",

View File

@ -2328,7 +2328,7 @@
} }
}, },
"schemaVersion": "3.4.4", "schemaVersion": "3.4.4",
"updatedAt": "2022-01-13T11:14:28.219Z", "updatedAt": "2022-01-17T01:57:21.945Z",
"networkType": "ethereum", "networkType": "ethereum",
"devdoc": { "devdoc": {
"kind": "dev", "kind": "dev",

View File

@ -8958,7 +8958,7 @@
} }
}, },
"schemaVersion": "3.4.4", "schemaVersion": "3.4.4",
"updatedAt": "2022-01-13T11:14:28.175Z", "updatedAt": "2022-01-17T01:57:21.894Z",
"networkType": "ethereum", "networkType": "ethereum",
"devdoc": { "devdoc": {
"kind": "dev", "kind": "dev",

View File

@ -37,7 +37,7 @@ contract EvolveProxy is Ownable, Initializable {
require(publicEvolveAllowed); require(publicEvolveAllowed);
hero.burn(owner, tokenIds[1]); hero.burn(owner, tokenIds[1]);
if (tokenIds[2] > 0) { if (tokenIds[2] > 0) {
chip.burn(owner, tokenIds[1]); chip.burn(owner, tokenIds[2]);
} }
emit TokenEvolved(address(hero), owner, tokenIds[0], tokenIds[1], tokenIds[2]); emit TokenEvolved(address(hero), owner, tokenIds[0], tokenIds[1], tokenIds[2]);
return true; return true;
@ -51,7 +51,7 @@ contract EvolveProxy is Ownable, Initializable {
require(publicEvolveAllowed); require(publicEvolveAllowed);
equip.burn(owner, tokenIds[1]); equip.burn(owner, tokenIds[1]);
if (tokenIds[2] > 0) { if (tokenIds[2] > 0) {
chip.burn(owner, tokenIds[1]); chip.burn(owner, tokenIds[2]);
} }
emit TokenEvolved(address(equip), owner, tokenIds[0], tokenIds[1], tokenIds[2]); emit TokenEvolved(address(equip), owner, tokenIds[0], tokenIds[1], tokenIds[2]);
return true; return true;