Меню выбора оружия на полный экран.
Новая стартовая анимация лазера.
This commit is contained in:
DyatelO
parent
1e72a7cd68
commit
02afe0af46
@ -13,10 +13,10 @@ MonoBehaviour:
|
||||
m_Name: LaserAttack
|
||||
m_EditorClassIdentifier:
|
||||
duration: 0.15
|
||||
distance: 1
|
||||
distance: 2
|
||||
actionType: 1
|
||||
standartAttackPref: {fileID: 8121987183708165570, guid: cb8749a9b299fa64089f10bdb65197f5,
|
||||
type: 3}
|
||||
standartAttackGroundImpact: {fileID: 8715260329460421181, guid: e0388f43a34de79458c79763de903ffb,
|
||||
standartAttackGroundImpact: {fileID: 8619867339336636724, guid: fb745cfc34702fc4daee97f8f3273f09,
|
||||
type: 3}
|
||||
throw_SFX: {fileID: 0}
|
||||
|
||||
@ -27,7 +27,7 @@ Transform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8121987183708165570}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalPosition: {x: 0, y: 1.15, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 3560900723245820978}
|
||||
@ -99,7 +99,7 @@ PrefabInstance:
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 1
|
||||
value: 1.7
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
@ -109,12 +109,12 @@ PrefabInstance:
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0.7071068
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
@ -129,7 +129,7 @@ PrefabInstance:
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: -90
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 7219588875883182153, guid: ab214974cd498df42867306700ba5fd2,
|
||||
type: 3}
|
||||
|
||||
@ -423,6 +423,36 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &214332165
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 214332166}
|
||||
m_Layer: 0
|
||||
m_Name: AttackPosition
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &214332166
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 214332165}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 1.15, z: 1.381}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &246600702
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -881,7 +911,7 @@ PrefabInstance:
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 4
|
||||
value: 5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 594306107339981724, guid: ef48e21b8db1e4c42bf5cad1512c98d4,
|
||||
type: 3}
|
||||
@ -1661,7 +1691,7 @@ RectTransform:
|
||||
- {fileID: 925062906}
|
||||
- {fileID: 1378130271}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 3
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
@ -4108,7 +4138,7 @@ Transform:
|
||||
- {fileID: 566274521}
|
||||
- {fileID: 1163069908}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 3
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 30, z: 0}
|
||||
--- !u!114 &1536054282
|
||||
MonoBehaviour:
|
||||
@ -4618,6 +4648,7 @@ Transform:
|
||||
m_LocalPosition: {x: 18.657974, y: 0, z: -16.15812}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 214332166}
|
||||
- {fileID: 1944520322}
|
||||
- {fileID: 1996574566}
|
||||
- {fileID: 622020284}
|
||||
@ -4712,7 +4743,7 @@ MonoBehaviour:
|
||||
currentHealth: 0
|
||||
playerImpactVFX: {fileID: 2957420090356197408, guid: 5d1244f7b80cadd428a70173a01ce889,
|
||||
type: 3}
|
||||
groundImpactVFX: {fileID: 6794377120831721188, guid: 2e8dc25f6c4c6264e95bc99e5bffa3e5,
|
||||
groundImpactVFX: {fileID: 4746165193704193263, guid: 4e7523811a052fd46acf941fc69c8c98,
|
||||
type: 3}
|
||||
--- !u!114 &1801060028
|
||||
MonoBehaviour:
|
||||
@ -5431,7 +5462,7 @@ Transform:
|
||||
m_Children:
|
||||
- {fileID: 246600703}
|
||||
m_Father: {fileID: 1801060022}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &2020157753 stripped
|
||||
MonoBehaviour:
|
||||
@ -34141,7 +34172,7 @@ PrefabInstance:
|
||||
- target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 0
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 4572196853266583038, guid: d00f156879942114488e4db0689a3fb7,
|
||||
type: 3}
|
||||
|
||||
@ -317,7 +317,7 @@ GameObject:
|
||||
- component: {fileID: 28181228}
|
||||
- component: {fileID: 28181230}
|
||||
- component: {fileID: 28181229}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP) (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -604,7 +604,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1849782111}
|
||||
m_RootOrder: 2
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0.5}
|
||||
m_AnchorMax: {x: 1, y: 0.5}
|
||||
@ -661,7 +661,7 @@ GameObject:
|
||||
- component: {fileID: 259848696}
|
||||
- component: {fileID: 259848695}
|
||||
- component: {fileID: 259848697}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: ButtonWeapon_Laser
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -677,15 +677,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 259848693}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -8.694454}
|
||||
m_LocalScale: {x: 29.15844, y: 32.43877, z: 32.438778}
|
||||
m_LocalScale: {x: 28.473515, y: 28.303028, z: 32.43878}
|
||||
m_Children:
|
||||
- {fileID: 1087850083}
|
||||
m_Father: {fileID: 1983758579}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 34.6, y: 15.7}
|
||||
m_AnchoredPosition: {x: 37.065918, y: 15.337891}
|
||||
m_SizeDelta: {x: 0.876, y: 1.238}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &259848695
|
||||
@ -806,7 +806,7 @@ GameObject:
|
||||
- component: {fileID: 270363976}
|
||||
- component: {fileID: 270363978}
|
||||
- component: {fileID: 270363977}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: WeaponBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -821,17 +821,16 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 270363975}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -63}
|
||||
m_LocalScale: {x: 14.446189, y: 14.446189, z: 14.446189}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -314}
|
||||
m_LocalScale: {x: 18.261427, y: 18.74718, z: 18.261427}
|
||||
m_Children:
|
||||
- {fileID: 1983758579}
|
||||
- {fileID: 993001542}
|
||||
m_Father: {fileID: 981249586}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 883}
|
||||
m_AnchoredPosition: {x: 0, y: 941}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &270363977
|
||||
@ -934,7 +933,7 @@ RectTransform:
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1849782111}
|
||||
m_RootOrder: 0
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
@ -1539,7 +1538,7 @@ GameObject:
|
||||
- component: {fileID: 972429954}
|
||||
- component: {fileID: 972429953}
|
||||
- component: {fileID: 972429955}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: ButtonWeapon_Lighting
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -1555,15 +1554,15 @@ RectTransform:
|
||||
m_GameObject: {fileID: 972429951}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -8.694454}
|
||||
m_LocalScale: {x: 29.15844, y: 32.43877, z: 32.438778}
|
||||
m_LocalScale: {x: 28.473515, y: 28.303028, z: 32.43878}
|
||||
m_Children:
|
||||
- {fileID: 28181228}
|
||||
m_Father: {fileID: 1983758579}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 34.6, y: -15.7}
|
||||
m_AnchoredPosition: {x: 37.06578, y: -15.324463}
|
||||
m_SizeDelta: {x: 0.876, y: 1.238}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &972429953
|
||||
@ -1705,7 +1704,7 @@ RectTransform:
|
||||
m_Children:
|
||||
- {fileID: 270363976}
|
||||
m_Father: {fileID: 1849782111}
|
||||
m_RootOrder: 1
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
@ -1762,7 +1761,7 @@ GameObject:
|
||||
- component: {fileID: 993001545}
|
||||
- component: {fileID: 993001544}
|
||||
- component: {fileID: 993001543}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: ButtonExit
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -1776,16 +1775,16 @@ RectTransform:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 993001541}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 4.361012}
|
||||
m_LocalScale: {x: 0.056509066, y: 0.056509066, z: 0.056509066}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 18.883362}
|
||||
m_LocalScale: {x: 0.06024095, y: 0.059880227, z: 0.06863018}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 270363976}
|
||||
m_RootOrder: 1
|
||||
m_Father: {fileID: 1983758579}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -24, y: 46.19}
|
||||
m_AnchoredPosition: {x: 61.13797, y: 26.408691}
|
||||
m_SizeDelta: {x: 100, y: 100}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &993001543
|
||||
@ -2046,7 +2045,7 @@ GameObject:
|
||||
- component: {fileID: 1087850083}
|
||||
- component: {fileID: 1087850085}
|
||||
- component: {fileID: 1087850084}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: Text (TMP)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -2773,9 +2772,9 @@ RectTransform:
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 136704028}
|
||||
- {fileID: 467766966}
|
||||
- {fileID: 981249586}
|
||||
- {fileID: 136704028}
|
||||
m_Father: {fileID: 1801607763}
|
||||
m_RootOrder: 8
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
@ -3199,7 +3198,7 @@ GameObject:
|
||||
- component: {fileID: 1983758579}
|
||||
- component: {fileID: 1983758581}
|
||||
- component: {fileID: 1983758580}
|
||||
m_Layer: 0
|
||||
m_Layer: 5
|
||||
m_Name: MenuBG
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
@ -3214,18 +3213,19 @@ RectTransform:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1983758578}
|
||||
m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10.7060795}
|
||||
m_LocalScale: {x: 0.7979032, y: 0.8876673, z: 0.7979032}
|
||||
m_LocalPosition: {x: 0, y: 0, z: -10.706082}
|
||||
m_LocalScale: {x: 0.8908006, y: 0.9090199, z: 0.7979031}
|
||||
m_Children:
|
||||
- {fileID: 259848694}
|
||||
- {fileID: 972429952}
|
||||
- {fileID: 259848694}
|
||||
- {fileID: 993001542}
|
||||
m_Father: {fileID: 270363976}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 90}
|
||||
m_AnchorMin: {x: 0.5, y: 1}
|
||||
m_AnchorMax: {x: 0.5, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: -53.625854}
|
||||
m_SizeDelta: {x: 114.9597, y: 114.9597}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -49.99356, y: -8.161255}
|
||||
m_SizeDelta: {x: 113.7, y: 13.959702}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &1983758580
|
||||
MonoBehaviour:
|
||||
|
||||
@ -11,6 +11,7 @@ public class Attack : PlayerAction
|
||||
|
||||
public AudioClip throw_SFX;
|
||||
|
||||
|
||||
public override bool IsActionAllowed(TileInfo targetTile, PlayerState playerState)
|
||||
{
|
||||
if (!targetTile)
|
||||
|
||||
@ -63,7 +63,7 @@ public class ProjectileController : MonoBehaviour
|
||||
_tileOffset = tileOffset;
|
||||
this.owner = owner;
|
||||
|
||||
transform.LookAt(direction);
|
||||
transform.LookAt(direction * 10f);
|
||||
}
|
||||
|
||||
private void OnTriggerEnter(Collider other)
|
||||
|
||||
@ -111,6 +111,18 @@ TextureImporter:
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
||||
File diff suppressed because one or more lines are too long
File diff suppressed because one or more lines are too long
Loading…
x
Reference in New Issue
Block a user