Skip to content

Commit deac7fc

Browse files
committed
Adds PlayerManager and temp avatars
1 parent 41bf20e commit deac7fc

Some content is hidden

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

47 files changed

+2100
-5
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version https://git-lfs.github.com/spec/v1
2-
oid sha256:1bbf505a0596de40b039d4cffd0448370cf7f78821d66e196eca98adcc4e5f3b
3-
size 31883
2+
oid sha256:0b3c02daaa5306fe157660d9c28a3ba4f48d11c75c653fdf279442a264d8d1fe
3+
size 32317

Assets/_Project/Scenes/tally-viz.unity

Lines changed: 66 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -312,6 +312,7 @@ Transform:
312312
- {fileID: 1682990918}
313313
- {fileID: 481131867}
314314
- {fileID: 304955103}
315+
- {fileID: 935203669}
315316
m_Father: {fileID: 0}
316317
m_RootOrder: 3
317318
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -538,7 +539,7 @@ MonoBehaviour:
538539
m_Name:
539540
m_EditorClassIdentifier:
540541
chosenHost: 1
541-
chosenEndpoint: 4
542+
chosenEndpoint: 3
542543
host:
543544
endpoint:
544545
--- !u!114 &481131869
@@ -769,6 +770,70 @@ Transform:
769770
m_Father: {fileID: 0}
770771
m_RootOrder: 1
771772
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
773+
--- !u!1 &935203668
774+
GameObject:
775+
m_ObjectHideFlags: 0
776+
m_CorrespondingSourceObject: {fileID: 0}
777+
m_PrefabInstance: {fileID: 0}
778+
m_PrefabAsset: {fileID: 0}
779+
serializedVersion: 6
780+
m_Component:
781+
- component: {fileID: 935203669}
782+
- component: {fileID: 935203670}
783+
m_Layer: 8
784+
m_Name: PlayerManager
785+
m_TagString: Untagged
786+
m_Icon: {fileID: 0}
787+
m_NavMeshLayer: 0
788+
m_StaticEditorFlags: 0
789+
m_IsActive: 1
790+
--- !u!4 &935203669
791+
Transform:
792+
m_ObjectHideFlags: 0
793+
m_CorrespondingSourceObject: {fileID: 0}
794+
m_PrefabInstance: {fileID: 0}
795+
m_PrefabAsset: {fileID: 0}
796+
m_GameObject: {fileID: 935203668}
797+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
798+
m_LocalPosition: {x: 0, y: 0, z: 1}
799+
m_LocalScale: {x: 1, y: 1, z: 1}
800+
m_Children: []
801+
m_Father: {fileID: 137097094}
802+
m_RootOrder: 3
803+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
804+
--- !u!114 &935203670
805+
MonoBehaviour:
806+
m_ObjectHideFlags: 0
807+
m_CorrespondingSourceObject: {fileID: 0}
808+
m_PrefabInstance: {fileID: 0}
809+
m_PrefabAsset: {fileID: 0}
810+
m_GameObject: {fileID: 935203668}
811+
m_Enabled: 1
812+
m_EditorHideFlags: 0
813+
m_Script: {fileID: 11500000, guid: e95c91a2017a74006a149ca36d72913c, type: 3}
814+
m_Name:
815+
m_EditorClassIdentifier:
816+
worldContainerCollider: {fileID: 215753798}
817+
playerPrefab: {fileID: 9008334923571228613, guid: ecec1fc7bdc6441a691ca908dfadc8b4, type: 3}
818+
avatars:
819+
- {fileID: 21300000, guid: 8d9c45a6d65954fa9af3d58238d60180, type: 3}
820+
- {fileID: 21300000, guid: 1e813c34370bf4de8a1fb132038443c4, type: 3}
821+
- {fileID: 21300000, guid: 85c00bd38eca84189b36ad829339a74e, type: 3}
822+
- {fileID: 21300000, guid: dcedc4820dd0c447e9660a70a77d5308, type: 3}
823+
- {fileID: 21300000, guid: 11e51ceef6bd042c08d8249290d7d7f5, type: 3}
824+
- {fileID: 21300000, guid: 2e04ca17ad6e045ff92d48b81703898c, type: 3}
825+
- {fileID: 21300000, guid: f1495ae59cefd463694581c47532e0a0, type: 3}
826+
- {fileID: 21300000, guid: 3300b7178a529402aa47f84dddb29aa1, type: 3}
827+
- {fileID: 21300000, guid: 24e1fafb7a64345edba975f4a147a6eb, type: 3}
828+
- {fileID: 21300000, guid: ba07ace28a0b34db987fead279d7088a, type: 3}
829+
- {fileID: 21300000, guid: 572c2509d4a6242d7a62ce86ef58fb0a, type: 3}
830+
- {fileID: 21300000, guid: a5663cf5af8fc403eb5f47cd338c0f41, type: 3}
831+
- {fileID: 21300000, guid: 023729818fa4d4f83bfb17cffe539019, type: 3}
832+
- {fileID: 21300000, guid: 1a0cc98517c1c41d5a819fdb063e4bcc, type: 3}
833+
- {fileID: 21300000, guid: 70f96b99f6876446bbb957877383d0b8, type: 3}
834+
- {fileID: 21300000, guid: e4572dc84b36f448c83e75a66e1fb2b1, type: 3}
835+
avatarTransform: {fileID: 0}
836+
avatar: {fileID: 0}
772837
--- !u!1 &945187312
773838
GameObject:
774839
m_ObjectHideFlags: 0

Assets/_Project/Scripts/Data/DataManager.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public enum EndpointType {
4646
rangeOneWeek,
4747
rangePlusStreamOneDay,
4848
rangePlusStreamOneHour,
49-
rangePlusStreamFiveMinutes
49+
rangePlusStreamFiveMinute
5050
}
5151
public EndpointType chosenEndpoint;
5252
string [] endpoints = {

Assets/_Project/Scripts/Players.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 45 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,45 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
6+
// display a sprite animation with a coroutine
7+
8+
public class FrameAnimation : MonoBehaviour
9+
{
10+
public SpriteRenderer sr;
11+
public Sprite[] sprites;
12+
public int frame;
13+
public float speed;
14+
15+
// set initial vars
16+
void Awake()
17+
{
18+
// get components, init vars
19+
sr = GetComponent<SpriteRenderer>();
20+
frame = 0;
21+
speed = 0.1f;
22+
23+
// start main animation loop
24+
StartCoroutine(Loop());
25+
}
26+
27+
IEnumerator Loop()
28+
{
29+
while (true)
30+
{
31+
// if all frames are present
32+
if (sprites.Length == 3)
33+
{
34+
sr.sprite = sprites[frame];
35+
frame++;
36+
}
37+
if (frame >= 3)
38+
frame = 0;
39+
40+
yield return new WaitForSeconds(speed);
41+
}
42+
}
43+
44+
45+
}

Assets/_Project/Scripts/Players/FrameAnimation.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class Monster : MonoBehaviour
6+
{
7+
8+
// base class for monster
9+
10+
public int mid;
11+
12+
13+
14+
}

Assets/_Project/Scripts/Players/Monster.cs.meta

Lines changed: 11 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
using System.Collections;
2+
using System.Collections.Generic;
3+
using UnityEngine;
4+
5+
public class Player : MonoBehaviour
6+
{
7+
8+
9+
public string username;
10+
11+
12+
public void Init(string username)
13+
{
14+
this.username = username;
15+
}
16+
17+
18+
}

Assets/_Project/Scripts/Players/Player.cs.meta

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

0 commit comments

Comments
 (0)