Skip to content

Commit

Permalink
Merge pull request #302 from GothicVRProject/feature/more-externals
Browse files Browse the repository at this point in the history
Feature/more externals
  • Loading branch information
JucanAndreiDaniel authored Feb 1, 2024
2 parents 7a91ca8 + b82d178 commit 84ec72a
Show file tree
Hide file tree
Showing 56 changed files with 1,062 additions and 248 deletions.
174 changes: 42 additions & 132 deletions Assets/GothicVR/Resources/Prefabs/UI Element Prefabs/VRPlayer.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -128,134 +128,6 @@ AudioSource:
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &589842099468929089
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 9113810631379704788}
- component: {fileID: 367388854615376469}
m_Layer: 7
m_Name: HeroVoice
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &9113810631379704788
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589842099468929089}
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: 3286136463054414638}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!82 &367388854615376469
AudioSource:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 589842099468929089}
m_Enabled: 1
serializedVersion: 4
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Spatialize: 0
SpatializePostEffects: 0
Priority: 128
DopplerLevel: 1
MinDistance: 1
MaxDistance: 500
Pan2D: 0
rolloffMode: 0
BypassEffects: 0
BypassListenerEffects: 0
BypassReverbZones: 0
rolloffCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
panLevelCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
spreadCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
reverbZoneMixCustomCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
--- !u!1 &2063933424735589160
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6188,6 +6060,7 @@ GameObject:
- component: {fileID: 3286136461781483593}
- component: {fileID: 3490461415993468589}
- component: {fileID: 5331787116829108395}
- component: {fileID: 2500770934419847238}
m_Layer: 7
m_Name: VRPlayer
m_TagString: Player
Expand Down Expand Up @@ -6299,7 +6172,7 @@ AudioSource:
OutputAudioMixerGroup: {fileID: 0}
m_audioClip: {fileID: 0}
m_PlayOnAwake: 1
m_Volume: 0.25
m_Volume: 1
m_Pitch: 1
Loop: 0
Mute: 0
Expand Down Expand Up @@ -6343,7 +6216,7 @@ AudioSource:
m_Curve:
- serializedVersion: 3
time: 0
value: 1
value: 0
inSlope: 0
outSlope: 0
tangentMode: 0
Expand Down Expand Up @@ -6406,6 +6279,44 @@ CapsuleCollider:
m_Height: 2
m_Direction: 1
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &2500770934419847238
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3286136461781483594}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: da21e4a06ee346319b0a6dc74e0dcc61, type: 3}
m_Name:
m_EditorClassIdentifier:
npcSound: {fileID: 0}
bip01: {fileID: 0}
colliderRootMotion: {fileID: 0}
head: {fileID: 0}
headMorph: {fileID: 0}
mdmName:
baseMdsName:
overlayMdsName:
perceptionTime: 0
walkMode: 0
bodyState: 0
currentInteractable: {fileID: 0}
currentInteractableSlot: {fileID: 0}
currentInteractableStateId: -1
prevStateStart: 0
stateStart: 0
stateLoop: 0
stateEnd: 0
isStateTimeActive: 0
stateTime: 0
currentLoopState: 0
hasItemEquipped: 0
currentItem: 0
usedItemSlot:
itemAnimationState: -1
isClonedFromAnother: 0
--- !u!1 &3286136462172449750
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8253,8 +8164,7 @@ Transform:
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 9113810631379704788}
m_Children: []
m_Father: {fileID: 3329884094427662597}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!20 &3286136463054414635
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2022050282646122291}
- component: {fileID: 5252305678164495226}
m_Layer: 0
m_Name: Interactable
m_Name: Vob
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
Expand Down Expand Up @@ -44,5 +44,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 024fa582612e45c0afcf4ba9d756341e, type: 3}
m_Name:
m_EditorClassIdentifier:
<visual>k__BackingField:
<visualScheme>k__BackingField:
47 changes: 47 additions & 0 deletions Assets/GothicVR/Resources/Prefabs/Vobs/oCMobContainer.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2022050282646122291}
- component: {fileID: 6383736313796596418}
m_Layer: 0
m_Name: oCMobContainer
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2022050282646122291
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
serializedVersion: 2
m_LocalRotation: {x: 0.69465834, y: 0, z: 0, w: 0.71933985}
m_LocalPosition: {x: -328.3223, y: 27.197954, z: -177.9182}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 88, y: 0, z: 0}
--- !u!114 &6383736313796596418
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3647fae04a904a6dbba443f755b63a7d, type: 3}
m_Name:
m_EditorClassIdentifier:
<visualScheme>k__BackingField:

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions Assets/GothicVR/Resources/Prefabs/Vobs/oCMobDoor.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2022050282646122291}
- component: {fileID: 2607151182155886275}
m_Layer: 0
m_Name: oCMobDoor
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2022050282646122291
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
serializedVersion: 2
m_LocalRotation: {x: 0.69465834, y: 0, z: 0, w: 0.71933985}
m_LocalPosition: {x: -328.3223, y: 27.197954, z: -177.9182}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 88, y: 0, z: 0}
--- !u!114 &2607151182155886275
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: aa8549f9b79448e4b3ebd6901ded3136, type: 3}
m_Name:
m_EditorClassIdentifier:
<visualScheme>k__BackingField:
7 changes: 7 additions & 0 deletions Assets/GothicVR/Resources/Prefabs/Vobs/oCMobDoor.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

47 changes: 47 additions & 0 deletions Assets/GothicVR/Resources/Prefabs/Vobs/oCMobInter.prefab
Original file line number Diff line number Diff line change
@@ -0,0 +1,47 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &6503575194566409312
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2022050282646122291}
- component: {fileID: 862177027832733350}
m_Layer: 0
m_Name: oCMobInter
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2022050282646122291
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
serializedVersion: 2
m_LocalRotation: {x: 0.69465834, y: 0, z: 0, w: 0.71933985}
m_LocalPosition: {x: -328.3223, y: 27.197954, z: -177.9182}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 88, y: 0, z: 0}
--- !u!114 &862177027832733350
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6503575194566409312}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fcee438f16834e5f8768391122403ab5, type: 3}
m_Name:
m_EditorClassIdentifier:
<visualScheme>k__BackingField:
7 changes: 7 additions & 0 deletions Assets/GothicVR/Resources/Prefabs/Vobs/oCMobInter.prefab.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 84ec72a

Please sign in to comment.