updated upon importing City Builder Starter Kit

originrobot · Feb 26, 2015 · 609af19 · 609af19
1 parent e36cfbc
commit 609af19
Show file tree

Hide file tree

Showing 16 changed files with 124 additions and 291 deletions.
diff --git a/Assets/uLua/Examples/01_HelloWorld/01_HelloWorld.unity b/Assets/uLua/Examples/01_HelloWorld/01_HelloWorld.unity
diff --git a/Assets/uLua/Examples/02_CreateGameObject/02_CreateGameObject.unity b/Assets/uLua/Examples/02_CreateGameObject/02_CreateGameObject.unity
diff --git a/Assets/uLua/Examples/03_AccessingLuaVariables/03_AccessingLuaVariables.unity b/Assets/uLua/Examples/03_AccessingLuaVariables/03_AccessingLuaVariables.unity
diff --git a/Assets/uLua/Examples/04_ScriptsFromFile/04_ScriptsFromFile.unity b/Assets/uLua/Examples/04_ScriptsFromFile/04_ScriptsFromFile.unity
diff --git a/Assets/uLua/Examples/05_CallLuaFunction/05_CallLuaFunction.unity b/Assets/uLua/Examples/05_CallLuaFunction/05_CallLuaFunction.unity
diff --git a/Assets/uLua/Examples/06_LuaCoroutines/06_LuaCoroutines.unity b/Assets/uLua/Examples/06_LuaCoroutines/06_LuaCoroutines.unity
diff --git a/ProjectSettings/DynamicsManager.asset b/ProjectSettings/DynamicsManager.asset
@@ -6,10 +6,10 @@ PhysicsManager:
   m_Gravity: {x: 0, y: -9.81000042, z: 0}
   m_DefaultMaterial: {fileID: 0}
   m_BounceThreshold: 2
-  m_SleepThreshold: .00499999989
+  m_SleepVelocity: .150000006
+  m_SleepAngularVelocity: .140000001
   m_MaxAngularVelocity: 7
   m_MinPenetrationForPenalty: .00999999978
   m_SolverIterationCount: 6
   m_RaycastsHitTriggers: 1
-  m_EnableAdaptiveForce: 0
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
diff --git a/ProjectSettings/EditorBuildSettings.asset b/ProjectSettings/EditorBuildSettings.asset
@@ -6,4 +6,4 @@ EditorBuildSettings:
   serializedVersion: 2
   m_Scenes:
   - enabled: 1
-    path: Assets/gamescene/dragMoveScene.unity
+    path: Assets/CityBuilderStarterKit/Extensions/UnitAnimations/UnitAnimations.unity
diff --git a/ProjectSettings/EditorSettings.asset b/ProjectSettings/EditorSettings.asset
@@ -4,9 +4,9 @@
 EditorSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 3
-  m_ExternalVersionControlSupport: Hidden Meta Files
+  m_ExternalVersionControlSupport: Asset Server
   m_SerializationMode: 2
   m_WebSecurityEmulationEnabled: 0
   m_WebSecurityEmulationHostUrl: http://www.mydomain.com/mygame.unity3d
-  m_DefaultBehaviorMode: 1
-  m_SpritePackerMode: 2
+  m_DefaultBehaviorMode: 0
+  m_SpritePackerMode: 0
diff --git a/ProjectSettings/GraphicsSettings.asset b/ProjectSettings/GraphicsSettings.asset
@@ -4,23 +4,7 @@
 GraphicsSettings:
   m_ObjectHideFlags: 0
   serializedVersion: 2
-  m_Deferred:
-    m_Mode: 1
-    m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
-  m_LegacyDeferred:
-    m_Mode: 1
-    m_Shader: {fileID: 63, guid: 0000000000000000f000000000000000, type: 0}
   m_AlwaysIncludedShaders:
   - {fileID: 7, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
   - {fileID: 10782, guid: 0000000000000000f000000000000000, type: 0}
-  m_PreloadedShaders: []
-  m_LightmapStripping: 0
-  m_LightmapKeepPlain: 1
-  m_LightmapKeepDirCombined: 1
-  m_LightmapKeepDirSeparate: 1
-  m_LightmapKeepDynamic: 1
-  m_FogStripping: 0
-  m_FogKeepLinear: 1
-  m_FogKeepExp: 1
-  m_FogKeepExp2: 1
diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset
@@ -3,7 +3,6 @@
 --- !u!13 &1
 InputManager:
   m_ObjectHideFlags: 0
-  serializedVersion: 2
   m_Axes:
   - serializedVersion: 3
     m_Name: Horizontal
@@ -149,6 +148,38 @@ InputManager:
     type: 1
     axis: 2
     joyNum: 0
+  - serializedVersion: 3
+    m_Name: Window Shake X
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: .100000001
+    snap: 0
+    invert: 0
+    type: 3
+    axis: 0
+    joyNum: 0
+  - serializedVersion: 3
+    m_Name: Window Shake Y
+    descriptiveName: 
+    descriptiveNegativeName: 
+    negativeButton: 
+    positiveButton: 
+    altNegativeButton: 
+    altPositiveButton: 
+    gravity: 0
+    dead: 0
+    sensitivity: .100000001
+    snap: 0
+    invert: 0
+    type: 3
+    axis: 1
+    joyNum: 0
   - serializedVersion: 3
     m_Name: Horizontal
     descriptiveName: 
@@ -245,51 +276,3 @@ InputManager:
     type: 0
     axis: 0
     joyNum: 0
-  - serializedVersion: 3
-    m_Name: Submit
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: return
-    altNegativeButton: 
-    altPositiveButton: joystick button 0
-    gravity: 1000
-    dead: .00100000005
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Submit
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: enter
-    altNegativeButton: 
-    altPositiveButton: space
-    gravity: 1000
-    dead: .00100000005
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
-  - serializedVersion: 3
-    m_Name: Cancel
-    descriptiveName: 
-    descriptiveNegativeName: 
-    negativeButton: 
-    positiveButton: escape
-    altNegativeButton: 
-    altPositiveButton: joystick button 1
-    gravity: 1000
-    dead: .00100000005
-    sensitivity: 1000
-    snap: 0
-    invert: 0
-    type: 0
-    axis: 0
-    joyNum: 0
diff --git a/ProjectSettings/Physics2DSettings.asset b/ProjectSettings/Physics2DSettings.asset
@@ -7,16 +7,5 @@ Physics2DSettings:
   m_DefaultMaterial: {fileID: 0}
   m_VelocityIterations: 8
   m_PositionIterations: 3
-  m_VelocityThreshold: 1
-  m_MaxLinearCorrection: .200000003
-  m_MaxAngularCorrection: 8
-  m_MaxTranslationSpeed: 100
-  m_MaxRotationSpeed: 360
-  m_BaumgarteScale: .200000003
-  m_BaumgarteTimeOfImpactScale: .75
-  m_TimeToSleep: .5
-  m_LinearSleepTolerance: .00999999978
-  m_AngularSleepTolerance: 2
   m_RaycastsHitTriggers: 1
-  m_DeleteStopsCallbacks: 1
   m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff