Skip to content

Commit b8946d9

Browse files
committed
update unity version to 2017.1.0f3
1 parent 3d92819 commit b8946d9

18 files changed

+115
-361
lines changed

Assets/JCSUnity/Scripts/JCS_Camera.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ public virtual void TakeScreenShot()
113113
JCS_GameSettings.instance.SCREENSHOT_PATH,
114114
JCS_GameSettings.instance.SCREENSHOT_FILENAME) + 1;
115115

116-
Application.CaptureScreenshot(
116+
ScreenCapture.CaptureScreenshot(
117117
Application.dataPath +
118118
JCS_GameSettings.instance.SCREENSHOT_PATH +
119119
JCS_GameSettings.instance.SCREENSHOT_FILENAME +

Assets/JCSUnity/Scripts/Network/JCS_PacketLostPreventer.cs

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,12 @@ public class JCS_PacketLostPreventer
3434

3535
[Header("** Runtime Variables (JCS_PacketLostPreventer) **")]
3636

37+
[Tooltip("How fast the packet resend?")]
38+
[SerializeField] [Range(0.0f, 1.0f)]
39+
private float mResendTime = 0.001f;
40+
41+
private float mResendTimer = 0.0f;
42+
3743
[Tooltip("Packet's ID that are still being process.")]
3844
[SerializeField]
3945
private List<short> mWaitingPacketIds = new List<short>();
@@ -185,6 +191,15 @@ private void TrackPacket()
185191
!JCS_NetworkSettings.GetGameSocket().IsConnected())
186192
return;
187193

194+
mResendTimer += Time.deltaTime;
195+
196+
if (mResendTimer < mResendTime)
197+
return;
198+
199+
// reset timer.
200+
mResendTimer = 0;
201+
202+
188203
/* First check if the packet responded? Remove it if
189204
already responded. */
190205
{

Assets/JCS_GameData/SavedData/BF_GameData.jcs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,5 @@
2121
</ItemIdInclude>
2222
</ItemsInclude>
2323
<Name />
24-
<Cash>187351</Cash>
24+
<Cash>183034</Cash>
2525
</BF_GameData>
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Build from DESKTOP-5QUO247 at 9/8/2017 1:13:34 PM
1+
Build from DESKTOP-5QUO247 at 9/9/2017 4:32:54 PM

ProjectSettings/AudioManager.asset

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,6 @@ AudioManager:
1212
m_VirtualVoiceCount: 512
1313
m_RealVoiceCount: 32
1414
m_SpatializerPlugin:
15+
m_AmbisonicDecoderPlugin:
1516
m_DisableAudio: 0
17+
m_VirtualizeEffects: 1

ProjectSettings/DynamicsManager.asset

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,17 @@
33
--- !u!55 &1
44
PhysicsManager:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 2
6+
serializedVersion: 3
77
m_Gravity: {x: 0, y: -9.81, z: 0}
88
m_DefaultMaterial: {fileID: 0}
99
m_BounceThreshold: 2
1010
m_SleepThreshold: 0.005
1111
m_DefaultContactOffset: 0.01
12-
m_SolverIterationCount: 6
12+
m_DefaultSolverIterations: 6
13+
m_DefaultSolverVelocityIterations: 1
14+
m_QueriesHitBackfaces: 0
1315
m_QueriesHitTriggers: 1
1416
m_EnableAdaptiveForce: 0
17+
m_EnablePCM: 1
1518
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
19+
m_AutoSimulation: 1

ProjectSettings/EditorBuildSettings.asset

Lines changed: 14 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -6,35 +6,32 @@ EditorBuildSettings:
66
serializedVersion: 2
77
m_Scenes:
88
- enabled: 1
9-
path: Assets/RunningCrush_Assets/Scenes/RC_Lobby.unity
10-
guid: 79ae511c75834744fa3639dda549df37
9+
path: Assets/RunningCrush_Assets/Scenes/RC_LogoScene.unity
10+
guid: 797d927e078735e4b87529c67fe5c573
1111
- enabled: 1
1212
path: Assets/BossFight_Assets/Scenes/BF_LogoScene.unity
1313
guid: 620bf97ff9e8b7c48a92cccc9cfb6484
14+
- enabled: 1
15+
path: Assets/JCSUnity/Scenes/JCS_ApplicationCloseSimulateSceneOnline.unity
16+
guid: 8f14fd39503fc6b46b80dbb178229d61
1417
- enabled: 1
1518
path: Assets/JCSUnity/Scenes/JCS_ApplicationCloseSimulateScene.unity
1619
guid: 04f6db7d2bf5e974bbf699294c1f33f6
1720
- enabled: 1
18-
path: Assets/JCSUnity/Scenes/JCS_ApplicationCloseSimulateSceneOnline.unity
19-
guid: 8f14fd39503fc6b46b80dbb178229d61
21+
path: Assets/BossFight_Assets/Scenes/BF_Lobby.unity
22+
guid: 96c4c1b86d16b5d4aa4690906f847208
2023
- enabled: 1
21-
path: Assets/RunningCrush_Assets/Scenes/RC_LogoScene.unity
22-
guid: 797d927e078735e4b87529c67fe5c573
24+
path: Assets/BossFight_Assets/Scenes/BF_Game.unity
25+
guid: dd51279f1777da448a82e3262d0bf645
26+
- enabled: 1
27+
path: Assets/RunningCrush_Assets/Scenes/RC_Lobby.unity
28+
guid: 79ae511c75834744fa3639dda549df37
2329
- enabled: 1
2430
path: Assets/RunningCrush_Assets/Scenes/RC_Level_01.unity
2531
guid: 3bfd82bad98dad54ea813a2daafcab24
26-
- enabled: 1
27-
path: Assets/RunningCrush_Assets/Scenes/RC_EndGame.unity
28-
guid: 26dc9a66adce7894faed66899ee9dddd
2932
- enabled: 1
3033
path: Assets/RunningCrush_Assets/Scenes/RC_Shop.unity
3134
guid: bc638b6436bd54542adcf750846b924b
3235
- enabled: 1
33-
path: Assets/BossFight_Assets/Scenes/BF_Lobby.unity
34-
guid: 96c4c1b86d16b5d4aa4690906f847208
35-
- enabled: 1
36-
path: Assets/BossFight_Assets/Scenes/BF_Game.unity
37-
guid: dd51279f1777da448a82e3262d0bf645
38-
- enabled: 1
39-
path: Assets/JCSUnity/Scenes/Demo/2D/JCS_SideScrollerDemo.unity
40-
guid: ce256848959924545ac54675b0ff9fae
36+
path: Assets/RunningCrush_Assets/Scenes/RC_EndGame.unity
37+
guid: 26dc9a66adce7894faed66899ee9dddd

ProjectSettings/EditorSettings.asset

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@
33
--- !u!159 &1
44
EditorSettings:
55
m_ObjectHideFlags: 0
6-
serializedVersion: 3
6+
serializedVersion: 4
77
m_ExternalVersionControlSupport: Visible Meta Files
88
m_SerializationMode: 2
9-
m_WebSecurityEmulationEnabled: 0
10-
m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
11-
m_DefaultBehaviorMode: 1
12-
m_SpritePackerMode: 2
9+
m_DefaultBehaviorMode: 0
10+
m_SpritePackerMode: 0
1311
m_SpritePackerPaddingPower: 1
1412
m_ProjectGenerationIncludedExtensions: txt;xml;fnt;cd
1513
m_ProjectGenerationRootNamespace:
14+
m_UserGeneratedProjectSuffix:
15+
m_CollabEditorSettings:
16+
inProgressEnabled: 1

ProjectSettings/GraphicsSettings.asset

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,8 @@ GraphicsSettings:
3333
- {fileID: 15104, guid: 0000000000000000f000000000000000, type: 0}
3434
- {fileID: 15105, guid: 0000000000000000f000000000000000, type: 0}
3535
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
36+
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
3637
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
37-
- {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
38-
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
3938
m_PreloadedShaders: []
4039
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
4140
type: 0}

0 commit comments

Comments
 (0)