diff --git a/Assets/5_Scenes/DreconDemo.unity b/Assets/5_Scenes/DreconDemo.unity index 1cf1be4..c4e8143 100644 --- a/Assets/5_Scenes/DreconDemo.unity +++ b/Assets/5_Scenes/DreconDemo.unity @@ -594,7 +594,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 153031623} serializedVersion: 2 - m_LocalRotation: {x: -0.000010761081, y: 0.9982297, z: 0.059476666, w: -0.000077618104} + m_LocalRotation: {x: -0.000010763137, y: 0.9982297, z: 0.059476644, w: -0.00007758362} m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -918,7 +918,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 320225263} serializedVersion: 2 - m_LocalRotation: {x: 0.38916612, y: 0.593208, z: -0.58294386, w: 0.3960183} + m_LocalRotation: {x: 0.38916573, y: 0.59320825, z: -0.58294415, w: 0.3960179} m_LocalPosition: {x: 17.78, y: 21.78, z: 3.06} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -1000,7 +1000,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 326736459} serializedVersion: 2 - m_LocalRotation: {x: -0.073961094, y: 0.9066138, z: 0.17882526, w: 0.3749702} + m_LocalRotation: {x: -0.07396109, y: 0.9066138, z: 0.17882524, w: 0.37497023} m_LocalPosition: {x: 17.7008, y: 8.655965, z: -0.081218004} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -2000,6 +2000,7 @@ RectTransform: - {fileID: 446294240} - {fileID: 405810718} - {fileID: 1261636062} + - {fileID: 1016948516} m_Father: {fileID: 951379159} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -2382,7 +2383,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 752249933} serializedVersion: 2 - m_LocalRotation: {x: 0.0000007538141, y: 0.9999878, z: -0.004940901, w: 0.00015256426} + m_LocalRotation: {x: 0.00000075398714, y: 0.9999878, z: -0.004940921, w: 0.00015259867} m_LocalPosition: {x: 18.109627, y: 8.274419, z: 9.536423} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3364,8 +3365,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 0, y: 0, z: 0} m_ConstrainProportionsScale: 0 - m_Children: - - {fileID: 1016948516} + m_Children: [] m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0} @@ -3480,7 +3480,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 882491594} serializedVersion: 2 - m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.0011930601, w: 0.8706919} + m_LocalRotation: {x: 0.49182287, y: 0.0021121176, z: -0.00119306, w: 0.8706919} m_LocalPosition: {x: 18.100853, y: 10.155965, z: -0.48116565} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 @@ -3925,16 +3925,16 @@ RectTransform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1016948515} - m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + 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_LocalScale: {x: 1.5, y: 1.5, z: 1.5} m_ConstrainProportionsScale: 0 m_Children: [] - m_Father: {fileID: 851761779} + m_Father: {fileID: 459103777} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0, y: 0.5} m_AnchorMax: {x: 0, y: 0.5} - m_AnchoredPosition: {x: 300, y: 455} + m_AnchoredPosition: {x: -839, y: 878.8} m_SizeDelta: {x: 100, y: 100} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1016948517 @@ -4455,7 +4455,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -838.1, y: 857.2} + m_AnchoredPosition: {x: 75, y: 916.7} m_SizeDelta: {x: 1800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1261636063 @@ -4513,7 +4513,7 @@ MonoBehaviour: m_fontSizeMin: 75 m_fontSizeMax: 100 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -4665,7 +4665,7 @@ RectTransform: m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: -850, y: 916.7} + m_AnchoredPosition: {x: 75, y: 857} m_SizeDelta: {x: 1800, y: 0} m_Pivot: {x: 0.5, y: 0.5} --- !u!114 &1361807061 @@ -4723,7 +4723,7 @@ MonoBehaviour: m_fontSizeMin: 75 m_fontSizeMax: 100 m_fontStyle: 0 - m_HorizontalAlignment: 2 + m_HorizontalAlignment: 1 m_VerticalAlignment: 512 m_textAlignment: 65535 m_characterSpacing: 0 @@ -6284,7 +6284,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1955078056} serializedVersion: 2 - m_LocalRotation: {x: 0.7004385, y: -0.026140159, z: 0.025709378, w: 0.71277046} + 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 diff --git a/Assets/8_Scripts/2_General/DissapearShader.cs b/Assets/8_Scripts/2_General/DissapearShader.cs index d7b8ae6..f8c1bde 100644 --- a/Assets/8_Scripts/2_General/DissapearShader.cs +++ b/Assets/8_Scripts/2_General/DissapearShader.cs @@ -10,7 +10,6 @@ public class DissapearShader : MonoBehaviour private float m_InitalHeight; void Awake(){ m_InitalHeight = this.transform.position.y; - Debug.Log(m_InitalHeight); } void Update(){ float value = Mathf.Clamp( Remap(this.transform.position.y, m_HeightThresholdMin, m_HeightThresholdMax, 1, 0), 0, 1 ); diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/pose.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/pose.mat index c2591d5..8511798 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/pose.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/pose.mat @@ -19,7 +19,8 @@ Material: m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 m_CustomRenderQueue: 2225 - stringTagMap: {} + stringTagMap: + MotionVector: User disabledShaderPasses: - TransparentDepthPrepass - TransparentDepthPostpass @@ -30,6 +31,11 @@ Material: m_SavedProperties: serializedVersion: 3 m_TexEnvs: + - Texture2D_4450AB74: + m_Texture: {fileID: 28632447872294304, guid: cfe2f6982d41d43f1981909e78e77df2, + type: 2} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} - _AnisotropyMap: m_Texture: {fileID: 0} m_Scale: {x: 1, y: 1} @@ -128,6 +134,9 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: + - Boolean_43476D73: 0 + - Boolean_D258FF8E: 0 + - Vector1_B2CC132F: 58.72 - _AORemapMax: 1 - _AORemapMin: 0 - _ATDistance: 1 @@ -145,6 +154,7 @@ Material: - _Anisotropy: 0 - _BlendMode: 0 - _CoatMask: 0 + - _ConservativeDepthOffsetEnable: 0 - _CullMode: 2 - _CullModeForward: 2 - _Cutoff: 0.5 @@ -157,6 +167,8 @@ Material: - _DisplacementLockObjectScale: 1 - _DisplacementLockTilingScale: 1 - _DisplacementMode: 0 + - _Dissapear: 0 + - _DissapearValue: 0 - _DoubleSidedEnable: 0 - _DoubleSidedGIMode: 0 - _DoubleSidedNormalMode: 1 @@ -201,6 +213,7 @@ Material: - _ReceivesSSR: 1 - _ReceivesSSRTransparent: 0 - _RefractionModel: 0 + - _RenderQueueType: 1 - _Smoothness: 0.5 - _SmoothnessRemapMax: 1 - _SmoothnessRemapMin: 0 @@ -210,10 +223,12 @@ Material: - _SrcBlend: 1 - _StencilRef: 0 - _StencilRefDepth: 8 + - _StencilRefDistortionVec: 4 - _StencilRefGBuffer: 10 - _StencilRefMV: 40 - _StencilWriteMask: 6 - _StencilWriteMaskDepth: 9 + - _StencilWriteMaskDistortionVec: 4 - _StencilWriteMaskGBuffer: 15 - _StencilWriteMaskMV: 41 - _SubsurfaceMask: 1 @@ -241,9 +256,9 @@ Material: - _ZTestTransparent: 4 - _ZWrite: 1 m_Colors: - - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _BaseColor: {r: 1, g: 1, b: 0.7372549, a: 1} - _BaseColorMap_MipInfo: {r: 0, g: 0, b: 0, a: 0} - - _Color: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 0.737255, a: 1} - _DiffusionProfileAsset: {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} diff --git a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat index d2dac7f..a4dce3f 100644 --- a/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat +++ b/Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human pose.mat @@ -33,7 +33,7 @@ Material: serializedVersion: 3 m_TexEnvs: - Texture2D_4450AB74: - m_Texture: {fileID: 2800000, guid: a8892f830876f50488e9bd05d6541488, type: 3} + m_Texture: {fileID: 10307, guid: 0000000000000000f000000000000000, type: 0} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _AnisotropyMap: @@ -143,7 +143,7 @@ Material: - Boolean_D258FF8E: 0 - Vector1_21C41D02: 256 - Vector1_6F288C5B: 0.5 - - Vector1_B2CC132F: 150 + - Vector1_B2CC132F: 60 - Vector1_B9994903: 11 - Vector1_E8746023: 16 - _AORemapMax: 1 diff --git a/Assets/ML-Agents/Timers/DreconDemo_timers.json b/Assets/ML-Agents/Timers/DreconDemo_timers.json index 4a8ef7c..a0a084d 100644 --- a/Assets/ML-Agents/Timers/DreconDemo_timers.json +++ b/Assets/ML-Agents/Timers/DreconDemo_timers.json @@ -1 +1 @@ -{"count":1,"self":71.5940992,"total":74.2176406,"children":{"InitializeActuators":{"count":1,"self":0.0015046999999999999,"total":0.0015046999999999999,"children":null},"InitializeSensors":{"count":1,"self":0.0020055999999999997,"total":0.0020055999999999997,"children":null},"AgentSendState":{"count":4000,"self":0.020758,"total":0.5591006,"children":{"CollectObservations":{"count":2000,"self":0.5234307,"total":0.5234307,"children":null},"WriteActionMask":{"count":2000,"self":0.0010165999999999999,"total":0.0010165999999999999,"children":null},"RequestDecision":{"count":2000,"self":0.0138953,"total":0.0138953,"children":null}}},"DecideAction":{"count":4000,"self":1.5183522999999999,"total":1.5183522999999999,"children":null},"AgentAct":{"count":4000,"self":0.5425781,"total":0.5425781,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714489955","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 60ab91bb-e88b-415d-bad5-85669cb2f254 -accessToken igrlSuBmRMV_tJv_LBLFXMbOAtqeySRX9_MYTnwkljU005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714490029"}} \ No newline at end of file +{"count":1,"self":99.6232448,"total":103.34810429999999,"children":{"InitializeActuators":{"count":1,"self":0.0010059,"total":0.0010059,"children":null},"InitializeSensors":{"count":1,"self":0.001,"total":0.001,"children":null},"AgentSendState":{"count":5806,"self":0.036708,"total":0.7096931,"children":{"CollectObservations":{"count":2903,"self":0.64968589999999993,"total":0.64968589999999993,"children":null},"WriteActionMask":{"count":2903,"self":0.0082209,"total":0.0082209,"children":null},"RequestDecision":{"count":2903,"self":0.0150783,"total":0.0150783,"children":null}}},"DecideAction":{"count":5806,"self":2.1199612,"total":2.1199612,"children":null},"AgentAct":{"count":5806,"self":0.89319819999999994,"total":0.89319819999999994,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1714504141","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 60ab91bb-e88b-415d-bad5-85669cb2f254 -accessToken rOssV57lkV_2CxBoV6hoSZhKnDbTSE3vUsvRzk8naI0005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1714504244"}} \ No newline at end of file