cailean
/
drecon-unity
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

updated cameras + end episode threshold

audio
cailean 7 months ago
parent
8c05d9df02
commit
bfa4c7ec63
8 changed files with 302 additions and 114 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      Assets/10_Materials/Moloch Body.mat
  2. 3
      Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs
  3. 372
      Assets/5_Scenes/DreconDemo.unity
  4. 1
      Assets/8_Scripts/1_Managers/SubtitleManager.cs
  5. 6
      Assets/8_Scripts/2_General/Body.cs
  6. 2
      Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab
  7. 25
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
  8. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json

5
Assets/10_Materials/Moloch Body.mat
View File

@ -46,7 +46,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- Texture2D_4450AB74:
m_Texture: {fileID: 2800000, guid: b6a6551ec416c408e9353670dc7e6635, type: 3}
m_Texture: {fileID: 2800000, guid: 873df25e462adb64bb1b42f080d89330, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AnisotropyMap:
@ -257,6 +257,8 @@ Material:
- _DisplacementLockObjectScale: 1
- _DisplacementLockTilingScale: 1
- _DisplacementMode: 0
- _Dissapear: 0
- _DissapearValue: 0
- _DoubleSidedEnable: 0
- _DoubleSidedGIMode: 0
- _DoubleSidedNormalMode: 1
@ -372,6 +374,7 @@ Material:
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 0, g: 0.42068952, b: 1, a: 1}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DissapearColor: {r: 0, g: 0, b: 0, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}
- _EmissionColor: {r: 1, g: 1, b: 1, a: 1}
- _EmissiveColor: {r: 0, g: 0, b: 0, a: 1}

3
Assets/3_MarathonEnvs/Scripts/Ragdoll004/RagDollAgent.cs
View File

