Browse Source

ciruclar loop added for bodies & camera updates

main
cailean 9 months ago
parent
commit
8c46a110bc
  1. 545
      Assets/5_Scenes/DreconDemo.unity
  2. 10
      Assets/8_Scripts/1_Managers/BodyManager.cs
  3. 8
      Assets/8_Scripts/1_Managers/CameraManager.cs
  4. 12
      Assets/8_Scripts/2_General/RotationOffset.cs
  5. 11
      Assets/8_Scripts/2_General/RotationOffset.cs.meta
  6. 2
      Assets/9_Models/Humanoid/SMPLX/SMLPXModel_Loose_Joints.prefab
  7. 2
      Assets/9_Models/Humanoid/SMPLX/basicModel_m_lbs_10_207_0_v1.0.2 (1).prefab
  8. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json
  9. 2
      ProjectSettings/TagManager.asset

545
Assets/5_Scenes/DreconDemo.unity

@ -219,7 +219,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &62178362
Transform:
m_ObjectHideFlags: 0
@ -228,7 +228,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62178361}
serializedVersion: 2
m_LocalRotation: {x: 0.003875177, y: -0.029749023, z: 0.000115334624, w: 0.9995499}
m_LocalRotation: {x: 0.00623864, y: -0.029748663, z: 0.000185677, w: 0.99953794}
m_LocalPosition: {x: 24.371735, y: 8, z: -83.27547}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -252,7 +252,7 @@ MonoBehaviour:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 100000
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 1853480535}
m_Follow: {fileID: 1014898013}
@ -262,7 +262,7 @@ MonoBehaviour:
NearClipPlane: 0.1
FarClipPlane: 50000
Dutch: 0
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -417,7 +417,7 @@ MonoBehaviour:
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -681,7 +681,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &298844362
Transform:
m_ObjectHideFlags: 0
@ -724,7 +724,7 @@ MonoBehaviour:
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -826,15 +826,15 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.01
far clip plane: 50000
field of view: 40
near clip plane: 0.1
far clip plane: 5000
field of view: 14
orthographic: 0
orthographic size: 5.2
orthographic size: 10
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 383
m_Bits: 1407
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
@ -854,8 +854,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: 0.1728549, y: 0.8900992, z: 0.1411097, w: 0.3974074}
m_LocalPosition: {x: 93.69663, y: 11.427768, z: 12.745178}
m_LocalRotation: {x: 0.014131192, y: 0.76026535, z: 0.016547535, w: -0.6492482}
m_LocalPosition: {x: 75.44, y: 18.08, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -1288,103 +1288,6 @@ Transform:
- {fileID: 2031268867}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &552738671
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 552738672}
- component: {fileID: 552738673}
- component: {fileID: 552738674}
m_Layer: 0
m_Name: Mound-Top
m_TagString: vc_Body
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &552738672
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 552738671}
serializedVersion: 2
m_LocalRotation: {x: 0.31746292, y: -0.6318365, z: 0.6318365, w: 0.31746292}
m_LocalPosition: {x: 18.2, y: 10.3, z: 1.5}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 633725997}
m_Father: {fileID: 1346050330}
m_LocalEulerAnglesHint: {x: 90, y: -126.646, z: 0}
--- !u!114 &552738673
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 552738671}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 15.53
OrthographicSize: 0.43
NearClipPlane: 1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
Iso: 200
ShutterSpeed: 0.005
Aperture: 16
BladeCount: 5
Curvature: {x: 2, y: 11}
BarrelClipping: 0.25
Anamorphism: 0
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 633725997}
--- !u!114 &552738674
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 552738671}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 449ef5ebbe24720439ec31d15f7b6f3d, type: 3}
m_Name:
m_EditorClassIdentifier:
m_FocusTracksTarget: 0
m_FocusTracking: 4
m_FocusTarget: {fileID: 0}
m_FocusOffset: 0
m_Profile: {fileID: 11400000, guid: d49226c597192874a9da3c6697ea8d37, type: 2}
--- !u!1 &564611601
GameObject:
m_ObjectHideFlags: 0
@ -1417,68 +1320,6 @@ Transform:
- {fileID: 1601195943}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &633725996
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 633725997}
- component: {fileID: 633725999}
- component: {fileID: 633725998}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &633725997
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633725996}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 552738672}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &633725998
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633725996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: a3dacaec0287d7444b4bd276816e1666, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 3
m_FrequencyGain: 0.21
mNoiseOffsets: {x: -47.187897, y: 705.16565, z: -658.32715}
--- !u!114 &633725999
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 633725996}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &709210744
GameObject:
m_ObjectHideFlags: 0
@ -1541,10 +1382,11 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Rigidbody: {fileID: 6293844864974396996, guid: 49035d8f1718d354cac6d547795a0cb4,
type: 3}
m_SpawnTime: 2
m_DefaultPoolCapacity: 30
m_SpawnTime: 0.2
m_DefaultPoolCapacity: 25
m_MaxPoolCapacity: 40
m_Parent: {fileID: 1517085324}
m_SpawnParent: {fileID: 1568199458}
--- !u!4 &756894921
Transform:
m_ObjectHideFlags: 0
@ -1596,6 +1438,119 @@ Transform:
- {fileID: 2024068565}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &766384027
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 766384028}
- component: {fileID: 766384030}
- component: {fileID: 766384031}
- component: {fileID: 766384032}
- component: {fileID: 766384033}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &766384028
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766384027}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 19.341925, y: 6.744215, z: 1.1490406}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1634889328}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &766384030
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766384027}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &766384031
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766384027}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 0, z: 0}
m_XDamping: 0
m_YDamping: 0
m_ZDamping: 0
m_AngularDampingMode: 0
m_PitchDamping: 0
m_YawDamping: 0
m_RollDamping: 0
m_AngularDamping: 0
--- !u!114 &766384032
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766384027}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: -40, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &766384033
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 766384027}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 68bb026fafb42b14791938953eaace77, type: 3}
m_Name:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 1
m_FrequencyGain: 0.25
mNoiseOffsets: {x: -277.82047, y: 306.06458, z: -773.1399}
--- !u!1 &792989023
GameObject:
m_ObjectHideFlags: 0
@ -1778,7 +1733,7 @@ MonoBehaviour:
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: -95
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -1806,7 +1761,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.52918464, y: -0.000000026320038, z: 0.000000016414909, w: 0.8485067}
m_LocalRotation: {x: 0.52918464, y: -0.000000017930528, z: 0.000000011182658, w: 0.8485067}
m_LocalPosition: {x: 18.113062, y: 9.285504, z: -0.5535152}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1992,7 +1947,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &949034604
Transform:
m_ObjectHideFlags: 0
@ -2032,7 +1987,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 50
OrthographicSize: 116.57
NearClipPlane: 0.01
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 2
@ -2576,12 +2531,12 @@ Transform:
- {fileID: 153031625}
- {fileID: 1955078060}
- {fileID: 882491598}
- {fileID: 552738672}
- {fileID: 1657725490}
- {fileID: 298844362}
- {fileID: 949034604}
- {fileID: 62178362}
- {fileID: 1440085504}
- {fileID: 1634889328}
m_Father: {fileID: 547443783}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1361807059
@ -2881,7 +2836,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1440085504
Transform:
m_ObjectHideFlags: 0
@ -2914,7 +2869,7 @@ MonoBehaviour:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 1000000
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 1853480535}
m_Follow: {fileID: 39290366}
@ -2944,6 +2899,39 @@ MonoBehaviour:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 105761589}
--- !u!1 &1450629402
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1450629403}
m_Layer: 0
m_Name: Body Carousel
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1450629403
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1450629402}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 2.5, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1568199458}
- {fileID: 1645504645}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1517085323
GameObject:
m_ObjectHideFlags: 0
@ -3069,6 +3057,50 @@ Transform:
- {fileID: 1714340264729177822}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1568199457
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1568199458}
- component: {fileID: 1568199459}
m_Layer: 0
m_Name: Body Spawn Location
m_TagString: Untagged
m_Icon: {fileID: 5132851093641282708, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1568199458
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568199457}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 5, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1450629403}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1568199459
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1568199457}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdec66b4af82b494f830bb5ac54844ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &1601195942
PrefabInstance:
m_ObjectHideFlags: 0
@ -3168,6 +3200,11 @@ PrefabInstance:
propertyPath: m_Name
value: Rocks
objectReference: {fileID: 0}
- target: {fileID: 8980549144392899874, guid: 48098b8dbd129e14a8ce29e7d166189a,
type: 3}
propertyPath: m_Layer
value: 10
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
@ -3180,6 +3217,129 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1601195942}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1634889327
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1634889328}
- component: {fileID: 1634889329}
m_Layer: 0
m_Name: Mound-Top-Down
m_TagString: vc_Body
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1634889328
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634889327}
serializedVersion: 2
m_LocalRotation: {x: -0.25415206, y: 0.6907072, z: -0.61357707, w: -0.28610042}
m_LocalPosition: {x: 22.891924, y: 9.244215, z: 4.6990404}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 766384028}
m_Father: {fileID: 1346050330}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1634889329
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634889327}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 45e653bab7fb20e499bda25e1b646fea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ExcludedPropertiesInInspector:
- m_Script
m_LockStageInInspector:
m_StreamingVersion: 20170927
m_Priority: 1000
m_StandbyUpdate: 2
m_LookAt: {fileID: 1853480535}
m_Follow: {fileID: 1645504645}
m_Lens:
FieldOfView: 40
OrthographicSize: 0.53
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: 0
ModeOverride: 1
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
Iso: 200
ShutterSpeed: 0.005
Aperture: 16
BladeCount: 5
Curvature: {x: 2, y: 11}
BarrelClipping: 0.25
Anamorphism: 0
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 766384028}
--- !u!1 &1645504644
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1645504645}
- component: {fileID: 1645504646}
m_Layer: 0
m_Name: Camera Offset
m_TagString: Untagged
m_Icon: {fileID: 3936346786652291628, guid: 0000000000000000d000000000000000, type: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1645504645
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1645504644}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 3.55, y: 0, z: 3.55}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1450629403}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1645504646
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1645504644}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fdec66b4af82b494f830bb5ac54844ea, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1657725489
GameObject:
m_ObjectHideFlags: 0
@ -3196,7 +3356,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &1657725490
Transform:
m_ObjectHideFlags: 0
@ -3239,7 +3399,7 @@ MonoBehaviour:
NearClipPlane: 0.1
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -3359,7 +3519,7 @@ Transform:
m_GameObject: {fileID: 1853480531}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0.6, z: 0}
m_LocalPosition: {x: 0, y: 0.2, z: 0}
m_LocalScale: {x: 1.5235814, y: 1.5235814, z: 1.5235814}
m_ConstrainProportionsScale: 0
m_Children: []
@ -3610,7 +3770,7 @@ MonoBehaviour:
NearClipPlane: 1.11
FarClipPlane: 5000
Dutch: 0
ModeOverride: 0
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -3638,7 +3798,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955078056}
serializedVersion: 2
m_LocalRotation: {x: -0.0000005639385, y: 0.7132504, z: -0.7009093, w: -0.0000005738679}
m_LocalRotation: {x: 0.0000014609433, y: 0.7132504, z: -0.7009093, w: 0.0000014866663}
m_LocalPosition: {x: 18.113062, y: 10.981609, z: -0.6314695}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3662,7 +3822,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!4 &2024068565
Transform:
m_ObjectHideFlags: 0
@ -3692,16 +3852,16 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_Everything:
serializedVersion: 2
m_Bits: 383
m_Bits: 1407
m_Agent:
serializedVersion: 2
m_Bits: 127
m_Bits: 1151
m_Bodies:
serializedVersion: 2
m_Bits: 311
m_Bits: 1335
m_Environment:
serializedVersion: 2
m_Bits: 63
m_Bits: 1087
m_CameraBlendMin: 3
m_CameraBlendMax: 4
m_CameraSwapMin: 7
@ -14716,6 +14876,7 @@ SceneRoots:
- {fileID: 21194790}
- {fileID: 543450651852864845}
- {fileID: 327870760}
- {fileID: 1450629403}
- {fileID: 1517085324}
- {fileID: 1853480535}
- {fileID: 709210745}

