Merge branch 'dev' of https://github.com/2aurore/Gameton-06 into dev
This commit is contained in:
@@ -13507,8 +13507,9 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 336376026}
|
||||
- component: {fileID: 336376025}
|
||||
- component: {fileID: 336376027}
|
||||
m_Layer: 3
|
||||
m_Name: Collider
|
||||
m_Name: Eyesight
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@@ -13543,12 +13544,12 @@ CircleCollider2D:
|
||||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 0
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
m_Radius: 1
|
||||
--- !u!4 &336376026
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -13564,6 +13565,19 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 585265470}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &336376027
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 336376024}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0eeefb865ea9d4749bbb4de3d1100f3e, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_monsterBase: {fileID: 585265463}
|
||||
--- !u!213 &345793892
|
||||
Sprite:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -22338,7 +22352,7 @@ Animator:
|
||||
m_GameObject: {fileID: 585265462}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: fcd7ead41abcd7f458edb6a3cdfdd564, type: 2}
|
||||
m_Controller: {fileID: 22100000, guid: 651e27074ab33cf47886fbe008de917d, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
@@ -22518,6 +22532,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 1574532559}
|
||||
- {fileID: 336376026}
|
||||
- {fileID: 2003670963}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &589876486
|
||||
@@ -71855,6 +71870,87 @@ Sprite:
|
||||
m_PhysicsShape: []
|
||||
m_Bones: []
|
||||
m_SpriteID:
|
||||
--- !u!1 &2003670962
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2003670963}
|
||||
- component: {fileID: 2003670964}
|
||||
- component: {fileID: 2003670965}
|
||||
m_Layer: 3
|
||||
m_Name: AttackRange
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2003670963
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2003670962}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 9, y: 1, z: 11}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 585265470}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!58 &2003670964
|
||||
CircleCollider2D:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2003670962}
|
||||
m_Enabled: 1
|
||||
m_Density: 1
|
||||
m_Material: {fileID: 0}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_LayerOverridePriority: 0
|
||||
m_ForceSendLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ForceReceiveLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_ContactCaptureLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_CallbackLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4294967295
|
||||
m_IsTrigger: 1
|
||||
m_UsedByEffector: 0
|
||||
m_UsedByComposite: 0
|
||||
m_Offset: {x: 0, y: 0}
|
||||
serializedVersion: 2
|
||||
m_Radius: 0.5
|
||||
--- !u!114 &2003670965
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2003670962}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 0913d8f50c531ce4585705c1366b8351, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
_monsterBase: {fileID: 585265463}
|
||||
--- !u!213 &2010724901
|
||||
Sprite:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -75135,6 +75231,63 @@ Sprite:
|
||||
m_PhysicsShape: []
|
||||
m_Bones: []
|
||||
m_SpriteID:
|
||||
--- !u!1001 &2131259786
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 0}
|
||||
m_Modifications:
|
||||
- target: {fileID: 1762751622269960499, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_Name
|
||||
value: SpriteEffect
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: -4
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 1762751622269960500, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: c28b253474f28e54ebeca15f342c2482, type: 3}
|
||||
--- !u!114 &2132150059
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -75979,3 +76132,4 @@ SceneRoots:
|
||||
- {fileID: 1494770074}
|
||||
- {fileID: 957750499}
|
||||
- {fileID: 585265470}
|
||||
- {fileID: 2131259786}
|
||||
|
||||
Reference in New Issue
Block a user