diff --git a/.idea/.name b/.idea/.name
new file mode 100644
index 0000000..70f598f
--- /dev/null
+++ b/.idea/.name
@@ -0,0 +1 @@
+HeadlessCocos
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index 61a9130..fb7f4a8 100644
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
-
+
\ No newline at end of file
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index dcf70cf..223130a 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -8,11 +8,12 @@
+
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 5df0807..17e3704 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,6 @@
+
+
diff --git a/js/main.js b/js/main.js
index 8d128cc..ad698a2 100644
--- a/js/main.js
+++ b/js/main.js
@@ -6,9 +6,8 @@ console.log(">>begin load wallet main file");
*/
function initWallet(funId, type, chain) {
- // chain = chain || 80001
- type = 0
- chain = 1338
+ type = parseInt(type)
+ chain = parseInt(chain)
try {
var wallet;
if (!window.jc || !jc.wallet) {
@@ -379,6 +378,8 @@ function signOutGoogle(funId) {
//}
function buyNft721(funId, addresses, values, signature) {
+ addresses = JSON.parse(addresses)
+ values = JSON.parse(values)
jc.wallet.jcStandard
.buyNft721({
addresses,
@@ -390,7 +391,7 @@ function buyNft721(funId, addresses, values, signature) {
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
@@ -400,6 +401,11 @@ function buyNft721(funId, addresses, values, signature) {
}
function buyNft1155(funId, addresses, values, ids, amounts, signature) {
+ addresses = JSON.parse(addresses)
+ values = JSON.parse(values)
+ ids = JSON.parse(ids)
+ amounts = JSON.parse(amounts)
+
jc.wallet.jcStandard
.buyNft1155({
addresses,
@@ -413,7 +419,7 @@ function buyNft1155(funId, addresses, values, ids, amounts, signature) {
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
@@ -430,7 +436,7 @@ function evolveNft721(
nonce,
signature
) {
- {
+ tokenIds = JSON.parse(tokenIds)
jc.wallet.jcStandard
.evolve721NFT({
nftAddress,
@@ -444,17 +450,17 @@ function evolveNft721(
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
.catch((err) => {
jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));
});
- }
}
function evolveChip(funId, tokenIds, startTime, nonce, signature) {
+ tokenIds = JSON.parse(tokenIds)
jc.wallet.jcStandard
.evolveChip({
tokenIds,
@@ -467,7 +473,7 @@ function evolveChip(funId, tokenIds, startTime, nonce, signature) {
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
@@ -484,6 +490,9 @@ function mintShardBatchUser(
nonce,
signature
) {
+ tokenIds = JSON.parse(tokenIds)
+ amounts = JSON.parse(amounts)
+
jc.wallet.jcStandard
.mintShardBatchUser({
tokenIds,
@@ -497,7 +506,7 @@ function mintShardBatchUser(
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
@@ -518,6 +527,9 @@ function shardMixByUser(
nonce,
signature
) {
+ ids = JSON.parse(ids)
+ amounts = JSON.parse(amounts)
+
jc.wallet.jcStandard
.shardMixByUser({
tokenId,
@@ -535,7 +547,7 @@ function shardMixByUser(
funId,
JSON.stringify({
errcode: 0,
- data: result,
+ data: JSON.stringify(result),
})
);
})
@@ -544,44 +556,66 @@ function shardMixByUser(
});
}
+
+// addresses: [nftId, chip, sign_address]
+// values: [token_id,salt_nonce,startTime]
+// chipIds: [...chipIds]
function pluginChip(
funId,
- nftAddress,
- chipAddress,
- nftId,
- chipIds
+ addresses,
+ values,
+ chipIds,
+ slots,
+ signature
) {
+ addresses = JSON.parse(addresses)
+ values = JSON.parse(values)
+ chipIds = JSON.parse(chipIds)
+ slots = JSON.parse(slots)
+
jc.wallet.jcStandard
.pluginChip({
- nftAddress,
- chipAddress,
- nftId,
- chipIds
+ addresses,
+ values,
+ chipIds,
+ slots,
+ signature
})
.then((result) => {
- jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result}));
+ jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)}));
})
.catch((err) => {
jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));
});
}
+// addresses: [nftId, chip, sign_address]
+// values: [token_id,salt_nonce,startTime]
+// chipIds: [...chipIds]
function unplugChip(
funId,
- nftAddress,
- chipAddress,
- nftId,
- chipIds
+ addresses,
+ values,
+ chipIds,
+ slots,
+ signature
) {
+
+ addresses = JSON.parse(addresses)
+ values = JSON.parse(values)
+ chipIds = JSON.parse(chipIds)
+ slots = JSON.parse(slots)
+
jc.wallet.jcStandard
.unplugChip({
- nftAddress,
- chipAddress,
- nftId,
- chipIds
+ addresses,
+ values,
+ chipIds,
+ slots,
+ signature
})
.then((result) => {
- jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: result}));
+ jsb.jcCallback(funId,JSON.stringify({errcode: 0,data: JSON.stringify(result)}));
})
.catch((err) => {
jsb.jcCallback(funId,JSON.stringify({errcode: 1,errmsg: err}));