Skip to content
This repository was archived by the owner on May 2, 2023. It is now read-only.

Commit c55288f

Browse files
Krayt78Krayt78
authored
Merge pull request #3 from Ankr-network/Merge-SDK-changes
Merge sdk changes
2 parents a2c9d8b + 20fb679 commit c55288f

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+14516
-9360
lines changed

‎Assets/AnkrDemo/Prefabs/UI/CanvasPortrait 2.prefab‎

Lines changed: 9552 additions & 8034 deletions
Large diffs are not rendered by default.

‎Assets/AnkrDemo/Scenes/CharacterNFTModel.prefab‎

Lines changed: 1797 additions & 0 deletions
Large diffs are not rendered by default.

‎Assets/AnkrDemo/Scenes/CharacterNFTModel.prefab.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/AnkrDemo/Scenes/Managers.prefab‎

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &5058050051824399960
4+
GameObject:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
serializedVersion: 6
10+
m_Component:
11+
- component: {fileID: 5058050051824399966}
12+
- component: {fileID: 5058050051824399967}
13+
- component: {fileID: 5058050051824399964}
14+
- component: {fileID: 5058050051824399965}
15+
m_Layer: 0
16+
m_Name: Managers
17+
m_TagString: Untagged
18+
m_Icon: {fileID: 0}
19+
m_NavMeshLayer: 0
20+
m_StaticEditorFlags: 0
21+
m_IsActive: 1
22+
--- !u!4 &5058050051824399966
23+
Transform:
24+
m_ObjectHideFlags: 0
25+
m_CorrespondingSourceObject: {fileID: 0}
26+
m_PrefabInstance: {fileID: 0}
27+
m_PrefabAsset: {fileID: 0}
28+
m_GameObject: {fileID: 5058050051824399960}
29+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
30+
m_LocalPosition: {x: 0, y: 0, z: 0}
31+
m_LocalScale: {x: 1, y: 1, z: 1}
32+
m_Children: []
33+
m_Father: {fileID: 0}
34+
m_RootOrder: 0
35+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
36+
--- !u!114 &5058050051824399967
37+
MonoBehaviour:
38+
m_ObjectHideFlags: 0
39+
m_CorrespondingSourceObject: {fileID: 0}
40+
m_PrefabInstance: {fileID: 0}
41+
m_PrefabAsset: {fileID: 0}
42+
m_GameObject: {fileID: 5058050051824399960}
43+
m_Enabled: 1
44+
m_EditorHideFlags: 0
45+
m_Script: {fileID: 11500000, guid: e95845d48ceee4155879501728e2847c, type: 3}
46+
m_Name:
47+
m_EditorClassIdentifier:
48+
--- !u!114 &5058050051824399964
49+
MonoBehaviour:
50+
m_ObjectHideFlags: 0
51+
m_CorrespondingSourceObject: {fileID: 0}
52+
m_PrefabInstance: {fileID: 0}
53+
m_PrefabAsset: {fileID: 0}
54+
m_GameObject: {fileID: 5058050051824399960}
55+
m_Enabled: 1
56+
m_EditorHideFlags: 0
57+
m_Script: {fileID: 11500000, guid: 38c29963bf3bdca46bdc3049efdf0083, type: 3}
58+
m_Name:
59+
m_EditorClassIdentifier:
60+
_text: {fileID: 0}
61+
_characterID: {fileID: 0}
62+
_character: {fileID: 0}
63+
_characterHead: {fileID: 0}
64+
_itemsDescriptions: {fileID: 11400000, guid: 417faab1603025a41ac506db5fdc4eb0, type: 2}
65+
_inventory: {fileID: 0}
66+
_contractHandler: {fileID: 5058050051824399965}
67+
--- !u!114 &5058050051824399965
68+
MonoBehaviour:
69+
m_ObjectHideFlags: 0
70+
m_CorrespondingSourceObject: {fileID: 0}
71+
m_PrefabInstance: {fileID: 0}
72+
m_PrefabAsset: {fileID: 0}
73+
m_GameObject: {fileID: 5058050051824399960}
74+
m_Enabled: 1
75+
m_EditorHideFlags: 0
76+
m_Script: {fileID: 11500000, guid: ecc548cc70e4a404fabd13ff72170e66, type: 3}
77+
m_Name:
78+
m_EditorClassIdentifier:
79+
_text: {fileID: 0}

‎Assets/AnkrDemo/Scenes/Managers.prefab.meta‎

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/AnkrDemo/Scenes/UIDemo-Opening.unity‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56301,7 +56301,7 @@ MonoBehaviour:
5630156301
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
5630256302
m_IntArgument: 0
5630356303
m_FloatArgument: 0
56304-
m_StringArgument: UIDemo
56304+
m_StringArgument: UIDemoNew
5630556305
m_BoolArgument: 0
5630656306
m_CallState: 2
5630756307
--- !u!114 &1811535657

‎Assets/AnkrDemo/Scenes/UIDemo-WearableNFTs.unity‎

