Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
229 changes: 215 additions & 14 deletions Assets/Scenes/Eskills/EskillsExample.unity
Original file line number Diff line number Diff line change
Expand Up @@ -630,6 +630,87 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 241065732}
m_CullTransparentMesh: 0
--- !u!1 &248316851
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 248316852}
- component: {fileID: 248316854}
- component: {fileID: 248316853}
m_Layer: 5
m_Name: Text
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &248316852
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248316851}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 434031969}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 11, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &248316853
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248316851}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.19607843, g: 0.19607843, b: 0.19607843, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_FontData:
m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
m_FontSize: 78
m_FontStyle: 0
m_BestFit: 0
m_MinSize: 10
m_MaxSize: 78
m_Alignment: 4
m_AlignByGeometry: 0
m_RichText: 1
m_HorizontalOverflow: 0
m_VerticalOverflow: 0
m_LineSpacing: 1
m_Text: 'Wait For Players

'
--- !u!222 &248316854
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 248316851}
m_CullTransparentMesh: 0
--- !u!1 &326308079
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -842,6 +923,139 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 328676518}
m_CullTransparentMesh: 0
--- !u!1 &434031968
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 434031969}
- component: {fileID: 434031972}
- component: {fileID: 434031971}
- component: {fileID: 434031970}
m_Layer: 5
m_Name: WaitForPlayers
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &434031969
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 434031968}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 248316852}
m_Father: {fileID: 574155109}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: -0.00012207, y: -1676}
m_SizeDelta: {x: 600, y: 120}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &434031970
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 434031968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 434031971}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 1884698649}
m_TargetAssemblyTypeName: Eskills.Ui.ButtonsController, Assembly-CSharp
m_MethodName: OnWaitForPlayersToFinnish
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &434031971
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 434031968}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 10905, guid: 0000000000000000f000000000000000, type: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &434031972
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 434031968}
m_CullTransparentMesh: 0
--- !u!1 &526230975
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -954,6 +1168,7 @@ RectTransform:
- {fileID: 2018614425}
- {fileID: 2116105489}
- {fileID: 990162274}
- {fileID: 434031969}
m_Father: {fileID: 1427691005}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -2757,7 +2972,6 @@ GameObject:
- component: {fileID: 1884698647}
- component: {fileID: 1884698646}
- component: {fileID: 1884698649}
- component: {fileID: 1884698650}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
Expand Down Expand Up @@ -2846,19 +3060,6 @@ MonoBehaviour:
sessionText: {fileID: 782871253}
scoreText: {fileID: 627524184}
playerStatus: {fileID: 1660288430}
onPeriodicUpdate: {fileID: 1884698650}
--- !u!114 &1884698650
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1884698645}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d96598d34d6f1e1c6a5712edc2c96819, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1939118496
GameObject:
m_ObjectHideFlags: 0
Expand Down
14 changes: 14 additions & 0 deletions Assets/Scripts/Eskills/EskillsService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,19 @@ public void StopPeriodicUpdate()
_eskillsManager.StopPeriodicUpdate();
}

public void WaitForPlayersToFinnish(string session, Action<RoomData> success, Action<EskillsError> error)
{
GetPeriodicUpdate(session,
room => {
Debug.Log("Waiting For All Players To Finish");
if(room.status == RoomStatus.COMPLETED){
success(room);
StopPeriodicUpdate();
}
},
error
);
}

}
}
9 changes: 9 additions & 0 deletions Assets/Scripts/Eskills/Ui/ButtonsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -28,18 +28,27 @@ public void OnSetScoreClick()
room => Debug.Log("ButtonsController: " + room.roomId),
error => Debug.Log("ButtonsController: " + error.Message));
}

public void OnGetPeriodicUpdates()
{
service.GetPeriodicUpdate(sessionText.text,
room => {
Debug.Log("Periodic Score Update:"+room.roomId);
if(room.currentUser.status == PlayerStatus.COMPLETED){
service.StopPeriodicUpdate();
OnWaitForPlayersToFinnish();
}
},
error => Debug.Log(error.Message)
);

}

public void OnWaitForPlayersToFinnish()
{
service.WaitForPlayersToFinnish(sessionText.text,
room=> Debug.Log(room.roomResult.winner.userName + "Won!"),
error => Debug.Log(error));
}
}
}