zoriya/Goulag-Prototype
1
0
Fork 0
mirror of https://github.com/zoriya/Goulag-Prototype.git synced 2026-06-04 10:44:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

conflict

Browse Source
This commit is contained in:
happy44300
2018-10-07 16:21:11 +02:00
parent de1f16c6b0
commit 70069e6f99
4 changed files with 200 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/Scenes/Level 1.unity
+171 -93
View File
@@ -222,69 +222,6 @@ Prefab:
propertyPath: m_Name
value: Player
objectReference: {fileID: 0}
- target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: sensiX
value: 10
objectReference: {fileID: 0}
- target: {fileID: 50129134328127070, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_CollisionDetection
value: 1
objectReference: {fileID: 0}
- target: {fileID: 50129134328127070, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_Interpolate
value: 1
objectReference: {fileID: 0}
- target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: sensiY
value: 30
objectReference: {fileID: 0}
- target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: layerMask.m_Bits
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1295779273530774, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
propertyPath: m_Layer
value: 9
objectReference: {fileID: 0}
- target: {fileID: 1295779273530774, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
propertyPath: m_TagString
value: Player
objectReference: {fileID: 0}
- target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: DownDetector
value: 1
objectReference: {fileID: 0}
- target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_FlipX
value: 0
objectReference: {fileID: 0}
- target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_FlipY
value: 0
objectReference: {fileID: 0}
- target: {fileID: 212465444373585022, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_Sprite
value:
objectReference: {fileID: 10901, guid: 0000000000000000f000000000000000, type: 0}
- target: {fileID: 50129134328127070, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: m_LinearDrag
value: 0
objectReference: {fileID: 0}
- target: {fileID: 114482567245020594, guid: f5eee23f42e32c740a46ae6b64fb96e1,
type: 2}
propertyPath: echo_act_3
value: 2
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: f5eee23f42e32c740a46ae6b64fb96e1, type: 2}
m_IsPrefabAsset: 0
@@ -297,10 +234,12 @@ GameObject:
m_Component:
- component: {fileID: 403186793}
- component: {fileID: 403186792}
- component: {fileID: 403186796}
- component: {fileID: 403186795}
- component: {fileID: 403186794}
m_Layer: 0
m_Name: GameManager
m_TagString: Untagged
m_TagString: GameManager
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@@ -334,26 +273,123 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!50 &403186794
Rigidbody2D:
serializedVersion: 4
--- !u!81 &403186794
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 403186791}
m_BodyType: 0
m_Simulated: 1
m_UseFullKinematicContacts: 0
m_UseAutoMass: 0
m_Mass: 1
m_LinearDrag: 0
m_AngularDrag: 0.05
m_GravityScale: 1
m_Material: {fileID: 0}
m_Interpolate: 0
m_SleepingMode: 1
m_CollisionDetection: 0
m_Constraints: 0
m_Enabled: 1
--- !u!82 &403186795
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 403186791}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 0
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!114 &403186796
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 403186791}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f9a880a4af99f7b4ca47a85c5b10b90f, type: 3}
m_Name:
m_EditorClassIdentifier:
PlayerPrefab: {fileID: 1400916412662404, guid: e39e9213b04aede49a12e77bc88f11a4,
type: 2}
RespawnTime: 5
RespawnPosition: {x: 0, y: 0, z: 0}
--- !u!1 &489446559
GameObject:
m_ObjectHideFlags: 0
@@ -998,7 +1034,7 @@ Tilemap:
- first: {x: -11, y: -4, z: 0}
second:
m_TileIndex: 9
m_TileSpriteIndex: 9
m_TileSpriteIndex: 167
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1187,7 +1223,7 @@ Tilemap:
- first: {x: -11, y: -3, z: 0}
second:
m_TileIndex: 8
m_TileSpriteIndex: 8
m_TileSpriteIndex: 9
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1376,7 +1412,7 @@ Tilemap:
- first: {x: -11, y: -2, z: 0}
second:
m_TileIndex: 7
m_TileSpriteIndex: 7
m_TileSpriteIndex: 8
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1565,7 +1601,7 @@ Tilemap:
- first: {x: -11, y: -1, z: 0}
second:
m_TileIndex: 6
m_TileSpriteIndex: 6
m_TileSpriteIndex: 7
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1691,7 +1727,7 @@ Tilemap:
- first: {x: -11, y: 0, z: 0}
second:
m_TileIndex: 5
m_TileSpriteIndex: 5
m_TileSpriteIndex: 6
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1817,7 +1853,7 @@ Tilemap:
- first: {x: -11, y: 1, z: 0}
second:
m_TileIndex: 4
m_TileSpriteIndex: 4
m_TileSpriteIndex: 5
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -1988,7 +2024,7 @@ Tilemap:
- first: {x: -11, y: 2, z: 0}
second:
m_TileIndex: 3
m_TileSpriteIndex: 3
m_TileSpriteIndex: 4
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -2150,7 +2186,7 @@ Tilemap:
- first: {x: -11, y: 3, z: 0}
second:
m_TileIndex: 2
m_TileSpriteIndex: 2
m_TileSpriteIndex: 3
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -2312,7 +2348,7 @@ Tilemap:
- first: {x: -11, y: 4, z: 0}
second:
m_TileIndex: 0
m_TileSpriteIndex: 1
m_TileSpriteIndex: 2
m_TileMatrixIndex: 0
m_TileColorIndex: 0
m_ObjectToInstantiate: {fileID: 0}
@@ -2812,6 +2848,8 @@ Tilemap:
m_TileSpriteArray:
- m_RefCount: 41
m_Data: {fileID: 21300000, guid: 4b853489fd7a76b4b9b6de748100e91d, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 21300120, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 1
@@ -2828,8 +2866,6 @@ Tilemap:
m_Data: {fileID: 21300360, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300400, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 1
m_Data: {fileID: 21300440, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300480, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 1
@@ -3144,8 +3180,8 @@ Tilemap:
m_Data: {fileID: 21300476, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 2
m_Data: {fileID: 21300516, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
- m_RefCount: 0
m_Data: {fileID: 0}
- m_RefCount: 1
m_Data: {fileID: 21300440, guid: 0f0229bf37171004fb08c6ec8a3946e5, type: 3}
m_TileMatrixArray:
- m_RefCount: 226
m_Data:
@@ -3515,6 +3551,48 @@ Tilemap:
e31: 0
e32: 0
e33: 1
--- !u!1001 &1303662950
Prefab:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalPosition.x
value: -3.4032
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalPosition.y
value: 1.265
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4816062612851216, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e39e9213b04aede49a12e77bc88f11a4, type: 2}
m_IsPrefabAsset: 0
--- !u!1 &1919711501
GameObject:
m_ObjectHideFlags: 0
Assets/Script/PlayerController.cs
+20 -23
View File
@@ -2,15 +2,6 @@
public class PlayerController : MonoBehaviour
{
//Definition des Inputs
/*[HideInInspector]*/ public string Horizontal;
[HideInInspector] public string Vertical;
[HideInInspector] public KeyCode JumpKey;
[HideInInspector] public KeyCode UseKey;
[HideInInspector] public KeyCode TakeKey;
public bool setuped = false;
[Space]
Rigidbody2D rb2;
[SerializeField]
float sensiX = 1;
@@ -21,7 +12,7 @@ public class PlayerController : MonoBehaviour
float DownDetector = 1;
[SerializeField]
float echo_act_3 = 10;
int layerMask = 1 << 9;
int layerMask = 1 << 9;
private bool IsGrounded = true;
RaycastHit2D hit;
SpriteRenderer rend;
@@ -37,7 +28,9 @@ public class PlayerController : MonoBehaviour
rb2 = gameObject.GetComponent<Rigidbody2D>();
layerMask = ~layerMask;
rend = gameObject.GetComponent<SpriteRenderer>();
//GameManager = GameObject.FindGameObjectWithTag("GameManager");
GameManager = GameObject.FindGameObjectWithTag("GameManager");
}
@@ -48,7 +41,7 @@ public class PlayerController : MonoBehaviour
#region
void OnCollisionStay2D(Collision2D other)
void OnCollisionEnter2D(Collision2D other)
{
if (other.transform != null && hit.transform !=null)
{
@@ -58,12 +51,23 @@ public class PlayerController : MonoBehaviour
}
}
}
void OnCollisionStay2D(Collision2D other)
{
if (other.transform != null && hit.transform != null)
{
if (other.transform.name == hit.transform.name)
{
IsGrounded = true;
}
}
}
void ShortInput()
{
// Si il faut rajouter su code pour différencer les manettes c'est ici
float horizontal = Input.GetAxisRaw(Horizontal) * sensiX;
float rawtical = Input.GetAxisRaw(Vertical) * sensiY;
float horizontal = Input.GetAxisRaw("Horizontal") * sensiX;
float rawtical = Input.GetAxisRaw("Vertical") * sensiY;
DectectInput(horizontal, rawtical);
}
@@ -72,7 +76,7 @@ public class PlayerController : MonoBehaviour
{
//Ici on preprocess les inputs
switch (Mathf.RoundToInt(vertical))
switch (Mathf.RoundToInt(Input.GetAxisRaw("Vertical")))
{
case 1:
@@ -97,18 +101,12 @@ public class PlayerController : MonoBehaviour
IsGrounded = false;
}
if (IsGrounded == false)
{
vertical = 0;
}
Move(horizontal, vertical);
if (IsGrounded == false)
{
rb2.gravityScale = echo_act_3;
vertical = 0;
}
else
{
@@ -149,7 +147,6 @@ public class PlayerController : MonoBehaviour
{
GameManager.GetComponent<AudioSource>().clip = DeathSound;
GameManager.GetComponent<AudioSource>().Play();
GameManager.GetComponent<GameManager>().Respawn();
Debug.Log("Les vivants morts: ceux qui tolèrent l'injustice");
Destroy(gameObject);
Assets/Sound.meta
+8
View File
@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 35b32c52a60dc7941aa679aa9985c868
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
ProjectSettings/TagManager.asset
+1
View File
@@ -6,6 +6,7 @@ TagManager:
tags:
- FallingBlock
- Tilemap
- GameManager
layers:
- Default
- TransparentFX