Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Rouet Gwenn
Momie
Commits
cee437c4
Commit
cee437c4
authored
May 11, 2021
by
Pablo Cancoin Desktop
Browse files
Menage
parent
905fa432
Changes
15
Hide whitespace changes
Inline
Side-by-side
Assets/Prefabs/EnsembleMomie.prefab
View file @
cee437c4
...
...
@@ -626,7 +626,6 @@ GameObject:
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
6907266747298618739
}
-
component
:
{
fileID
:
6907266747298618738
}
-
component
:
{
fileID
:
6907266747298618741
}
m_Layer
:
0
m_Name
:
tas_eparse
...
...
@@ -666,22 +665,6 @@ Transform:
m_Father
:
{
fileID
:
6907266746615436623
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
7.2050004
,
y
:
90.00001
,
z
:
0
}
---
!u!114
&6907266747298618738
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6907266747298618736
}
m_Enabled
:
0
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
2870729a84abf7148bfe0aac37f89d10
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
minForce
:
50
maxForce
:
150
radius
:
10
start
:
0
---
!u!54
&6907266747298618741
Rigidbody
:
m_ObjectHideFlags
:
0
...
...
@@ -772,18 +755,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
---
!u!1
&5988348601444992274
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747277719619
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924922366320552
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747277719619
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348601444992274
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747277719619
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747307848074
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -933,18 +916,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
e411b557d6780664b9e9d68c11c9c994
,
type
:
3
}
---
!u!4
&6363924922327864929
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
e411b557d6780664b9e9d68c11c9c994
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747307848074
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348601475779803
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
e411b557d6780664b9e9d68c11c9c994
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747307848074
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924922327864929
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
e411b557d6780664b9e9d68c11c9c994
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747307848074
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747340952407
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1019,18 +1002,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
9919a46d82d321f40add279de54501e5
,
type
:
3
}
---
!u!1
&5988348601375206918
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
9919a46d82d321f40add279de54501e5
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747340952407
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924922294432956
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
9919a46d82d321f40add279de54501e5
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747340952407
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348601375206918
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
9919a46d82d321f40add279de54501e5
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747340952407
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747673734977
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1105,18 +1088,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
935d3f642db4a5a41945fc8fe9f0316a
,
type
:
3
}
---
!u!4
&6363924922003654826
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
935d3f642db4a5a41945fc8fe9f0316a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747673734977
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348601707319824
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
935d3f642db4a5a41945fc8fe9f0316a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747673734977
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924922003654826
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
935d3f642db4a5a41945fc8fe9f0316a
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747673734977
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747705635713
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1191,18 +1174,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
881d485510964d3468e6769fd98e1a44
,
type
:
3
}
---
!u!1
&5988348600798777040
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
881d485510964d3468e6769fd98e1a44
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747705635713
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924921971758186
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
881d485510964d3468e6769fd98e1a44
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747705635713
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348600798777040
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
881d485510964d3468e6769fd98e1a44
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747705635713
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747850591806
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -1363,18 +1346,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
143d8b684f5e1834d91de71d4b7e4398
,
type
:
3
}
---
!u!1
&5988348600963167049
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
143d8b684f5e1834d91de71d4b7e4398
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747868433944
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924921800567283
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
143d8b684f5e1834d91de71d4b7e4398
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747868433944
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348600963167049
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
143d8b684f5e1834d91de71d4b7e4398
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266747868433944
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266747873902910
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -2166,18 +2149,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
---
!u!4
&6363924921251149150
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748392886965
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&5988348600413745124
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
919132149155446097
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748392886965
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924921251149150
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
36605d014ac379d40a9c1f6703ae106f
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748392886965
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266748404425696
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -2272,18 +2255,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
351c4b557d2a1114ca8144ac15509931
,
type
:
3
}
---
!u!4
&6363924921264768011
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
351c4b557d2a1114ca8144ac15509931
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748404425696
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&3357196797673809512
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
8164078558771037576
,
guid
:
351c4b557d2a1114ca8144ac15509931
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748404425696
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924921264768011
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
351c4b557d2a1114ca8144ac15509931
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748404425696
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266748435695136
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
@@ -2373,18 +2356,18 @@ PrefabInstance:
objectReference
:
{
fileID
:
0
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
269107188bc9001409bf9e5eedf90c6c
,
type
:
3
}
---
!u!4
&6363924921241690571
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
269107188bc9001409bf9e5eedf90c6c
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748435695136
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&3357196797575349160
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
8164078558771037576
,
guid
:
269107188bc9001409bf9e5eedf90c6c
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748435695136
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!4
&6363924921241690571
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
269107188bc9001409bf9e5eedf90c6c
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
6907266748435695136
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1001
&6907266748455516321
PrefabInstance
:
m_ObjectHideFlags
:
0
...
...
Assets/Scenes/Principal.unity
View file @
cee437c4
...
...
@@ -5357,7 +5357,6 @@ GameObject:
serializedVersion: 6
m_Component:
- component: {fileID: 381371690}
- component: {fileID: 381371692}
- component: {fileID: 381371691}
m_Layer: 0
m_Name: tas_eparse
...
...
@@ -5412,22 +5411,6 @@ Rigidbody:
m_Interpolate: 0
m_Constraints: 126
m_CollisionDetection: 0
--- !u!114 &381371692
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 381371689}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2870729a84abf7148bfe0aac37f89d10, type: 3}
m_Name:
m_EditorClassIdentifier:
minForce: 50
maxForce: 150
radius: 10
start: 0
--- !u!1 &385743650
GameObject:
m_ObjectHideFlags: 0
...
...
@@ -31047,7 +31030,8 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 1.315
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedComponents:
- {fileID: 6907266747298618738, guid: cc25f91a29b04e240843d052138a4f5c, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: cc25f91a29b04e240843d052138a4f5c, type: 3}
--- !u!4 &6950410354655815188
Transform:
...
...
Assets/Scripts/Explosion.cs
deleted
100644 → 0
View file @
905fa432
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
public
class
Explosion
:
MonoBehaviour
{
public
float
minForce
;
public
float
maxForce
;
public
float
radius
;
public
bool
start
;
void
Update
()
{
if
(
start
)
{
Explode
();
}
start
=
false
;
}
public
void
Explode
()
{
foreach
(
Transform
t
in
transform
)
{
var
rb
=
t
.
GetComponent
<
Rigidbody
>();
if
(
rb
!=
null
)
{
rb
.
AddExplosionForce
(
Random
.
Range
(
minForce
,
maxForce
),
transform
.
position
-
new
Vector3
(-
5
,
0
,
0
),
radius
);
}
}
}
}
Assets/Scripts/Explosion.cs.meta
deleted
100644 → 0
View file @
905fa432
fileFormatVersion: 2
guid: 2870729a84abf7148bfe0aac37f89d10
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Assets/Scripts/
Demo
.meta
→
Assets/Scripts/
Sequences
.meta
View file @
cee437c4
File moved
Assets/ScriptRecoOs.cs
→
Assets/
Scripts/Sequences/
ScriptRecoOs.cs
View file @
cee437c4
File moved
Assets/ScriptRecoOs.cs.meta
→
Assets/
Scripts/Sequences/
ScriptRecoOs.cs.meta
View file @
cee437c4
File moved
Assets/Scripts/
Demo
/fouilleScript.cs
→
Assets/Scripts/
Sequences
/fouilleScript.cs
View file @
cee437c4
...
...
@@ -43,9 +43,6 @@ public class fouilleScript : MonoBehaviour
{
spawnTime
=
Time
.
time
;
//Component[] ChildrenRenderer = bones.GetComponentsInChildren(typeof(GameObject));
//bones.SetActive(false);
mummy_script
.
enabled
=
true
;
ball
.
SetActive
(
true
);
smoke
.
Play
();
...
...
@@ -61,12 +58,8 @@ public class fouilleScript : MonoBehaviour
yield
return
new
WaitForSeconds
(
0.3f
);
// bones.SetActive(true);
// bones.GetComponentInChildren<Rigidbody>().useGravity = true;
foreach
(
Transform
child
in
bones
.
transform
)
{
//child.gameObject.SetActive(true);
child
.
gameObject
.
GetComponent
<
Rigidbody
>().
constraints
=
RigidbodyConstraints
.
None
;
yield
return
new
WaitForSeconds
(
0.04f
);
child
.
gameObject
.
GetComponentInChildren
<
Rigidbody
>().
useGravity
=
true
;
...
...
@@ -76,7 +69,6 @@ public class fouilleScript : MonoBehaviour
mummy_script
.
enabled
=
true
;
//momie.SetActive(false);
yield
return
new
WaitForSeconds
(
0.5f
);
mummy_script
.
enabled
=
false
;
...
...
Assets/Scripts/
Demo
/fouilleScript.cs.meta
→
Assets/Scripts/
Sequences
/fouilleScript.cs.meta
View file @
cee437c4
File moved
Assets/Scripts/
Demo
/setAlpha.cs
→
Assets/Scripts/
Sequences
/setAlpha.cs
View file @
cee437c4
...
...
@@ -6,7 +6,6 @@ public class setAlpha : MonoBehaviour
{
public
float
fadeSpeed
=
0.1f
;
private
Material
enveloppeMaterial
;
// Value used to know when the enemy has been spawned
private
float
spawnTime
;
// Use this for initialization
...
...
Assets/Scripts/
Demo
/setAlpha.cs.meta
→
Assets/Scripts/
Sequences
/setAlpha.cs.meta
View file @
cee437c4
File moved
Assets/Scripts/
Demo
/tomoScript.cs
→
Assets/Scripts/
Sequences
/tomoScript.cs
View file @
cee437c4
File moved
Assets/Scripts/
Demo
/tomoScript.cs.meta
→
Assets/Scripts/
Sequences
/tomoScript.cs.meta
View file @
cee437c4
File moved
Assets/Scripts/ZoneSlider.cs
deleted
100644 → 0
View file @
905fa432
using
System.Collections
;
using
System.Collections.Generic
;
using
UnityEngine
;
using
Leap.Unity.Interaction
;
using
TMPro
;
public
class
ZoneSlider
:
MonoBehaviour
{
public
InteractionSlider
slider
;
public
TextMeshProUGUI
zoneText
;
// Start is called before the first frame update
void
Start
()
{
slider
.
HorizontalSlideEvent
+=
zone
;
}
private
void
zone
(
float
f
)
{
if
(
slider
.
isPressed
)
{
if
(
f
<
0.5
)
{
zoneText
.
text
=
"Zone 1"
;
}
else
{
zoneText
.
text
=
"Zone 2"
;
}
}
}
}
Assets/Scripts/ZoneSlider.cs.meta
deleted
100644 → 0
View file @
905fa432
fileFormatVersion: 2
guid: 7aebffdc0d4dc494f8200bfd136098e5
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment