Skip to content

Commit df17f04

Browse files
committed
Build(unity): upgrade unity version to 2019.1.9f1
1 parent 86d949a commit df17f04

File tree

1,648 files changed

+63744
-188519
lines changed

Some content is hidden

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

1,648 files changed

+63744
-188519
lines changed
Binary file not shown.
48 Bytes
Binary file not shown.
48 Bytes
Binary file not shown.
34.7 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
34.5 KB
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

Assets/Scenes/Start.unity

15.2 KB
Binary file not shown.

Assets/Scripts/CameraRotation.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using UnityEngine;
2-
using System.Collections;
32

43
public class CameraRotation : MonoBehaviour {
54

Assets/Scripts/DoorAnimation.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using UnityEngine;
2-
using System.Collections;
32

43
[RequireComponent(typeof(Animator))]
54

Assets/Scripts/FpsGun.cs

+3-7
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using Photon.Pun;
2-
using Photon.Realtime;
32
using UnityEngine;
4-
using UnitySampleAssets.CrossPlatformInput;
3+
using UnityStandardAssets.CrossPlatformInput;
54
using System.Collections;
65

76
public class FpsGun : MonoBehaviour {
@@ -63,10 +62,8 @@ void Shoot() {
6362
string hitTag = shootHit.transform.gameObject.tag;
6463
switch (hitTag) {
6564
case "Player":
66-
if (shootHit.collider.gameObject != gameObject) {
67-
shootHit.collider.GetComponent<PhotonView>().RPC("TakeDamage", RpcTarget.All, damagePerShot, PhotonNetwork.LocalPlayer.NickName);
68-
PhotonNetwork.Instantiate("impactFlesh", shootHit.point, Quaternion.Euler(shootHit.normal.x - 90, shootHit.normal.y, shootHit.normal.z), 0);
69-
}
65+
shootHit.collider.GetComponent<PhotonView>().RPC("TakeDamage", RpcTarget.All, damagePerShot, PhotonNetwork.LocalPlayer.NickName);
66+
PhotonNetwork.Instantiate("impactFlesh", shootHit.point, Quaternion.Euler(shootHit.normal.x - 90, shootHit.normal.y, shootHit.normal.z), 0);
7067
break;
7168
default:
7269
PhotonNetwork.Instantiate("impact" + hitTag, shootHit.point, Quaternion.Euler(shootHit.normal.x - 90, shootHit.normal.y, shootHit.normal.z), 0);
@@ -86,4 +83,3 @@ public IEnumerator DisableShootingEffect() {
8683
}
8784

8885
}
89-

Assets/Scripts/IKControl.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using UnityEngine;
2-
using System.Collections;
32

43
[RequireComponent(typeof(Animator))]
54

Assets/Scripts/ImpactLifeCycle.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using UnityEngine;
2-
using System.Collections;
32

43
[RequireComponent(typeof(ParticleSystem))]
54

Assets/Scripts/NameTag.cs

-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
using Photon.Pun;
2-
using Photon.Realtime;
32
using UnityEngine;
43
using UnityEngine.UI;
5-
using System.Collections;
64

75
public class NameTag : MonoBehaviourPunCallbacks {
86

Assets/Scripts/PlayerHealth.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
using Photon.Pun;
2-
using Photon.Realtime;
32
using UnityEngine;
43
using UnityEngine.UI;
5-
using UnityEngine.SceneManagement;
6-
using UnitySampleAssets.Characters.FirstPerson;
4+
using UnityStandardAssets.Characters.FirstPerson;
75
using System.Collections;
86

97
[RequireComponent(typeof(FirstPersonController))]
@@ -59,6 +57,7 @@ void Start() {
5957
healthSlider = GameObject.FindGameObjectWithTag("Screen").GetComponentInChildren<Slider>();
6058
currentHealth = startingHealth;
6159
if (photonView.IsMine) {
60+
gameObject.layer = LayerMask.NameToLayer("FPSPlayer");
6261
healthSlider.value = currentHealth;
6362
}
6463
damaged = false;

Assets/Scripts/PlayerNetworkMover.cs

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
using Photon.Pun;
2-
using Photon.Realtime;
32
using UnityEngine;
4-
using UnitySampleAssets.CrossPlatformInput;
5-
using UnitySampleAssets.Characters.FirstPerson;
3+
using UnityStandardAssets.CrossPlatformInput;
4+
using UnityStandardAssets.Characters.FirstPerson;
65
using System.Collections;
76

87
[RequireComponent(typeof(FirstPersonController))]

Assets/Scripts/PlayerScore.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using UnityEngine;
2-
using System.Collections;
32

43
// TODO: finish score system later, this script is not used now.
54
public class PlayerScore : MonoBehaviour {

Assets/Scripts/TpsGun.cs

-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
11
using Photon.Pun;
2-
using Photon.Realtime;
32
using UnityEngine;
4-
using UnitySampleAssets.CrossPlatformInput;
5-
using System.Collections;
63

74
public class TpsGun : MonoBehaviourPunCallbacks, IPunObservable {
85

@@ -108,4 +105,3 @@ public void OnPhotonSerializeView(PhotonStream stream, PhotonMessageInfo info) {
108105
}
109106

110107
}
111-

Assets/Standard Assets.meta

+2-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Standard Assets/Cameras.meta

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Standard Assets/Cameras/CameraGuidelines.txt.meta

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Standard Assets/Cameras/Prefabs.meta

-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Standard Assets/Cameras/Prefabs/CctvCamera.prefab

+16-17
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ GameObject:
1515
- 114: {fileID: 11400000}
1616
- 114: {fileID: 11400002}
1717
m_Layer: 0
18-
m_Name: CCTVCamera
18+
m_Name: CctvCamera
1919
m_TagString: MainCamera
2020
m_Icon: {fileID: 0}
2121
m_NavMeshLayer: 0
@@ -28,7 +28,7 @@ Transform:
2828
m_PrefabInternal: {fileID: 100100000}
2929
m_GameObject: {fileID: 100000}
3030
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
31-
m_LocalPosition: {x: 13.2973595, y: 5, z: 86.4863968}
31+
m_LocalPosition: {x: 234.210007, y: 92.913002, z: -126.029999}
3232
m_LocalScale: {x: 1, y: 1, z: 1}
3333
m_Children: []
3434
m_Father: {fileID: 0}
@@ -49,9 +49,9 @@ Camera:
4949
y: 0
5050
width: 1
5151
height: 1
52-
near clip plane: .100000001
53-
far clip plane: 2000
54-
field of view: 60
52+
near clip plane: 1
53+
far clip plane: 4000
54+
field of view: 40
5555
orthographic: 0
5656
orthographic size: 5
5757
m_Depth: 0
@@ -90,11 +90,11 @@ MonoBehaviour:
9090
m_Script: {fileID: 11500000, guid: f2ec2b96de5640e42a622fc3064f1c80, type: 3}
9191
m_Name:
9292
m_EditorClassIdentifier:
93-
target: {fileID: 0}
94-
autoTargetPlayer: 1
95-
updateType: 0
96-
rotationRange: {x: 90, y: 360}
97-
followSpeed: .100000001
93+
m_Target: {fileID: 0}
94+
m_AutoTargetPlayer: 1
95+
m_UpdateType: 0
96+
m_RotationRange: {x: 90, y: 360}
97+
m_FollowSpeed: .100000001
9898
--- !u!114 &11400002
9999
MonoBehaviour:
100100
m_ObjectHideFlags: 1
@@ -106,12 +106,12 @@ MonoBehaviour:
106106
m_Script: {fileID: 11500000, guid: a62942d9af3f36d448094c6ed1f214dd, type: 3}
107107
m_Name:
108108
m_EditorClassIdentifier:
109-
target: {fileID: 0}
110-
autoTargetPlayer: 1
111-
updateType: 0
112-
fovAdjustTime: 1
113-
zoomAmountMultiplier: 5
114-
includeEffectsInSize: 0
109+
m_Target: {fileID: 0}
110+
m_AutoTargetPlayer: 1
111+
m_UpdateType: 0
112+
m_FovAdjustTime: 1
113+
m_ZoomAmountMultiplier: 2
114+
m_IncludeEffectsInSize: 0
115115
--- !u!124 &12400000
116116
Behaviour:
117117
m_ObjectHideFlags: 1
@@ -130,4 +130,3 @@ Prefab:
130130
m_ParentPrefab: {fileID: 0}
131131
m_RootGameObject: {fileID: 100000}
132132
m_IsPrefabParent: 1
133-
m_IsExploded: 1

Assets/Standard Assets/Cameras/Prefabs/CctvCamera.prefab.meta

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Standard Assets/Cameras/Prefabs/FreeLookCameraRig.prefab

+22-25
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Transform:
7171
m_PrefabParentObject: {fileID: 0}
7272
m_PrefabInternal: {fileID: 100100000}
7373
m_GameObject: {fileID: 100002}
74-
m_LocalRotation: {x: 0, y: 6.33250039e-08, z: 0, w: 1}
74+
m_LocalRotation: {x: 0, y: 0.000000063325004, z: 0, w: 1}
7575
m_LocalPosition: {x: -0, y: 0, z: -4}
7676
m_LocalScale: {x: 1, y: 1, z: 1}
7777
m_Children: []
@@ -84,7 +84,7 @@ Transform:
8484
m_PrefabInternal: {fileID: 100100000}
8585
m_GameObject: {fileID: 100004}
8686
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
87-
m_LocalPosition: {x: -.078047514, y: .0411977768, z: .684945583}
87+
m_LocalPosition: {x: -0.078047514, y: 0.041197777, z: 0.6849456}
8888
m_LocalScale: {x: 1, y: 1, z: 1}
8989
m_Children:
9090
- {fileID: 400000}
@@ -99,14 +99,14 @@ Camera:
9999
m_Enabled: 1
100100
serializedVersion: 2
101101
m_ClearFlags: 1
102-
m_BackGroundColor: {r: .625529051, g: .684091985, b: .776119411, a: .0196078438}
102+
m_BackGroundColor: {r: 0.62552905, g: 0.684092, b: 0.7761194, a: 0.019607844}
103103
m_NormalizedViewPortRect:
104104
serializedVersion: 2
105105
x: 0
106106
y: 0
107107
width: 1
108108
height: 1
109-
near clip plane: .0199999996
109+
near clip plane: 0.02
110110
far clip plane: 400
111111
field of view: 60
112112
orthographic: 0
@@ -118,10 +118,12 @@ Camera:
118118
m_RenderingPath: -1
119119
m_TargetTexture: {fileID: 0}
120120
m_TargetDisplay: 0
121+
m_TargetEye: 3
121122
m_HDR: 0
122123
m_OcclusionCulling: 1
123124
m_StereoConvergence: 10
124-
m_StereoSeparation: .0219999999
125+
m_StereoSeparation: 0.022
126+
m_StereoMirrorMode: 0
125127
--- !u!54 &5400000
126128
Rigidbody:
127129
m_ObjectHideFlags: 1
@@ -131,7 +133,7 @@ Rigidbody:
131133
serializedVersion: 2
132134
m_Mass: 1
133135
m_Drag: 0
134-
m_AngularDrag: .0500000007
136+
m_AngularDrag: 0.05
135137
m_UseGravity: 1
136138
m_IsKinematic: 1
137139
m_Interpolate: 1
@@ -162,17 +164,16 @@ MonoBehaviour:
162164
m_Script: {fileID: 11500000, guid: e44af8091779fcb40801d5b284353dbe, type: 3}
163165
m_Name:
164166
m_EditorClassIdentifier:
165-
target: {fileID: 0}
166-
autoTargetPlayer: 1
167-
updateType: 1
168-
followTargetInEditMode: 1
169-
moveSpeed: 5
170-
turnSpeed: 10
171-
turnSmoothing: 0
172-
tiltMax: 75
173-
tiltMin: 45
174-
lockCursor: 0
175-
verticalAutoReturn: 0
167+
m_Target: {fileID: 0}
168+
m_AutoTargetPlayer: 1
169+
m_UpdateType: 0
170+
m_MoveSpeed: 1
171+
m_TurnSpeed: 1.5
172+
m_TurnSmoothing: 0
173+
m_TiltMax: 75
174+
m_TiltMin: 45
175+
m_LockCursor: 0
176+
m_VerticalAutoReturn: 0
176177
--- !u!114 &11400002
177178
MonoBehaviour:
178179
m_ObjectHideFlags: 1
@@ -184,11 +185,11 @@ MonoBehaviour:
184185
m_Script: {fileID: 11500000, guid: 94b04ec3bda6b7747aa53936ef3b0ae2, type: 3}
185186
m_Name:
186187
m_EditorClassIdentifier:
187-
clipMoveTime: .0500000007
188-
returnTime: .400000006
189-
sphereCastRadius: .100000001
188+
clipMoveTime: 0.05
189+
returnTime: 0.4
190+
sphereCastRadius: 0.1
190191
visualiseInEditor: 1
191-
closestDistance: .5
192+
closestDistance: 0.5
192193
dontClipTag: Player
193194
--- !u!124 &12400000
194195
Behaviour:
@@ -205,10 +206,6 @@ Prefab:
205206
m_TransformParent: {fileID: 0}
206207
m_Modifications: []
207208
m_RemovedComponents: []
208-
m_DeprecatedTransformRoot: {fileID: 0}
209-
m_DeprecatedTransformMap: {}
210-
m_DeprecatedTransformComplete: 1
211209
m_ParentPrefab: {fileID: 0}
212210
m_RootGameObject: {fileID: 100004}
213211
m_IsPrefabParent: 1
214-
m_IsExploded: 1

Assets/Standard Assets/Cameras/Prefabs/FreeLookCameraRig.prefab.meta

-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)