Merge remote-tracking branch 'origin/HEAD'

StockRunning/Assembly-CSharp.csproj

@@ -304,16 +304,21 @@
      <Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCJoystick.cs" />
      <Compile Include="Assets\EasyTouchBundle\EasyTouchControls\Plugins\ETCTouchPad.cs" />
      <Compile Include="Assets\My\Scripts\AI\AIMove.cs" />
-     <Compile Include="Assets\My\Scripts\AI\Enemy_Vertigo.cs" />
+     <Compile Include="Assets\My\Scripts\ConfigurationFile.cs" />
      <Compile Include="Assets\My\Scripts\DoRanking.cs" />
+     <Compile Include="Assets\My\Scripts\EndPoint.cs" />
      <Compile Include="Assets\My\Scripts\FloorBoard.cs" />
      <Compile Include="Assets\My\Scripts\Gold\Gold.cs" />
      <Compile Include="Assets\My\Scripts\Player\PlayerMove.cs" />
      <Compile Include="Assets\My\Scripts\Prickle\Prickle.cs" />
+     <Compile Include="Assets\My\Scripts\Prop\Enemy_Vertigo.cs" />
+     <Compile Include="Assets\My\Scripts\Prop\GiantRock.cs" />
+     <Compile Include="Assets\My\Scripts\Prop\Prop.cs" />
      <Compile Include="Assets\My\Scripts\RandomEnvironment.cs" />
      <Compile Include="Assets\My\Scripts\TriggerTurnDir.cs" />
      <Compile Include="Assets\My\Scripts\Wall.cs" />
      <Compile Include="Assets\My\Test\TestEtc.cs" />
+     <Compile Include="Assets\My\Test\TestOnDrag.cs" />
      <Compile Include="Assets\Ultimate Game Tools\AutomaticLOD\Scripts\AutomaticLOD.cs" />
      <Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshSimplify.cs" />
      <Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshUniqueVertices.cs" />

StockRunning/Assets/#Z4_Icons.meta

-fileFormatVersion: 2
-guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

StockRunning/Assets/#Z4_Previews.meta

-fileFormatVersion: 2
-guid: 55c4962f2a6593c4b9c1bb6003b1ff08
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

StockRunning/Assets/Art_Assets/0C1_Models/Supercyan/Prefabs/Common People/Base/Mobile/MobileMale1.prefab

