Fixes for git issues.
This commit is contained in:
parent
b2dd779b7a
commit
5ccef9b815
2 changed files with 11 additions and 70 deletions
|
|
@ -552,73 +552,6 @@ Transform:
|
||||||
m_LocalScale: {x: .5, y: 8, z: 18.25}
|
m_LocalScale: {x: .5, y: 8, z: 18.25}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1731015427}
|
m_Father: {fileID: 1731015427}
|
||||||
--- !u!1 &344584444
|
|
||||||
GameObject:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_PrefabParentObject: {fileID: 100000, guid: e5c4c39c0dd99f94dbc695a71276c6eb, type: 2}
|
|
||||||
m_PrefabInternal: {fileID: 1292380322}
|
|
||||||
serializedVersion: 4
|
|
||||||
m_Component:
|
|
||||||
- 4: {fileID: 344584445}
|
|
||||||
- 212: {fileID: 344584447}
|
|
||||||
- 95: {fileID: 344584446}
|
|
||||||
m_Layer: 0
|
|
||||||
m_Name: poser2_0
|
|
||||||
m_TagString: Untagged
|
|
||||||
m_Icon: {fileID: 0}
|
|
||||||
m_NavMeshLayer: 0
|
|
||||||
m_StaticEditorFlags: 0
|
|
||||||
m_IsActive: 1
|
|
||||||
--- !u!4 &344584445
|
|
||||||
Transform:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_PrefabParentObject: {fileID: 400000, guid: e5c4c39c0dd99f94dbc695a71276c6eb, type: 2}
|
|
||||||
m_PrefabInternal: {fileID: 1292380322}
|
|
||||||
m_GameObject: {fileID: 344584444}
|
|
||||||
m_LocalRotation: {x: .382683486, y: 0, z: 0, w: .923879564}
|
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
||||||
m_LocalScale: {x: 6, y: 5, z: 1}
|
|
||||||
m_Children: []
|
|
||||||
m_Father: {fileID: 975281915}
|
|
||||||
--- !u!95 &344584446
|
|
||||||
Animator:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_PrefabParentObject: {fileID: 9500000, guid: e5c4c39c0dd99f94dbc695a71276c6eb,
|
|
||||||
type: 2}
|
|
||||||
m_PrefabInternal: {fileID: 1292380322}
|
|
||||||
m_GameObject: {fileID: 344584444}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_Avatar: {fileID: 0}
|
|
||||||
m_Controller: {fileID: 9100000, guid: 0e6e6ed32792d450e95d8cc18b204166, type: 2}
|
|
||||||
m_CullingMode: 0
|
|
||||||
m_ApplyRootMotion: 1
|
|
||||||
m_AnimatePhysics: 0
|
|
||||||
m_HasTransformHierarchy: 1
|
|
||||||
--- !u!212 &344584447
|
|
||||||
SpriteRenderer:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_PrefabParentObject: {fileID: 21200000, guid: e5c4c39c0dd99f94dbc695a71276c6eb,
|
|
||||||
type: 2}
|
|
||||||
m_PrefabInternal: {fileID: 1292380322}
|
|
||||||
m_GameObject: {fileID: 344584444}
|
|
||||||
m_Enabled: 1
|
|
||||||
m_CastShadows: 0
|
|
||||||
m_ReceiveShadows: 0
|
|
||||||
m_LightmapIndex: 255
|
|
||||||
m_LightmapTilingOffset: {x: 1, y: 1, z: 0, w: 0}
|
|
||||||
m_Materials:
|
|
||||||
- {fileID: 10754, guid: 0000000000000000e000000000000000, type: 0}
|
|
||||||
m_SubsetIndices:
|
|
||||||
m_StaticBatchRoot: {fileID: 0}
|
|
||||||
m_UseLightProbes: 0
|
|
||||||
m_LightProbeAnchor: {fileID: 0}
|
|
||||||
m_ScaleInLightmap: 1
|
|
||||||
m_SortingLayer: 0
|
|
||||||
m_SortingOrder: 0
|
|
||||||
m_SortingLayerID: 0
|
|
||||||
m_Sprite: {fileID: 21300000, guid: 47c59ffe452059a43afe37861e97dcd6, type: 3}
|
|
||||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
||||||
--- !u!1 &400339584
|
--- !u!1 &400339584
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
|
@ -1198,6 +1131,14 @@ Prefab:
|
||||||
propertyPath: m_LocalRotation.w
|
propertyPath: m_LocalRotation.w
|
||||||
value: 1
|
value: 1
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 400050, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 8.85427189
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 400050, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2}
|
||||||
|
propertyPath: m_LocalScale.z
|
||||||
|
value: 12.6073637
|
||||||
|
objectReference: {fileID: 0}
|
||||||
m_RemovedComponents: []
|
m_RemovedComponents: []
|
||||||
m_ParentPrefab: {fileID: 100100000, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2}
|
m_ParentPrefab: {fileID: 100100000, guid: c2a599d40f95a644fb16f5f31c9d3c2c, type: 2}
|
||||||
m_RootGameObject: {fileID: 1731015426}
|
m_RootGameObject: {fileID: 1731015426}
|
||||||
|
|
@ -2714,8 +2655,8 @@ Transform:
|
||||||
m_PrefabInternal: {fileID: 752434186}
|
m_PrefabInternal: {fileID: 752434186}
|
||||||
m_GameObject: {fileID: 1840477154}
|
m_GameObject: {fileID: 1840477154}
|
||||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||||
m_LocalPosition: {x: 29.5528221, y: 0, z: 8.97632408}
|
m_LocalPosition: {x: 29.5528221, y: 0, z: 8.85427189}
|
||||||
m_LocalScale: {x: 29.2999992, y: .5, z: 11.7473516}
|
m_LocalScale: {x: 29.2999992, y: 1, z: 12.6073637}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 1731015427}
|
m_Father: {fileID: 1731015427}
|
||||||
--- !u!23 &1840477156
|
--- !u!23 &1840477156
|
||||||
|
|
|
||||||
|
|
@ -19,7 +19,7 @@ Material:
|
||||||
second:
|
second:
|
||||||
m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3}
|
m_Texture: {fileID: 2800000, guid: 26c9dff0fed396341b045e42e3a0b500, type: 3}
|
||||||
m_Scale: {x: 1, y: .5}
|
m_Scale: {x: 1, y: .5}
|
||||||
m_Offset: {x: 0, y: 0}
|
m_Offset: {x: 0, y: .5}
|
||||||
data:
|
data:
|
||||||
first:
|
first:
|
||||||
name: _BumpMap
|
name: _BumpMap
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue