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

change window wall mesh

Browse Source
This commit is contained in:
Vova
2024-04-28 14:21:30 +03:00
parent 567fc7a1c2
commit 38f8b297f2
10 changed files with 97 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Assets/BlenderModels/SmallWindowWall.blend
BIN
View File
Binary file not shown.
Assets/BlenderModels/SmallWindowWall.blend1
BIN
View File
Binary file not shown.
Assets/Models/Interrior/SmallWindowWall.fbx
BIN
View File
Binary file not shown.
Assets/Scenes/House.unity
+87 -86
View File
@@ -1160,6 +1160,92 @@ Transform:
- {fileID: 1322861160939933662}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &279779151
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3682155555161930313}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.82
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.33
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.48
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalRotation.x
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalRotation.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: -90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: 'm_Materials.Array.data[0]'
value:
objectReference: {fileID: 939195216085209779, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
- target: {fileID: -7511558181221131132, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: 'm_Materials.Array.data[1]'
value:
objectReference: {fileID: 7390871704515345542, guid: 0d817475ce7adaa4f81fbdb111b8599c,
type: 3}
- target: {fileID: 919132149155446097, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
propertyPath: m_Name
value: SmallWindowWall
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 780942ce2a0781847a785cc2a6542524, type: 3}
--- !u!4 &279779152 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 780942ce2a0781847a785cc2a6542524,
type: 3}
m_PrefabInstance: {fileID: 279779151}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &337658541
PrefabInstance:
m_ObjectHideFlags: 0
@@ -3340,91 +3426,6 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 1277957130}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1386640813
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
serializedVersion: 3
m_TransformParent: {fileID: 3682155555161930313}
m_Modifications:
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalScale.x
value: 50
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.x
value: -2.82
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.y
value: 1.33
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalPosition.z
value: 0.48000002
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.5
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -7511558181221131132, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: 'm_Materials.Array.data[1]'
value:
objectReference: {fileID: 7390871704515345542, guid: 0d817475ce7adaa4f81fbdb111b8599c,
type: 3}
- target: {fileID: 919132149155446097, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
propertyPath: m_Name
value: FlatWall (5)
objectReference: {fileID: 0}
m_RemovedComponents: []
m_RemovedGameObjects: []
m_AddedGameObjects: []
m_AddedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c8bb8ae79767d54cb8f825f82322c06, type: 3}
--- !u!4 &1386640814 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 0c8bb8ae79767d54cb8f825f82322c06,
type: 3}
m_PrefabInstance: {fileID: 1386640813}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1410712755
PrefabInstance:
m_ObjectHideFlags: 0
@@ -6021,6 +6022,7 @@ Transform:
- {fileID: 234810171}
- {fileID: 919639036}
- {fileID: 1813307401}
- {fileID: 279779152}
- {fileID: 681458588}
- {fileID: 1901518856}
- {fileID: 166253209}
@@ -6030,7 +6032,6 @@ Transform:
- {fileID: 1807107299}
- {fileID: 506256712}
- {fileID: 540730147}
- {fileID: 1386640814}
- {fileID: 998626130}
- {fileID: 1870880150}
- {fileID: 1119847137}
Assets/Scripts/Player/BaseCharacter.cs
+2
View File
@@ -56,6 +56,8 @@ public abstract class BaseCharacter : MonoBehaviour
_currentTask.UpdateStatus(MoveToPoint());
break;
case Tasks.Interact:
_currentTask.UpdateStatus(TaskStatus.Waiting);
_currentTask.UpdateStatus(_currentTask.TagretObject.Interact());
break;
}
Assets/Scripts/Player/Player.cs
+1 -1
View File
@@ -130,7 +130,7 @@ public class Player : BaseCharacter
{
Destroy(_containerItem.gameObject);
_containerItem = null;
//OnContainerChanged.Invoke(this, false);
OnContainerChanged.Invoke(this, false);
}
public ContainerItem GetContainerItem()
Assets/Scripts/UIElements/UIContainer.cs
+3 -2
View File
@@ -33,8 +33,9 @@ public class UIContainer : MonoBehaviour
else
{
_container.gameObject.SetActive(false);
_playerContainer.OnItemsChange -= OnItemsChange;
_playerContainer = null;
Destroy(_playerContainer);
//_playerContainer.OnItemsChange -= OnItemsChange;
//_playerContainer = null;
}
}
Packages/manifest.json
+1 -1
View File
@@ -4,7 +4,7 @@
"com.unity.ai.navigation": "2.0.0",
"com.unity.animation.rigging": "1.3.0",
"com.unity.cinemachine": "2.9.7",
"com.unity.collab-proxy": "2.2.0",
"com.unity.collab-proxy": "2.3.1",
"com.unity.formats.fbx": "5.1.0",
"com.unity.ide.visualstudio": "2.0.22",
"com.unity.inputsystem": "1.7.0",
Packages/packages-lock.json
+1 -1
View File
@@ -53,7 +53,7 @@
"url": "https://packages.unity.com"
},
"com.unity.collab-proxy": {
"version": "2.2.0",
"version": "2.3.1",
"depth": 0,
"source": "registry",
"dependencies": {},
ProjectSettings/ProjectVersion.txt
+2 -2
View File
@@ -1,2 +1,2 @@
m_EditorVersion: 2023.2.13f1
m_EditorVersionWithRevision: 2023.2.13f1 (70197a359f36)
m_EditorVersion: 2023.2.15f1
m_EditorVersionWithRevision: 2023.2.15f1 (c5cbb0b314fa)