@ -226,7 +226,8 @@ public class RagDollAgent : Agent
AddReward(_dReConRewards.Reward);
// if (_dReConRewards.HeadHeightDistance > 0.5f || _dReConRewards.Reward < 1f)
if (_dReConRewards.HeadHeightDistance > 0.75f || _dReConRewards.Reward <= 0f)
if (_dReConRewards.HeadHeightDistance > 0.75f) //|| _dReConRewards.Reward <= 0f)
{
if (!dontResetOnZeroReward)

372
Assets/5_Scenes/DreconDemo.unity
View File

@ -841,7 +841,7 @@ MonoBehaviour:
m_Path: {fileID: 1926240438}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 1
m_Speed: 1.5
m_Position: 0
--- !u!1 &42386020
GameObject:
@ -919,22 +919,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -376.1646, y: -22.060394, z: -325.08182}
- {x: -133.25189, y: -22.060394, z: -325.08182}
- {x: -133.25189, y: -22.060394, z: -72.42349}
- {x: -376.1646, y: -22.060394, z: -72.42349}
- {x: -376.1646, y: -22.060394, z: -325.08182}
- {x: -376.1646, y: 403.50128, z: -325.08182}
- {x: -133.25189, y: 403.50128, z: -325.08182}
- {x: -133.25189, y: -22.060394, z: -325.08182}
- {x: -133.25189, y: 403.50128, z: -325.08182}
- {x: -133.25189, y: 403.50128, z: -72.42349}
- {x: -133.25189, y: -22.060394, z: -72.42349}
- {x: -133.25189, y: 403.50128, z: -72.42349}
- {x: -376.1646, y: 403.50128, z: -72.42349}
- {x: -376.1646, y: -22.060394, z: -72.42349}
- {x: -376.1646, y: 403.50128, z: -72.42349}
- {x: -376.1646, y: 403.50128, z: -325.08182}
- {x: -398.40652, y: -20.228851, z: -264.44186}
- {x: -150.03946, y: -20.228851, z: -264.44186}
- {x: -150.03946, y: -20.228851, z: -85.16855}
- {x: -398.40652, y: -20.228851, z: -85.16855}
- {x: -398.40652, y: -20.228851, z: -264.44186}
- {x: -398.40652, y: 400.47815, z: -264.44186}
- {x: -150.03946, y: 400.47815, z: -264.44186}
- {x: -150.03946, y: -20.228851, z: -264.44186}
- {x: -150.03946, y: 400.47815, z: -264.44186}
- {x: -150.03946, y: 400.47815, z: -85.16855}
- {x: -150.03946, y: -20.228851, z: -85.16855}
- {x: -150.03946, y: 400.47815, z: -85.16855}
- {x: -398.40652, y: 400.47815, z: -85.16855}
- {x: -398.40652, y: -20.228851, z: -85.16855}
- {x: -398.40652, y: 400.47815, z: -85.16855}
- {x: -398.40652, y: 400.47815, z: -264.44186}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -1268,7 +1268,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 62178361}
serializedVersion: 2
m_LocalRotation: {x: 0.12400308, y: -0.092653364, z: 0.011630281, w: 0.9878782}
m_LocalRotation: {x: 0.12400306, y: -0.09265334, z: 0.011630276, w: 0.9878782}
m_LocalPosition: {x: 24.371735, y: 51, z: -83.27547}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -1917,7 +1917,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -3685,6 +3685,7 @@ Transform:
m_Children:
- {fileID: 574220080}
- {fileID: 1621936321}
- {fileID: 498922613}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &318504361
@ -3870,8 +3871,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: 0.0029274332, y: 0.99193895, z: 0.023320587, w: -0.1245181}
m_LocalPosition: {x: 148.10088, y: 306.30005, z: -312.9648}
m_LocalRotation: {x: 0.28226304, y: -0.69399333, z: 0.34734362, w: 0.5639621}
m_LocalPosition: {x: 157.60458, y: 326.77478, z: -328.9009}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -3899,12 +3900,12 @@ MonoBehaviour:
m_LookAt: {fileID: 453061649}
m_Follow: {fileID: 1683887270}
m_Lens:
FieldOfView: 1.5
OrthographicSize: 0.35
NearClipPlane: 0.1
FieldOfView: 9.13
OrthographicSize: 0.46
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: 0
ModeOverride: 2
ModeOverride: 1
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -4173,11 +4174,11 @@ Camera:
y: 0
width: 1
height: 1
near clip plane: 0.1
near clip plane: 0.01
far clip plane: 5000
field of view: 1.5
orthographic: 0
orthographic size: 0.35
field of view: 9.13
orthographic: 1
orthographic size: 0.46
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@ -4201,8 +4202,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: 0.0029274332, y: 0.99193895, z: 0.023320587, w: -0.1245181}
m_LocalPosition: {x: 148.10088, y: 306.30005, z: -312.9648}
m_LocalRotation: {x: 0.28226304, y: -0.69399333, z: 0.34734362, w: 0.5639621}
m_LocalPosition: {x: 157.60458, y: 326.77478, z: -328.9009}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -6684,7 +6685,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -6800,7 +6801,7 @@ GameObject:
- component: {fileID: 498922612}
- component: {fileID: 498922611}
m_Layer: 10
m_Name: Swarm VFX (1)
m_Name: 'Swarm VFX '
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -6895,12 +6896,12 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 498922610}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -0.5, y: -0.7, z: 41.4}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.5547085, y: -3.7189982, z: 34.051918}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_Father: {fileID: 299259240}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &530571714
PrefabInstance:
@ -7878,7 +7879,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 605393721}
serializedVersion: 2
m_LocalRotation: {x: -0.000066303845, y: 0.99952006, z: 0.03090522, w: 0.002144363}
m_LocalRotation: {x: -0.00006630494, y: 0.99952006, z: 0.030905241, w: 0.0021443975}
m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -10403,7 +10404,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &805826300
Transform:
m_ObjectHideFlags: 0
@ -10412,8 +10413,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 805826299}
serializedVersion: 2
m_LocalRotation: {x: 0.055356342, y: 0.94144976, z: -0.19182332, w: 0.27168342}
m_LocalPosition: {x: -12.123461, y: 131.86787, z: 18.86845}
m_LocalRotation: {x: 0.02228008, y: 0.97466654, z: 0.11340368, w: -0.1914898}
m_LocalPosition: {x: 97.37887, y: 52.13183, z: 21.754604}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -10439,7 +10440,7 @@ MonoBehaviour:
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 1141103525}
m_Follow: {fileID: 1080996488}
m_Follow: {fileID: 39290366}
m_Lens:
FieldOfView: 20
OrthographicSize: 5.2
@ -11305,7 +11306,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 35.81
OrthographicSize: 10
NearClipPlane: 0.5
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: 0
ModeOverride: 2
@ -11336,8 +11337,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.49182287, y: 0.0021121474, z: -0.0011930768, w: 0.8706919}
m_LocalPosition: {x: 18.100853, y: 10.155965, z: -0.48116565}
m_LocalRotation: {x: 0.25553617, y: 0.66415954, z: -0.6526675, w: 0.26003557}
m_LocalPosition: {x: 18.100853, y: 10.055965, z: -0.48116565}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -11554,7 +11555,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 7
m_AmplitudeGain: 1
m_FrequencyGain: 1
mNoiseOffsets: {x: 902.40234, y: -591.7914, z: 888.80176}
--- !u!114 &912166844
@ -11581,7 +11582,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: -2.2, z: 2.4}
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
@ -11609,10 +11610,10 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 1.2, z: 0}
m_XDamping: 1
m_FollowOffset: {x: 0, y: 1.1, z: 0}
m_XDamping: 6
m_YDamping: 1
m_ZDamping: 1
m_ZDamping: 6
m_AngularDampingMode: 0
m_PitchDamping: 0
m_YawDamping: 1
@ -13073,7 +13074,7 @@ MonoBehaviour:
m_Path: {fileID: 792989025}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 1
m_Speed: 1.5
m_Position: 0
--- !u!1 &1016948515
GameObject:
@ -13702,7 +13703,7 @@ GameObject:
- component: {fileID: 1080996488}
- component: {fileID: 1080996489}
m_Layer: 0
m_Name: Dolly-Cart-Landscape
m_Name: Dolly-Cart-Sweep
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@ -13716,8 +13717,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1080996487}
serializedVersion: 2
m_LocalRotation: {x: -0, y: 0.92115396, z: -0, w: -0.38919854}
m_LocalPosition: {x: -110.22031, y: 76.955246, z: -62.91939}
m_LocalRotation: {x: 0.01672008, y: 0.8685767, z: -0.02937429, w: 0.49440077}
m_LocalPosition: {x: -34.512222, y: 103.98984, z: 42.69754}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -13739,8 +13740,8 @@ MonoBehaviour:
m_Path: {fileID: 1858671033}
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 1
m_Position: 80.45
m_Speed: 2
m_Position: 0.44758606
--- !u!4 &1082549878 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9c26b1036545e1e478afe84464ba5588,
@ -14190,7 +14191,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -14755,7 +14756,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -14948,7 +14949,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -15633,6 +15634,99 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1212933364}
m_PrefabAsset: {fileID: 0}
--- !u!1 &1219864459
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1219864460}
- component: {fileID: 1219864462}
- component: {fileID: 1219864461}
m_Layer: 0
m_Name: Environment-Wide-Dolly-Down
m_TagString: vc_Environment
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1219864460
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219864459}
serializedVersion: 2
m_LocalRotation: {x: -0.026052836, y: 0.7066267, z: -0.7066267, w: -0.026052836}
m_LocalPosition: {x: 68.48778, y: 154.98984, z: 116.69754}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2132802821}
m_Father: {fileID: 1346050330}
m_LocalEulerAnglesHint: {x: 90, y: 184.223, z: 0}
--- !u!114 &1219864461
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219864459}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a4300a1a4ef3b064a89ed9ad47a8cca5, type: 3}
m_Name:
m_EditorClassIdentifier:
m_CameraSettings: {fileID: 11400000, guid: 42c5ba543fa15ee47bcc3879b6527f54, type: 2}
--- !u!114 &1219864462
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1219864459}
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: 1080996488}
m_Lens:
FieldOfView: 30.1
OrthographicSize: 26
NearClipPlane: 0.1
FarClipPlane: 50000
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: 2132802821}
--- !u!1001 &1225477207
PrefabInstance:
m_ObjectHideFlags: 0
@ -15644,7 +15738,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -17306,6 +17400,7 @@ Transform:
- {fileID: 949034604}
- {fileID: 62178362}
- {fileID: 1440085504}
- {fileID: 1219864460}
- {fileID: 805826300}
- {fileID: 1634889328}
- {fileID: 320225264}
@ -17977,8 +18072,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1440085503}
serializedVersion: 2
m_LocalRotation: {x: 0.022280075, y: 0.97466654, z: 0.11340367, w: -0.19148977}
m_LocalPosition: {x: 93.69663, y: 54.427773, z: 12.745178}
m_LocalRotation: {x: -0.0065367715, y: 0.98346967, z: -0.17728451, w: -0.036262147}
m_LocalPosition: {x: 68.48778, y: 154.98984, z: 116.69754}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -18004,14 +18099,14 @@ MonoBehaviour:
m_Priority: 0
m_StandbyUpdate: 2
m_LookAt: {fileID: 1141103525}
m_Follow: {fileID: 39290366}
m_Follow: {fileID: 1080996488}
m_Lens:
FieldOfView: 20
OrthographicSize: 5.2
FieldOfView: 30.1
OrthographicSize: 26
NearClipPlane: 0.1
FarClipPlane: 50000
Dutch: 0
ModeOverride: 2
ModeOverride: 1
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -19985,8 +20080,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1585336076}
serializedVersion: 2
m_LocalRotation: {x: -0.043333374, y: 0.9566133, z: -0.20882952, w: -0.19850297}
m_LocalPosition: {x: 150.83829, y: 315.9374, z: -314.44928}
m_LocalRotation: {x: -0.028847452, y: 0.71116596, z: -0.7020458, w: -0.023293788}
m_LocalPosition: {x: 68.48778, y: 154.98984, z: 116.69754}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -20200,10 +20295,10 @@ Camera:
width: 1
height: 1
near clip plane: 0.1
far clip plane: 5000
field of view: 3
far clip plane: 50000
field of view: 30.1
orthographic: 1
orthographic size: 0.3
orthographic size: 26
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@ -21076,7 +21171,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -21155,7 +21250,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -21864,8 +21959,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1683887269}
serializedVersion: 2
m_LocalRotation: {x: -0, y: -0.7112369, z: -0, w: 0.7029524}
m_LocalPosition: {x: 2.3600159, y: 0, z: 9.252167}
m_LocalRotation: {x: -0, y: 0.023243474, z: -0, w: 0.9997299}
m_LocalPosition: {x: 8.465775, y: 0, z: 1.7690735}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -21887,7 +21982,7 @@ MonoBehaviour:
m_UpdateMethod: 0
m_PositionUnits: 1
m_Speed: 1
m_Position: 16.02
m_Position: 5
--- !u!1001 &1699042340
PrefabInstance:
m_ObjectHideFlags: 0
@ -22398,7 +22493,7 @@ PrefabInstance:
- target: {fileID: 1540711913744385834, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
propertyPath: maxJointForceLimit
value: 3.402823e+20
value: 340.2823
objectReference: {fileID: 0}
- target: {fileID: 1855795095694562573, guid: a26fb91b7bf9b5547ad21058d0442f76,
type: 3}
@ -22701,7 +22796,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
m_NoiseProfile: {fileID: 11400000, guid: 46965f9cbaf525742a6da4c2172a99cd, type: 2}
m_PivotOffset: {x: 0, y: 0, z: 0}
m_AmplitudeGain: 0
m_AmplitudeGain: 0.05
m_FrequencyGain: 0.5
mNoiseOffsets: {x: -11.757019, y: -299.61145, z: -901.43494}
--- !u!114 &1795712170
@ -22743,7 +22838,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 6ad980451443d70438faac0bc6c235a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: -5, z: 0}
m_TrackedObjectOffset: {x: 0, y: 7, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
@ -23525,15 +23620,15 @@ MonoBehaviour:
width: 0.75
m_Looped: 1
m_Waypoints:
- position: {x: -34.90872, y: 76.955246, z: -61.25482}
- position: {x: -34.90872, y: 104.02086, z: 42.932564}
roll: 0
- position: {x: -99.01859, y: 76.955246, z: -54.639305}
- position: {x: 43.38131, y: 76.955246, z: -62.555172}
roll: 0
- position: {x: -133.03781, y: 76.955246, z: -99.965965}
- position: {x: 23.808807, y: 83.72165, z: -141.44598}
roll: 0
- position: {x: -98.10489, y: 76.955246, z: -58.907574}
- position: {x: -172.85463, y: 90.48805, z: -96.805405}
roll: 0
- position: {x: -36.83068, y: 76.955246, z: -62.555172}
- position: {x: -252.84866, y: 97.254456, z: 88.84965}
roll: 0
--- !u!1 &1864854690
GameObject:
@ -23624,22 +23719,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -82.328896, y: -21.387222, z: -242.26161}
- {x: 168.4873, y: -21.387222, z: -242.26161}
- {x: 168.4873, y: -21.387222, z: -8.238968}
- {x: -82.328896, y: -21.387222, z: -8.238968}
- {x: -82.328896, y: -21.387222, z: -242.26161}
- {x: -82.328896, y: 425.73987, z: -242.26161}
- {x: 168.4873, y: 425.73987, z: -242.26161}
- {x: 168.4873, y: -21.387222, z: -242.26161}
- {x: 168.4873, y: 425.73987, z: -242.26161}
- {x: 168.4873, y: 425.73987, z: -8.238968}
- {x: 168.4873, y: -21.387222, z: -8.238968}
- {x: 168.4873, y: 425.73987, z: -8.238968}
- {x: -82.328896, y: 425.73987, z: -8.238968}
- {x: -82.328896, y: -21.387222, z: -8.238968}
- {x: -82.328896, y: 425.73987, z: -8.238968}
- {x: -82.328896, y: 425.73987, z: -242.26161}
- {x: -93.16517, y: -17.507889, z: -261.49307}
- {x: 173.06015, y: -17.507889, z: -261.49307}
- {x: 173.06015, y: -17.507889, z: 45.800194}
- {x: -93.16517, y: -17.507889, z: 45.800194}
- {x: -93.16517, y: -17.507889, z: -261.49307}
- {x: -93.16517, y: 406.70538, z: -261.49307}
- {x: 173.06015, y: 406.70538, z: -261.49307}
- {x: 173.06015, y: -17.507889, z: -261.49307}
- {x: 173.06015, y: 406.70538, z: -261.49307}
- {x: 173.06015, y: 406.70538, z: 45.800194}
- {x: 173.06015, y: -17.507889, z: 45.800194}
- {x: 173.06015, y: 406.70538, z: 45.800194}
- {x: -93.16517, y: 406.70538, z: 45.800194}
- {x: -93.16517, y: -17.507889, z: 45.800194}
- {x: -93.16517, y: 406.70538, z: 45.800194}
- {x: -93.16517, y: 406.70538, z: -261.49307}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -24561,7 +24656,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1955078056}
serializedVersion: 2
m_LocalRotation: {x: 0.70043844, y: -0.026139703, z: 0.025708925, w: 0.7127705}
m_LocalRotation: {x: 0.70043856, y: -0.02613758, z: 0.025706843, w: 0.7127705}
m_LocalPosition: {x: 18.102207, y: 11.040333, z: -0.5004903}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -27191,6 +27286,82 @@ PrefabInstance:
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5ab13d1ef8d328b4e9672e35f4030e4e, type: 3}
--- !u!1 &2132802820
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2132802821}
- component: {fileID: 2132802824}
- component: {fileID: 2132802823}
- component: {fileID: 2132802822}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2132802821
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132802820}
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: 1219864460}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &2132802822
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132802820}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 36d1163fa822e8b418a0a603ec078d5c, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Damping: 1
--- !u!114 &2132802823
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132802820}
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.1
mNoiseOffsets: {x: -933.8756, y: -486.32202, z: 1.2081909}
--- !u!114 &2132802824
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2132802820}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &2146712482
PrefabInstance:
m_ObjectHideFlags: 0
@ -38873,5 +39044,4 @@ SceneRoots:
- {fileID: 1771925926}
- {fileID: 1626698624}
- {fileID: 699558210}
- {fileID: 498922613}
- {fileID: 299259240}