10
Assets/8_Scripts/1_Managers/BodyManager.cs

@ -13,8 +13,10 @@ public class BodyManager : MonoBehaviour
public int m_DefaultPoolCapacity;
public int m_MaxPoolCapacity;
public Transform m_Parent;
public Transform m_SpawnParent;
private Vector3 m_PelvisPosition;
private void Awake()
{
if (_instance != null)
@ -35,8 +37,8 @@ public class BodyManager : MonoBehaviour
private Body CreateBody()
{
Vector3 spawnPos = new Vector3(this.transform.position.x + Random.Range(-0.5f, 0.5f), this.transform.position.y, this.transform.position.z + Random.Range(-0.5f, .5f));
Body body = Instantiate(m_Rigidbody, spawnPos, new Quaternion(Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180)), m_Parent);
Vector3 spawnPos = new Vector3(this.transform.position.x + Random.Range(-0.2f, 0.2f), this.transform.position.y, this.transform.position.z + Random.Range(-0.2f, .2f));
Body body = Instantiate(m_Rigidbody, m_SpawnParent.position, new Quaternion(Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180), Random.Range(0, 180)), m_Parent);
body.m_Pelvis.gameObject.GetComponent<Rigidbody>().AddForce(new Vector3(1, 1, 1));
m_PelvisPosition = body.m_Pelvis.position;
body.SetPool(m_Pool);
@ -45,7 +47,7 @@ public class BodyManager : MonoBehaviour
private void OnTakeBodyFromPool(Body body)
{
body.m_Pelvis.transform.position = m_PelvisPosition;
body.m_Pelvis.transform.position = m_SpawnParent.position;
body.gameObject.SetActive(true);
}
@ -61,7 +63,7 @@ public class BodyManager : MonoBehaviour
IEnumerator Spawn()
{
yield return new WaitForSecondsRealtime(Random.Range(3f, 7f));
yield return new WaitForSecondsRealtime(Random.Range(1f, 2.5f));
m_Pool.Get();
StartCoroutine(Spawn());

8
Assets/8_Scripts/1_Managers/CameraManager.cs

@ -77,7 +77,7 @@ public class CameraManager : MonoBehaviour
m_Camera.cullingMask = m_Bodies;
break;
case "vc_Environment":
m_Camera.cullingMask = m_Bodies;
m_Camera.cullingMask = m_Environment;
break;
default:
case "vc_Default":
@ -153,7 +153,8 @@ public class CameraManager : MonoBehaviour
CinemachineBrain cmBrain = m_Brain.GetComponent<CinemachineBrain>();
float blendtime = (float)Random.Range(m_CameraBlendMin, m_CameraBlendMax);
if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent"))
if (AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Agent") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Body")
|| AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Environment", "vc_Environment") || AreDifferentPairs(pastCamera.tag, m_ActiveCamera.tag, "vc_Body", "vc_Body"))
blendtime = 0;
cmBrain.m_DefaultBlend.m_Time = blendtime;
@ -185,6 +186,7 @@ public class CameraManager : MonoBehaviour
{
foreach(Transform child in parentObject.transform)
{
if(child.gameObject.activeSelf)
m_CameraObjects.Add(child.gameObject);
}
}
@ -202,6 +204,8 @@ public class CameraManager : MonoBehaviour
Debug.LogError("CM Brain <GameObject> could not be found.");
}
Debug.Log(m_CameraObjects.Count);
}

