minor fixes
This commit is contained in:
parent
bf97cf74ca
commit
594635d9e7
@ -183,7 +183,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 9
|
m_RootOrder: 10
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &7787032016551483534
|
--- !u!137 &7787032016551483534
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -425,7 +425,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 4
|
m_RootOrder: 5
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &1535139920634758287
|
--- !u!137 &1535139920634758287
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -757,7 +757,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 12
|
m_RootOrder: 13
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &120578717624362536
|
--- !u!137 &120578717624362536
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -946,7 +946,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 13
|
m_RootOrder: 14
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &471171710276162467
|
--- !u!137 &471171710276162467
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -1143,7 +1143,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
|
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 15
|
m_RootOrder: 16
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &2998734148321009098
|
--- !u!1 &2998734148321009098
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -1351,7 +1351,7 @@ Transform:
|
|||||||
- {fileID: 3942302939394760573}
|
- {fileID: 3942302939394760573}
|
||||||
- {fileID: 667030322987050621}
|
- {fileID: 667030322987050621}
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 16
|
m_RootOrder: 17
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &3550544345492550626
|
--- !u!1 &3550544345492550626
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -1443,7 +1443,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &2369926001070854608
|
--- !u!137 &2369926001070854608
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -1591,7 +1591,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 8
|
m_RootOrder: 9
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &1066266445648319513
|
--- !u!137 &1066266445648319513
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -1769,7 +1769,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 6
|
m_RootOrder: 7
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &1415883333001484866
|
--- !u!137 &1415883333001484866
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -2275,7 +2275,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 14
|
m_RootOrder: 15
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &6378985549787095652
|
--- !u!1 &6378985549787095652
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -2399,7 +2399,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 7
|
m_RootOrder: 8
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &5961881081274232608
|
--- !u!137 &5961881081274232608
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -2567,7 +2567,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 11
|
m_RootOrder: 12
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &1757102963672203897
|
--- !u!137 &1757102963672203897
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -2654,7 +2654,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 2
|
m_RootOrder: 3
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &886099741712191097
|
--- !u!137 &886099741712191097
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -2866,7 +2866,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 10
|
m_RootOrder: 11
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &459785038751003865
|
--- !u!137 &459785038751003865
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -2953,6 +2953,7 @@ Transform:
|
|||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
|
m_LocalScale: {x: 1.25, y: 1.25, z: 1.25}
|
||||||
m_Children:
|
m_Children:
|
||||||
|
- {fileID: 146049362059388828}
|
||||||
- {fileID: 6258711480188133543}
|
- {fileID: 6258711480188133543}
|
||||||
- {fileID: 7241339582013630877}
|
- {fileID: 7241339582013630877}
|
||||||
- {fileID: 2119672840264383957}
|
- {fileID: 2119672840264383957}
|
||||||
@ -3065,7 +3066,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 2
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &5172988542483986851
|
--- !u!137 &5172988542483986851
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -3152,7 +3153,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 5
|
m_RootOrder: 6
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &8379158873016648925
|
--- !u!137 &8379158873016648925
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -3513,7 +3514,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 3
|
m_RootOrder: 4
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!137 &6563519984864369551
|
--- !u!137 &6563519984864369551
|
||||||
SkinnedMeshRenderer:
|
SkinnedMeshRenderer:
|
||||||
@ -3630,7 +3631,7 @@ Transform:
|
|||||||
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
|
m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000001}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 7150739129758644021}
|
m_Father: {fileID: 7150739129758644021}
|
||||||
m_RootOrder: 17
|
m_RootOrder: 18
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
--- !u!1 &8793283468575075051
|
--- !u!1 &8793283468575075051
|
||||||
GameObject:
|
GameObject:
|
||||||
@ -3697,6 +3698,101 @@ Transform:
|
|||||||
m_Father: {fileID: 6637522580184705995}
|
m_Father: {fileID: 6637522580184705995}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||||
|
--- !u!1001 &736823833987687424
|
||||||
|
PrefabInstance:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
serializedVersion: 2
|
||||||
|
m_Modification:
|
||||||
|
m_TransformParent: {fileID: 7150739129758644021}
|
||||||
|
m_Modifications:
|
||||||
|
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: InitialModule.startSizeY.minMaxState
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: InitialModule.startSizeZ.minMaxState
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: InitialModule.startRotationX.minMaxState
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107324821622, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: InitialModule.startRotationY.minMaxState
|
||||||
|
value: 3
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_RootOrder
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.y
|
||||||
|
value: 0.01
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalPosition.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 1
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.z
|
||||||
|
value: 0
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 594306107340321050, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_Name
|
||||||
|
value: CharacterAura
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
m_RemovedComponents: []
|
||||||
|
m_SourcePrefab: {fileID: 100100000, guid: ef48e21b8db1e4c42bf5cad1512c98d4, type: 3}
|
||||||
|
--- !u!4 &146049362059388828 stripped
|
||||||
|
Transform:
|
||||||
|
m_CorrespondingSourceObject: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||||
|
type: 3}
|
||||||
|
m_PrefabInstance: {fileID: 736823833987687424}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
--- !u!1001 &1284989811002482917
|
--- !u!1001 &1284989811002482917
|
||||||
PrefabInstance:
|
PrefabInstance:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -3707,7 +3803,7 @@ PrefabInstance:
|
|||||||
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
|
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
value: 18
|
value: 19
|
||||||
objectReference: {fileID: 0}
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
|
- target: {fileID: 5327400453591529684, guid: 04efd775509c00144993f7b46ecc2812,
|
||||||
type: 3}
|
type: 3}
|
||||||
|
@ -24,14 +24,18 @@ MonoBehaviour:
|
|||||||
type: 3}
|
type: 3}
|
||||||
DefaultTexture: {fileID: 0}
|
DefaultTexture: {fileID: 0}
|
||||||
colors:
|
colors:
|
||||||
|
- _unitColor: 2
|
||||||
|
_texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3}
|
||||||
|
_vfxPrefab: {fileID: 0}
|
||||||
- _unitColor: 0
|
- _unitColor: 0
|
||||||
_texture: {fileID: 2800000, guid: 0298dfcb0756f534a9a125d510461c7a, type: 3}
|
_texture: {fileID: 2800000, guid: 0298dfcb0756f534a9a125d510461c7a, type: 3}
|
||||||
_vfxPreab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c,
|
_vfxPrefab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c,
|
||||||
type: 3}
|
type: 3}
|
||||||
- _unitColor: 1
|
- _unitColor: 1
|
||||||
_texture: {fileID: 2800000, guid: 3b75368df991b164583e8cede390e24e, type: 3}
|
_texture: {fileID: 2800000, guid: 3b75368df991b164583e8cede390e24e, type: 3}
|
||||||
_vfxPreab: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a,
|
_vfxPrefab: {fileID: 442387583353148024, guid: 53959bc898e9a644daad0282881d596a,
|
||||||
|
type: 3}
|
||||||
|
- _unitColor: 3
|
||||||
|
_texture: {fileID: 2800000, guid: 1a76a79d5a83143479c76f4f37c4b896, type: 3}
|
||||||
|
_vfxPrefab: {fileID: 5732852186060375560, guid: 54d847a18c62f57479c53469d4398ceb,
|
||||||
type: 3}
|
type: 3}
|
||||||
- _unitColor: 2
|
|
||||||
_texture: {fileID: 2800000, guid: 983242f4b4db7a841af48234cf0021b8, type: 3}
|
|
||||||
_vfxPreab: {fileID: 0}
|
|
||||||
|
@ -19,7 +19,4 @@ MonoBehaviour:
|
|||||||
type: 3}
|
type: 3}
|
||||||
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f,
|
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f,
|
||||||
type: 3}
|
type: 3}
|
||||||
hexTexture: {fileID: 2800000, guid: 0298dfcb0756f534a9a125d510461c7a, type: 3}
|
color: 3
|
||||||
vfxPrefab: {fileID: 8021195855904498788, guid: 2f6d0540c8fd7bb46b356ff86962379c,
|
|
||||||
type: 3}
|
|
||||||
color: 0
|
|
||||||
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||||||
m_ReflectionIntensity: 1
|
m_ReflectionIntensity: 1
|
||||||
m_CustomReflection: {fileID: 0}
|
m_CustomReflection: {fileID: 0}
|
||||||
m_Sun: {fileID: 0}
|
m_Sun: {fileID: 0}
|
||||||
m_IndirectSpecularColor: {r: 0.4482475, g: 0.49827462, b: 0.57558316, a: 1}
|
m_IndirectSpecularColor: {r: 0.44657892, g: 0.49641353, b: 0.5748163, a: 1}
|
||||||
m_UseRadianceAmbientProbe: 0
|
m_UseRadianceAmbientProbe: 0
|
||||||
--- !u!157 &3
|
--- !u!157 &3
|
||||||
LightmapSettings:
|
LightmapSettings:
|
||||||
@ -130,6 +130,36 @@ PrefabInstance:
|
|||||||
m_Modification:
|
m_Modification:
|
||||||
m_TransformParent: {fileID: 0}
|
m_TransformParent: {fileID: 0}
|
||||||
m_Modifications:
|
m_Modifications:
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.w
|
||||||
|
value: 0.82139385
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.x
|
||||||
|
value: 0.38302222
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.y
|
||||||
|
value: 0.38302222
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalRotation.z
|
||||||
|
value: -0.17860618
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.x
|
||||||
|
value: 50
|
||||||
|
objectReference: {fileID: 0}
|
||||||
|
- target: {fileID: 5177366465263722277, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
|
type: 3}
|
||||||
|
propertyPath: m_LocalEulerAnglesHint.y
|
||||||
|
value: 50
|
||||||
|
objectReference: {fileID: 0}
|
||||||
- target: {fileID: 5177366466773781006, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
- target: {fileID: 5177366466773781006, guid: a7fb19d4a93bce94bba24aacfe92a572,
|
||||||
type: 3}
|
type: 3}
|
||||||
propertyPath: m_RootOrder
|
propertyPath: m_RootOrder
|
||||||
@ -303,6 +333,7 @@ GameObject:
|
|||||||
- component: {fileID: 963194228}
|
- component: {fileID: 963194228}
|
||||||
- component: {fileID: 963194227}
|
- component: {fileID: 963194227}
|
||||||
- component: {fileID: 963194226}
|
- component: {fileID: 963194226}
|
||||||
|
- component: {fileID: 963194229}
|
||||||
m_Layer: 0
|
m_Layer: 0
|
||||||
m_Name: Main Camera
|
m_Name: Main Camera
|
||||||
m_TagString: MainCamera
|
m_TagString: MainCamera
|
||||||
@ -375,6 +406,23 @@ Transform:
|
|||||||
m_Father: {fileID: 0}
|
m_Father: {fileID: 0}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
|
m_LocalEulerAnglesHint: {x: 60, y: 0, z: 0}
|
||||||
|
--- !u!114 &963194229
|
||||||
|
MonoBehaviour:
|
||||||
|
m_ObjectHideFlags: 0
|
||||||
|
m_CorrespondingSourceObject: {fileID: 0}
|
||||||
|
m_PrefabInstance: {fileID: 0}
|
||||||
|
m_PrefabAsset: {fileID: 0}
|
||||||
|
m_GameObject: {fileID: 963194225}
|
||||||
|
m_Enabled: 1
|
||||||
|
m_EditorHideFlags: 0
|
||||||
|
m_Script: {fileID: 11500000, guid: 8b9a305e18de0c04dbd257a21cd47087, type: 3}
|
||||||
|
m_Name:
|
||||||
|
m_EditorClassIdentifier:
|
||||||
|
sharedProfile: {fileID: 11400000, guid: 2de9544b84ed15540888b484d269757d, type: 2}
|
||||||
|
isGlobal: 1
|
||||||
|
blendDistance: 0
|
||||||
|
weight: 1
|
||||||
|
priority: 0
|
||||||
--- !u!1 &1475618468
|
--- !u!1 &1475618468
|
||||||
GameObject:
|
GameObject:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -2869,7 +2869,8 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 01e8b657feba8284998c7fd1ef74b606, type: 3}
|
m_Sprite: {fileID: 8536133104978798909, guid: a46675f9b4ecabf48a87c8ca677f6421,
|
||||||
|
type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
@ -7644,7 +7645,7 @@ RectTransform:
|
|||||||
m_AnchorMin: {x: 0.5, y: 0}
|
m_AnchorMin: {x: 0.5, y: 0}
|
||||||
m_AnchorMax: {x: 0.5, y: 0}
|
m_AnchorMax: {x: 0.5, y: 0}
|
||||||
m_AnchoredPosition: {x: 0, y: 400}
|
m_AnchoredPosition: {x: 0, y: 400}
|
||||||
m_SizeDelta: {x: 255, y: 290}
|
m_SizeDelta: {x: 756, y: 246}
|
||||||
m_Pivot: {x: 0.5, y: 0}
|
m_Pivot: {x: 0.5, y: 0}
|
||||||
--- !u!114 &1623606164
|
--- !u!114 &1623606164
|
||||||
MonoBehaviour:
|
MonoBehaviour:
|
||||||
@ -7734,7 +7735,7 @@ MonoBehaviour:
|
|||||||
m_OnCullStateChanged:
|
m_OnCullStateChanged:
|
||||||
m_PersistentCalls:
|
m_PersistentCalls:
|
||||||
m_Calls: []
|
m_Calls: []
|
||||||
m_Sprite: {fileID: 21300000, guid: 651ded2506005364a921ca41ac5a817d, type: 3}
|
m_Sprite: {fileID: 633053397979461921, guid: a46675f9b4ecabf48a87c8ca677f6421, type: 3}
|
||||||
m_Type: 0
|
m_Type: 0
|
||||||
m_PreserveAspect: 0
|
m_PreserveAspect: 0
|
||||||
m_FillCenter: 1
|
m_FillCenter: 1
|
||||||
|
@ -18,5 +18,10 @@ namespace Chars
|
|||||||
{
|
{
|
||||||
throw new System.NotImplementedException();
|
throw new System.NotImplementedException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void Attack(HexDirection direction)
|
||||||
|
{
|
||||||
|
throw new System.NotImplementedException();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -7,5 +7,6 @@ namespace Chars
|
|||||||
public void Move(HexDirection direction);
|
public void Move(HexDirection direction);
|
||||||
public void Spawn();
|
public void Spawn();
|
||||||
public void Death();
|
public void Death();
|
||||||
|
public void Attack(HexDirection direction);
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -14,19 +14,17 @@ namespace Chars
|
|||||||
|
|
||||||
public class Player : IUnit
|
public class Player : IUnit
|
||||||
{
|
{
|
||||||
private HexCoordinates spawnPos;
|
private HexCoordinates _spawnPos;
|
||||||
private bool _isAlive;
|
private bool _isAlive;
|
||||||
private GameObject _instance;
|
private GameObject _instance;
|
||||||
private GameObject prefab;
|
private GameObject _prefab;
|
||||||
private AnimLength _animLength;
|
private AnimLength _animLength;
|
||||||
private HexCell _cell;
|
private HexCell _cell;
|
||||||
private HexGrid _hexGrid;
|
private HexGrid _hexGrid;
|
||||||
private Texture _texture;
|
public Action<GameObject> onPlayerSpawned;
|
||||||
public Action<GameObject> OnPlayerSpawned;
|
|
||||||
private Animator _animator;
|
private Animator _animator;
|
||||||
private PlayerView _playerView;
|
private PlayerView _playerView;
|
||||||
private bool _isMoving;
|
private bool _isMoving;
|
||||||
private GameObject _vfxPrefab;
|
|
||||||
private UnitColor _color;
|
private UnitColor _color;
|
||||||
private static readonly int Moving = Animator.StringToHash("isMoving");
|
private static readonly int Moving = Animator.StringToHash("isMoving");
|
||||||
private static readonly int Move1 = Animator.StringToHash("Move");
|
private static readonly int Move1 = Animator.StringToHash("Move");
|
||||||
@ -36,8 +34,8 @@ namespace Chars
|
|||||||
|
|
||||||
public Player(PlayerData playerData, HexGrid hexGrid)
|
public Player(PlayerData playerData, HexGrid hexGrid)
|
||||||
{
|
{
|
||||||
spawnPos = playerData.spawnPos;
|
_spawnPos = playerData.spawnPos;
|
||||||
prefab = playerData.playerPrefab;
|
_prefab = playerData.playerPrefab;
|
||||||
_isAlive = false;
|
_isAlive = false;
|
||||||
_hexGrid = hexGrid;
|
_hexGrid = hexGrid;
|
||||||
_isMoving = false;
|
_isMoving = false;
|
||||||
@ -71,11 +69,15 @@ namespace Chars
|
|||||||
AnimationClip[] clips = _animator.runtimeAnimatorController.animationClips;
|
AnimationClip[] clips = _animator.runtimeAnimatorController.animationClips;
|
||||||
foreach (var clip in clips)
|
foreach (var clip in clips)
|
||||||
{
|
{
|
||||||
_animLength.Move = clip.name switch
|
switch (clip.name)
|
||||||
{
|
{
|
||||||
"Jump" => clip.length,
|
case "Jump":
|
||||||
_ => _animLength.Move
|
_animLength.Move = clip.length;
|
||||||
};
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -83,16 +85,16 @@ namespace Chars
|
|||||||
{
|
{
|
||||||
if (!_isAlive)
|
if (!_isAlive)
|
||||||
{
|
{
|
||||||
_cell = _hexGrid.GetCellFromCoord(spawnPos);
|
_cell = _hexGrid.GetCellFromCoord(_spawnPos);
|
||||||
_cell.PaintHex(_color);
|
_cell.PaintHex(_color);
|
||||||
for (int i = 0; i < 6; i++)
|
for (int i = 0; i < 6; i++)
|
||||||
{
|
{
|
||||||
_cell.GetNeighbor((HexDirection)i).PaintHex(_color);
|
_cell.GetNeighbor((HexDirection)i).PaintHex(_color);
|
||||||
}
|
}
|
||||||
|
|
||||||
_instance = Object.Instantiate(prefab, _cell.transform.parent);
|
_instance = Object.Instantiate(_prefab, _cell.transform.parent);
|
||||||
_instance.transform.localPosition = _cell.transform.localPosition;
|
_instance.transform.localPosition = _cell.transform.localPosition;
|
||||||
OnPlayerSpawned?.Invoke(_instance);
|
onPlayerSpawned?.Invoke(_instance);
|
||||||
_isAlive = true;
|
_isAlive = true;
|
||||||
_animator = _instance.GetComponent<Animator>();
|
_animator = _instance.GetComponent<Animator>();
|
||||||
_playerView = _instance.GetComponent<PlayerView>();
|
_playerView = _instance.GetComponent<PlayerView>();
|
||||||
@ -102,7 +104,12 @@ namespace Chars
|
|||||||
|
|
||||||
public void Death()
|
public void Death()
|
||||||
{
|
{
|
||||||
throw new System.NotImplementedException();
|
throw new NotImplementedException();
|
||||||
|
}
|
||||||
|
|
||||||
|
public void Attack(HexDirection direction)
|
||||||
|
{
|
||||||
|
throw new NotImplementedException();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
@ -25,9 +25,9 @@ namespace Controller
|
|||||||
controllers.Add(playerControl);
|
controllers.Add(playerControl);
|
||||||
|
|
||||||
CameraControl cameraControl =
|
CameraControl cameraControl =
|
||||||
new CameraControl(UnityEngine.Camera.main, data.CameraData);
|
new CameraControl(Camera.main, data.CameraData);
|
||||||
controllers.Add(cameraControl);
|
controllers.Add(cameraControl);
|
||||||
player.OnPlayerSpawned += cameraControl.InitCameraControl;
|
player.onPlayerSpawned += cameraControl.InitCameraControl;
|
||||||
}
|
}
|
||||||
private void DoSomething(HexCell cell)
|
private void DoSomething(HexCell cell)
|
||||||
{
|
{
|
||||||
|
@ -17,7 +17,7 @@ namespace HexFiled
|
|||||||
private void Awake()
|
private void Awake()
|
||||||
{
|
{
|
||||||
_renderer = GetComponent<MeshRenderer>();
|
_renderer = GetComponent<MeshRenderer>();
|
||||||
PaintHex(UnitColor.GREY);
|
_color = UnitColor.GREY;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void SetDictionary(Dictionary<UnitColor, CellColor> colors)
|
public void SetDictionary(Dictionary<UnitColor, CellColor> colors)
|
||||||
|
@ -24,13 +24,13 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5177366465263722279}
|
m_GameObject: {fileID: 5177366465263722279}
|
||||||
m_LocalRotation: {x: 0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815}
|
m_LocalRotation: {x: 0.38302222, y: 0.38302222, z: -0.17860618, w: 0.82139385}
|
||||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5177366466773781006}
|
m_Father: {fileID: 5177366466773781006}
|
||||||
m_RootOrder: 0
|
m_RootOrder: 0
|
||||||
m_LocalEulerAnglesHint: {x: 45, y: 90, z: 0}
|
m_LocalEulerAnglesHint: {x: 50, y: 50, z: 0}
|
||||||
--- !u!108 &5177366465263722276
|
--- !u!108 &5177366465263722276
|
||||||
Light:
|
Light:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
@ -117,13 +117,13 @@ Transform:
|
|||||||
m_PrefabInstance: {fileID: 0}
|
m_PrefabInstance: {fileID: 0}
|
||||||
m_PrefabAsset: {fileID: 0}
|
m_PrefabAsset: {fileID: 0}
|
||||||
m_GameObject: {fileID: 5177366465427951230}
|
m_GameObject: {fileID: 5177366465427951230}
|
||||||
m_LocalRotation: {x: 0.6532809, y: 0.27059945, z: -0.6532809, w: 0.27059945}
|
m_LocalRotation: {x: 0.32139382, y: 0.32139382, z: -0.8830222, w: 0.11697779}
|
||||||
m_LocalPosition: {x: 35.65, y: 0, z: 0}
|
m_LocalPosition: {x: 35.65, y: 0, z: 0}
|
||||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||||
m_Children: []
|
m_Children: []
|
||||||
m_Father: {fileID: 5177366466773781006}
|
m_Father: {fileID: 5177366466773781006}
|
||||||
m_RootOrder: 1
|
m_RootOrder: 1
|
||||||
m_LocalEulerAnglesHint: {x: 135, y: 89.99999, z: 0}
|
m_LocalEulerAnglesHint: {x: 140, y: 140, z: 0}
|
||||||
--- !u!108 &5177366465427951231
|
--- !u!108 &5177366465427951231
|
||||||
Light:
|
Light:
|
||||||
m_ObjectHideFlags: 0
|
m_ObjectHideFlags: 0
|
||||||
|
@ -4,6 +4,7 @@
|
|||||||
{
|
{
|
||||||
GREEN,
|
GREEN,
|
||||||
RED,
|
RED,
|
||||||
GREY
|
GREY,
|
||||||
|
YELLOW
|
||||||
}
|
}
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user