1
Assets/8_Scripts/1_Managers/SubtitleManager.cs
View File

@ -69,7 +69,6 @@ public class SubtitleManager : MonoBehaviour
private IEnumerator ClearText(float waitTime, bool earlyStop)
{
var offset = (waitTime - m_TimeElapsed) * Random.Range(0.6f, 0.95f);
Debug.Log($"{offset}");
if (offset > 12.5)
{

6
Assets/8_Scripts/2_General/Body.cs
View File

@ -100,9 +100,9 @@ public class Body : MonoBehaviour
foreach (var bodyPart in bpDict.Values){
bodyPart.SetJointTargetRotation(
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + 1) * m_NoiseSpeed, (Time.time + counter + 4) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1),
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + 2) * m_NoiseSpeed, (Time.time + counter + 5) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1),
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + 3) * m_NoiseSpeed, (Time.time + counter + 6) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1)
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + m_NoiseX + 1) * m_NoiseSpeed, (Time.time + counter + m_NoiseX + 4) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1),
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + m_NoiseY + 2) * m_NoiseSpeed, (Time.time + counter + m_NoiseY + 5) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1),
Mathf.Clamp( (Mathf.PerlinNoise((Time.time + counter + m_NoiseZ + 3) * m_NoiseSpeed, (Time.time + counter + m_NoiseZ + 6) * m_NoiseSpeed) + -0.5f) * 3f, -1, 1)
);
bodyPart.SetJointStrength(1);

