Merge branch 'feature/NewWork1' of http://git.wzaxr.top/wz1531/5.24BuYu into feature/NewWork1
This commit is contained in:
@@ -24,12 +24,12 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2239818359603741327}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0.6624955, y: -0.247184, z: -0.6844632, w: -0.17751046}
|
||||
m_LocalPosition: {x: 0.398, y: 0.033, z: -0}
|
||||
m_LocalScale: {x: 0.15625001, y: 0.15624999, z: 0.15625}
|
||||
m_LocalRotation: {x: -0.87689036, y: 0.41680294, z: 0.04401029, w: 0.23537597}
|
||||
m_LocalPosition: {x: 0.045, y: 0.202, z: -0.016}
|
||||
m_LocalScale: {x: 0.15624996, y: 0.15624997, z: 0.15624991}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 6684669712678268171}
|
||||
m_Father: {fileID: 6684880348342949832}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3849609048896104274
|
||||
GameObject:
|
||||
@@ -555,7 +555,7 @@ PrefabInstance:
|
||||
type: 3}
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 3105193050080627676}
|
||||
- targetCorrespondingSourceObject: {fileID: 4045458335737618, guid: e4de03f3bbdf4d643b88a0ed7bd4df63,
|
||||
- targetCorrespondingSourceObject: {fileID: 4397768327470545, guid: e4de03f3bbdf4d643b88a0ed7bd4df63,
|
||||
type: 3}
|
||||
insertIndex: 0
|
||||
addedObject: {fileID: 7626289246856194830}
|
||||
@@ -577,9 +577,9 @@ PrefabInstance:
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 3221886391567758502}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: e4de03f3bbdf4d643b88a0ed7bd4df63, type: 3}
|
||||
--- !u!4 &6684669712678268171 stripped
|
||||
--- !u!4 &6684880348342949832 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 4045458335737618, guid: e4de03f3bbdf4d643b88a0ed7bd4df63,
|
||||
m_CorrespondingSourceObject: {fileID: 4397768327470545, guid: e4de03f3bbdf4d643b88a0ed7bd4df63,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 6686412772157032985}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
@@ -1083,6 +1083,7 @@ MonoBehaviour:
|
||||
forwordXYZ: Z
|
||||
fishenum: 0
|
||||
moveTime: 0
|
||||
yzGroupTimeOffset: 0
|
||||
isyz: 0
|
||||
yzID:
|
||||
colliderList: []
|
||||
|
||||
Reference in New Issue
Block a user