Skip to content

Commit

Permalink
Merge branch 'main' into ryan/multicall-484
Browse files Browse the repository at this point in the history
# Conflicts:
#	Packages/io.chainsafe.web3-unity.lootboxes/Chainlink/Runtime/Libraries/Chainsafe.Gaming.Chainlink.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Chainlink.Lootboxes.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Debugging.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Gelato.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessSigner.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.InProcessTransactionExecutor.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.Unity.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.WebPageWallet.dll
#	Packages/io.chainsafe.web3-unity/Runtime/Libraries/ChainSafe.Gaming.dll
  • Loading branch information
RyRy79261 committed Oct 24, 2023
2 parents 277d880 + 17299f5 commit 75d2f66
Show file tree
Hide file tree
Showing 375 changed files with 9,151 additions and 1,535 deletions.
1 change: 1 addition & 0 deletions .github/workflows/unity_tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ jobs:
- name: Publish to Unity Package
run: |
rm -f ${{ matrix.publishPath }}/UnityEngine.dll
rm -f ${{ matrix.publishPath }}/Microsoft.CSharp.dll
mkdir -p ${{ matrix.packageLibraryPath }}
rm -f ${{ matrix.packageLibraryPath }}/*
cp ${{ matrix.publishPath }}/*.dll ${{ matrix.packageLibraryPath }}/
Expand Down
4 changes: 2 additions & 2 deletions ChainSafe.Gaming.sln
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChainSafe.Gaming.Unity.ThirdParty", "src\ChainSafe.Gaming.Unity.ThirdParty\ChainSafe.Gaming.Unity.ThirdParty.csproj", "{9EC71CB4-9401-4E02-AC63-FC13B3D1AA53}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChainSafe.Gaming.WebPageWallet", "src\ChainSafe.Gaming.WebPageWallet\ChainSafe.Gaming.WebPageWallet.csproj", "{99E7A645-CAC5-441B-848D-1253405D6400}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ChainSafe.Gaming.WalletConnect", "src\ChainSafe.Gaming.WalletConnect\ChainSafe.Gaming.WalletConnect.csproj", "{99E7A645-CAC5-441B-848D-1253405D6400}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChainSafe.Gaming.InProcessSigner", "src\ChainSafe.Gaming.InProcessSigner\ChainSafe.Gaming.InProcessSigner.csproj", "{3C01FD36-4D44-4886-A971-4786D99CBFCC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChainSafe.Gaming.InProcessTransactionExecutor", "src\ChainSafe.Gaming.InProcessTransactionExecutor\ChainSafe.Gaming.InProcessTransactionExecutor.csproj", "{457E4582-4CC5-4D42-A0CB-5F48204328FE}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChainSafe.Gaming.Gelato", "src\ChainSafe.Gaming.Gelato\ChainSafe.Gaming.Gelato.csproj", "{205BA2B5-B8B0-4860-B8D0-1AFA148D882E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChainSafe.Gaming.Chainlink.Lootboxes", "src\ChainSafe.Gaming.Chainlink.Lootboxes\ChainSafe.Gaming.Chainlink.Lootboxes.csproj", "{2A1E49E1-219A-4821-B580-CF6E85A5EA20}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ChainSafe.Gaming.Lootboxes.Chainlink", "src\ChainSafe.Gaming.Lootboxes.Chainlink\ChainSafe.Gaming.Lootboxes.Chainlink.csproj", "{2A1E49E1-219A-4821-B580-CF6E85A5EA20}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chainsafe.Gaming.Chainlink", "src\Chainsafe.Gaming.Chainlink\Chainsafe.Gaming.Chainlink.csproj", "{A8A29975-3146-445E-87F6-7B2447C39760}"
EndProject
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file not shown.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

File renamed without changes.
File renamed without changes.

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
using Chainsafe.Gaming.Chainlink;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene;
using Chainsafe.Gaming.Chainlink;
using ChainSafe.Gaming.Debugging;
using ChainSafe.Gaming.Evm.JsonRpc;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using ChainSafe.Gaming.Wallets;
using ChainSafe.Gaming.Web3;
using ChainSafe.Gaming.Web3.Build;
using ChainSafe.Gaming.Web3.Unity;
using LootBoxes.Scene;
using Microsoft.Extensions.DependencyInjection;
using UnityEngine;


namespace LootBoxes
namespace Chainlink.LootBoxes
{
/// <summary>
/// Initializes Web3 using local RPC node and node's user
/// </summary>
public class TempLauncher : MonoBehaviour
public class ChainlinkLootboxSampleLauncher : MonoBehaviour
{
public LootBoxScene lootBoxScene;
public string ContractAbi;
Expand Down Expand Up @@ -44,7 +44,7 @@ private async void Awake()
services.Debug().UseJsonRpcWallet(new JsonRpcWalletConfig { AccountIndex = 2 });
services.UseChainlinkLootboxService(new LootboxServiceConfig
{
ContractAddress = "0x46E334e90454aDDF311Cd75D4Ae19e2fA06285Ff",
ContractAddress = "0x1993e2dD323B5dcBd8b52dB7d370bC36D280424B",
ContractAbi = ContractAbi
});
services.AddSingleton<Erc1155MetaDataReader>();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using System.Threading.Tasks;
using ChainSafe.Gaming.Web3.Environment;

namespace LootBoxes
namespace Chainlink.LootBoxes
{
public class Erc1155MetaData
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace LootBoxes
namespace Chainlink.LootBoxes
{
public static class Menues
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using UnityEngine;
using UnityEngine.UI;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Blackout : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
[RequireComponent(typeof(Renderer))]
[ExecuteInEditMode]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
using System.Collections.Generic;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class LootBoxScene : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class LootBoxSceneException : Exception
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
using System;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class LootBox : MonoBehaviour
public class Lootbox : MonoBehaviour
{
public Animator animator;
public ParticleSystem claimedFx;

private bool _selected;
public event Action<LootBox> Clicked;
public event Action<Lootbox> Clicked;

public bool Selected
{
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using TMPro;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class CoinReward : Reward
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using System;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using ChainSafe.Gaming.UnityPackage;
using LootBoxes.Scene.StageItems;
using UnityEngine;
using UnityEngine.Networking;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Erc1155NftRewardFactory : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using ChainSafe.Gaming.UnityPackage;
using LootBoxes.Scene.StageItems;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Erc1155RewardFactory : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using System.Globalization;
using System.Numerics;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using ChainSafe.Gaming.UnityPackage;
using LootBoxes.Scene.StageItems;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Erc20RewardFactory : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,24 +1,19 @@
using System;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using ChainSafe.Gaming.UnityPackage;
using LootBoxes.Scene.StageItems;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Erc721NftRewardFactory : MonoBehaviour
{
public StageItem NftRewardItemPrefab;

private IContractBuilder contractBuilder;

public void Configure(IContractBuilder contractBuilder)
{
this.contractBuilder = contractBuilder;
}

private void OnValidate()
{
if (NftRewardItemPrefab && NftRewardItemPrefab.Reward is not NftReward)
Expand All @@ -28,6 +23,11 @@ private void OnValidate()
}
}

public void Configure(IContractBuilder contractBuilder)
{
this.contractBuilder = contractBuilder;
}

public async Task<StageItem> Create(Erc721Reward data)
{
var item = Instantiate(NftRewardItemPrefab);
Expand All @@ -51,7 +51,7 @@ public async Task<StageItem> Create(Erc721Reward data)

private Texture DownloadImage()
{
throw new System.NotImplementedException();
throw new NotImplementedException();
}
}
}
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class NftReward : Reward
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public abstract class Reward : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
using ChainSafe.Gaming.Chainlink.Lootboxes;
using Chainlink.LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Evm.Contracts;
using LootBoxes.Scene.StageItems;
using ChainSafe.Gaming.Lootboxes.Chainlink;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class RewardStageItemSpawner : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
using System.Collections.Generic;
using LootBoxes.Scene.StageItems;
using Chainlink.LootBoxes.Scene.StageItems;
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class Stage : MonoBehaviour
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UnityEngine;

namespace LootBoxes.Scene
namespace Chainlink.LootBoxes.Scene
{
public class StageCamera : MonoBehaviour
{
Expand Down
Loading

0 comments on commit 75d2f66

Please sign in to comment.