12
Assets/8_Scripts/2_General/RotationOffset.cs

@ -0,0 +1,12 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
public class RotationOffset : MonoBehaviour
{
private float m_Speed = 2.5f;
private void FixedUpdate()
{
transform.RotateAround(transform.parent.transform.position, Vector3.up, m_Speed * Time.fixedDeltaTime);
}
}

11
Assets/8_Scripts/2_General/RotationOffset.cs.meta

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: fdec66b4af82b494f830bb5ac54844ea
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

2
Assets/9_Models/Humanoid/SMPLX/SMLPXModel_Loose_Joints.prefab

@ -306,7 +306,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Pelvis: {fileID: 4895783841800412640}
m_DespawnTimer: 50
m_DespawnTimer: 5
--- !u!1 &2317700900345097672
GameObject:
m_ObjectHideFlags: 0

2
Assets/9_Models/Humanoid/SMPLX/basicModel_m_lbs_10_207_0_v1.0.2 (1).prefab

@ -306,7 +306,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Pelvis: {fileID: 4895783841800412640}
m_DespawnTimer: 100
m_DespawnTimer: 45
--- !u!1 &2317700900345097672
GameObject:
m_ObjectHideFlags: 0

2
Assets/ML-Agents/Timers/DreconDemo_timers.json

