lionfish/SimUL
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix TestPack

Browse Source
This commit is contained in:
Vova
2023-03-26 16:41:13 +03:00
parent fe0ee319e1
commit 9bf19a4c3c
11 changed files with 471 additions and 152623 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/OutPost.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 47803fb36cd83c943b9d1ca0c66527e6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/OutPost/Resources.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 658fa8a63b8a9194c908adb2c1b61f80
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/OutPost/Resources/Scenes.meta
-8
View File
@@ -1,8 +0,0 @@
fileFormatVersion: 2
guid: 3e6d47cb765305e4e906f6257589ab39
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/OutPost/Resources/Scenes/NYC_Block_6.unity
-152551
View File
File diff suppressed because it is too large Load Diff
Assets/OutPost/Resources/Scenes/NYC_Block_6.unity.meta
-7
View File
@@ -1,7 +0,0 @@
fileFormatVersion: 2
guid: 3de8f2afe46df40468732477062ca76d
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Prefabs/TestPack.prefab
+5 -6
View File
@@ -41,12 +41,11 @@ MonoBehaviour:
m_GameObject: {fileID: 133785098126353824}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 98af8458d80ad3a489a169272f679b4c, type: 3}
m_Script: {fileID: 11500000, guid: 00bbfcf5f7cdbb543bd6e09cd773f199, type: 3}
m_Name:
m_EditorClassIdentifier:
_startHour: 9
_sunriseHour: 7
_sunsetHour: 20.5
_sunriseHour: 9
_sunsetHour: 20
--- !u!1 &462433139557538863
GameObject:
m_ObjectHideFlags: 0
@@ -331,7 +330,7 @@ MonoBehaviour:
m_GameObject: {fileID: 749627522795951761}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f3ae2c077e8e7c041b87a85a0ff8dd4c, type: 3}
m_Script: {fileID: 11500000, guid: dcf28888027a4ab4ba2df2a33b89899e, type: 3}
m_Name:
m_EditorClassIdentifier:
_selectableLayerMask:
@@ -691,7 +690,7 @@ MonoBehaviour:
m_GameObject: {fileID: 1670483080127149646}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ae5ecbfd9a3637247b4cd539f9a57316, type: 3}
m_Script: {fileID: 11500000, guid: a49cd67cb3095a74d9b654426bc046b6, type: 3}
m_Name:
m_EditorClassIdentifier:
_interactionPoint: {fileID: 562878396306856202}
Assets/Scenes/City.unity
+6 -5
View File
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1}
m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -3127,7 +3127,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 963194225}
m_LocalRotation: {x: 0.5371753, y: -0.000000029953316, z: 0.00000001907616, w: 0.8434707}
m_LocalRotation: {x: 0.53717524, y: 0.000000015757937, z: -0.000000010035648, w: 0.8434707}
m_LocalPosition: {x: 29.11, y: 15, z: -57.39}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -10908,7 +10908,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8b80f4c0c91e48e418ea436255074f8e, type: 3}
m_Name:
m_EditorClassIdentifier:
_camera: {fileID: 2110938953}
_playerCamera: {fileID: 2110938953}
_cityMapCamera: {fileID: 0}
--- !u!1 &1965245019
GameObject:
m_ObjectHideFlags: 0
@@ -11538,7 +11539,7 @@ GameObject:
- component: {fileID: 2110938952}
- component: {fileID: 2110938953}
m_Layer: 0
m_Name: Virtual Camera
m_Name: PlayerCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -11551,7 +11552,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2110938951}
m_LocalRotation: {x: 0.5371753, y: -0.000000029953316, z: 0.00000001907616, w: 0.8434707}
m_LocalRotation: {x: 0.53717524, y: 0.000000015757937, z: -0.000000010035648, w: 0.8434707}
m_LocalPosition: {x: 29.11, y: 15, z: -57.39}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
Assets/Scenes/City_new.unity
+175 -6
View File
@@ -255,7 +255,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 37693064}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -23.8, y: 13.5, z: -26}
m_LocalPosition: {x: -26.19, y: 15, z: -26}
m_LocalScale: {x: 15, y: 15, z: 15}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -440,6 +440,101 @@ MeshFilter:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 39150163}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &60182159
GameObject:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 60182160}
- component: {fileID: 60182163}
- component: {fileID: 60182162}
- component: {fileID: 60182161}
m_Layer: 0
m_Name: cm
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &60182160
Transform:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60182159}
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: 465810073}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &60182161
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60182159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fa7155796051b734daa718462081dc5f, type: 3}
m_Name:
m_EditorClassIdentifier:
m_BindingMode: 1
m_FollowOffset: {x: 0, y: 0, z: -10}
m_XDamping: 1
m_YDamping: 1
m_ZDamping: 1
m_AngularDampingMode: 0
m_PitchDamping: 0
m_YawDamping: 0
m_RollDamping: 0
m_AngularDamping: 0
--- !u!114 &60182162
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60182159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4044717213e31446939f7bd49c896ea, type: 3}
m_Name:
m_EditorClassIdentifier:
m_TrackedObjectOffset: {x: 0, y: 0, z: 0}
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 0.5
m_VerticalDamping: 0.5
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0
m_DeadZoneHeight: 0
m_SoftZoneWidth: 0.8
m_SoftZoneHeight: 0.8
m_BiasX: 0
m_BiasY: 0
m_CenterOnActivate: 1
--- !u!114 &60182163
MonoBehaviour:
m_ObjectHideFlags: 3
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 60182159}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &93020046
GameObject:
m_ObjectHideFlags: 0
@@ -1030,8 +1125,8 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 267488171}
m_LocalRotation: {x: 0.37174806, y: 0.6015009, z: -0.37174803, w: 0.601501}
m_LocalPosition: {x: -4.9999995, y: 10, z: 0.00000059604645}
m_LocalRotation: {x: 0.19630352, y: -0.68694735, z: 0.20127675, w: 0.67011636}
m_LocalPosition: {x: 14.98, y: 27.75, z: -19.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@@ -1417,7 +1512,7 @@ GameObject:
- component: {fileID: 348985860}
- component: {fileID: 348985861}
m_Layer: 0
m_Name: Virtual Camera
m_Name: PlayerCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -1430,7 +1525,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 348985859}
m_LocalRotation: {x: 0.37174806, y: 0.6015009, z: -0.37174803, w: 0.601501}
m_LocalRotation: {x: 0.37174806, y: 0.601501, z: -0.37174806, w: 0.6015009}
m_LocalPosition: {x: -4.9999995, y: 10, z: 0.00000059604645}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1509,6 +1604,7 @@ Transform:
- {fileID: 267488172}
- {fileID: 1141445178}
- {fileID: 348985860}
- {fileID: 465810073}
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -6461,6 +6557,78 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &465810072
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 465810073}
- component: {fileID: 465810074}
m_Layer: 0
m_Name: MapCamera
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &465810073
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 465810072}
m_LocalRotation: {x: 0.19630352, y: -0.68694735, z: 0.20127675, w: 0.67011636}
m_LocalPosition: {x: 14.98, y: 27.75, z: -19.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 60182160}
m_Father: {fileID: 355520529}
m_RootOrder: -1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &465810074
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 465810072}
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: 10
m_StandbyUpdate: 2
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 60.000004
OrthographicSize: 5
NearClipPlane: 0.3
FarClipPlane: 100
Dutch: 0
ModeOverride: 0
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
m_SensorSize: {x: 1, y: 1}
m_Transitions:
m_BlendHint: 0
m_InheritPosition: 0
m_OnCameraLive:
m_PersistentCalls:
m_Calls: []
m_LegacyBlendHint: 0
m_ComponentOwner: {fileID: 60182160}
--- !u!1 &535029578
GameObject:
m_ObjectHideFlags: 0
@@ -8172,7 +8340,8 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 8b80f4c0c91e48e418ea436255074f8e, type: 3}
m_Name:
m_EditorClassIdentifier:
_camera: {fileID: 348985861}
_playerCamera: {fileID: 0}
_cityMapCamera: {fileID: 0}
--- !u!1 &1150111678
GameObject:
m_ObjectHideFlags: 0
Assets/Scenes/MiniMarket.unity
+271 -5
View File
@@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.172768, g: 0.21589169, b: 0.29782546, a: 1}
m_IndirectSpecularColor: {r: 0.17276844, g: 0.21589246, b: 0.2978263, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
@@ -637,6 +637,26 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &282141101 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 133785098126353824, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
m_PrefabInstance: {fileID: 1624644996}
m_PrefabAsset: {fileID: 0}
--- !u!114 &282141104
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 282141101}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 00bbfcf5f7cdbb543bd6e09cd773f199, type: 3}
m_Name:
m_EditorClassIdentifier:
_sunriseHour: 9
_sunsetHour: 20
--- !u!1 &287262744
GameObject:
m_ObjectHideFlags: 0
@@ -3723,6 +3743,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -60
objectReference: {fileID: 0}
- target: {fileID: 861852511658165882, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 861852511658165882, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 896272491191485165, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -3748,6 +3778,46 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -35
objectReference: {fileID: 0}
- target: {fileID: 926206427573245246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 926206427573245246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 926206427573245246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 926206427573245246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 975756442002492414, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 975756442002492414, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 975756442002492414, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1096659982905702024, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_ChildAlignment
value: 3
objectReference: {fileID: 0}
- target: {fileID: 1159489747999635777, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -3768,6 +3838,26 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -25
objectReference: {fileID: 0}
- target: {fileID: 1395877371924808577, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395877371924808577, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395877371924808577, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1395877371924808577, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2133092304313334115, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -3803,6 +3893,66 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 3496241957797327246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3496241957797327246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3496241957797327246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3496241957797327246, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646754596050849260, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646754596050849260, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646754596050849260, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3646754596050849260, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3714819668211759467, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3714819668211759467, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3714819668211759467, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3714819668211759467, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4029620110191918265, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_RootOrder
@@ -3928,6 +4078,66 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: 1419.21
objectReference: {fileID: 0}
- target: {fileID: 5320626124659346440, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320626124659346440, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320626124659346440, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5320626124659346440, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5725110264888201341, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5725110264888201341, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5725110264888201341, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5771673107298587569, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5771673107298587569, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5771673107298587569, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5783904402994132757, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5783904402994132757, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5971285090833758387, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -4006,7 +4216,7 @@ PrefabInstance:
- target: {fileID: 6967241971874729682, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_IsActive
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7046225486284069809, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
@@ -4018,6 +4228,26 @@ PrefabInstance:
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 250
objectReference: {fileID: 0}
- target: {fileID: 7442524031950193185, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -90
objectReference: {fileID: 0}
- target: {fileID: 7489002102543253423, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
@@ -4133,10 +4363,34 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -95
objectReference: {fileID: 0}
- target: {fileID: 8358239169832994492, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8358239169832994492, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8358239169832994492, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8358239169832994492, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_AddedComponents:
- targetCorrespondingSourceObject: {fileID: 133785098126353824, guid: 8939548f67eb43c4fa321f112c45f83b,
type: 3}
insertIndex: -1
addedObject: {fileID: 282141104}
m_SourcePrefab: {fileID: 100100000, guid: 8939548f67eb43c4fa321f112c45f83b, type: 3}
--- !u!1 &1708622714
GameObject:
@@ -15852,7 +16106,7 @@ Transform:
m_GameObject: {fileID: 5140298269252668911}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -0.1, z: 4.5}
m_LocalScale: {x: 5, y: 1, z: 5}
m_LocalScale: {x: 3, y: 1, z: 3}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1322861160939933662}
@@ -21346,7 +21600,7 @@ PrefabInstance:
type: 3}
propertyPath: _selectedObject
value:
objectReference: {fileID: 0}
objectReference: {fileID: 9076485829295504666}
- target: {fileID: 6415229415882937303, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
propertyPath: visualGameObjectArray.Array.size
@@ -21448,6 +21702,18 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 9076485829295504664}
m_PrefabAsset: {fileID: 0}
--- !u!114 &9076485829295504666 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8460308244935545385, guid: 8dfe1ac2e5f005b4f96bfab77c1b187f,
type: 3}
m_PrefabInstance: {fileID: 9076485829295504664}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 024987a58bcb1394a97473f1d70d0c47, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &9090051199988614802
GameObject:
m_ObjectHideFlags: 0
Assets/Scripts/Managers/CameraSystem.cs
+12 -18
View File
@@ -4,27 +4,21 @@ using UnityEngine;
public class CameraSystem : MonoBehaviour
{
[SerializeField]
private CinemachineVirtualCamera _camera;
private CinemachineVirtualCamera _playerCamera;
[SerializeField]
private CinemachineVirtualCamera _cityMapCamera;
private void Start()
{
//transform.position = Player.Instance.transform.position;
_camera.LookAt = Player.Instance.transform;
_camera.Follow = Player.Instance.transform;
_playerCamera.LookAt = Player.Instance.transform;
_playerCamera.Follow = Player.Instance.transform;
}
//private void Update()
//{
// Vector3 inputDir = Vector3.zero;
// if (Input.GetKey(KeyCode.W)) inputDir.z = +1f;
// if (Input.GetKey(KeyCode.S)) inputDir.z = -1f;
// if (Input.GetKey(KeyCode.A)) inputDir.x = -1f;
// if (Input.GetKey(KeyCode.D)) inputDir.x = +1f;
// Vector3 moveDir = transform.forward * inputDir.z + transform.right * inputDir.x;
// //if (moveDir == Vector3.zero && Player.Instance.stat) transform.position = Player.Instance.transform.position;
// transform.position += moveDir * _moveSpeed * Time.deltaTime;
//}
private void Update()
{
if (Input.GetKey(KeyCode.M))
{
//change camera
}
}
}
Assets/Scripts/Player/Player.cs
+2 -1
View File
@@ -41,6 +41,7 @@ public class Player : MonoBehaviour
}
PlayerPrefs.SetString("lastExitName", string.Empty);
Instance = this;
Stats = PlayerStats.CreateInitialStats();
DontDestroyOnLoad(gameObject);
}
@@ -49,7 +50,7 @@ public class Player : MonoBehaviour
TimeManager.Instance.OnMinuteChanged += UpdateStatsByClock;
_animator.applyRootMotion = true;
_navAgent.updatePosition = false;
Stats = PlayerStats.CreateInitialStats();
_currentActing = PlayerStates.Awake;
}