Skip to content

Commit 013d53d

Browse files
edricwilliemedricwilliem
committed
update project to 2019.4.3f1 & add platform dependent compilation directives for webgl platform (fix issue #3)
1 parent c633e18 commit 013d53d

16 files changed

+758
-156
lines changed

‎.DS_Store

0 Bytes
Binary file not shown.

‎Assets/FirebaseREST/Database/DatabaseReference.cs

+2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ public partial class DatabaseReference : Query
2222
FirebaseServerEventResponse eventResponse;
2323

2424
UnityWebRequest webReq;
25+
#if UNITY_WEBGL
2526
FirebaseDatabase.FirebaseEventSourceWebGL esGL;
27+
#endif
2628
object CacheData;
2729

2830
int childMovedRefCount = 0, childChangedRefCount = 0, childAddedRefCount = 0, childRemovedRefCount = 0, valueChangedRefCount = 0;

‎Assets/FirebaseREST/Database/FirebaseDatabase.cs

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,7 @@ void OnDestroy()
9999
delegate void _EventSourceErrorArgs(int id, string errorMessage);
100100
delegate void _EventSourceClosedArgs(int id);
101101

102+
#if UNITY_WEBGL
102103
static Dictionary<int, FirebaseEventSourceWebGL> esWebGLMap = new Dictionary<int, FirebaseEventSourceWebGL>();
103104

104105
[MonoPInvokeCallback(typeof(_EventSourceOpenArgs))]
@@ -143,5 +144,6 @@ static extern int CreateEventSource(string urlPtr, bool withCredentials, _EventS
143144

144145
[DllImport("__Internal")]
145146
static extern void CloseEventSource(int id);
147+
#endif
146148
}
147149
}

‎Assets/FirebaseREST/Database/FirebaseEventSourceWebGL.cs

+2
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace FirebaseREST
33
{
44
public partial class FirebaseDatabase
55
{
6+
#if UNITY_WEBGL
67
public class FirebaseEventSourceWebGL
78
{
89
Action<FirebaseEventSourceErrorArgs> _EventSourceError;
@@ -37,5 +38,6 @@ public void Close()
3738
}
3839
}
3940
}
41+
#endif
4042
}
4143
}

‎Logs/Packages-Update.log

+52
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
2+
=== Wed Sep 16 11:21:19 2020
3+
4+
Packages were changed.
5+
Update Mode: updateDependencies
6+
7+
The following packages were added:
8+
com.unity.2d.sprite@1.0.0
9+
com.unity.2d.tilemap@1.0.0
10+
com.unity.ads@3.4.7
11+
com.unity.analytics@3.3.5
12+
com.unity.collab-proxy@1.2.16
13+
com.unity.ide.rider@1.1.4
14+
com.unity.ide.vscode@1.2.1
15+
com.unity.modules.ai@1.0.0
16+
com.unity.modules.androidjni@1.0.0
17+
com.unity.modules.animation@1.0.0
18+
com.unity.modules.assetbundle@1.0.0
19+
com.unity.modules.audio@1.0.0
20+
com.unity.modules.cloth@1.0.0
21+
com.unity.modules.director@1.0.0
22+
com.unity.modules.imageconversion@1.0.0
23+
com.unity.modules.imgui@1.0.0
24+
com.unity.modules.jsonserialize@1.0.0
25+
com.unity.modules.particlesystem@1.0.0
26+
com.unity.modules.physics@1.0.0
27+
com.unity.modules.physics2d@1.0.0
28+
com.unity.modules.screencapture@1.0.0
29+
com.unity.modules.terrain@1.0.0
30+
com.unity.modules.terrainphysics@1.0.0
31+
com.unity.modules.tilemap@1.0.0
32+
com.unity.modules.ui@1.0.0
33+
com.unity.modules.uielements@1.0.0
34+
com.unity.modules.umbra@1.0.0
35+
com.unity.modules.unityanalytics@1.0.0
36+
com.unity.modules.unitywebrequest@1.0.0
37+
com.unity.modules.unitywebrequestassetbundle@1.0.0
38+
com.unity.modules.unitywebrequestaudio@1.0.0
39+
com.unity.modules.unitywebrequesttexture@1.0.0
40+
com.unity.modules.unitywebrequestwww@1.0.0
41+
com.unity.modules.vehicles@1.0.0
42+
com.unity.modules.video@1.0.0
43+
com.unity.modules.vr@1.0.0
44+
com.unity.modules.wind@1.0.0
45+
com.unity.modules.xr@1.0.0
46+
com.unity.multiplayer-hlapi@1.0.6
47+
com.unity.purchasing@2.0.6
48+
com.unity.test-framework@1.1.14
49+
com.unity.textmeshpro@2.0.1
50+
com.unity.timeline@1.2.6
51+
com.unity.ugui@1.0.0
52+
com.unity.xr.legacyinputhelpers@2.1.4

