Skip to content

Commit b95d844

Browse files
authored
Merge pull request #10 from cometh-game/develop
Develop
2 parents 7fa0c39 + e4e3de7 commit b95d844

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

+963
-105
lines changed

Assets/ComethSDK/Examples/ContractDefinition.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
{
2+
"name": "ContractDefinition"
3+
}

Assets/ComethSDK/Examples/ContractDefinition/ContractDefinition.asmdef.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
namespace ComethSDK.Examples.ContractDefinition
2+
{
3+
public class CountFunction : CountFunctionBase
4+
{
5+
6+
}
7+
}

Assets/ComethSDK/Examples/ContractDefinition/CountFunction.cs.meta

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using Nethereum.ABI.FunctionEncoding.Attributes;
2+
using Nethereum.Contracts;
3+
4+
namespace ComethSDK.Examples.ContractDefinition
5+
{
6+
[Function("count")]
7+
public class CountFunctionBase : FunctionMessage
8+
{
9+
10+
}
11+
}

Assets/ComethSDK/Examples/ContractDefinition/CountFunctionBase.cs.meta

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

Assets/ComethSDK/Examples/Scenes/Connect-Example.unity

Lines changed: 275 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -643,7 +643,7 @@ RectTransform:
643643
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
644644
m_AnchorMin: {x: 0.5, y: 0.5}
645645
m_AnchorMax: {x: 0.5, y: 0.5}
646-
m_AnchoredPosition: {x: -270.7737, y: -243.40814}
646+
m_AnchoredPosition: {x: -270.7737, y: -342.34204}
647647
m_SizeDelta: {x: 238.8818, y: 59.6312}
648648
m_Pivot: {x: 0.5, y: 0.5}
649649
--- !u!114 &270538141
@@ -1537,7 +1537,7 @@ RectTransform:
15371537
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
15381538
m_AnchorMin: {x: 0.5, y: 0.5}
15391539
m_AnchorMax: {x: 0.5, y: 0.5}
1540-
m_AnchoredPosition: {x: -605.4474, y: -246.79013}
1540+
m_AnchoredPosition: {x: -605.4474, y: -345.72403}
15411541
m_SizeDelta: {x: 238.8818, y: 59.6312}
15421542
m_Pivot: {x: 0.5, y: 0.5}
15431543
--- !u!114 &491760304
@@ -2526,8 +2526,8 @@ MonoBehaviour:
25262526
m_TargetGraphic: {fileID: 141378945}
25272527
m_HandleRect: {fileID: 141378944}
25282528
m_Direction: 0
2529-
m_Value: 0.49999994
2530-
m_Size: 0.4630167
2529+
m_Value: 0.50000006
2530+
m_Size: 0.46301672
25312531
m_NumberOfSteps: 0
25322532
m_OnValueChanged:
25332533
m_PersistentCalls:
@@ -2570,6 +2570,140 @@ CanvasRenderer:
25702570
m_PrefabAsset: {fileID: 0}
25712571
m_GameObject: {fileID: 853382815}
25722572
m_CullTransparentMesh: 1
2573+
--- !u!1 &855925796
2574+
GameObject:
2575+
m_ObjectHideFlags: 0
2576+
m_CorrespondingSourceObject: {fileID: 0}
2577+
m_PrefabInstance: {fileID: 0}
2578+
m_PrefabAsset: {fileID: 0}
2579+
serializedVersion: 6
2580+
m_Component:
2581+
- component: {fileID: 855925797}
2582+
- component: {fileID: 855925799}
2583+
- component: {fileID: 855925798}
2584+
m_Layer: 5
2585+
m_Name: Text (TMP)
2586+
m_TagString: Untagged
2587+
m_Icon: {fileID: 0}
2588+
m_NavMeshLayer: 0
2589+
m_StaticEditorFlags: 0
2590+
m_IsActive: 1
2591+
--- !u!224 &855925797
2592+
RectTransform:
2593+
m_ObjectHideFlags: 0
2594+
m_CorrespondingSourceObject: {fileID: 0}
2595+
m_PrefabInstance: {fileID: 0}
2596+
m_PrefabAsset: {fileID: 0}
2597+
m_GameObject: {fileID: 855925796}
2598+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
2599+
m_LocalPosition: {x: 0, y: 0, z: 0}
2600+
m_LocalScale: {x: 1, y: 1, z: 1}
2601+
m_ConstrainProportionsScale: 0
2602+
m_Children: []
2603+
m_Father: {fileID: 1460381554}
2604+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
2605+
m_AnchorMin: {x: 0, y: 0}
2606+
m_AnchorMax: {x: 1, y: 1}
2607+
m_AnchoredPosition: {x: 0, y: 0}
2608+
m_SizeDelta: {x: 0, y: 0}
2609+
m_Pivot: {x: 0.5, y: 0.5}
2610+
--- !u!114 &855925798
2611+
MonoBehaviour:
2612+
m_ObjectHideFlags: 0
2613+
m_CorrespondingSourceObject: {fileID: 0}
2614+
m_PrefabInstance: {fileID: 0}
2615+
m_PrefabAsset: {fileID: 0}
2616+
m_GameObject: {fileID: 855925796}
2617+
m_Enabled: 1
2618+
m_EditorHideFlags: 0
2619+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
2620+
m_Name:
2621+
m_EditorClassIdentifier:
2622+
m_Material: {fileID: 0}
2623+
m_Color: {r: 1, g: 1, b: 1, a: 1}
2624+
m_RaycastTarget: 1
2625+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
2626+
m_Maskable: 1
2627+
m_OnCullStateChanged:
2628+
m_PersistentCalls:
2629+
m_Calls: []
2630+
m_text: 'Send Sponsored Tx: Batch Count'
2631+
m_isRightToLeft: 0
2632+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
2633+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
2634+
m_fontSharedMaterials: []
2635+
m_fontMaterial: {fileID: 0}
2636+
m_fontMaterials: []
2637+
m_fontColor32:
2638+
serializedVersion: 2
2639+
rgba: 4281479730
2640+
m_fontColor: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
2641+
m_enableVertexGradient: 0
2642+
m_colorMode: 3
2643+
m_fontColorGradient:
2644+
topLeft: {r: 1, g: 1, b: 1, a: 1}
2645+
topRight: {r: 1, g: 1, b: 1, a: 1}
2646+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
2647+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
2648+
m_fontColorGradientPreset: {fileID: 0}
2649+
m_spriteAsset: {fileID: 0}
2650+
m_tintAllSprites: 0
2651+
m_StyleSheet: {fileID: 0}
2652+
m_TextStyleHashCode: -1183493901
2653+
m_overrideHtmlColors: 0
2654+
m_faceColor:
2655+
serializedVersion: 2
2656+
rgba: 4294967295
2657+
m_fontSize: 24
2658+
m_fontSizeBase: 24
2659+
m_fontWeight: 400
2660+
m_enableAutoSizing: 0
2661+
m_fontSizeMin: 18
2662+
m_fontSizeMax: 72
2663+
m_fontStyle: 0
2664+
m_HorizontalAlignment: 2
2665+
m_VerticalAlignment: 512
2666+
m_textAlignment: 65535
2667+
m_characterSpacing: 0
2668+
m_wordSpacing: 0
2669+
m_lineSpacing: 0
2670+
m_lineSpacingMax: 0
2671+
m_paragraphSpacing: 0
2672+
m_charWidthMaxAdj: 0
2673+
m_enableWordWrapping: 1
2674+
m_wordWrappingRatios: 0.4
2675+
m_overflowMode: 0
2676+
m_linkedTextComponent: {fileID: 0}
2677+
parentLinkedComponent: {fileID: 0}
2678+
m_enableKerning: 1
2679+
m_enableExtraPadding: 0
2680+
checkPaddingRequired: 0
2681+
m_isRichText: 1
2682+
m_parseCtrlCharacters: 1
2683+
m_isOrthographic: 1
2684+
m_isCullingEnabled: 0
2685+
m_horizontalMapping: 0
2686+
m_verticalMapping: 0
2687+
m_uvLineOffset: 0
2688+
m_geometrySortingOrder: 0
2689+
m_IsTextObjectScaleStatic: 0
2690+
m_VertexBufferAutoSizeReduction: 0
2691+
m_useMaxVisibleDescender: 1
2692+
m_pageToDisplay: 1
2693+
m_margin: {x: 0, y: 0, z: 0, w: 0}
2694+
m_isUsingLegacyAnimationComponent: 0
2695+
m_isVolumetricText: 0
2696+
m_hasFontAssetChanged: 0
2697+
m_baseMaterial: {fileID: 0}
2698+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
2699+
--- !u!222 &855925799
2700+
CanvasRenderer:
2701+
m_ObjectHideFlags: 0
2702+
m_CorrespondingSourceObject: {fileID: 0}
2703+
m_PrefabInstance: {fileID: 0}
2704+
m_PrefabAsset: {fileID: 0}
2705+
m_GameObject: {fileID: 855925796}
2706+
m_CullTransparentMesh: 1
25732707
--- !u!1 &900214159
25742708
GameObject:
25752709
m_ObjectHideFlags: 0
@@ -3253,7 +3387,7 @@ RectTransform:
32533387
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
32543388
m_AnchorMin: {x: 0.5, y: 0.5}
32553389
m_AnchorMax: {x: 0.5, y: 0.5}
3256-
m_AnchoredPosition: {x: -599.75, y: -60.25}
3390+
m_AnchoredPosition: {x: -599.75, y: -238.45798}
32573391
m_SizeDelta: {x: 238.8818, y: 59.6312}
32583392
m_Pivot: {x: 0.5, y: 0.5}
32593393
--- !u!114 &1305436149
@@ -3461,6 +3595,7 @@ RectTransform:
34613595
- {fileID: 1935419022}
34623596
- {fileID: 1305436148}
34633597
- {fileID: 216291508}
3598+
- {fileID: 1460381554}
34643599
- {fileID: 2098011956}
34653600
m_Father: {fileID: 0}
34663601
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3909,6 +4044,139 @@ CanvasRenderer:
39094044
m_PrefabAsset: {fileID: 0}
39104045
m_GameObject: {fileID: 1444845274}
39114046
m_CullTransparentMesh: 1
4047+
--- !u!1 &1460381553
4048+
GameObject:
4049+
m_ObjectHideFlags: 0
4050+
m_CorrespondingSourceObject: {fileID: 0}
4051+
m_PrefabInstance: {fileID: 0}
4052+
m_PrefabAsset: {fileID: 0}
4053+
serializedVersion: 6
4054+
m_Component:
4055+
- component: {fileID: 1460381554}
4056+
- component: {fileID: 1460381557}
4057+
- component: {fileID: 1460381556}
4058+
- component: {fileID: 1460381555}
4059+
m_Layer: 5
4060+
m_Name: 'Sponsored: Batch Count'
4061+
m_TagString: Untagged
4062+
m_Icon: {fileID: 0}
4063+
m_NavMeshLayer: 0
4064+
m_StaticEditorFlags: 0
4065+
m_IsActive: 1
4066+
--- !u!224 &1460381554
4067+
RectTransform:
4068+
m_ObjectHideFlags: 0
4069+
m_CorrespondingSourceObject: {fileID: 0}
4070+
m_PrefabInstance: {fileID: 0}
4071+
m_PrefabAsset: {fileID: 0}
4072+
m_GameObject: {fileID: 1460381553}
4073+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
4074+
m_LocalPosition: {x: 0, y: 0, z: 0}
4075+
m_LocalScale: {x: 1, y: 1, z: 1}
4076+
m_ConstrainProportionsScale: 0
4077+
m_Children:
4078+
- {fileID: 855925797}
4079+
m_Father: {fileID: 1379782326}
4080+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
4081+
m_AnchorMin: {x: 0.5, y: 0.5}
4082+
m_AnchorMax: {x: 0.5, y: 0.5}
4083+
m_AnchoredPosition: {x: -598.25, y: -55.974243}
4084+
m_SizeDelta: {x: 258.7886, y: 59.6312}
4085+
m_Pivot: {x: 0.5, y: 0.5}
4086+
--- !u!114 &1460381555
4087+
MonoBehaviour:
4088+
m_ObjectHideFlags: 0
4089+
m_CorrespondingSourceObject: {fileID: 0}
4090+
m_PrefabInstance: {fileID: 0}
4091+
m_PrefabAsset: {fileID: 0}
4092+
m_GameObject: {fileID: 1460381553}
4093+
m_Enabled: 1
4094+
m_EditorHideFlags: 0
4095+
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
4096+
m_Name:
4097+
m_EditorClassIdentifier:
4098+
m_Navigation:
4099+
m_Mode: 3
4100+
m_WrapAround: 0
4101+
m_SelectOnUp: {fileID: 0}
4102+
m_SelectOnDown: {fileID: 0}
4103+
m_SelectOnLeft: {fileID: 0}
4104+
m_SelectOnRight: {fileID: 0}
4105+
m_Transition: 1
4106+
m_Colors:
4107+
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
4108+
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
4109+
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
4110+
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
4111+
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
4112+
m_ColorMultiplier: 1
4113+
m_FadeDuration: 0.1
4114+
m_SpriteState:
4115+
m_HighlightedSprite: {fileID: 0}
4116+
m_PressedSprite: {fileID: 0}
4117+
m_SelectedSprite: {fileID: 0}
4118+
m_DisabledSprite: {fileID: 0}
4119+
m_AnimationTriggers:
4120+
m_NormalTrigger: Normal
4121+
m_HighlightedTrigger: Highlighted
4122+
m_PressedTrigger: Pressed
4123+
m_SelectedTrigger: Selected
4124+
m_DisabledTrigger: Disabled
4125+
m_Interactable: 1
4126+
m_TargetGraphic: {fileID: 1460381556}
4127+
m_OnClick:
4128+
m_PersistentCalls:
4129+
m_Calls:
4130+
- m_Target: {fileID: 1442284380}
4131+
m_TargetAssemblyTypeName: ComethSDK.Examples.Scripts.TestConnectWallet, ExampleScripts
4132+
m_MethodName: TestCallToCountBatch
4133+
m_Mode: 1
4134+
m_Arguments:
4135+
m_ObjectArgument: {fileID: 0}
4136+
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
4137+
m_IntArgument: 0
4138+
m_FloatArgument: 0
4139+
m_StringArgument:
4140+
m_BoolArgument: 0
4141+
m_CallState: 2
4142+
--- !u!114 &1460381556
4143+
MonoBehaviour:
4144+
m_ObjectHideFlags: 0
4145+
m_CorrespondingSourceObject: {fileID: 0}
4146+
m_PrefabInstance: {fileID: 0}
4147+
m_PrefabAsset: {fileID: 0}
4148+
m_GameObject: {fileID: 1460381553}
4149+
m_Enabled: 1
4150+
m_EditorHideFlags: 0
4151+
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
4152+
m_Name:
4153+
m_EditorClassIdentifier:
4154+
m_Material: {fileID: 0}
4155+
m_Color: {r: 0.5647059, g: 0.6156863, b: 0.62352943, a: 1}
4156+
m_RaycastTarget: 1
4157+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
4158+
m_Maskable: 1
4159+
m_OnCullStateChanged:
4160+
m_PersistentCalls:
4161+
m_Calls: []
4162+
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
4163+
m_Type: 1
4164+
m_PreserveAspect: 0
4165+
m_FillCenter: 1
4166+
m_FillMethod: 4
4167+
m_FillAmount: 1
4168+
m_FillClockwise: 1
4169+
m_FillOrigin: 0
4170+
m_UseSpriteMesh: 0
4171+
m_PixelsPerUnitMultiplier: 1
4172+
--- !u!222 &1460381557
4173+
CanvasRenderer:
4174+
m_ObjectHideFlags: 0
4175+
m_CorrespondingSourceObject: {fileID: 0}
4176+
m_PrefabInstance: {fileID: 0}
4177+
m_PrefabAsset: {fileID: 0}
4178+
m_GameObject: {fileID: 1460381553}
4179+
m_CullTransparentMesh: 1
39124180
--- !u!1 &1499967064
39134181
GameObject:
39144182
m_ObjectHideFlags: 0
@@ -4922,7 +5190,7 @@ GameObject:
49225190
m_Icon: {fileID: 0}
49235191
m_NavMeshLayer: 0
49245192
m_StaticEditorFlags: 0
4925-
m_IsActive: 0
5193+
m_IsActive: 1
49265194
--- !u!224 &1935419022
49275195
RectTransform:
49285196
m_ObjectHideFlags: 0
@@ -4941,7 +5209,7 @@ RectTransform:
49415209
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
49425210
m_AnchorMin: {x: 0.5, y: 0.5}
49435211
m_AnchorMax: {x: 0.5, y: 0.5}
4944-
m_AnchoredPosition: {x: -276, y: -92.950195}
5212+
m_AnchoredPosition: {x: -276, y: -144.8052}
49455213
m_SizeDelta: {x: 250, y: 60}
49465214
m_Pivot: {x: 0.5, y: 0.5}
49475215
--- !u!114 &1935419023

0 commit comments

Comments
 (0)