Skip to content

Commit 6f8df92

Browse files
committed
Added namespace to some scripts and FIxed Animation files with duplicated models
1 parent 8e74a9a commit 6f8df92

30 files changed

+3084
-597
lines changed
Binary file not shown.
Binary file not shown.

Dynamic Parkour System/Assets/Dynamic Parkour System/Prefabs/Player.prefab

Lines changed: 38 additions & 87 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ Transform:
2424
m_PrefabInstance: {fileID: 0}
2525
m_PrefabAsset: {fileID: 0}
2626
m_GameObject: {fileID: 5556358532925082188}
27-
m_LocalRotation: {x: -0.029345429, y: -0.06377024, z: 0.004761399, w: 0.9975217}
27+
m_LocalRotation: {x: -0.024210533, y: -0.0635295, z: 0.005072402, w: 0.9976734}
2828
m_LocalPosition: {x: 0, y: 0, z: 0}
2929
m_LocalScale: {x: 1, y: 1, z: 1}
3030
m_Children:
@@ -101,8 +101,8 @@ Transform:
101101
m_PrefabInstance: {fileID: 0}
102102
m_PrefabAsset: {fileID: 0}
103103
m_GameObject: {fileID: 5556358532959275495}
104-
m_LocalRotation: {x: 0.03162671, y: 0.0022977379, z: -0.00007270644, w: 0.9994972}
105-
m_LocalPosition: {x: -1.4810903, y: 2.0128083, z: -2.2720213}
104+
m_LocalRotation: {x: 0.04039458, y: 0.0026654424, z: -0.000107757754, w: 0.99918026}
105+
m_LocalPosition: {x: 0.0043398812, y: 1.7817322, z: -2.4903374}
106106
m_LocalScale: {x: 1, y: 1, z: 1}
107107
m_Children: []
108108
m_Father: {fileID: 5556358533142032527}
@@ -231,7 +231,7 @@ Transform:
231231
m_PrefabInstance: {fileID: 0}
232232
m_PrefabAsset: {fileID: 0}
233233
m_GameObject: {fileID: 5556358533096778056}
234-
m_LocalRotation: {x: -0.011244095, y: -0.063673384, z: 0.005917501, w: 0.9978899}
234+
m_LocalRotation: {x: -0.0061073005, y: -0.06342702, z: 0.0062240846, w: 0.9979484}
235235
m_LocalPosition: {x: 0, y: 0, z: 0}
236236
m_LocalScale: {x: 1, y: 1, z: 1}
237237
m_Children:
@@ -339,8 +339,8 @@ Transform:
339339
m_PrefabInstance: {fileID: 0}
340340
m_PrefabAsset: {fileID: 0}
341341
m_GameObject: {fileID: 5556358533144897770}
342-
m_LocalRotation: {x: 0.006908864, y: -0.0635552, z: 0.0070747077, w: 0.9979294}
343-
m_LocalPosition: {x: 0, y: 0, z: 0}
342+
m_LocalRotation: {x: 0.012533395, y: -0.06327932, z: 0.0074052988, w: 0.99788976}
343+
m_LocalPosition: {x: -0.00000050542565, y: 0.00000039228348, z: 0.0000037606615}
344344
m_LocalScale: {x: 1, y: 1, z: 1}
345345
m_Children:
346346
- {fileID: 5556358533691288225}
@@ -498,7 +498,7 @@ Transform:
498498
m_PrefabAsset: {fileID: 0}
499499
m_GameObject: {fileID: 5556358533377525086}
500500
m_LocalRotation: {x: 0.05183023, y: 0.066304006, z: -0.0034488074, w: 0.9964465}
501-
m_LocalPosition: {x: 0, y: 1.8864899, z: -4.211672}
501+
m_LocalPosition: {x: 0, y: 1.8864899, z: -4.2116737}
502502
m_LocalScale: {x: 1, y: 1, z: 1}
503503
m_Children:
504504
- {fileID: 5556358533144897771}
@@ -665,7 +665,7 @@ MonoBehaviour:
665665
m_Script: {fileID: 11500000, guid: 2ce077e73dad4e6459a2a7f99a5ce342, type: 3}
666666
m_Name:
667667
m_EditorClassIdentifier:
668-
_offset: {x: 0, y: 0, z: -2}
668+
_offset: {x: 0, y: 0, z: -1.5}
669669
_default: {x: 0, y: 0, z: 0}
670670
maxTime: 5
671671
--- !u!114 &1565225843
@@ -990,7 +990,7 @@ Transform:
990990
m_PrefabAsset: {fileID: 0}
991991
m_GameObject: {fileID: 5556358534259412728}
992992
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
993-
m_LocalPosition: {x: 0.36, y: 0.5, z: -1.86}
993+
m_LocalPosition: {x: 0.36, y: 0.5, z: -1.8600006}
994994
m_LocalScale: {x: 1, y: 1, z: 1}
995995
m_Children:
996996
- {fileID: 5556358533204089959}
@@ -1180,7 +1180,7 @@ GameObject:
11801180
- component: {fileID: 5556358534646836585}
11811181
- component: {fileID: 5556358534646836584}
11821182
m_Layer: 0
1183-
m_Name: Player
1183+
m_Name: PlayerModel
11841184
m_TagString: Player
11851185
m_Icon: {fileID: 0}
11861186
m_NavMeshLayer: 0
@@ -1198,7 +1198,7 @@ Transform:
11981198
m_LocalScale: {x: 1, y: 1, z: 1}
11991199
m_Children:
12001200
- {fileID: 5556358533626337606}
1201-
- {fileID: 5374658958455714127}
1201+
- {fileID: 4575614726672998396}
12021202
m_Father: {fileID: 5556358533142032527}
12031203
m_RootOrder: 3
12041204
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -1335,17 +1335,13 @@ MonoBehaviour:
13351335
RunSpeed: 4.5
13361336
fallForce: 2.5
13371337
enableFeetIK: 1
1338-
useProIKFeature: 1
1339-
environmentLayer:
1340-
serializedVersion: 2
1341-
m_Bits: 1281
13421338
heightFromGroundRaycast: 0.7
13431339
raycastDownDistance: 0.7
13441340
pelvisOffset: 0
13451341
pelvisUpDownSpeed: 0.25
13461342
feetToIKPositionSpeed: 0.25
1347-
leftFootAnimVariableName: LeftFootCurve
1348-
rightFootAnimVariableName: RightFootCurve
1343+
leftFootAnim: LeftFootCurve
1344+
rightFootAnim: RightFootCurve
13491345
--- !u!114 &5556358534646836586
13501346
MonoBehaviour:
13511347
m_ObjectHideFlags: 0
@@ -1378,15 +1374,9 @@ MonoBehaviour:
13781374
ledgeLayer:
13791375
serializedVersion: 2
13801376
m_Bits: 256
1381-
wallLayer:
1382-
serializedVersion: 2
1383-
m_Bits: 1024
13841377
climbLayer:
13851378
serializedVersion: 2
1386-
m_Bits: 1280
1387-
environmentLayer:
1388-
serializedVersion: 2
1389-
m_Bits: 1025
1379+
m_Bits: 513
13901380
OriginLedgeRay: {x: 0, y: 1.57, z: 0.1}
13911381
OriginFeetRay: {x: 0.3, y: -1, z: -0.3}
13921382
LedgeRayLength: 1.5
@@ -1443,126 +1433,87 @@ MonoBehaviour:
14431433
originFootIKOffset: {x: 0, y: 0, z: -0.41}
14441434
IKHandRayLength: 0.73
14451435
IKFootRayLength: 0.85
1446-
LHand: {fileID: 5418328446914608113}
1447-
RHand: {fileID: 6884716734290235065}
1448-
LFoot: {fileID: 6614467266380392676}
1449-
RFoot: {fileID: 4314689455366298590}
1436+
AutoSearchBones: 1
1437+
LHand: {fileID: 0}
1438+
RHand: {fileID: 0}
1439+
LFoot: {fileID: 0}
1440+
RFoot: {fileID: 0}
14501441
LHandAnimVariableName: LHandCurve
14511442
RHandAnimVariableName: RHandCurve
14521443
LFootAnimVariableName: LeftFootCurve
14531444
RFootAnimVariableName: RightFootCurve
1454-
--- !u!1001 &5556358533754312356
1445+
--- !u!1001 &4104292345617233943
14551446
PrefabInstance:
14561447
m_ObjectHideFlags: 0
14571448
serializedVersion: 2
14581449
m_Modification:
14591450
m_TransformParent: {fileID: 5556358534646836579}
14601451
m_Modifications:
1461-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1452+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14621453
type: 3}
14631454
propertyPath: m_RootOrder
14641455
value: 1
14651456
objectReference: {fileID: 0}
1466-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1457+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14671458
type: 3}
14681459
propertyPath: m_LocalPosition.x
14691460
value: 0
14701461
objectReference: {fileID: 0}
1471-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1462+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14721463
type: 3}
14731464
propertyPath: m_LocalPosition.y
14741465
value: 0
14751466
objectReference: {fileID: 0}
1476-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1467+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14771468
type: 3}
14781469
propertyPath: m_LocalPosition.z
14791470
value: 0
14801471
objectReference: {fileID: 0}
1481-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1472+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14821473
type: 3}
14831474
propertyPath: m_LocalRotation.w
14841475
value: 1
14851476
objectReference: {fileID: 0}
1486-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1477+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14871478
type: 3}
14881479
propertyPath: m_LocalRotation.x
14891480
value: -0
14901481
objectReference: {fileID: 0}
1491-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1482+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14921483
type: 3}
14931484
propertyPath: m_LocalRotation.y
14941485
value: -0
14951486
objectReference: {fileID: 0}
1496-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1487+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
14971488
type: 3}
14981489
propertyPath: m_LocalRotation.z
14991490
value: -0
15001491
objectReference: {fileID: 0}
1501-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1492+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
15021493
type: 3}
15031494
propertyPath: m_LocalEulerAnglesHint.x
15041495
value: 0
15051496
objectReference: {fileID: 0}
1506-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1497+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
15071498
type: 3}
15081499
propertyPath: m_LocalEulerAnglesHint.y
15091500
value: 0
15101501
objectReference: {fileID: 0}
1511-
- target: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1502+
- target: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
15121503
type: 3}
15131504
propertyPath: m_LocalEulerAnglesHint.z
15141505
value: 0
15151506
objectReference: {fileID: 0}
1516-
- target: {fileID: 919132149155446097, guid: 22b711a6bc0709f418fc54e2888f622e,
1507+
- target: {fileID: 919132149155446097, guid: 1d2ab63b861fb5f40954f749c04af063,
15171508
type: 3}
15181509
propertyPath: m_Name
1519-
value: Mesh
1520-
objectReference: {fileID: 0}
1521-
- target: {fileID: 5866666021909216657, guid: 22b711a6bc0709f418fc54e2888f622e,
1522-
type: 3}
1523-
propertyPath: m_Enabled
1524-
value: 0
1525-
objectReference: {fileID: 0}
1526-
- target: {fileID: 5866666021909216657, guid: 22b711a6bc0709f418fc54e2888f622e,
1527-
type: 3}
1528-
propertyPath: m_Controller
1529-
value:
1530-
objectReference: {fileID: 9100000, guid: e3e25480d2d5544409a577f05406fb17, type: 2}
1531-
- target: {fileID: 5866666021909216657, guid: 22b711a6bc0709f418fc54e2888f622e,
1532-
type: 3}
1533-
propertyPath: m_ApplyRootMotion
1534-
value: 0
1510+
value: Erika
15351511
objectReference: {fileID: 0}
1536-
m_RemovedComponents:
1537-
- {fileID: 5866666021909216657, guid: 22b711a6bc0709f418fc54e2888f622e, type: 3}
1538-
m_SourcePrefab: {fileID: 100100000, guid: 22b711a6bc0709f418fc54e2888f622e, type: 3}
1539-
--- !u!4 &5374658958455714127 stripped
1512+
m_RemovedComponents: []
1513+
m_SourcePrefab: {fileID: 100100000, guid: 1d2ab63b861fb5f40954f749c04af063, type: 3}
1514+
--- !u!4 &4575614726672998396 stripped
15401515
Transform:
1541-
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 22b711a6bc0709f418fc54e2888f622e,
1542-
type: 3}
1543-
m_PrefabInstance: {fileID: 5556358533754312356}
1544-
m_PrefabAsset: {fileID: 0}
1545-
--- !u!1 &6614467266380392676 stripped
1546-
GameObject:
1547-
m_CorrespondingSourceObject: {fileID: 1645898859189091904, guid: 22b711a6bc0709f418fc54e2888f622e,
1548-
type: 3}
1549-
m_PrefabInstance: {fileID: 5556358533754312356}
1550-
m_PrefabAsset: {fileID: 0}
1551-
--- !u!1 &4314689455366298590 stripped
1552-
GameObject:
1553-
m_CorrespondingSourceObject: {fileID: -649365422237708934, guid: 22b711a6bc0709f418fc54e2888f622e,
1554-
type: 3}
1555-
m_PrefabInstance: {fileID: 5556358533754312356}
1556-
m_PrefabAsset: {fileID: 0}
1557-
--- !u!1 &5418328446914608113 stripped
1558-
GameObject:
1559-
m_CorrespondingSourceObject: {fileID: -8778109796107686571, guid: 22b711a6bc0709f418fc54e2888f622e,
1560-
type: 3}
1561-
m_PrefabInstance: {fileID: 5556358533754312356}
1562-
m_PrefabAsset: {fileID: 0}
1563-
--- !u!1 &6884716734290235065 stripped
1564-
GameObject:
1565-
m_CorrespondingSourceObject: {fileID: -7883749328917080035, guid: 22b711a6bc0709f418fc54e2888f622e,
1516+
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 1d2ab63b861fb5f40954f749c04af063,
15661517
type: 3}
1567-
m_PrefabInstance: {fileID: 5556358533754312356}
1518+
m_PrefabInstance: {fileID: 4104292345617233943}
15681519
m_PrefabAsset: {fileID: 0}

Dynamic Parkour System/Assets/Dynamic Parkour System/Resources/ActionsConfig/VaultReach.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MonoBehaviour:
1919
startDelay: 0
2020
layer:
2121
serializedVersion: 2
22-
m_Bits: 1024
22+
m_Bits: 4294967295
2323
tag: Reach
2424
midHeight: 1.2
2525
maxHeight: 2

0 commit comments

Comments
 (0)