Merge pull request #19 from neftyblocks/Packs-View

last bug fix
neftyblocks · Jun 27, 2023 · 3cdbd94 · 3cdbd94 · vercel · Jun 27, 2023
2 parents b2456ac + 8e73ece
commit 3cdbd94
Show file tree

Hide file tree

Showing 8 changed files with 6 additions and 14 deletions.
diff --git a/Assets/Scenes/MainScene.unity b/Assets/Scenes/MainScene.unity
@@ -10371,7 +10371,7 @@ MonoBehaviour:
   m_TargetGraphic: {fileID: 1726226118}
   m_HandleRect: {fileID: 1726226117}
   m_Direction: 2
-  m_Value: 0
+  m_Value: 1
   m_Size: 1
   m_NumberOfSteps: 0
   m_OnValueChanged:

diff --git a/Assets/Scripts/Class/Deserealizers/Reward.cs b/Assets/Scripts/Class/Deserealizers/Reward.cs
@@ -207,15 +207,6 @@ public partial class TransferredAsset
         [JsonProperty("backed_tokens")]
         public List<object> backedTokens { get; set; }
 
-        [JsonProperty("burned_by_account")]
-        public string burnedByAccount { get; set; }
-
-        [JsonProperty("burned_at_block")]
-        public long burnedAtBlock { get; set; }
-
-        [JsonProperty("burned_at_time")]
-        public string burnedAtTime { get; set; }
-
         [JsonProperty("updated_at_block")]
         public long updatedAtBlock { get; set; }
 

diff --git a/Assets/Scripts/Fetcher/RewardFetcher.cs b/Assets/Scripts/Fetcher/RewardFetcher.cs
@@ -36,6 +36,7 @@ public async Task<RewardAsset> GetRewardData(string txId, int blendId)
 
             if (deserializedJsonResult.data.Count == 0 || deserializedJsonResult.data[0].results.Count == 0)
             {
+                Debug.Log("burn");
                 result.rewardName = "burn";
                 result.rewardSprite = await imageLoader.GetSpriteAsync(null);
                 return result;

diff --git a/Assets/Scripts/Plugins/WrapperJS.jslib b/Assets/Scripts/Plugins/WrapperJS.jslib
@@ -72,7 +72,7 @@ mergeInto(LibraryManager.library, {
       };
       const result = await user.signTransaction({ actions }, tapos);
       console.log(result.transactionId);
-      await new Promise(resolve => setTimeout(resolve, 2000));
+      await new Promise(resolve => setTimeout(resolve, 1750));
       var txData = {
         txId: result.transactionId,
         blendId: blend_id,
@@ -142,7 +142,7 @@ mergeInto(LibraryManager.library, {
       };
       const result = await user.signTransaction({ actions }, tapos);
       console.log(result.transactionId);
-      await new Promise(resolve => setTimeout(resolve, 2000));
+      await new Promise(resolve => setTimeout(resolve, 1750));
       var txData = {
         txId: result.transactionId,
         blendId: blend_id,

diff --git a/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json b/ProjectSettings/Packages/com.unity.testtools.codecoverage/Settings.json
@@ -21,7 +21,7 @@
             {
                 "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",
                 "key": "PathsToExclude",
-                "value": "{\"m_Value\":\"{ProjectPath}/Assets/Scripts/Class/**,{ProjectPath}/Assets/Scripts/Fetcher/**,{ProjectPath}/Assets/Scripts/UI/**,{ProjectPath}/Assets/Scripts/Controller/BlendInputter.cs,{ProjectPath}/Assets/Scripts/Controller/LoginController.cs,{ProjectPath}/Assets/Scripts/Controller/PluginController.cs,{ProjectPath}/Assets/Scripts/Javascript/SendTransactionJS.cs,{ProjectPath}/Assets/Scripts/Controller/LogoutController.cs,{ProjectPath}/Assets/Scripts/Controller/RPCController.cs,{ProjectPath}/Assets/Scripts/Controller/IngredientSelector.cs\"}"
+                "value": "{\"m_Value\":\"{ProjectPath}/Assets/Scripts/Class/**,{ProjectPath}/Assets/Scripts/Fetcher/**,{ProjectPath}/Assets/Scripts/UI/**,{ProjectPath}/Assets/Scripts/Controller/BlendInputter.cs,{ProjectPath}/Assets/Scripts/Controller/LoginController.cs,{ProjectPath}/Assets/Scripts/Controller/PluginController.cs,{ProjectPath}/Assets/Scripts/Javascript/SendTransactionJS.cs,{ProjectPath}/Assets/Scripts/Controller/LogoutController.cs,{ProjectPath}/Assets/Scripts/Controller/RPCController.cs,{ProjectPath}/Assets/Scripts/Controller/IngredientSelector.cs,{ProjectPath}/Assets/Scripts/Controller/HyperlinkController.cs\"}"
             },
             {
                 "type": "System.String, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089",

diff --git a/WebGL-Build/Build/WebGL-Build.data b/WebGL-Build/Build/WebGL-Build.data
diff --git a/WebGL-Build/Build/WebGL-Build.framework.js b/WebGL-Build/Build/WebGL-Build.framework.js
diff --git a/WebGL-Build/Build/WebGL-Build.wasm b/WebGL-Build/Build/WebGL-Build.wasm