fr.jeanf.universal.player 0.8.2 → 0.8.4
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -860,6 +860,156 @@ CapsuleCollider:
|
|
|
860
860
|
m_Height: 0.05379386
|
|
861
861
|
m_Direction: 2
|
|
862
862
|
m_Center: {x: 0, y: 0, z: 0}
|
|
863
|
+
--- !u!1 &984586684703107472
|
|
864
|
+
GameObject:
|
|
865
|
+
m_ObjectHideFlags: 0
|
|
866
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
867
|
+
m_PrefabInstance: {fileID: 0}
|
|
868
|
+
m_PrefabAsset: {fileID: 0}
|
|
869
|
+
serializedVersion: 6
|
|
870
|
+
m_Component:
|
|
871
|
+
- component: {fileID: 3353766818954711641}
|
|
872
|
+
- component: {fileID: 6737550944826681002}
|
|
873
|
+
- component: {fileID: 6613360146104973944}
|
|
874
|
+
- component: {fileID: 5882072871154787892}
|
|
875
|
+
m_Layer: 5
|
|
876
|
+
m_Name: LoadingInformationText
|
|
877
|
+
m_TagString: Untagged
|
|
878
|
+
m_Icon: {fileID: 0}
|
|
879
|
+
m_NavMeshLayer: 0
|
|
880
|
+
m_StaticEditorFlags: 0
|
|
881
|
+
m_IsActive: 1
|
|
882
|
+
--- !u!224 &3353766818954711641
|
|
883
|
+
RectTransform:
|
|
884
|
+
m_ObjectHideFlags: 0
|
|
885
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
886
|
+
m_PrefabInstance: {fileID: 0}
|
|
887
|
+
m_PrefabAsset: {fileID: 0}
|
|
888
|
+
m_GameObject: {fileID: 984586684703107472}
|
|
889
|
+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
890
|
+
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
891
|
+
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
892
|
+
m_ConstrainProportionsScale: 0
|
|
893
|
+
m_Children: []
|
|
894
|
+
m_Father: {fileID: 1641143906095406954}
|
|
895
|
+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
896
|
+
m_AnchorMin: {x: 0, y: 0}
|
|
897
|
+
m_AnchorMax: {x: 0.9, y: 0.9}
|
|
898
|
+
m_AnchoredPosition: {x: 0, y: 0}
|
|
899
|
+
m_SizeDelta: {x: 0, y: 0}
|
|
900
|
+
m_Pivot: {x: 0.5, y: 0.5}
|
|
901
|
+
--- !u!222 &6737550944826681002
|
|
902
|
+
CanvasRenderer:
|
|
903
|
+
m_ObjectHideFlags: 0
|
|
904
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
905
|
+
m_PrefabInstance: {fileID: 0}
|
|
906
|
+
m_PrefabAsset: {fileID: 0}
|
|
907
|
+
m_GameObject: {fileID: 984586684703107472}
|
|
908
|
+
m_CullTransparentMesh: 1
|
|
909
|
+
--- !u!114 &6613360146104973944
|
|
910
|
+
MonoBehaviour:
|
|
911
|
+
m_ObjectHideFlags: 0
|
|
912
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
913
|
+
m_PrefabInstance: {fileID: 0}
|
|
914
|
+
m_PrefabAsset: {fileID: 0}
|
|
915
|
+
m_GameObject: {fileID: 984586684703107472}
|
|
916
|
+
m_Enabled: 1
|
|
917
|
+
m_EditorHideFlags: 0
|
|
918
|
+
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
|
|
919
|
+
m_Name:
|
|
920
|
+
m_EditorClassIdentifier:
|
|
921
|
+
m_Material: {fileID: 0}
|
|
922
|
+
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
923
|
+
m_RaycastTarget: 1
|
|
924
|
+
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
|
|
925
|
+
m_Maskable: 1
|
|
926
|
+
m_OnCullStateChanged:
|
|
927
|
+
m_PersistentCalls:
|
|
928
|
+
m_Calls: []
|
|
929
|
+
m_text:
|
|
930
|
+
m_isRightToLeft: 0
|
|
931
|
+
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
|
932
|
+
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
|
|
933
|
+
m_fontSharedMaterials: []
|
|
934
|
+
m_fontMaterial: {fileID: 0}
|
|
935
|
+
m_fontMaterials: []
|
|
936
|
+
m_fontColor32:
|
|
937
|
+
serializedVersion: 2
|
|
938
|
+
rgba: 4294967295
|
|
939
|
+
m_fontColor: {r: 1, g: 1, b: 1, a: 1}
|
|
940
|
+
m_enableVertexGradient: 0
|
|
941
|
+
m_colorMode: 3
|
|
942
|
+
m_fontColorGradient:
|
|
943
|
+
topLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
944
|
+
topRight: {r: 1, g: 1, b: 1, a: 1}
|
|
945
|
+
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
|
|
946
|
+
bottomRight: {r: 1, g: 1, b: 1, a: 1}
|
|
947
|
+
m_fontColorGradientPreset: {fileID: 0}
|
|
948
|
+
m_spriteAsset: {fileID: 0}
|
|
949
|
+
m_tintAllSprites: 0
|
|
950
|
+
m_StyleSheet: {fileID: 0}
|
|
951
|
+
m_TextStyleHashCode: -1183493901
|
|
952
|
+
m_overrideHtmlColors: 0
|
|
953
|
+
m_faceColor:
|
|
954
|
+
serializedVersion: 2
|
|
955
|
+
rgba: 4294967295
|
|
956
|
+
m_fontSize: 36
|
|
957
|
+
m_fontSizeBase: 36
|
|
958
|
+
m_fontWeight: 400
|
|
959
|
+
m_enableAutoSizing: 0
|
|
960
|
+
m_fontSizeMin: 18
|
|
961
|
+
m_fontSizeMax: 72
|
|
962
|
+
m_fontStyle: 0
|
|
963
|
+
m_HorizontalAlignment: 1
|
|
964
|
+
m_VerticalAlignment: 1024
|
|
965
|
+
m_textAlignment: 65535
|
|
966
|
+
m_characterSpacing: 0
|
|
967
|
+
m_wordSpacing: 0
|
|
968
|
+
m_lineSpacing: 0
|
|
969
|
+
m_lineSpacingMax: 0
|
|
970
|
+
m_paragraphSpacing: 0
|
|
971
|
+
m_charWidthMaxAdj: 0
|
|
972
|
+
m_TextWrappingMode: 1
|
|
973
|
+
m_wordWrappingRatios: 0.4
|
|
974
|
+
m_overflowMode: 0
|
|
975
|
+
m_linkedTextComponent: {fileID: 0}
|
|
976
|
+
parentLinkedComponent: {fileID: 0}
|
|
977
|
+
m_enableKerning: 0
|
|
978
|
+
m_ActiveFontFeatures: 6e72656b
|
|
979
|
+
m_enableExtraPadding: 0
|
|
980
|
+
checkPaddingRequired: 0
|
|
981
|
+
m_isRichText: 1
|
|
982
|
+
m_EmojiFallbackSupport: 1
|
|
983
|
+
m_parseCtrlCharacters: 1
|
|
984
|
+
m_isOrthographic: 1
|
|
985
|
+
m_isCullingEnabled: 0
|
|
986
|
+
m_horizontalMapping: 0
|
|
987
|
+
m_verticalMapping: 0
|
|
988
|
+
m_uvLineOffset: 0
|
|
989
|
+
m_geometrySortingOrder: 0
|
|
990
|
+
m_IsTextObjectScaleStatic: 0
|
|
991
|
+
m_VertexBufferAutoSizeReduction: 0
|
|
992
|
+
m_useMaxVisibleDescender: 1
|
|
993
|
+
m_pageToDisplay: 1
|
|
994
|
+
m_margin: {x: 0, y: 0, z: 0, w: 0}
|
|
995
|
+
m_isUsingLegacyAnimationComponent: 0
|
|
996
|
+
m_isVolumetricText: 0
|
|
997
|
+
m_hasFontAssetChanged: 0
|
|
998
|
+
m_baseMaterial: {fileID: 0}
|
|
999
|
+
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
|
|
1000
|
+
--- !u!114 &5882072871154787892
|
|
1001
|
+
MonoBehaviour:
|
|
1002
|
+
m_ObjectHideFlags: 0
|
|
1003
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
1004
|
+
m_PrefabInstance: {fileID: 0}
|
|
1005
|
+
m_PrefabAsset: {fileID: 0}
|
|
1006
|
+
m_GameObject: {fileID: 984586684703107472}
|
|
1007
|
+
m_Enabled: 1
|
|
1008
|
+
m_EditorHideFlags: 0
|
|
1009
|
+
m_Script: {fileID: 11500000, guid: 870d6a39371c636478cc8124cdbf4bcc, type: 3}
|
|
1010
|
+
m_Name:
|
|
1011
|
+
m_EditorClassIdentifier:
|
|
1012
|
+
tmp: {fileID: 6613360146104973944}
|
|
863
1013
|
--- !u!1 &1084467950943283014
|
|
864
1014
|
GameObject:
|
|
865
1015
|
m_ObjectHideFlags: 0
|
|
@@ -1819,6 +1969,7 @@ Transform:
|
|
|
1819
1969
|
m_ConstrainProportionsScale: 0
|
|
1820
1970
|
m_Children:
|
|
1821
1971
|
- {fileID: 4935331013338665783}
|
|
1972
|
+
- {fileID: 1641143906095406954}
|
|
1822
1973
|
m_Father: {fileID: 7264267533721849609}
|
|
1823
1974
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
1824
1975
|
--- !u!114 &1480624697409009770
|
|
@@ -1838,7 +1989,7 @@ MonoBehaviour:
|
|
|
1838
1989
|
serializedVersion: 2
|
|
1839
1990
|
m_Bits: 0
|
|
1840
1991
|
sphereCheckSize: 0.15
|
|
1841
|
-
|
|
1992
|
+
_isHeadInWall: 0
|
|
1842
1993
|
--- !u!114 &7491902866069632838
|
|
1843
1994
|
MonoBehaviour:
|
|
1844
1995
|
m_ObjectHideFlags: 0
|
|
@@ -1859,7 +2010,7 @@ MonoBehaviour:
|
|
|
1859
2010
|
m_Calls:
|
|
1860
2011
|
- m_Target: {fileID: 1480624697409009770}
|
|
1861
2012
|
m_TargetAssemblyTypeName: jeanf.vrplayer.NoPeeking, vrplayer
|
|
1862
|
-
m_MethodName:
|
|
2013
|
+
m_MethodName: SetIsLoadingState
|
|
1863
2014
|
m_Mode: 0
|
|
1864
2015
|
m_Arguments:
|
|
1865
2016
|
m_ObjectArgument: {fileID: 0}
|
|
@@ -2669,6 +2820,108 @@ Transform:
|
|
|
2669
2820
|
m_Children: []
|
|
2670
2821
|
m_Father: {fileID: 2333825688453011937}
|
|
2671
2822
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
2823
|
+
--- !u!1 &4029824438484593722
|
|
2824
|
+
GameObject:
|
|
2825
|
+
m_ObjectHideFlags: 0
|
|
2826
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
2827
|
+
m_PrefabInstance: {fileID: 0}
|
|
2828
|
+
m_PrefabAsset: {fileID: 0}
|
|
2829
|
+
serializedVersion: 6
|
|
2830
|
+
m_Component:
|
|
2831
|
+
- component: {fileID: 1641143906095406954}
|
|
2832
|
+
- component: {fileID: 3305523478037124010}
|
|
2833
|
+
- component: {fileID: 2550431422591946388}
|
|
2834
|
+
- component: {fileID: 7401678481808364707}
|
|
2835
|
+
m_Layer: 5
|
|
2836
|
+
m_Name: LoadingInformationCanvas
|
|
2837
|
+
m_TagString: Untagged
|
|
2838
|
+
m_Icon: {fileID: 0}
|
|
2839
|
+
m_NavMeshLayer: 0
|
|
2840
|
+
m_StaticEditorFlags: 0
|
|
2841
|
+
m_IsActive: 1
|
|
2842
|
+
--- !u!224 &1641143906095406954
|
|
2843
|
+
RectTransform:
|
|
2844
|
+
m_ObjectHideFlags: 0
|
|
2845
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
2846
|
+
m_PrefabInstance: {fileID: 0}
|
|
2847
|
+
m_PrefabAsset: {fileID: 0}
|
|
2848
|
+
m_GameObject: {fileID: 4029824438484593722}
|
|
2849
|
+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
2850
|
+
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
2851
|
+
m_LocalScale: {x: 0, y: 0, z: 0}
|
|
2852
|
+
m_ConstrainProportionsScale: 0
|
|
2853
|
+
m_Children:
|
|
2854
|
+
- {fileID: 3353766818954711641}
|
|
2855
|
+
m_Father: {fileID: 2969270201452490162}
|
|
2856
|
+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
2857
|
+
m_AnchorMin: {x: 0, y: 0}
|
|
2858
|
+
m_AnchorMax: {x: 0, y: 0}
|
|
2859
|
+
m_AnchoredPosition: {x: 0, y: 0}
|
|
2860
|
+
m_SizeDelta: {x: 0, y: 0}
|
|
2861
|
+
m_Pivot: {x: 0, y: 0}
|
|
2862
|
+
--- !u!223 &3305523478037124010
|
|
2863
|
+
Canvas:
|
|
2864
|
+
m_ObjectHideFlags: 0
|
|
2865
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
2866
|
+
m_PrefabInstance: {fileID: 0}
|
|
2867
|
+
m_PrefabAsset: {fileID: 0}
|
|
2868
|
+
m_GameObject: {fileID: 4029824438484593722}
|
|
2869
|
+
m_Enabled: 1
|
|
2870
|
+
serializedVersion: 3
|
|
2871
|
+
m_RenderMode: 0
|
|
2872
|
+
m_Camera: {fileID: 0}
|
|
2873
|
+
m_PlaneDistance: 100
|
|
2874
|
+
m_PixelPerfect: 0
|
|
2875
|
+
m_ReceivesEvents: 1
|
|
2876
|
+
m_OverrideSorting: 0
|
|
2877
|
+
m_OverridePixelPerfect: 0
|
|
2878
|
+
m_SortingBucketNormalizedSize: 0
|
|
2879
|
+
m_VertexColorAlwaysGammaSpace: 0
|
|
2880
|
+
m_AdditionalShaderChannelsFlag: 25
|
|
2881
|
+
m_UpdateRectTransformForStandalone: 0
|
|
2882
|
+
m_SortingLayerID: 0
|
|
2883
|
+
m_SortingOrder: 0
|
|
2884
|
+
m_TargetDisplay: 0
|
|
2885
|
+
--- !u!114 &2550431422591946388
|
|
2886
|
+
MonoBehaviour:
|
|
2887
|
+
m_ObjectHideFlags: 0
|
|
2888
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
2889
|
+
m_PrefabInstance: {fileID: 0}
|
|
2890
|
+
m_PrefabAsset: {fileID: 0}
|
|
2891
|
+
m_GameObject: {fileID: 4029824438484593722}
|
|
2892
|
+
m_Enabled: 1
|
|
2893
|
+
m_EditorHideFlags: 0
|
|
2894
|
+
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
|
2895
|
+
m_Name:
|
|
2896
|
+
m_EditorClassIdentifier:
|
|
2897
|
+
m_UiScaleMode: 0
|
|
2898
|
+
m_ReferencePixelsPerUnit: 100
|
|
2899
|
+
m_ScaleFactor: 1
|
|
2900
|
+
m_ReferenceResolution: {x: 800, y: 600}
|
|
2901
|
+
m_ScreenMatchMode: 0
|
|
2902
|
+
m_MatchWidthOrHeight: 0
|
|
2903
|
+
m_PhysicalUnit: 3
|
|
2904
|
+
m_FallbackScreenDPI: 96
|
|
2905
|
+
m_DefaultSpriteDPI: 96
|
|
2906
|
+
m_DynamicPixelsPerUnit: 1
|
|
2907
|
+
m_PresetInfoIsWorld: 0
|
|
2908
|
+
--- !u!114 &7401678481808364707
|
|
2909
|
+
MonoBehaviour:
|
|
2910
|
+
m_ObjectHideFlags: 0
|
|
2911
|
+
m_CorrespondingSourceObject: {fileID: 0}
|
|
2912
|
+
m_PrefabInstance: {fileID: 0}
|
|
2913
|
+
m_PrefabAsset: {fileID: 0}
|
|
2914
|
+
m_GameObject: {fileID: 4029824438484593722}
|
|
2915
|
+
m_Enabled: 1
|
|
2916
|
+
m_EditorHideFlags: 0
|
|
2917
|
+
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
|
2918
|
+
m_Name:
|
|
2919
|
+
m_EditorClassIdentifier:
|
|
2920
|
+
m_IgnoreReversedGraphics: 1
|
|
2921
|
+
m_BlockingObjects: 0
|
|
2922
|
+
m_BlockingMask:
|
|
2923
|
+
serializedVersion: 2
|
|
2924
|
+
m_Bits: 4294967295
|
|
2672
2925
|
--- !u!1 &4568312785888129817
|
|
2673
2926
|
GameObject:
|
|
2674
2927
|
m_ObjectHideFlags: 0
|
|
@@ -2736,7 +2989,6 @@ MonoBehaviour:
|
|
|
2736
2989
|
m_RepeatRate: 0.1
|
|
2737
2990
|
m_TrackedDeviceDragThresholdMultiplier: 2
|
|
2738
2991
|
m_TrackedScrollDeltaMultiplier: 5
|
|
2739
|
-
m_BypassUIToolkitEvents: 0
|
|
2740
2992
|
m_ActiveInputMode: 1
|
|
2741
2993
|
m_EnableXRInput: 1
|
|
2742
2994
|
m_EnableMouseInput: 1
|
|
@@ -3674,7 +3926,7 @@ MonoBehaviour:
|
|
|
3674
3926
|
m_IsGlobal: 0
|
|
3675
3927
|
priority: 0
|
|
3676
3928
|
blendDistance: 0
|
|
3677
|
-
weight:
|
|
3929
|
+
weight: 1
|
|
3678
3930
|
sharedProfile: {fileID: 11400000, guid: ab06ed5ee4fe73548b3c4829b155a02d, type: 2}
|
|
3679
3931
|
--- !u!114 &8755935149309269784
|
|
3680
3932
|
MonoBehaviour:
|
|
@@ -38,8 +38,9 @@ namespace jeanf.universalplayer
|
|
|
38
38
|
[SerializeField] private Volume postProcessVolume;
|
|
39
39
|
private static Volume staticPostProcessVolume;
|
|
40
40
|
|
|
41
|
-
|
|
42
41
|
private static MotionHandle _fadeHandle;
|
|
42
|
+
private static bool _isCurrentlyFading = false;
|
|
43
|
+
private static bool _targetState = false;
|
|
43
44
|
|
|
44
45
|
[Header("Listening On")]
|
|
45
46
|
[SerializeField] private BoolFloatEventChannelSO fadeOutChannelSO;
|
|
@@ -71,7 +72,7 @@ namespace jeanf.universalplayer
|
|
|
71
72
|
|
|
72
73
|
private void Unsubscribe()
|
|
73
74
|
{
|
|
74
|
-
if (_shaderMaterial)_shaderMaterial.SetColor(FadeColor,
|
|
75
|
+
if (_shaderMaterial)_shaderMaterial.SetColor(FadeColor, color);
|
|
75
76
|
inputBinding.performed -= null;
|
|
76
77
|
fadeOutChannelSO.OnEventRaised -= FadeValue;
|
|
77
78
|
inputBinding.Disable();
|
|
@@ -89,6 +90,7 @@ namespace jeanf.universalplayer
|
|
|
89
90
|
_isFaded = !_isFaded;
|
|
90
91
|
FadeValue(_isFaded);
|
|
91
92
|
}
|
|
93
|
+
|
|
92
94
|
public static void FadeValue(bool value)
|
|
93
95
|
{
|
|
94
96
|
FadeValue(value, _fadeTime);
|
|
@@ -97,12 +99,33 @@ namespace jeanf.universalplayer
|
|
|
97
99
|
|
|
98
100
|
public static void FadeValue(bool value, float fadeTime)
|
|
99
101
|
{
|
|
102
|
+
// Check if volume is initialized
|
|
103
|
+
if (staticPostProcessVolume == null)
|
|
104
|
+
{
|
|
105
|
+
if (_isDebugSTATIC) Debug.LogWarning("FadeMask: staticPostProcessVolume is null. Make sure FadeMask.Awake() has been called.");
|
|
106
|
+
return;
|
|
107
|
+
}
|
|
108
|
+
|
|
109
|
+
// Don't start a new fade if we're already fading to the same target
|
|
110
|
+
if (_isCurrentlyFading && _targetState == value)
|
|
111
|
+
return;
|
|
100
112
|
|
|
101
113
|
if (_isDebugSTATIC) Debug.Log($"Fading to: {value}, in {fadeTime}s");
|
|
102
|
-
|
|
103
|
-
|
|
104
|
-
_fadeHandle
|
|
105
|
-
|
|
114
|
+
|
|
115
|
+
// Only cancel if the handle is valid and active
|
|
116
|
+
if (_fadeHandle.IsActive())
|
|
117
|
+
{
|
|
118
|
+
_fadeHandle.Cancel();
|
|
119
|
+
}
|
|
120
|
+
|
|
121
|
+
_targetState = value;
|
|
122
|
+
_isCurrentlyFading = true;
|
|
123
|
+
float targetAlpha = value ? 1 : 0;
|
|
124
|
+
var volume = staticPostProcessVolume;
|
|
125
|
+
|
|
126
|
+
_fadeHandle = LMotion.Create(volume.weight, targetAlpha, fadeTime)
|
|
127
|
+
.WithOnComplete(() => _isCurrentlyFading = false)
|
|
128
|
+
.Bind(x => volume.weight = x);
|
|
106
129
|
}
|
|
107
130
|
|
|
108
131
|
private void DisableFadeHandle()
|
|
@@ -15,45 +15,50 @@ namespace jeanf.universalplayer
|
|
|
15
15
|
[SerializeField] private LayerMask collisionLayer;
|
|
16
16
|
[SerializeField] private float sphereCheckSize = .15f;
|
|
17
17
|
|
|
18
|
-
private bool
|
|
19
|
-
private bool
|
|
18
|
+
[SerializeField] private bool _isHeadInWall = false;
|
|
19
|
+
private bool _isHeadInWallLastValue = false;
|
|
20
|
+
|
|
21
|
+
private static bool _isSceneLoading = true;
|
|
20
22
|
|
|
21
|
-
[SerializeField] private bool isSceneLoading = false;
|
|
22
23
|
private void FixedUpdate()
|
|
23
24
|
{
|
|
24
|
-
|
|
25
|
+
_isHeadInWallLastValue = _isHeadInWall;
|
|
26
|
+
|
|
27
|
+
if (_isSceneLoading)
|
|
25
28
|
{
|
|
26
|
-
|
|
29
|
+
_isHeadInWall = true;
|
|
27
30
|
}
|
|
28
31
|
else
|
|
29
32
|
{
|
|
30
33
|
if (isDebug) Debug.Log("NoPeeking - made it through the return");
|
|
31
34
|
if (Physics.CheckSphere(transform.position, sphereCheckSize, collisionLayer, QueryTriggerInteraction.Ignore))
|
|
32
35
|
{
|
|
33
|
-
|
|
36
|
+
_isHeadInWall = true;
|
|
34
37
|
}
|
|
35
38
|
else
|
|
36
39
|
{
|
|
37
|
-
|
|
40
|
+
_isHeadInWall = false;
|
|
38
41
|
}
|
|
39
42
|
}
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
+
|
|
44
|
+
if (_isHeadInWall == _isHeadInWallLastValue) return;
|
|
45
|
+
FadeMask.FadeValue(_isHeadInWall);
|
|
46
|
+
if(isDebug) Debug.Log($"isHeadInWall changed to: {_isHeadInWall}");
|
|
43
47
|
}
|
|
44
48
|
|
|
45
|
-
|
|
49
|
+
#if UNITY_EDITOR
|
|
46
50
|
private void OnDrawGizmos()
|
|
47
51
|
{
|
|
48
52
|
Gizmos.color = new Color(0f, 1f, 0f, .75f);
|
|
49
53
|
Gizmos.DrawSphere(transform.position, sphereCheckSize);
|
|
50
54
|
}
|
|
51
|
-
|
|
55
|
+
#endif
|
|
52
56
|
|
|
53
|
-
public void
|
|
57
|
+
public static void SetIsLoadingState(bool value)
|
|
54
58
|
{
|
|
55
|
-
|
|
56
|
-
|
|
59
|
+
value = !value;
|
|
60
|
+
_isSceneLoading = value;
|
|
61
|
+
Debug.Log($"isSceneLoading: {_isSceneLoading}");
|
|
57
62
|
}
|
|
58
63
|
}
|
|
59
64
|
}
|
|
@@ -43,7 +43,6 @@ namespace jeanf.universalplayer
|
|
|
43
43
|
|
|
44
44
|
private void AttemptAction()
|
|
45
45
|
{
|
|
46
|
-
if (_isDebug) Debug.Log("trying to interact with object");
|
|
47
46
|
if (BroadcastControlsStatus.controlScheme == BroadcastControlsStatus.ControlScheme.XR) return;
|
|
48
47
|
if (!cameraTransform) cameraTransform = Camera.main.transform;
|
|
49
48
|
|
|
@@ -23,13 +23,13 @@ Transform:
|
|
|
23
23
|
m_PrefabInstance: {fileID: 0}
|
|
24
24
|
m_PrefabAsset: {fileID: 0}
|
|
25
25
|
m_GameObject: {fileID: 195984981655805839}
|
|
26
|
+
serializedVersion: 2
|
|
26
27
|
m_LocalRotation: {x: 2.7755576e-17, y: 3.469447e-18, z: 6.938894e-18, w: 1}
|
|
27
28
|
m_LocalPosition: {x: -0.00030950963, y: 0.0011371541, z: 0.024963856}
|
|
28
29
|
m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001}
|
|
29
30
|
m_ConstrainProportionsScale: 0
|
|
30
31
|
m_Children: []
|
|
31
32
|
m_Father: {fileID: 4572389166072670635}
|
|
32
|
-
m_RootOrder: 0
|
|
33
33
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
34
34
|
--- !u!1 &345863118176216196
|
|
35
35
|
GameObject:
|
|
@@ -54,6 +54,7 @@ Transform:
|
|
|
54
54
|
m_PrefabInstance: {fileID: 0}
|
|
55
55
|
m_PrefabAsset: {fileID: 0}
|
|
56
56
|
m_GameObject: {fileID: 345863118176216196}
|
|
57
|
+
serializedVersion: 2
|
|
57
58
|
m_LocalRotation: {x: 0.18964538, y: -0.011715396, z: 0.009750124, w: 0.9817344}
|
|
58
59
|
m_LocalPosition: {x: -0.0018839999, y: 0.005105, z: 0.061360996}
|
|
59
60
|
m_LocalScale: {x: 0.9999646, y: 1.0000069, z: 1.0000081}
|
|
@@ -61,7 +62,6 @@ Transform:
|
|
|
61
62
|
m_Children:
|
|
62
63
|
- {fileID: 5620449021316145138}
|
|
63
64
|
m_Father: {fileID: 7816746538603700524}
|
|
64
|
-
m_RootOrder: 0
|
|
65
65
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
66
66
|
--- !u!1 &374069179793709044
|
|
67
67
|
GameObject:
|
|
@@ -86,6 +86,7 @@ Transform:
|
|
|
86
86
|
m_PrefabInstance: {fileID: 0}
|
|
87
87
|
m_PrefabAsset: {fileID: 0}
|
|
88
88
|
m_GameObject: {fileID: 374069179793709044}
|
|
89
|
+
serializedVersion: 2
|
|
89
90
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
90
91
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
91
92
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -93,7 +94,6 @@ Transform:
|
|
|
93
94
|
m_Children:
|
|
94
95
|
- {fileID: 4516092657092262880}
|
|
95
96
|
m_Father: {fileID: 0}
|
|
96
|
-
m_RootOrder: 0
|
|
97
97
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
98
98
|
--- !u!1 &449363402561489656
|
|
99
99
|
GameObject:
|
|
@@ -118,6 +118,7 @@ Transform:
|
|
|
118
118
|
m_PrefabInstance: {fileID: 0}
|
|
119
119
|
m_PrefabAsset: {fileID: 0}
|
|
120
120
|
m_GameObject: {fileID: 449363402561489656}
|
|
121
|
+
serializedVersion: 2
|
|
121
122
|
m_LocalRotation: {x: -0.06665305, y: 0.39692008, z: -0.5750258, w: 0.71229005}
|
|
122
123
|
m_LocalPosition: {x: 0.030218, y: -0.016083999, z: 0.034498}
|
|
123
124
|
m_LocalScale: {x: 1.0000205, y: 1.0000343, z: 0.99997866}
|
|
@@ -125,7 +126,6 @@ Transform:
|
|
|
125
126
|
m_Children:
|
|
126
127
|
- {fileID: 6710750435592238022}
|
|
127
128
|
m_Father: {fileID: 238893749033992988}
|
|
128
|
-
m_RootOrder: 5
|
|
129
129
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
130
130
|
--- !u!1 &857887844609194191
|
|
131
131
|
GameObject:
|
|
@@ -150,6 +150,7 @@ Transform:
|
|
|
150
150
|
m_PrefabInstance: {fileID: 0}
|
|
151
151
|
m_PrefabAsset: {fileID: 0}
|
|
152
152
|
m_GameObject: {fileID: 857887844609194191}
|
|
153
|
+
serializedVersion: 2
|
|
153
154
|
m_LocalRotation: {x: 0.20427474, y: -0.0019674818, z: 0.012308401, w: 0.9788343}
|
|
154
155
|
m_LocalPosition: {x: -0.00000033095478, y: -0.00000087738033, z: 0.042926535}
|
|
155
156
|
m_LocalScale: {x: 1.0000315, y: 0.999996, z: 1.000038}
|
|
@@ -157,7 +158,6 @@ Transform:
|
|
|
157
158
|
m_Children:
|
|
158
159
|
- {fileID: 4572389166072670635}
|
|
159
160
|
m_Father: {fileID: 5927456894226309190}
|
|
160
|
-
m_RootOrder: 0
|
|
161
161
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
162
162
|
--- !u!1 &1240702597703455857
|
|
163
163
|
GameObject:
|
|
@@ -182,6 +182,7 @@ Transform:
|
|
|
182
182
|
m_PrefabInstance: {fileID: 0}
|
|
183
183
|
m_PrefabAsset: {fileID: 0}
|
|
184
184
|
m_GameObject: {fileID: 1240702597703455857}
|
|
185
|
+
serializedVersion: 2
|
|
185
186
|
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
|
186
187
|
m_LocalPosition: {x: 0.019818999, y: -0.009505, z: 0.036448}
|
|
187
188
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -189,7 +190,6 @@ Transform:
|
|
|
189
190
|
m_Children:
|
|
190
191
|
- {fileID: 6234125969712869431}
|
|
191
192
|
m_Father: {fileID: 238893749033992988}
|
|
192
|
-
m_RootOrder: 0
|
|
193
193
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
194
194
|
--- !u!1 &1542528115233642685
|
|
195
195
|
GameObject:
|
|
@@ -214,13 +214,13 @@ Transform:
|
|
|
214
214
|
m_PrefabInstance: {fileID: 0}
|
|
215
215
|
m_PrefabAsset: {fileID: 0}
|
|
216
216
|
m_GameObject: {fileID: 1542528115233642685}
|
|
217
|
+
serializedVersion: 2
|
|
217
218
|
m_LocalRotation: {x: -9.62965e-35, y: -2.7755576e-17, z: -3.469447e-18, w: 1}
|
|
218
219
|
m_LocalPosition: {x: -0.0006706834, y: 0.0010256481, z: 0.02459195}
|
|
219
220
|
m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 1}
|
|
220
221
|
m_ConstrainProportionsScale: 0
|
|
221
222
|
m_Children: []
|
|
222
223
|
m_Father: {fileID: 4569776856077603902}
|
|
223
|
-
m_RootOrder: 0
|
|
224
224
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
225
225
|
--- !u!1 &1871309438992319211
|
|
226
226
|
GameObject:
|
|
@@ -245,6 +245,7 @@ Transform:
|
|
|
245
245
|
m_PrefabInstance: {fileID: 0}
|
|
246
246
|
m_PrefabAsset: {fileID: 0}
|
|
247
247
|
m_GameObject: {fileID: 1871309438992319211}
|
|
248
|
+
serializedVersion: 2
|
|
248
249
|
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
|
249
250
|
m_LocalPosition: {x: 0.00361, y: -0.007648, z: 0.034286004}
|
|
250
251
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -252,7 +253,6 @@ Transform:
|
|
|
252
253
|
m_Children:
|
|
253
254
|
- {fileID: 5927456894226309190}
|
|
254
255
|
m_Father: {fileID: 238893749033992988}
|
|
255
|
-
m_RootOrder: 2
|
|
256
256
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
257
257
|
--- !u!1 &2085464642649158847
|
|
258
258
|
GameObject:
|
|
@@ -277,6 +277,7 @@ Transform:
|
|
|
277
277
|
m_PrefabInstance: {fileID: 0}
|
|
278
278
|
m_PrefabAsset: {fileID: 0}
|
|
279
279
|
m_GameObject: {fileID: 2085464642649158847}
|
|
280
|
+
serializedVersion: 2
|
|
280
281
|
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
|
281
282
|
m_LocalPosition: {x: -0.014992, y: -0.0060159997, z: 0.034776}
|
|
282
283
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -284,7 +285,6 @@ Transform:
|
|
|
284
285
|
m_Children:
|
|
285
286
|
- {fileID: 1058363782154160698}
|
|
286
287
|
m_Father: {fileID: 238893749033992988}
|
|
287
|
-
m_RootOrder: 4
|
|
288
288
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
289
289
|
--- !u!1 &2236458765641727962
|
|
290
290
|
GameObject:
|
|
@@ -309,6 +309,7 @@ Transform:
|
|
|
309
309
|
m_PrefabInstance: {fileID: 0}
|
|
310
310
|
m_PrefabAsset: {fileID: 0}
|
|
311
311
|
m_GameObject: {fileID: 2236458765641727962}
|
|
312
|
+
serializedVersion: 2
|
|
312
313
|
m_LocalRotation: {x: 0.11291981, y: 0.05065549, z: -0.0791567, w: 0.98914987}
|
|
313
314
|
m_LocalPosition: {x: -0.0000010251998, y: -0.0000018262863, z: 0.033794336}
|
|
314
315
|
m_LocalScale: {x: 0.99998796, y: 0.99996454, z: 1.0000015}
|
|
@@ -316,7 +317,6 @@ Transform:
|
|
|
316
317
|
m_Children:
|
|
317
318
|
- {fileID: 855643598358925680}
|
|
318
319
|
m_Father: {fileID: 6710750435592238022}
|
|
319
|
-
m_RootOrder: 0
|
|
320
320
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
321
321
|
--- !u!1 &2712584852362974380
|
|
322
322
|
GameObject:
|
|
@@ -341,6 +341,7 @@ Transform:
|
|
|
341
341
|
m_PrefabInstance: {fileID: 0}
|
|
342
342
|
m_PrefabAsset: {fileID: 0}
|
|
343
343
|
m_GameObject: {fileID: 2712584852362974380}
|
|
344
|
+
serializedVersion: 2
|
|
344
345
|
m_LocalRotation: {x: 0.13075915, y: -0.0037599164, z: 0.026288582, w: 0.99105847}
|
|
345
346
|
m_LocalPosition: {x: 0.0000014615058, y: -0.0000018197297, z: 0.03792747}
|
|
346
347
|
m_LocalScale: {x: 0.99995524, y: 0.9999495, z: 0.9999498}
|
|
@@ -348,7 +349,6 @@ Transform:
|
|
|
348
349
|
m_Children:
|
|
349
350
|
- {fileID: 1260852415989740353}
|
|
350
351
|
m_Father: {fileID: 6234125969712869431}
|
|
351
|
-
m_RootOrder: 0
|
|
352
352
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
353
353
|
--- !u!1 &3291766546678055093
|
|
354
354
|
GameObject:
|
|
@@ -373,13 +373,13 @@ Transform:
|
|
|
373
373
|
m_PrefabInstance: {fileID: 0}
|
|
374
374
|
m_PrefabAsset: {fileID: 0}
|
|
375
375
|
m_GameObject: {fileID: 3291766546678055093}
|
|
376
|
+
serializedVersion: 2
|
|
376
377
|
m_LocalRotation: {x: -0.000029424828, y: -2.7755576e-17, z: -8.16703e-22, w: 1}
|
|
377
378
|
m_LocalPosition: {x: -0.0002563882, y: 0.0016081142, z: 0.024326066}
|
|
378
379
|
m_LocalScale: {x: 1, y: 1.0000553, z: 1}
|
|
379
380
|
m_ConstrainProportionsScale: 0
|
|
380
381
|
m_Children: []
|
|
381
382
|
m_Father: {fileID: 86699548284653760}
|
|
382
|
-
m_RootOrder: 0
|
|
383
383
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
384
384
|
--- !u!1 &3469718640563796307
|
|
385
385
|
GameObject:
|
|
@@ -404,6 +404,7 @@ Transform:
|
|
|
404
404
|
m_PrefabInstance: {fileID: 0}
|
|
405
405
|
m_PrefabAsset: {fileID: 0}
|
|
406
406
|
m_GameObject: {fileID: 3469718640563796307}
|
|
407
|
+
serializedVersion: 2
|
|
407
408
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
408
409
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
409
410
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -412,7 +413,6 @@ Transform:
|
|
|
412
413
|
- {fileID: 2146625281762301002}
|
|
413
414
|
- {fileID: 238893749033992988}
|
|
414
415
|
m_Father: {fileID: 1043468710468570446}
|
|
415
|
-
m_RootOrder: 0
|
|
416
416
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
417
417
|
--- !u!1 &3960169563806877935
|
|
418
418
|
GameObject:
|
|
@@ -437,6 +437,7 @@ Transform:
|
|
|
437
437
|
m_PrefabInstance: {fileID: 0}
|
|
438
438
|
m_PrefabAsset: {fileID: 0}
|
|
439
439
|
m_GameObject: {fileID: 3960169563806877935}
|
|
440
|
+
serializedVersion: 2
|
|
440
441
|
m_LocalRotation: {x: -0.06267674, y: -0.051014844, z: -0.09903724, w: 0.99179673}
|
|
441
442
|
m_LocalPosition: {x: 0.0000025272368, y: 0.0000011599063, z: 0.04565198}
|
|
442
443
|
m_LocalScale: {x: 0.99995625, y: 1.0000366, z: 1.000068}
|
|
@@ -444,7 +445,6 @@ Transform:
|
|
|
444
445
|
m_Children:
|
|
445
446
|
- {fileID: 8707946407463548915}
|
|
446
447
|
m_Father: {fileID: 3667908875288706546}
|
|
447
|
-
m_RootOrder: 0
|
|
448
448
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
449
449
|
--- !u!1 &4048140225985126345
|
|
450
450
|
GameObject:
|
|
@@ -469,13 +469,13 @@ Transform:
|
|
|
469
469
|
m_PrefabInstance: {fileID: 0}
|
|
470
470
|
m_PrefabAsset: {fileID: 0}
|
|
471
471
|
m_GameObject: {fileID: 4048140225985126345}
|
|
472
|
+
serializedVersion: 2
|
|
472
473
|
m_LocalRotation: {x: 0, y: 4.3368087e-19, z: -0, w: 1}
|
|
473
474
|
m_LocalPosition: {x: -0.00029495, y: 0.0010254311, z: 0.022364644}
|
|
474
475
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
475
476
|
m_ConstrainProportionsScale: 0
|
|
476
477
|
m_Children: []
|
|
477
478
|
m_Father: {fileID: 1260852415989740353}
|
|
478
|
-
m_RootOrder: 0
|
|
479
479
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
480
480
|
--- !u!1 &4272958093972585541
|
|
481
481
|
GameObject:
|
|
@@ -500,13 +500,13 @@ Transform:
|
|
|
500
500
|
m_PrefabInstance: {fileID: 0}
|
|
501
501
|
m_PrefabAsset: {fileID: 0}
|
|
502
502
|
m_GameObject: {fileID: 4272958093972585541}
|
|
503
|
+
serializedVersion: 2
|
|
503
504
|
m_LocalRotation: {x: -2.7755576e-17, y: 2.7755576e-17, z: -1.3877788e-17, w: 1}
|
|
504
505
|
m_LocalPosition: {x: 0.00024632455, y: 0.0012151956, z: 0.021923332}
|
|
505
506
|
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000002}
|
|
506
507
|
m_ConstrainProportionsScale: 0
|
|
507
508
|
m_Children: []
|
|
508
509
|
m_Father: {fileID: 3364567075765715623}
|
|
509
|
-
m_RootOrder: 0
|
|
510
510
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
511
511
|
--- !u!1 &4458232919462869095
|
|
512
512
|
GameObject:
|
|
@@ -531,6 +531,7 @@ Transform:
|
|
|
531
531
|
m_PrefabInstance: {fileID: 0}
|
|
532
532
|
m_PrefabAsset: {fileID: 0}
|
|
533
533
|
m_GameObject: {fileID: 4458232919462869095}
|
|
534
|
+
serializedVersion: 2
|
|
534
535
|
m_LocalRotation: {x: 0.000000059604645, y: -0, z: 0.000000010244548, w: 1}
|
|
535
536
|
m_LocalPosition: {x: 0, y: 0, z: -0.080000006}
|
|
536
537
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
@@ -543,7 +544,6 @@ Transform:
|
|
|
543
544
|
- {fileID: 7515462064875205607}
|
|
544
545
|
- {fileID: 4472874246172221402}
|
|
545
546
|
m_Father: {fileID: 4516092657092262880}
|
|
546
|
-
m_RootOrder: 1
|
|
547
547
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
548
548
|
--- !u!1 &5172636095642404555
|
|
549
549
|
GameObject:
|
|
@@ -568,6 +568,7 @@ Transform:
|
|
|
568
568
|
m_PrefabInstance: {fileID: 0}
|
|
569
569
|
m_PrefabAsset: {fileID: 0}
|
|
570
570
|
m_GameObject: {fileID: 5172636095642404555}
|
|
571
|
+
serializedVersion: 2
|
|
571
572
|
m_LocalRotation: {x: 0.151882, y: 0.076982684, z: -0.041177794, w: 0.9845354}
|
|
572
573
|
m_LocalPosition: {x: 0.0037319993, y: 0.0021889997, z: 0.059548}
|
|
573
574
|
m_LocalScale: {x: 1.0000446, y: 1.0000408, z: 0.99999094}
|
|
@@ -575,7 +576,6 @@ Transform:
|
|
|
575
576
|
m_Children:
|
|
576
577
|
- {fileID: 5964191839413798599}
|
|
577
578
|
m_Father: {fileID: 7932595518460616741}
|
|
578
|
-
m_RootOrder: 0
|
|
579
579
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
580
580
|
--- !u!1 &5865217214547823689
|
|
581
581
|
GameObject:
|
|
@@ -600,6 +600,7 @@ Transform:
|
|
|
600
600
|
m_PrefabInstance: {fileID: 0}
|
|
601
601
|
m_PrefabAsset: {fileID: 0}
|
|
602
602
|
m_GameObject: {fileID: 5865217214547823689}
|
|
603
|
+
serializedVersion: 2
|
|
603
604
|
m_LocalRotation: {x: 0.018333552, y: -0.14033656, z: 0.2070356, w: 0.96804225}
|
|
604
605
|
m_LocalPosition: {x: -0.022999, y: -0.009419999, z: 0.034074}
|
|
605
606
|
m_LocalScale: {x: 1.0000186, y: 1.0000082, z: 0.999959}
|
|
@@ -607,7 +608,6 @@ Transform:
|
|
|
607
608
|
m_Children:
|
|
608
609
|
- {fileID: 1140964832876167965}
|
|
609
610
|
m_Father: {fileID: 238893749033992988}
|
|
610
|
-
m_RootOrder: 1
|
|
611
611
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
612
612
|
--- !u!1 &6192332092954066207
|
|
613
613
|
GameObject:
|
|
@@ -632,6 +632,7 @@ Transform:
|
|
|
632
632
|
m_PrefabInstance: {fileID: 0}
|
|
633
633
|
m_PrefabAsset: {fileID: 0}
|
|
634
634
|
m_GameObject: {fileID: 6192332092954066207}
|
|
635
|
+
serializedVersion: 2
|
|
635
636
|
m_LocalRotation: {x: -0.0030179783, y: -0.026077718, z: 0.016432201, w: 0.9995203}
|
|
636
637
|
m_LocalPosition: {x: 0.00000092506406, y: 0.00000015974044, z: 0.024305157}
|
|
637
638
|
m_LocalScale: {x: 1.0000451, y: 1.000008, z: 1.0000004}
|
|
@@ -639,7 +640,6 @@ Transform:
|
|
|
639
640
|
m_Children:
|
|
640
641
|
- {fileID: 58885230098841710}
|
|
641
642
|
m_Father: {fileID: 5964191839413798599}
|
|
642
|
-
m_RootOrder: 0
|
|
643
643
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
644
644
|
--- !u!1 &6765106064823175057
|
|
645
645
|
GameObject:
|
|
@@ -664,6 +664,7 @@ Transform:
|
|
|
664
664
|
m_PrefabInstance: {fileID: 0}
|
|
665
665
|
m_PrefabAsset: {fileID: 0}
|
|
666
666
|
m_GameObject: {fileID: 6765106064823175057}
|
|
667
|
+
serializedVersion: 2
|
|
667
668
|
m_LocalRotation: {x: 0.22011371, y: -0.050169148, z: 0.08162888, w: 0.9707573}
|
|
668
669
|
m_LocalPosition: {x: -0.0000011491775, y: -0.000004863739, z: 0.032513987}
|
|
669
670
|
m_LocalScale: {x: 0.99999297, y: 0.999997, z: 0.9999633}
|
|
@@ -671,7 +672,6 @@ Transform:
|
|
|
671
672
|
m_Children:
|
|
672
673
|
- {fileID: 4569776856077603902}
|
|
673
674
|
m_Father: {fileID: 4472874246172221402}
|
|
674
|
-
m_RootOrder: 0
|
|
675
675
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
676
676
|
--- !u!1 &6962810150867374793
|
|
677
677
|
GameObject:
|
|
@@ -696,6 +696,7 @@ Transform:
|
|
|
696
696
|
m_PrefabInstance: {fileID: 0}
|
|
697
697
|
m_PrefabAsset: {fileID: 0}
|
|
698
698
|
m_GameObject: {fileID: 6962810150867374793}
|
|
699
|
+
serializedVersion: 2
|
|
699
700
|
m_LocalRotation: {x: 0.11511069, y: 0.048731122, z: -0.0011094842, w: 0.992156}
|
|
700
701
|
m_LocalPosition: {x: 0.0000001335144, y: 0.00000063657757, z: 0.020311326}
|
|
701
702
|
m_LocalScale: {x: 1.000022, y: 0.9999687, z: 0.9999735}
|
|
@@ -703,7 +704,6 @@ Transform:
|
|
|
703
704
|
m_Children:
|
|
704
705
|
- {fileID: 8644527529487420191}
|
|
705
706
|
m_Father: {fileID: 8707946407463548915}
|
|
706
|
-
m_RootOrder: 0
|
|
707
707
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
708
708
|
--- !u!1 &7705771681301267287
|
|
709
709
|
GameObject:
|
|
@@ -732,13 +732,13 @@ Transform:
|
|
|
732
732
|
m_PrefabInstance: {fileID: 0}
|
|
733
733
|
m_PrefabAsset: {fileID: 0}
|
|
734
734
|
m_GameObject: {fileID: 7705771681301267287}
|
|
735
|
+
serializedVersion: 2
|
|
735
736
|
m_LocalRotation: {x: -0.7071068, y: -0.000000048428774, z: 0.000000007450581, w: 0.7071068}
|
|
736
737
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
737
738
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
738
739
|
m_ConstrainProportionsScale: 0
|
|
739
740
|
m_Children: []
|
|
740
741
|
m_Father: {fileID: 4516092657092262880}
|
|
741
|
-
m_RootOrder: 0
|
|
742
742
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
743
743
|
--- !u!137 &6988768184931549265
|
|
744
744
|
SkinnedMeshRenderer:
|
|
@@ -757,6 +757,9 @@ SkinnedMeshRenderer:
|
|
|
757
757
|
m_ReflectionProbeUsage: 1
|
|
758
758
|
m_RayTracingMode: 3
|
|
759
759
|
m_RayTraceProcedural: 0
|
|
760
|
+
m_RayTracingAccelStructBuildFlagsOverride: 0
|
|
761
|
+
m_RayTracingAccelStructBuildFlags: 1
|
|
762
|
+
m_SmallMeshCulling: 1
|
|
760
763
|
m_RenderingLayerMask: 257
|
|
761
764
|
m_RendererPriority: 0
|
|
762
765
|
m_Materials:
|
|
@@ -842,10 +845,21 @@ Rigidbody:
|
|
|
842
845
|
m_PrefabInstance: {fileID: 0}
|
|
843
846
|
m_PrefabAsset: {fileID: 0}
|
|
844
847
|
m_GameObject: {fileID: 7705771681301267287}
|
|
845
|
-
serializedVersion:
|
|
848
|
+
serializedVersion: 4
|
|
846
849
|
m_Mass: 1
|
|
847
850
|
m_Drag: 0.1
|
|
848
851
|
m_AngularDrag: 0.05
|
|
852
|
+
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
|
853
|
+
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
|
854
|
+
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
855
|
+
m_IncludeLayers:
|
|
856
|
+
serializedVersion: 2
|
|
857
|
+
m_Bits: 0
|
|
858
|
+
m_ExcludeLayers:
|
|
859
|
+
serializedVersion: 2
|
|
860
|
+
m_Bits: 0
|
|
861
|
+
m_ImplicitCom: 1
|
|
862
|
+
m_ImplicitTensor: 1
|
|
849
863
|
m_UseGravity: 0
|
|
850
864
|
m_IsKinematic: 1
|
|
851
865
|
m_Interpolate: 0
|
|
@@ -859,9 +873,17 @@ MeshCollider:
|
|
|
859
873
|
m_PrefabAsset: {fileID: 0}
|
|
860
874
|
m_GameObject: {fileID: 7705771681301267287}
|
|
861
875
|
m_Material: {fileID: 0}
|
|
876
|
+
m_IncludeLayers:
|
|
877
|
+
serializedVersion: 2
|
|
878
|
+
m_Bits: 0
|
|
879
|
+
m_ExcludeLayers:
|
|
880
|
+
serializedVersion: 2
|
|
881
|
+
m_Bits: 0
|
|
882
|
+
m_LayerOverridePriority: 0
|
|
862
883
|
m_IsTrigger: 0
|
|
884
|
+
m_ProvidesContacts: 0
|
|
863
885
|
m_Enabled: 1
|
|
864
|
-
serializedVersion:
|
|
886
|
+
serializedVersion: 5
|
|
865
887
|
m_Convex: 0
|
|
866
888
|
m_CookingOptions: 30
|
|
867
889
|
m_Mesh: {fileID: 2764515422069785744, guid: 76cd691b5e66d934aa972de4782f2492, type: 3}
|
|
@@ -888,6 +910,7 @@ Transform:
|
|
|
888
910
|
m_PrefabInstance: {fileID: 0}
|
|
889
911
|
m_PrefabAsset: {fileID: 0}
|
|
890
912
|
m_GameObject: {fileID: 7965834123657345673}
|
|
913
|
+
serializedVersion: 2
|
|
891
914
|
m_LocalRotation: {x: 0.09175414, y: 0.02957179, z: 0.008965106, w: 0.99530214}
|
|
892
915
|
m_LocalPosition: {x: -0.0000010371208, y: -0.00000054597854, z: 0.026573557}
|
|
893
916
|
m_LocalScale: {x: 0.9999347, y: 0.99997205, z: 1.0000098}
|
|
@@ -895,7 +918,6 @@ Transform:
|
|
|
895
918
|
m_Children:
|
|
896
919
|
- {fileID: 8354656723204250920}
|
|
897
920
|
m_Father: {fileID: 8617308595751039376}
|
|
898
|
-
m_RootOrder: 0
|
|
899
921
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
900
922
|
--- !u!1 &8137031466837440323
|
|
901
923
|
GameObject:
|
|
@@ -920,6 +942,7 @@ Transform:
|
|
|
920
942
|
m_PrefabInstance: {fileID: 0}
|
|
921
943
|
m_PrefabAsset: {fileID: 0}
|
|
922
944
|
m_GameObject: {fileID: 8137031466837440323}
|
|
945
|
+
serializedVersion: 2
|
|
923
946
|
m_LocalRotation: {x: 0.36025816, y: -0.025496997, z: 0.06776039, w: 0.930039}
|
|
924
947
|
m_LocalPosition: {x: 0.00000017166137, y: -0.00000066459177, z: 0.030719945}
|
|
925
948
|
m_LocalScale: {x: 1.0000147, y: 1.000013, z: 0.99994445}
|
|
@@ -927,7 +950,6 @@ Transform:
|
|
|
927
950
|
m_Children:
|
|
928
951
|
- {fileID: 3364567075765715623}
|
|
929
952
|
m_Father: {fileID: 1140964832876167965}
|
|
930
|
-
m_RootOrder: 0
|
|
931
953
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
932
954
|
--- !u!1 &8416277699948730796
|
|
933
955
|
GameObject:
|
|
@@ -952,6 +974,7 @@ Transform:
|
|
|
952
974
|
m_PrefabInstance: {fileID: 0}
|
|
953
975
|
m_PrefabAsset: {fileID: 0}
|
|
954
976
|
m_GameObject: {fileID: 8416277699948730796}
|
|
977
|
+
serializedVersion: 2
|
|
955
978
|
m_LocalRotation: {x: -0.032234482, y: -0.0019387039, z: 0.040452998, w: 0.9986595}
|
|
956
979
|
m_LocalPosition: {x: 0.00000016987323, y: 0.00000058412553, z: 0.027548427}
|
|
957
980
|
m_LocalScale: {x: 0.9999719, y: 1.0000138, z: 0.9999635}
|
|
@@ -959,7 +982,6 @@ Transform:
|
|
|
959
982
|
m_Children:
|
|
960
983
|
- {fileID: 8075543507614278096}
|
|
961
984
|
m_Father: {fileID: 5620449021316145138}
|
|
962
|
-
m_RootOrder: 0
|
|
963
985
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
964
986
|
--- !u!1 &8416785246647417335
|
|
965
987
|
GameObject:
|
|
@@ -984,6 +1006,7 @@ Transform:
|
|
|
984
1006
|
m_PrefabInstance: {fileID: 0}
|
|
985
1007
|
m_PrefabAsset: {fileID: 0}
|
|
986
1008
|
m_GameObject: {fileID: 8416785246647417335}
|
|
1009
|
+
serializedVersion: 2
|
|
987
1010
|
m_LocalRotation: {x: 0.3017412, y: 0.007293773, z: 0.039555237, w: 0.95254105}
|
|
988
1011
|
m_LocalPosition: {x: 0.00000052571295, y: 0.00000036686657, z: 0.03899503}
|
|
989
1012
|
m_LocalScale: {x: 1.0000359, y: 0.99992716, z: 0.9999418}
|
|
@@ -991,7 +1014,6 @@ Transform:
|
|
|
991
1014
|
m_Children:
|
|
992
1015
|
- {fileID: 86699548284653760}
|
|
993
1016
|
m_Father: {fileID: 1058363782154160698}
|
|
994
|
-
m_RootOrder: 0
|
|
995
1017
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
996
1018
|
--- !u!1 &8884788167040088194
|
|
997
1019
|
GameObject:
|
|
@@ -1016,13 +1038,13 @@ Transform:
|
|
|
1016
1038
|
m_PrefabInstance: {fileID: 0}
|
|
1017
1039
|
m_PrefabAsset: {fileID: 0}
|
|
1018
1040
|
m_GameObject: {fileID: 8884788167040088194}
|
|
1041
|
+
serializedVersion: 2
|
|
1019
1042
|
m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
|
|
1020
1043
|
m_LocalPosition: {x: 0.000863, y: -0.001272, z: 0.047823}
|
|
1021
1044
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
|
1022
1045
|
m_ConstrainProportionsScale: 0
|
|
1023
1046
|
m_Children: []
|
|
1024
1047
|
m_Father: {fileID: 238893749033992988}
|
|
1025
|
-
m_RootOrder: 3
|
|
1026
1048
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
1027
1049
|
--- !u!1 &9174589738255989531
|
|
1028
1050
|
GameObject:
|
|
@@ -1047,6 +1069,7 @@ Transform:
|
|
|
1047
1069
|
m_PrefabInstance: {fileID: 0}
|
|
1048
1070
|
m_PrefabAsset: {fileID: 0}
|
|
1049
1071
|
m_GameObject: {fileID: 9174589738255989531}
|
|
1072
|
+
serializedVersion: 2
|
|
1050
1073
|
m_LocalRotation: {x: 0.08123156, y: -0.086153395, z: 0.055879932, w: 0.9913912}
|
|
1051
1074
|
m_LocalPosition: {x: -0.0024730002, y: -0.0005129999, z: 0.053917997}
|
|
1052
1075
|
m_LocalScale: {x: 0.99998975, y: 1.0000366, z: 1.0000347}
|
|
@@ -1054,5 +1077,4 @@ Transform:
|
|
|
1054
1077
|
m_Children:
|
|
1055
1078
|
- {fileID: 8617308595751039376}
|
|
1056
1079
|
m_Father: {fileID: 7515462064875205607}
|
|
1057
|
-
m_RootOrder: 0
|
|
1058
1080
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|