2
Assets/9_Models/Humanoid/SMPLX Blend/SMPLX Body Actuations.prefab
View File

@ -3719,7 +3719,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
maxJointSpring: 2500000
jointDampen: 200000
maxJointForceLimit: 3.402823e+38
maxJointForceLimit: 3.402823e+12
bodyPartsList: []
--- !u!1 &6946488308254974939
GameObject:

25
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
View File

@ -19,7 +19,7 @@ Material:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2501
m_CustomRenderQueue: 2000
stringTagMap:
MotionVector: User
disabledShaderPasses:
@ -33,7 +33,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- Texture2D_4450AB74:
m_Texture: {fileID: 2800000, guid: a8892f830876f50488e9bd05d6541488, type: 3}
m_Texture: {fileID: 2800000, guid: 873df25e462adb64bb1b42f080d89330, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _AnisotropyMap:
@ -134,14 +134,24 @@ Material:
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- Boolean_193028D2: 0
- Boolean_3F1A8DAB: 0
- Boolean_43476D73: 1
- Boolean_7165A49C: 1
- Boolean_85059BBE: 1
- Boolean_8BBF99CD: 1
- Boolean_D258FF8E: 0
- Vector1_B2CC132F: 400
- Vector1_21C41D02: 256
- Vector1_6F288C5B: 0.5
- Vector1_B2CC132F: 150
- Vector1_B9994903: 11
- Vector1_E8746023: 16
- _AORemapMax: 1
- _AORemapMin: 0
- _ATDistance: 1
- _AddPrecomputedVelocity: 0
- _AlbedoAffectEmissive: 0
- _Alpha: 1
- _AlphaCutoff: 0.5
- _AlphaCutoffEnable: 0
- _AlphaCutoffPostpass: 0.5
@ -157,6 +167,7 @@ Material:
- _ConservativeDepthOffsetEnable: 0
- _CullMode: 2
- _CullModeForward: 2
- _CustomColor: 0
- _Cutoff: 0.5
- _DepthOffsetEnable: 0
- _DetailAlbedoScale: 1
@ -213,7 +224,8 @@ Material:
- _ReceivesSSR: 1
- _ReceivesSSRTransparent: 0
- _RefractionModel: 0
- _RenderQueueType: 2
- _RenderQueueType: 1
- _RequireSplitLighting: 0
- _Smoothness: 0.5
- _SmoothnessRemapMax: 1
- _SmoothnessRemapMin: 0
@ -251,14 +263,17 @@ Material:
- _UVEmissive: 0
- _UseEmissiveIntensity: 0
- _UseShadowThreshold: 0
- _ZTestDepthEqualForOpaque: 4
- _ZTestDepthEqualForOpaque: 3
- _ZTestGBuffer: 4
- _ZTestTransparent: 4
- _ZWrite: 1
m_Colors:
- Color_2E5415DE: {r: 1, g: 1, b: 1, a: 0}
- Vector2_8044833E: {r: 1, g: 1, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _CustomVector: {r: 0.3, g: 0.59, b: 0.11, a: 0}
- _DiffusionProfileAsset: {r: 0, g: 0, b: 0, a: 0}
- _DissapearColor: {r: 0.90196085, g: 0.2901961, b: 0.2627451, a: 0}
- _DoubleSidedConstants: {r: 1, g: 1, b: -1, a: 0}

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

@ -1 +1 @@
{"count":1,"self":70.8141696,"total":73.539224199999992,"children":{"InitializeActuators":{"count":1,"self":0.0011113,"total":0.0011113,"children":null},"InitializeSensors":{"count":1,"self":0.0012676999999999999,"total":0.0012676999999999999,"children":null},"AgentSendState":{"count":3995,"self":0.015514,"total":0.93067459999999991,"children":{"CollectObservations":{"count":1998,"self":0.889965,"total":0.889965,"children":null},"WriteActionMask":{"count":1998,"self":0.003531,"total":0.003531,"children":null},"RequestDecision":{"count":1998,"self":0.0216646,"total":0.0216646,"children":null}}},"DecideAction":{"count":3995,"self":1.1635574,"total":1.1635574,"children":null},"AgentAct":{"count":3995,"self":0.6279408,"total":0.6279408,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716744205","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 6c818376-ae95-4024-a0ac-3f3ac93afdd0 -accessToken rlJAvKnw-O35WL0QWWy2PzoejhvNuee0FReRn1Dmju8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716744279"}}
{"count":1,"self":128.685376,"total":133.54889559999998,"children":{"InitializeActuators":{"count":1,"self":0.000998,"total":0.000998,"children":null},"InitializeSensors":{"count":1,"self":0.0009999,"total":0.0009999,"children":null},"AgentSendState":{"count":7555,"self":0.0454517,"total":1.0627085,"children":{"CollectObservations":{"count":3778,"self":0.9992595,"total":0.9992595,"children":null},"WriteActionMask":{"count":3778,"self":0.0075305999999999993,"total":0.0075305999999999993,"children":null},"RequestDecision":{"count":3778,"self":0.010466699999999999,"total":0.010466699999999999,"children":null}}},"DecideAction":{"count":7555,"self":1.6012932,"total":1.6012932,"children":null},"AgentAct":{"count":7555,"self":2.1965206,"total":2.1965206,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1716820524","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 4bf14d4b-7c60-4da5-a8cb-0bf3a524e7b4 -accessToken yEUCxkm6udBRi80_eZgDO3eFwEjAjoJ7-cRY-ZImu30005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1716820658"}}
Write Preview
Loading…
Cancel
Save