unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character

This commit is contained in:
2022-04-05 10:21:55 +03:00
parent 53893b63a6
commit ccafc9e970
58 changed files with 18075 additions and 6403 deletions

View File

@@ -65,37 +65,6 @@ Transform:
m_Father: {fileID: 4501704942324762}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1007709937547950
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4453350789320212}
m_Layer: 0
m_Name: Set Character_Character_Male_Legs_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4453350789320212
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007709937547950}
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: 4493021605688238}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1008321977315354
GameObject:
m_ObjectHideFlags: 0
@@ -485,37 +454,6 @@ Transform:
m_Father: {fileID: 4822120185942956}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1065583186896960
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4684616241190890}
m_Layer: 0
m_Name: Set Character_Character_Male_Hair_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4684616241190890
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1065583186896960}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9900991, y: 0.9900991, z: 0.990099}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4493021605688238}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1068447607716544
GameObject:
m_ObjectHideFlags: 0
@@ -1230,7 +1168,7 @@ Transform:
- {fileID: 4307644995924180}
- {fileID: 4977433765208342}
m_Father: {fileID: 4026128850371490}
m_RootOrder: 2
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1239127053433692
GameObject:
@@ -1782,7 +1720,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4026128850371490}
m_RootOrder: 5
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1333928879224930
GameObject:
@@ -1846,10 +1784,10 @@ Transform:
m_Children:
- {fileID: 4094373081905234}
- {fileID: 4505894016144902}
- {fileID: 4358411822311794}
- {fileID: 4157798315238530}
- {fileID: 4732703978680780}
- {fileID: 4157798315238530}
- {fileID: 4794190135753666}
- {fileID: 4358411822311794}
m_Father: {fileID: 4493021605688238}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -2507,7 +2445,7 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4026128850371490}
m_RootOrder: 4
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1502755542236114
GameObject:
@@ -3082,9 +3020,6 @@ Transform:
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4026128850371490}
- {fileID: 4453350789320212}
- {fileID: 4360253625057714}
- {fileID: 4684616241190890}
m_Father: {fileID: 4532250632830336}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3914,37 +3849,6 @@ Transform:
m_Father: {fileID: 4667278343817002}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1858149772007134
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4360253625057714}
m_Layer: 0
m_Name: Set Character_Character_Male_Torso_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4360253625057714
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858149772007134}
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: 4493021605688238}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1865346217033004
GameObject:
m_ObjectHideFlags: 0