commit 5319c1b9cd18fb2ce12df80910f6ca7d44d80894 parent abf163e0819a9e9df77cb44617a7470ee3f04472 Author: PlutoTank <qwolkensperg@gmail.com> Date: Tue, 14 Apr 2020 19:49:21 -0400 Final merge fixes Diffstat:
11 files changed, 12 insertions(+), 469 deletions(-)
diff --git a/Assets/Prefabs/OldSlimes/Slime1.prefab b/Assets/Prefabs/OldSlimes/Slime1.prefab @@ -1,7 +1,5 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: -<<<<<<< HEAD -======= --- !u!1 &-33985822593101995 GameObject: m_ObjectHideFlags: 0 @@ -4692,7 +4690,6 @@ ParticleSystem: m_PostInfinity: 2 m_RotationOrder: 4 vectorLabel1_3: W ->>>>>>> Added triggers and lots of backend --- !u!1 &1000624889398560 GameObject: m_ObjectHideFlags: 0 @@ -5298,10 +5295,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -6961,10 +6955,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7360,20 +7351,12 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1963935372720986} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} -<<<<<<< HEAD - m_LocalPosition: {x: -13.734823, y: 3.4009705, z: -19.324768} -======= m_LocalPosition: {x: -27.548462, y: 3.314972, z: -15.480652} ->>>>>>> Added triggers and lots of backend m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4656148385489378} - {fileID: 4325916953773874} -<<<<<<< HEAD - - {fileID: 4928377106801728} -======= - {fileID: -5191362357236962624} ->>>>>>> Added triggers and lots of backend m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0} @@ -7537,8 +7520,6 @@ Transform: m_Father: {fileID: 4335820929245278} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} -<<<<<<< HEAD -======= --- !u!1 &3509570567496915065 GameObject: m_ObjectHideFlags: 0 @@ -7602,7 +7583,6 @@ Transform: m_Father: {fileID: -5191362357236962624} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ->>>>>>> Added triggers and lots of backend --- !u!1001 &4009498375011116109 PrefabInstance: m_ObjectHideFlags: 0 @@ -7672,18 +7652,3 @@ PrefabInstance: objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: b274cbf7d29ff8f479bc7acd2b221aee, type: 3} -<<<<<<< HEAD ---- !u!4 &4928377106801728 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4014145233050533901, guid: b274cbf7d29ff8f479bc7acd2b221aee, - type: 3} - m_PrefabInstance: {fileID: 4009498375011116109} - m_PrefabAsset: {fileID: 0} ---- !u!198 &198642331333518900 stripped -ParticleSystem: - m_CorrespondingSourceObject: {fileID: 3847518439521796729, guid: b274cbf7d29ff8f479bc7acd2b221aee, - type: 3} - m_PrefabInstance: {fileID: 4009498375011116109} - m_PrefabAsset: {fileID: 0} -======= ->>>>>>> Added triggers and lots of backend diff --git a/Assets/Prefabs/OldSlimes/Slime2.prefab b/Assets/Prefabs/OldSlimes/Slime2.prefab @@ -1221,10 +1221,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -1450,11 +1447,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1528545377225840} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} -<<<<<<< HEAD - m_LocalPosition: {x: -17.924824, y: 2.8509827, z: -1.8247681} -======= m_LocalPosition: {x: 1.1215372, y: 0.7649689, z: -21.270645} ->>>>>>> Added triggers and lots of backend m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4266858184767910} @@ -6523,10 +6516,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7316,10 +7306,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Prefabs/OldSlimes/Slime3.prefab b/Assets/Prefabs/OldSlimes/Slime3.prefab @@ -864,11 +864,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1344299255004228} m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068} -<<<<<<< HEAD - m_LocalPosition: {x: -20, y: 1, z: -20} -======= m_LocalPosition: {x: 30.021538, y: 1.4849701, z: -22.050644} ->>>>>>> Added triggers and lots of backend m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 4252936247035446} @@ -1266,10 +1262,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -2053,10 +2046,7 @@ SkinnedMeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -7324,10 +7314,7 @@ ParticleSystemRenderer: m_MotionVectors: 1 m_LightProbeUsage: 0 m_ReflectionProbeUsage: 0 -<<<<<<< HEAD -======= m_RayTracingMode: 0 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Prefabs/Slimes/Slime.prefab b/Assets/Prefabs/Slimes/Slime.prefab @@ -114,11 +114,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - abilityUser: {fileID: 8860697156266351435} -======= abilityUser: {fileID: 6087857262612827194} ->>>>>>> Added triggers and lots of backend isUsingAbility: 0 --- !u!114 &954595855 MonoBehaviour: @@ -212,11 +208,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - abilityUser: {fileID: 8860697156266351435} -======= abilityUser: {fileID: 6087857262612827194} ->>>>>>> Added triggers and lots of backend isUsingAbility: 1 --- !u!1 &1833990615 GameObject: @@ -340,11 +332,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eb78fb6112ed64b46a6a99ffabc4e964, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - abilityUser: {fileID: 8860697156266351435} -======= abilityUser: {fileID: 6087857262612827194} ->>>>>>> Added triggers and lots of backend isUsingAbility: 1 --- !u!1 &449381425311164905 GameObject: @@ -956,13 +944,6 @@ GameObject: - component: {fileID: 1533019556350475861} - component: {fileID: 4936583700566548586} - component: {fileID: 478784418} -<<<<<<< HEAD - - component: {fileID: 8860697156266351435} - - component: {fileID: 5435084252436152422} - - component: {fileID: 1963935554026982} - - component: {fileID: 1079583451375536456} - - component: {fileID: 1450437300} -======= - component: {fileID: 6087857262612827194} - component: {fileID: 5435084252436152422} - component: {fileID: 1963935554026982} @@ -970,7 +951,6 @@ GameObject: - component: {fileID: 1450437300} - component: {fileID: 3959615095757466810} - component: {fileID: 1545482344972484104} ->>>>>>> Added triggers and lots of backend m_Layer: 9 m_Name: Slime m_TagString: Slime @@ -1007,11 +987,7 @@ Rigidbody: m_Mass: 0.9 m_Drag: 1 m_AngularDrag: 0.5 -<<<<<<< HEAD - m_UseGravity: 1 -======= m_UseGravity: 0 ->>>>>>> Added triggers and lots of backend m_IsKinematic: 0 m_Interpolate: 0 m_Constraints: 112 @@ -1041,17 +1017,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 2ccd8232d0c288f46b989ad9148a12bb, type: 3} m_Name: m_EditorClassIdentifier: -<<<<<<< HEAD - movementSpeed: 16 - gravityDirection: {x: 0, y: -1, z: 0} - gravityForce: 9.81 - groundDistance: 0.8 - simulatedMass: 6 - minVelocityMagnitude: 0.01 - groundLayerMask: - serializedVersion: 2 - m_Bits: 8193 -======= rb: {fileID: 1551138524290547143} rotatable: {fileID: 4936583700566548586} playerCollider: {fileID: 1562335568724729083} @@ -1072,7 +1037,6 @@ MonoBehaviour: hitLayerMask: serializedVersion: 2 m_Bits: 8705 ->>>>>>> Added triggers and lots of backend speedOfMovementSmoothing: 20 airControl: 0.8 groundControl: 1 @@ -1103,11 +1067,7 @@ MonoBehaviour: m_EditorClassIdentifier: onSlimeColliderEnter: {fileID: 11400000, guid: 4f27798f9855ca943b97fde93e8a1d27, type: 2} -<<<<<<< HEAD ---- !u!114 &8860697156266351435 -======= --- !u!114 &6087857262612827194 ->>>>>>> Added triggers and lots of backend MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1122,11 +1082,8 @@ MonoBehaviour: useableAbilities: - ability: {fileID: 11400000, guid: 8fa4341321b16fa4abfca6b429b346f3, type: 2} initialized: 0 -<<<<<<< HEAD -======= - ability: {fileID: 11400000, guid: c86b13539019469498c09cc41eb4de39, type: 2} initialized: 0 ->>>>>>> Added triggers and lots of backend --- !u!114 &5435084252436152422 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1154,11 +1111,7 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: particleToBePlayed: {fileID: 8377438845730142059} -<<<<<<< HEAD ---- !u!114 &1079583451375536456 -======= --- !u!114 &528797603923251975 ->>>>>>> Added triggers and lots of backend MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -1167,16 +1120,10 @@ MonoBehaviour: m_GameObject: {fileID: 1531394410883810673} m_Enabled: 1 m_EditorHideFlags: 0 -<<<<<<< HEAD - m_Script: {fileID: 11500000, guid: af4ee957decc57e4e9323cab1069354f, type: 3} - m_Name: - m_EditorClassIdentifier: -======= m_Script: {fileID: 11500000, guid: 51ebc4d71a10b7344b9879000710a2b4, type: 3} m_Name: m_EditorClassIdentifier: _characterMovementController: {fileID: 1533019556350475861} ->>>>>>> Added triggers and lots of backend --- !u!114 &1450437300 MonoBehaviour: m_ObjectHideFlags: 0 @@ -1204,20 +1151,6 @@ MonoBehaviour: m_Calls: [] m_ActionEvents: - m_PersistentCalls: -<<<<<<< HEAD - m_Calls: [] - m_ActionId: 550962d9-e533-414f-aa32-f29e5dfa9019 - m_ActionName: VSGameplay/Horizontal[/Keyboard/a,/Keyboard/d,/XInputControllerWindows/leftStick/left,/XInputControllerWindows/leftStick/right] - - m_PersistentCalls: - m_Calls: [] - m_ActionId: e4869e00-a1d9-457d-98b7-3520944918a3 - m_ActionName: VSGameplay/Vertical[/Keyboard/s,/Keyboard/w,/XInputControllerWindows/leftStick/down,/XInputControllerWindows/leftStick/up] - m_NeverAutoSwitchControlSchemes: 0 - m_DefaultControlScheme: - m_DefaultActionMap: VSGameplay - m_SplitScreenIndex: -1 - m_Camera: {fileID: 0} -======= m_Calls: - m_Target: {fileID: 528797603923251975} m_MethodName: OnHorizontal @@ -1370,7 +1303,6 @@ AudioSource: m_PreInfinity: 2 m_PostInfinity: 2 m_RotationOrder: 4 ->>>>>>> Added triggers and lots of backend --- !u!1 &1531415707048473787 GameObject: m_ObjectHideFlags: 0 @@ -1482,11 +1414,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 -<<<<<<< HEAD - m_IsActive: 1 -======= m_IsActive: 0 ->>>>>>> Added triggers and lots of backend --- !u!4 &1533826743992105241 Transform: m_ObjectHideFlags: 0 @@ -3538,10 +3466,6 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8729308460022697609} -<<<<<<< HEAD - - component: {fileID: 1449647541052925711} -======= ->>>>>>> Added triggers and lots of backend m_Layer: 9 m_Name: Effects m_TagString: Untagged @@ -3564,38 +3488,6 @@ Transform: m_Father: {fileID: 1537802816993234539} m_RootOrder: 2 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} -<<<<<<< HEAD ---- !u!114 &1449647541052925711 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 7084267140620327289} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: b311a64b2a5334e44a3c37626adeb013, type: 3} - m_Name: - m_EditorClassIdentifier: - durationOfTick: 0.1 - loopFor: 0 - loopInfinite: 1 - onTimerEnd: - m_PersistentCalls: - m_Calls: - - m_Target: {fileID: 1963935554026982} - m_MethodName: PlayParticles - m_Mode: 1 - m_Arguments: - m_ObjectArgument: {fileID: 0} - m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine - m_IntArgument: 0 - m_FloatArgument: 0 - m_StringArgument: - m_BoolArgument: 0 - m_CallState: 2 -======= ->>>>>>> Added triggers and lots of backend --- !u!1 &8540263170632017633 GameObject: m_ObjectHideFlags: 0 diff --git a/Assets/Prefabs/Sword.prefab b/Assets/Prefabs/Sword.prefab @@ -30,10 +30,6 @@ Transform: m_LocalPosition: {x: 0.049, y: 1, z: 2.3470001} m_LocalScale: {x: 0.15, y: 0.15, z: 1.5} m_Children: -<<<<<<< HEAD - - {fileID: 1325930500781930158} -======= ->>>>>>> Added triggers and lots of backend - {fileID: 4432448012688814} m_Father: {fileID: 0} m_RootOrder: 0 @@ -152,10 +148,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 2 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: @@ -167,10 +160,7 @@ MeshRenderer: m_ProbeAnchor: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0} m_ScaleInLightmap: 1 -<<<<<<< HEAD -======= m_ReceiveGI: 1 ->>>>>>> Added triggers and lots of backend m_PreserveUVs: 0 m_IgnoreNormalsForChartDetection: 0 m_ImportantGI: 0 @@ -214,11 +204,7 @@ Transform: m_Children: - {fileID: 4574679940970476} m_Father: {fileID: 4171109667703892} -<<<<<<< HEAD - m_RootOrder: 1 -======= m_RootOrder: 0 ->>>>>>> Added triggers and lots of backend m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!64 &64262697665954266 MeshCollider: @@ -249,85 +235,3 @@ MonoBehaviour: width: 5 blockSpeed: 50 blockTime: 0.3 -<<<<<<< HEAD ---- !u!1001 &1326327410174061002 -PrefabInstance: - m_ObjectHideFlags: 0 - serializedVersion: 2 - m_Modification: - m_TransformParent: {fileID: 4171109667703892} - m_Modifications: - - target: {fileID: 1620881716688270, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_Name - value: PaintBrush - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalPosition.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalPosition.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalPosition.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalRotation.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalRotation.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalRotation.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalRotation.w - value: 1 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_RootOrder - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalEulerAnglesHint.x - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalEulerAnglesHint.y - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalEulerAnglesHint.z - value: 0 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalScale.x - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalScale.y - value: 2 - objectReference: {fileID: 0} - - target: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalScale.z - value: 0.18 - objectReference: {fileID: 0} - - target: {fileID: 4459337213840534, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} - propertyPath: m_LocalPosition.x - value: -0.11 - objectReference: {fileID: 0} - m_RemovedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 487083cf39c9a654da88403aa0b08cb7, type: 3} ---- !u!4 &1325930500781930158 stripped -Transform: - m_CorrespondingSourceObject: {fileID: 4126481982660452, guid: 487083cf39c9a654da88403aa0b08cb7, - type: 3} - m_PrefabInstance: {fileID: 1326327410174061002} - m_PrefabAsset: {fileID: 0} -======= ->>>>>>> Added triggers and lots of backend diff --git a/Assets/Prefabs/Swords/TesterSword1.prefab b/Assets/Prefabs/Swords/TesterSword1.prefab @@ -10,17 +10,10 @@ GameObject: m_Component: - component: {fileID: 2314149755559057351} - component: {fileID: 2375074089273406019} -<<<<<<< HEAD - - component: {fileID: 2416835633995077279} - - component: {fileID: 2364959692505286347} - - component: {fileID: 7899141307266342912} - - component: {fileID: 1642684556973010571} -======= - component: {fileID: 2364959692505286347} - component: {fileID: 7899141307266342912} - component: {fileID: 1642684556973010571} - component: {fileID: 457903427708918534} ->>>>>>> Added triggers and lots of backend m_Layer: 10 m_Name: TesterSword1 m_TagString: Sword @@ -35,15 +28,9 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 2311679785310360297} -<<<<<<< HEAD - m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 1, z: 0} - m_LocalScale: {x: 0.15, y: 0.15, z: 1.5} -======= m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0.3, y: 0.2, z: 1.8} ->>>>>>> Added triggers and lots of backend m_Children: - {fileID: 2306485253108203537} m_Father: {fileID: 0} @@ -62,40 +49,6 @@ BoxCollider: serializedVersion: 2 m_Size: {x: 1, y: 1, z: 1} m_Center: {x: 0, y: 0, z: 0} -<<<<<<< HEAD ---- !u!114 &2416835633995077279 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2311679785310360297} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 747b71826532c2045b176b616b93e325, type: 3} - m_Name: - m_EditorClassIdentifier: - swordDone: 1 - isBlocked: 0 - isFalling: 0 - swordSpeed: 11 - swordMouseSpeed: 0.15 - thrustSpeed: 25 - thrustTime: 0.2 - Radius: 3 - maxRadius: 5 - dangerTime: 0 - basicHitDistance: 10 - thrustHitDistance: 30 - blockHitDistanceTPunish: 20 - blockHitDistanceTDefensive: 100 - noTHitDistancePunish: 100 - noTHitDistanceDefensive: 100 - blockedOffset: {x: 0, y: 0, z: 0} - Owner: {fileID: 0} - thrustHit: 0 -======= ->>>>>>> Added triggers and lots of backend --- !u!54 &2364959692505286347 Rigidbody: m_ObjectHideFlags: 0 @@ -108,11 +61,7 @@ Rigidbody: m_Drag: 0 m_AngularDrag: 0.05 m_UseGravity: 0 -<<<<<<< HEAD - m_IsKinematic: 0 -======= m_IsKinematic: 1 ->>>>>>> Added triggers and lots of backend m_Interpolate: 0 m_Constraints: 112 m_CollisionDetection: 0 @@ -138,10 +87,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 2 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -166,8 +112,6 @@ MeshRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 -<<<<<<< HEAD -======= --- !u!114 &457903427708918534 MonoBehaviour: m_ObjectHideFlags: 0 @@ -182,7 +126,6 @@ MonoBehaviour: m_EditorClassIdentifier: bodyCollider: {fileID: 2375074089273406019} stats: {fileID: 11400000, guid: 44e3e2a9360e3f245b69bd99ec898212, type: 2} ->>>>>>> Added triggers and lots of backend --- !u!1 &2311745251963663901 GameObject: m_ObjectHideFlags: 0 @@ -193,10 +136,6 @@ GameObject: m_Component: - component: {fileID: 2306485253108203537} - component: {fileID: 2375548456093002017} -<<<<<<< HEAD - - component: {fileID: 2416144094420853923} -======= ->>>>>>> Added triggers and lots of backend m_Layer: 11 m_Name: Block Hitbox m_TagString: BlockArea @@ -233,24 +172,6 @@ MeshCollider: m_Convex: 1 m_CookingOptions: 14 m_Mesh: {fileID: 4300000, guid: 8d27435e73833654db7504d72c3ee2d4, type: 3} -<<<<<<< HEAD ---- !u!114 &2416144094420853923 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 2311745251963663901} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 11500000, guid: 5591714020b570c4e9e7df720734d72a, type: 3} - m_Name: - m_EditorClassIdentifier: - width: 5 - blockSpeed: 50 - blockTime: 0.3 -======= ->>>>>>> Added triggers and lots of backend --- !u!1 &2312406836008797191 GameObject: m_ObjectHideFlags: 0 @@ -305,10 +226,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 -<<<<<<< HEAD -======= m_RayTracingMode: 2 ->>>>>>> Added triggers and lots of backend m_RenderingLayerMask: 4294967295 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Scripts/Slimecing/Abilities/AbilitiesScriptableObjects/SlimeDashAbility.asset b/Assets/Scripts/Slimecing/Abilities/AbilitiesScriptableObjects/SlimeDashAbility.asset @@ -16,11 +16,7 @@ MonoBehaviour: abilityDescription: move forward faster abilityCooldown: 1 abilitySound: {fileID: 8300000, guid: c04b2f9ddb776a449abed020a9962595, type: 3} -<<<<<<< HEAD - abilityButton: Dash -======= abilityTrigger: {fileID: 11400000, guid: 79fb25d73d9e39c42a008d2e98e7e1d4, type: 2} ->>>>>>> Added triggers and lots of backend dashForce: 40 dashLength: 0.3 dashUseAmount: 1 diff --git a/Assets/Scripts/Slimecing/InputSystem/SlimeControls.inputactions b/Assets/Scripts/Slimecing/InputSystem/SlimeControls.inputactions @@ -2,22 +2,13 @@ "name": "SlimeControls", "maps": [ { -<<<<<<< HEAD - "name": "VSGameplay", - "id": "24f634ee-5f8f-4707-89a7-23e8b1ecbcf4", -======= "name": "VsGameplay", "id": "a0766e30-e847-4bfe-b5bc-cde1c9883be5", ->>>>>>> Added triggers and lots of backend "actions": [ { "name": "Horizontal", "type": "Button", -<<<<<<< HEAD - "id": "550962d9-e533-414f-aa32-f29e5dfa9019", -======= "id": "8abfc885-0de5-41b1-8abb-45b2ff94793e", ->>>>>>> Added triggers and lots of backend "expectedControlType": "", "processors": "", "interactions": "" @@ -25,11 +16,7 @@ { "name": "Vertical", "type": "Button", -<<<<<<< HEAD - "id": "e4869e00-a1d9-457d-98b7-3520944918a3", -======= "id": "795a2a8f-8cdf-4247-8e61-45697d87c257", ->>>>>>> Added triggers and lots of backend "expectedControlType": "", "processors": "", "interactions": "" @@ -38,11 +25,7 @@ "bindings": [ { "name": "1D Axis", -<<<<<<< HEAD - "id": "8e69cdda-7fed-470f-acaa-8a3ab63a63c2", -======= "id": "24e32e59-8146-430e-84f2-a1b70931ae4d", ->>>>>>> Added triggers and lots of backend "path": "1DAxis", "interactions": "", "processors": "", @@ -53,167 +36,95 @@ }, { "name": "negative", -<<<<<<< HEAD - "id": "dff2a34d-d502-4dfe-8227-94a0f5ac22aa", - "path": "<Keyboard>/a", - "interactions": "", - "processors": "", - "groups": "", -======= "id": "704f98c2-def6-4d1f-919a-f55afc789a69", "path": "<Gamepad>/leftStick/left", "interactions": "", "processors": "", "groups": "Gamepad", ->>>>>>> Added triggers and lots of backend "action": "Horizontal", "isComposite": false, "isPartOfComposite": true }, { "name": "positive", -<<<<<<< HEAD - "id": "7bf42d99-f48b-4b91-ad01-155c5eeebb07", - "path": "<Keyboard>/d", - "interactions": "", - "processors": "", - "groups": "", -======= "id": "7930672c-a277-4b7d-abd4-36e6dc8a2f60", "path": "<Gamepad>/leftStick/right", "interactions": "", "processors": "", "groups": "Gamepad", ->>>>>>> Added triggers and lots of backend "action": "Horizontal", "isComposite": false, "isPartOfComposite": true }, { "name": "1D Axis", -<<<<<<< HEAD - "id": "faa9dfee-c3af-4ef1-a36f-7ae201db94d2", -======= "id": "1795ec87-9b67-4d39-9dc3-1340cb616993", ->>>>>>> Added triggers and lots of backend "path": "1DAxis", "interactions": "", "processors": "", "groups": "", -<<<<<<< HEAD - "action": "Horizontal", -======= "action": "Vertical", ->>>>>>> Added triggers and lots of backend "isComposite": true, "isPartOfComposite": false }, { "name": "negative", -<<<<<<< HEAD - "id": "f69a983c-d4f8-4dbe-bdce-ee54ee4e8fe7", - "path": "<Gamepad>/leftStick/left", - "interactions": "", - "processors": "", - "groups": "", - "action": "Horizontal", -======= "id": "0935a6f8-0eef-416b-a799-3bd4bf1a7427", "path": "<Gamepad>/leftStick/down", "interactions": "", "processors": "", "groups": "Gamepad", "action": "Vertical", ->>>>>>> Added triggers and lots of backend "isComposite": false, "isPartOfComposite": true }, { "name": "positive", -<<<<<<< HEAD - "id": "492c4265-7d82-4a79-b795-e5117a26d1ff", - "path": "<Gamepad>/leftStick/right", - "interactions": "", - "processors": "", - "groups": "", - "action": "Horizontal", -======= "id": "5b09c630-5af5-43d1-9aa5-53f006f852db", "path": "<Gamepad>/leftStick/up", "interactions": "", "processors": "", "groups": "Gamepad", "action": "Vertical", ->>>>>>> Added triggers and lots of backend "isComposite": false, "isPartOfComposite": true }, { "name": "1D Axis", -<<<<<<< HEAD - "id": "ef047899-ff11-4d90-9e60-7ce7683a25a9", -======= "id": "81786b8d-0478-4026-822f-27bbb95d6069", ->>>>>>> Added triggers and lots of backend "path": "1DAxis", "interactions": "", "processors": "", "groups": "", -<<<<<<< HEAD - "action": "Vertical", -======= "action": "Horizontal", ->>>>>>> Added triggers and lots of backend "isComposite": true, "isPartOfComposite": false }, { "name": "negative", -<<<<<<< HEAD - "id": "f3cd3157-c5b2-440e-88ea-46fedd54b294", - "path": "<Keyboard>/s", - "interactions": "", - "processors": "", - "groups": "", - "action": "Vertical", -======= "id": "c7c2af17-1134-4d80-894b-b672947e3154", "path": "<Keyboard>/a", "interactions": "", "processors": "", "groups": "Keyboard & Mouse", "action": "Horizontal", ->>>>>>> Added triggers and lots of backend "isComposite": false, "isPartOfComposite": true }, { "name": "positive", -<<<<<<< HEAD - "id": "5ea49ba6-e713-4cc1-8260-d0459a6f549b", - "path": "<Keyboard>/w", - "interactions": "", - "processors": "", - "groups": "", - "action": "Vertical", -======= "id": "45d948f8-6196-4d84-b6d2-910feb90be8d", "path": "<Keyboard>/d", "interactions": "", "processors": "", "groups": "Keyboard & Mouse", "action": "Horizontal", ->>>>>>> Added triggers and lots of backend "isComposite": false, "isPartOfComposite": true }, { "name": "1D Axis", -<<<<<<< HEAD - "id": "82cb051e-4445-4323-be39-c955e64a53ca", -======= "id": "f63e4496-f181-4d11-b089-95ea60655e50", ->>>>>>> Added triggers and lots of backend "path": "1DAxis", "interactions": "", "processors": "", @@ -224,48 +135,27 @@ }, { "name": "negative", -<<<<<<< HEAD - "id": "8385a5f7-d192-4142-a50c-7bf9c4d408f0", - "path": "<Gamepad>/leftStick/down", - "interactions": "", - "processors": "", - "groups": "", -======= "id": "043fe824-d52a-42b9-82c3-12aec1a16dd5", "path": "<Keyboard>/s", "interactions": "", "processors": "", "groups": "Keyboard & Mouse", ->>>>>>> Added triggers and lots of backend "action": "Vertical", "isComposite": false, "isPartOfComposite": true }, { "name": "positive", -<<<<<<< HEAD - "id": "1abd2da0-6ed5-446b-88ba-1d1c22fcb787", - "path": "<Gamepad>/leftStick/up", - "interactions": "", - "processors": "", - "groups": "", -======= "id": "7898eedc-f9ff-4760-b4f4-e701c57d1998", "path": "<Keyboard>/w", "interactions": "", "processors": "", "groups": "Keyboard & Mouse", ->>>>>>> Added triggers and lots of backend "action": "Vertical", "isComposite": false, "isPartOfComposite": true } ] -<<<<<<< HEAD - } - ], - "controlSchemes": [] -======= }, { "name": "AbilityButtons", @@ -370,5 +260,4 @@ ] } ] ->>>>>>> Added triggers and lots of backend } \ No newline at end of file diff --git a/Assets/StreamingAssets/2DAnimationSampleAssetBundles/2DAnimationSampleAssetBundles b/Assets/StreamingAssets/2DAnimationSampleAssetBundles/2DAnimationSampleAssetBundles Binary files differ. diff --git a/Assets/StreamingAssets/2DAnimationSampleAssetBundles/2DAnimationSampleAssetBundles.manifest b/Assets/StreamingAssets/2DAnimationSampleAssetBundles/2DAnimationSampleAssetBundles.manifest @@ -1,10 +1,10 @@ ManifestFileVersion: 0 -CRC: 3690093247 +CRC: 1158353419 AssetBundleManifest: AssetBundleInfos: Info_0: - Name: rikrrage + Name: rikrpoison Dependencies: {} Info_1: - Name: rikrpoison + Name: rikrrage Dependencies: {} diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset @@ -598,7 +598,12 @@ PlayerSettings: daydream: daydreamIconForeground: {fileID: 0} daydreamIconBackground: {fileID: 0} - cloudServicesEnabled: {} + cloudServicesEnabled: + Build: 1 + Collab: 1 + ErrorHub: 0 + Hub: 0 + UNet: 1 luminIcon: m_Name: m_ModelFolderPath: @@ -611,10 +616,10 @@ PlayerSettings: m_VersionCode: 1 m_VersionName: apiCompatibilityLevel: 6 - cloudProjectId: + cloudProjectId: 9065f837-ea6c-4b59-a7b6-7cff282ce513 framebufferDepthMemorylessMode: 0 - projectName: - organizationId: + projectName: Slimecing + organizationId: plutotank cloudEnabled: 0 enableNativePlatformBackendsForNewInputSystem: 1 disableOldInputManagerSupport: 0