Lines changed: 96 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,14 @@ MonoBehaviour:
167167
m_Name:
168168
m_EditorClassIdentifier:
169169
_text: {fileID: 1685600447}
170+
_mintItemsButton: {fileID: 1685600455}
171+
_mintCharacterButton: {fileID: 1685600454}
172+
_getItemSetApprovalButton: {fileID: 1685600453}
173+
_getCharacterBalanceButton: {fileID: 1685600452}
174+
_getCharacterIDButton: {fileID: 1685600451}
175+
_changeHatBlueButton: {fileID: 1685600450}
176+
_changeHatRedButton: {fileID: 1685600448}
177+
_getHatButton: {fileID: 1685600449}
170178
--- !u!1 &285040555
171179
GameObject:
172180
m_ObjectHideFlags: 0
@@ -2400,3 +2408,91 @@ MonoBehaviour:
24002408
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
24012409
m_Name:
24022410
m_EditorClassIdentifier:
2411+
--- !u!114 &1685600448 stripped
2412+
MonoBehaviour:
2413+
m_CorrespondingSourceObject: {fileID: 5060647486733349001, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2414+
m_PrefabInstance: {fileID: 1685600446}
2415+
m_PrefabAsset: {fileID: 0}
2416+
m_GameObject: {fileID: 0}
2417+
m_Enabled: 1
2418+
m_EditorHideFlags: 0
2419+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2420+
m_Name:
2421+
m_EditorClassIdentifier:
2422+
--- !u!114 &1685600449 stripped
2423+
MonoBehaviour:
2424+
m_CorrespondingSourceObject: {fileID: 8986190887606416537, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2425+
m_PrefabInstance: {fileID: 1685600446}
2426+
m_PrefabAsset: {fileID: 0}
2427+
m_GameObject: {fileID: 0}
2428+
m_Enabled: 1
2429+
m_EditorHideFlags: 0
2430+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2431+
m_Name:
2432+
m_EditorClassIdentifier:
2433+
--- !u!114 &1685600450 stripped
2434+
MonoBehaviour:
2435+
m_CorrespondingSourceObject: {fileID: 1329788204455792441, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2436+
m_PrefabInstance: {fileID: 1685600446}
2437+
m_PrefabAsset: {fileID: 0}
2438+
m_GameObject: {fileID: 0}
2439+
m_Enabled: 1
2440+
m_EditorHideFlags: 0
2441+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2442+
m_Name:
2443+
m_EditorClassIdentifier:
2444+
--- !u!114 &1685600451 stripped
2445+
MonoBehaviour:
2446+
m_CorrespondingSourceObject: {fileID: 2483984513279600410, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2447+
m_PrefabInstance: {fileID: 1685600446}
2448+
m_PrefabAsset: {fileID: 0}
2449+
m_GameObject: {fileID: 0}
2450+
m_Enabled: 1
2451+
m_EditorHideFlags: 0
2452+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2453+
m_Name:
2454+
m_EditorClassIdentifier:
2455+
--- !u!114 &1685600452 stripped
2456+
MonoBehaviour:
2457+
m_CorrespondingSourceObject: {fileID: 4240396639280999955, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2458+
m_PrefabInstance: {fileID: 1685600446}
2459+
m_PrefabAsset: {fileID: 0}
2460+
m_GameObject: {fileID: 0}
2461+
m_Enabled: 1
2462+
m_EditorHideFlags: 0
2463+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2464+
m_Name:
2465+
m_EditorClassIdentifier:
2466+
--- !u!114 &1685600453 stripped
2467+
MonoBehaviour:
2468+
m_CorrespondingSourceObject: {fileID: 7967684813498803012, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2469+
m_PrefabInstance: {fileID: 1685600446}
2470+
m_PrefabAsset: {fileID: 0}
2471+
m_GameObject: {fileID: 0}
2472+
m_Enabled: 1
2473+
m_EditorHideFlags: 0
2474+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2475+
m_Name:
2476+
m_EditorClassIdentifier:
2477+
--- !u!114 &1685600454 stripped
2478+
MonoBehaviour:
2479+
m_CorrespondingSourceObject: {fileID: 1238535073476117021, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2480+
m_PrefabInstance: {fileID: 1685600446}
2481+
m_PrefabAsset: {fileID: 0}
2482+
m_GameObject: {fileID: 0}
2483+
m_Enabled: 1
2484+
m_EditorHideFlags: 0
2485+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2486+
m_Name:
2487+
m_EditorClassIdentifier:
2488+
--- !u!114 &1685600455 stripped
2489+
MonoBehaviour:
2490+
m_CorrespondingSourceObject: {fileID: 3067758468657805827, guid: 7d2ed8c6c249db6419dc78741072b60d, type: 3}
2491+
m_PrefabInstance: {fileID: 1685600446}
2492+
m_PrefabAsset: {fileID: 0}
2493+
m_GameObject: {fileID: 0}
2494+
m_Enabled: 1
2495+
m_EditorHideFlags: 0
2496+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
2497+
m_Name:
2498+
m_EditorClassIdentifier:

0 commit comments

Comments
 (0)