@ -1 +1 @@
{"count":1,"self":352.13857279999996,"total":368.1310928,"children":{"InitializeActuators":{"count":1,"self":0.0020099,"total":0.0020099,"children":null},"InitializeSensors":{"count":1,"self":0.0015163,"total":0.0015163,"children":null},"AgentSendState":{"count":21437,"self":0.17361959999999999,"total":5.1550451,"children":{"CollectObservations":{"count":10719,"self":4.9135431999999994,"total":4.9135433,"children":null},"WriteActionMask":{"count":10719,"self":0.013038399999999999,"total":0.013038399999999999,"children":null},"RequestDecision":{"count":10719,"self":0.0548438,"total":0.0548438,"children":null}}},"DecideAction":{"count":21437,"self":6.8029288,"total":6.8029291,"children":null},"AgentAct":{"count":21437,"self":4.0310136,"total":4.0310135,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":10,"max":4646.662,"min":59.2991867,"runningAverage":926.775269,"value":168.378342,"weightedAverage":639.4295}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712760894","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 4874cbb0-3ab6-4370-af74-dc24d0dd5dbe -accessToken gtOVuQT275ZJTcNaM_jom0CkevszjNJVBq4tQAWtuSU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712761262"}}
{"count":1,"self":76.9741568,"total":79.1122367,"children":{"InitializeActuators":{"count":1,"self":0.0005041,"total":0.0005041,"children":null},"InitializeSensors":{"count":1,"self":0.0010007,"total":0.0010007,"children":null},"AgentSendState":{"count":4383,"self":0.0261377,"total":0.55289369999999993,"children":{"CollectObservations":{"count":2192,"self":0.51046819999999993,"total":0.51046819999999993,"children":null},"WriteActionMask":{"count":2192,"self":0.0017471,"total":0.0017471,"children":null},"RequestDecision":{"count":2192,"self":0.0145407,"total":0.0145407,"children":null}}},"DecideAction":{"count":4383,"self":0.9455952,"total":0.9455952,"children":null},"AgentAct":{"count":4383,"self":0.6370874,"total":0.6370874,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":60.3221054,"min":60.3221054,"runningAverage":60.3221054,"value":60.3221054,"weightedAverage":60.3221054}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1712850333","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId e06e6a66-fc4f-47ff-ab1b-a6158c6e5744 -accessToken glZ5bBMEdkrTGI27K2niQCP1IQcygqyJ7kHayqUkY78005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1712850413"}}

2
ProjectSettings/TagManager.asset

@ -18,7 +18,7 @@ TagManager:
- Ground
- Body
- Body Ground
-
- VFX
-
-
-

Loading…
Cancel
Save