@@ -1367,7 +1367,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1916113758022548}
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalPosition: {x: -0, y: 0.938, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_Children: []
   m_Father: {fileID: 454358}
@@ -1387,6 +1387,7 @@ SkinnedMeshRenderer:
   m_MotionVectors: 1
   m_LightProbeUsage: 1
   m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 0
   m_RenderingLayerMask: 4294967295
   m_RendererPriority: 0
   m_Materials:
@@ -1399,6 +1400,7 @@ SkinnedMeshRenderer:
   m_ProbeAnchor: {fileID: 0}
   m_LightProbeVolumeOverride: {fileID: 0}
   m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
   m_PreserveUVs: 0
   m_IgnoreNormalsForChartDetection: 0
   m_ImportantGI: 0

StockRunning/Assets/Art_Assets/0C2_Animations/MobileMale1.controller

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-7239128476630980377
+AnimatorStateMachine:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: Base Layer
+  m_ChildStates:
+  - serializedVersion: 1
+    m_State: {fileID: 7926053327143699717}
+    m_Position: {x: 300, y: 170, z: 0}
+  m_ChildStateMachines: []
+  m_AnyStateTransitions: []
+  m_EntryTransitions: []
+  m_StateMachineTransitions: {}
+  m_StateMachineBehaviours: []
+  m_AnyStatePosition: {x: 50, y: 20, z: 0}
+  m_EntryPosition: {x: 50, y: 120, z: 0}
+  m_ExitPosition: {x: 800, y: 120, z: 0}
+  m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+  m_DefaultState: {fileID: 7926053327143699717}
+--- !u!91 &9100000
+AnimatorController:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: MobileMale1
+  serializedVersion: 5
+  m_AnimatorParameters: []
+  m_AnimatorLayers:
+  - serializedVersion: 5
+    m_Name: Base Layer
+    m_StateMachine: {fileID: -7239128476630980377}
+    m_Mask: {fileID: 0}
+    m_Motions: []
+    m_Behaviours: []
+    m_BlendingMode: 0
+    m_SyncedLayerIndex: -1
+    m_DefaultWeight: 0
+    m_IKPass: 0
+    m_SyncedLayerAffectsTiming: 0
+    m_Controller: {fileID: 9100000}
+--- !u!1102 &7926053327143699717
+AnimatorState:
+  serializedVersion: 5
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: sitpost
+  m_Speed: 1
+  m_CycleOffset: 0
+  m_Transitions: []
+  m_StateMachineBehaviours: []
+  m_Position: {x: 50, y: 50, z: 0}
+  m_IKOnFeet: 0
+  m_WriteDefaultValues: 1
+  m_Mirror: 0
+  m_SpeedParameterActive: 0
+  m_MirrorParameterActive: 0
+  m_CycleOffsetParameterActive: 0
+  m_TimeParameterActive: 0
+  m_Motion: {fileID: 7400000, guid: dc3d22f44d6bf064791141ab37c10edb, type: 2}
+  m_Tag: 
+  m_SpeedParameter: 
+  m_MirrorParameter: 
+  m_CycleOffsetParameter: 
+  m_TimeParameter: 

StockRunning/Assets/Art_Assets/0C2_Animations/MobileMale1.controller.meta

+fileFormatVersion: 2
+guid: d6269a4df0be50946b409721d65822a3
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/Art_Assets/0C2_Animations/sitpost.anim.meta

+fileFormatVersion: 2
+guid: dc3d22f44d6bf064791141ab37c10edb
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/#Z1_Tabs.meta → StockRunning/Assets/Art_Assets/Epic Toon FX 1.71.unitypackage.meta

 fileFormatVersion: 2
-guid: ca40beb7fc6998f40a6e15a59c6ab599
-folderAsset: yes
+guid: 47172aea36f3e0e40b60754a15a26488
 DefaultImporter:
   externalObjects: {}
   userData: 

StockRunning/Assets/#B2_Graphics.meta → StockRunning/Assets/Prefabs/Characters.meta

 fileFormatVersion: 2
-guid: 317d19313d1d7204e9bbc37122116e7f
+guid: 22591f533f7b7fe42abb3f83a040354c
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

StockRunning/Assets/#Z2_Documents.meta → StockRunning/Assets/Prefabs/Characters/OnBike.prefab.meta

 fileFormatVersion: 2
-guid: 325c11e064841204bbd6de7c85bebef6
-folderAsset: yes
-DefaultImporter:
+guid: 793fbca05fcc2ee408b8656d62a36dbf
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

StockRunning/Assets/#Z3_WebAPI.meta → StockRunning/Assets/Prefabs/Characters/OnBike2.prefab.meta

 fileFormatVersion: 2
-guid: aa43ce62596b0784081ec9bd0abc8516
-folderAsset: yes
-DefaultImporter:
+guid: b6c98f5bc16220b42872d1a7498bdd81
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

StockRunning/Assets/Prefabs/Characters/OnBike3.prefab.meta

+fileFormatVersion: 2
+guid: 8cdb81d97da4dac4fb32ba52cc783ea6
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/Prefabs/Characters/SM_Veh_Car_Sports_01 Variant.prefab

+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1001 &7618202504302801446
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 1684007911718038, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_Name
+      value: SM_Veh_Car_Sports_01
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.48127
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 1.76
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_RootOrder
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.30958
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.30958
+      objectReference: {fileID: 0}
+    - target: {fileID: 4996138570027138, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.30958
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 18c5fed9cca812a458ccf567688e3a1f, type: 3}

StockRunning/Assets/Prefabs/Characters/SM_Veh_Car_Sports_01 Variant.prefab.meta

+fileFormatVersion: 2
+guid: 3eb512a2db543e1478b1bb425cd18145
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

StockRunning/Assets/Prefabs/Level2My.prefab

@@ -5796,6 +5796,42 @@ PrefabInstance:
       propertyPath: m_Name
       value: MobileMale1
       objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0.0013801454
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0.9524596
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: -0.30452707
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0.009066953
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.0000000894066
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0.00000035762793
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 35.459003
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 178.84401
+      objectReference: {fileID: 0}
+    - target: {fileID: 426672, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: -0.20400001
+      objectReference: {fileID: 0}
     - target: {fileID: 454358, guid: 95be83ee7a755fb4687d0d079c6f693d, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0

StockRunning/StockRunning.sln

 
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp-firstpass", "Assembly-CSharp-firstpass.csproj", "{77A2A415-8E80-59FD-67BD-3FBFEF19D174}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Assembly-CSharp", "Assembly-CSharp.csproj", "{243048A2-A6E1-3156-AD46-FFD0667CD947}"