‎Packages/manifest.json

+49
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,49 @@
1+
{
2+
"dependencies": {
3+
"com.unity.2d.sprite": "1.0.0",
4+
"com.unity.2d.tilemap": "1.0.0",
5+
"com.unity.ads": "3.4.7",
6+
"com.unity.analytics": "3.3.5",
7+
"com.unity.collab-proxy": "1.2.16",
8+
"com.unity.ide.rider": "1.1.4",
9+
"com.unity.ide.vscode": "1.2.1",
10+
"com.unity.multiplayer-hlapi": "1.0.6",
11+
"com.unity.purchasing": "2.0.6",
12+
"com.unity.test-framework": "1.1.14",
13+
"com.unity.textmeshpro": "2.0.1",
14+
"com.unity.timeline": "1.2.6",
15+
"com.unity.ugui": "1.0.0",
16+
"com.unity.xr.legacyinputhelpers": "2.1.4",
17+
"com.unity.modules.ai": "1.0.0",
18+
"com.unity.modules.androidjni": "1.0.0",
19+
"com.unity.modules.animation": "1.0.0",
20+
"com.unity.modules.assetbundle": "1.0.0",
21+
"com.unity.modules.audio": "1.0.0",
22+
"com.unity.modules.cloth": "1.0.0",
23+
"com.unity.modules.director": "1.0.0",
24+
"com.unity.modules.imageconversion": "1.0.0",
25+
"com.unity.modules.imgui": "1.0.0",
26+
"com.unity.modules.jsonserialize": "1.0.0",
27+
"com.unity.modules.particlesystem": "1.0.0",
28+
"com.unity.modules.physics": "1.0.0",
29+
"com.unity.modules.physics2d": "1.0.0",
30+
"com.unity.modules.screencapture": "1.0.0",
31+
"com.unity.modules.terrain": "1.0.0",
32+
"com.unity.modules.terrainphysics": "1.0.0",
33+
"com.unity.modules.tilemap": "1.0.0",
34+
"com.unity.modules.ui": "1.0.0",
35+
"com.unity.modules.uielements": "1.0.0",
36+
"com.unity.modules.umbra": "1.0.0",
37+
"com.unity.modules.unityanalytics": "1.0.0",
38+
"com.unity.modules.unitywebrequest": "1.0.0",
39+
"com.unity.modules.unitywebrequestassetbundle": "1.0.0",
40+
"com.unity.modules.unitywebrequestaudio": "1.0.0",
41+
"com.unity.modules.unitywebrequesttexture": "1.0.0",
42+
"com.unity.modules.unitywebrequestwww": "1.0.0",
43+
"com.unity.modules.vehicles": "1.0.0",
44+
"com.unity.modules.video": "1.0.0",
45+
"com.unity.modules.vr": "1.0.0",
46+
"com.unity.modules.wind": "1.0.0",
47+
"com.unity.modules.xr": "1.0.0"
48+
}
49+
}

0 commit comments

Comments
 (0)