item system global fix

This commit is contained in:
dddushesss 2022-02-18 05:02:16 +03:00
parent 6533271dc8
commit 975bc7b311
79 changed files with 168981 additions and 67996 deletions

View File

@ -1,6 +1,6 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &5336165614562949988
--- !u!1 &6899111087713090639
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
@ -8,161 +8,36 @@ GameObject:
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5336165614562950011}
- component: {fileID: 6899111087713090637}
- component: {fileID: 6899111087713090638}
m_Layer: 0
m_Name: Light
m_Name: Directional Light _Global _2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5336165614562950011
--- !u!4 &6899111087713090637
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5336165614562949988}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -14.18, y: 11.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5336165614865083984}
- {fileID: 5336165615279669001}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &5336165614865083986
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5336165614865083984}
- component: {fileID: 5336165614865083985}
m_Layer: 0
m_Name: Directional Light Left
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5336165614865083984
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5336165614865083986}
m_LocalRotation: {x: 0.29883623, y: 0.64085644, z: -0.29883623, w: 0.64085644}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_GameObject: {fileID: 6899111087713090639}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.70710677}
m_LocalPosition: {x: -0.000061035156, y: 968.0922, z: 84.69711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5336165614562950011}
m_Father: {fileID: 6899111088217598641}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: 90, z: 0}
--- !u!108 &5336165614865083985
m_LocalEulerAnglesHint: {x: 135, y: 90, z: 0}
--- !u!108 &6899111087713090638
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5336165614865083986}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.7
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.408
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &5336165615279669003
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5336165615279669001}
- component: {fileID: 5336165615279669002}
m_Layer: 0
m_Name: Directional Light Right
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!4 &5336165615279669001
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5336165615279669003}
m_LocalRotation: {x: 0.32139382, y: 0.32139382, z: -0.8830222, w: 0.11697779}
m_LocalPosition: {x: 35.65, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 5336165614562950011}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 140, y: 140, z: 0}
--- !u!108 &5336165615279669002
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5336165615279669003}
m_GameObject: {fileID: 6899111087713090639}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
@ -218,3 +93,97 @@ Light:
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &6899111088217598643
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6899111088217598641}
- component: {fileID: 6899111088217598642}
m_Layer: 3
m_Name: Directional Light _Global
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6899111088217598641
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6899111088217598643}
m_LocalRotation: {x: 0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815}
m_LocalPosition: {x: 525.82, y: 971.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 6899111087713090637}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 45, y: 90, z: 0}
--- !u!108 &6899111088217598642
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6899111088217598643}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.7
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.617
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: b65a64902764f84428e8a07b071bad15
guid: cb4975459f71a664bb0f6657824962cf
PrefabImporter:
externalObjects: {}
userData:

View File

@ -49,7 +49,7 @@ MeshRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1661242500252451528}
m_Enabled: 1
m_CastShadows: 1
m_CastShadows: 0
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1

View File

@ -137,6 +137,7 @@ MonoBehaviour:
Data:
_unit: {fileID: 0}
_color: 0
speed: 0.1
--- !u!136 &7385595456525671967
CapsuleCollider:
m_ObjectHideFlags: 0

View File

@ -33747,7 +33747,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2957420090356197408}
m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
m_LocalRotation: {x: -0.5735764, y: 0, z: 0, w: 0.8191521}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 2}
m_Children:
@ -33762,7 +33762,7 @@ Transform:
- {fileID: 8964506239540283643}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: -70, y: 0, z: 0}
--- !u!198 &2957420090341248778
ParticleSystem:
m_ObjectHideFlags: 0
@ -57967,8 +57967,7 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 7bbb0c53be846834980c36dd3251a29c, type: 3}
--- !u!4 &2957420090617624857 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 483090, guid: 7bbb0c53be846834980c36dd3251a29c,
type: 3}
m_CorrespondingSourceObject: {fileID: 483090, guid: 7bbb0c53be846834980c36dd3251a29c, type: 3}
m_PrefabInstance: {fileID: 2957420090617406987}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &2957420091136113291
@ -58066,8 +58065,7 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 77d6e8e3fa15a0b419d018e3e16931f6, type: 3}
--- !u!4 &2957420091135947029 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 494494, guid: 77d6e8e3fa15a0b419d018e3e16931f6,
type: 3}
m_CorrespondingSourceObject: {fileID: 494494, guid: 77d6e8e3fa15a0b419d018e3e16931f6, type: 3}
m_PrefabInstance: {fileID: 2957420091136113291}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7272863172154189151
@ -58145,8 +58143,7 @@ PrefabInstance:
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
- target: {fileID: 199441933441137232, guid: 16f393fea92971c4f9d155ff0adab5a5,
type: 3}
- target: {fileID: 199441933441137232, guid: 16f393fea92971c4f9d155ff0adab5a5, type: 3}
propertyPath: m_Materials.Array.size
value: 1
objectReference: {fileID: 0}
@ -58154,7 +58151,6 @@ PrefabInstance:
m_SourcePrefab: {fileID: 100100000, guid: 16f393fea92971c4f9d155ff0adab5a5, type: 3}
--- !u!4 &7272863172154046861 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 416978, guid: 16f393fea92971c4f9d155ff0adab5a5,
type: 3}
m_CorrespondingSourceObject: {fileID: 416978, guid: 16f393fea92971c4f9d155ff0adab5a5, type: 3}
m_PrefabInstance: {fileID: 7272863172154189151}
m_PrefabAsset: {fileID: 0}

View File

@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: Bomb
m_EditorClassIdentifier:
icon: {fileID: 21300000, guid: 5a80ac41b33ef3f43945efa70e6dfdb0, type: 3}
isInvokeOnPickUp: 0
type: 1
buildingPrefab: {fileID: 6736513976106828952, guid: 18fb35664a7886842aa1702160b555a8, type: 3}
isVisiting: 0
aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}

View File

@ -17,4 +17,4 @@ MonoBehaviour:
duration: 4
value: 4
bonusType: 3
usisngVFX: {fileID: 0}
usisngVFX: {fileID: 5605842015688550160, guid: 6316606d61f85ac489c287fb99d0e008, type: 3}

View File

@ -16,3 +16,4 @@ MonoBehaviour:
type: 0
buildingPrefab: {fileID: 9125080148727291347, guid: 5663dbcf605325241b40bc2afd5b6647, type: 3}
isVisiting: 1
aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}

View File

@ -13,6 +13,7 @@ MonoBehaviour:
m_Name: Tower
m_EditorClassIdentifier:
icon: {fileID: 21300000, guid: b7771b47a72ca7947bf18f664e53a983, type: 3}
isInvokeOnPickUp: 0
type: 1
buildingPrefab: {fileID: 3496656575117217171, guid: 38edd53c7f09f41409153241c78268f9, type: 3}
isVisiting: 0
aimCanvas: {fileID: 2273039178377770117, guid: 09a0317cbdff9fa479a18c9e20743a8e, type: 3}

View File

@ -13,7 +13,6 @@ MonoBehaviour:
m_Name: UIData
m_EditorClassIdentifier:
_objectsToSpawn:
- {fileID: 5336165614562949988, guid: b65a64902764f84428e8a07b071bad15, type: 3}
- {fileID: 5296751824488078361, guid: 7305318dc10267546b643a42c7c21af3, type: 3}
_canvas: {fileID: 3022236851805642197, guid: 682042d5dd3e7d94bbe2a67ec2c1245a, type: 3}
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: b8a13763a5a3d7645b9c77943a8c44bd
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,19 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 39f9814b967541eeaf31ef497d721a87, type: 3}
m_Name: AIData
m_EditorClassIdentifier:
_distanceToAgr: 0
_percentToRetreet: 0
_percentToUseProtectBonus: 0
_manaPercentToCollectBonus: 0
_distaceToCollectBonus: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c02ef6aa8c2a487429d76e43f260f17a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,16 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 83b1020f31bf45569f5af6c77fc77d4e, type: 3}
m_Name: CameraData
m_EditorClassIdentifier:
offset: {x: 0, y: 0, z: 0}
smoothSpeed: 0

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f73280d78601cc64ebc721f0859c85ba
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 9ae8c093a7fd99146b219ab2eb5f6d9b, type: 3}
m_Name: Data
m_EditorClassIdentifier:
levelName: Level 2
fieldDataPath: FieldData
cameraDataPath: CameraData
unitDataPath: UnitsData
weaponDataPath: WeaponsData
uiDataPath: UIData
musicDataPath: MusicData
itemDataPath: ItemsData
aiDataPath: AIData
chosenWeaponDataPath: ChosenWeapon.json

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 640ee6f4fdeccad47b28ffd4439dfffa
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,650 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a1700d9ee2ab4d8e8ac1b551b7c93ce8, type: 3}
m_Name: FieldData
m_EditorClassIdentifier:
serializationData:
SerializedFormat: 2
SerializedBytes:
ReferencedUnityObjects: []
SerializedBytesString:
Prefab: {fileID: 0}
PrefabModificationsReferencedUnityObjects: []
PrefabModifications: []
SerializationNodes:
- Name: colors
Entry: 6
Data:
enviroment:
- {fileID: 6899111088767572749, guid: a25279a05a242784e943563e6f70bc65, type: 3}
- {fileID: 1926454186, guid: ef0170e70965e7f46a1a0d4edf4627a1, type: 3}
buildings:
- {fileID: 788472192, guid: cc20e28cdf3e7104b99074add5dece53, type: 3}
Field:
cells:
- x: 0
z: 0
i: 0
IsSpawnPos: 0
- x: 1
z: 0
i: 1
IsSpawnPos: 0
- x: 2
z: 0
i: 2
IsSpawnPos: 0
- x: 3
z: 0
i: 3
IsSpawnPos: 0
- x: 4
z: 0
i: 4
IsSpawnPos: 0
- x: 5
z: 0
i: 5
IsSpawnPos: 0
- x: 6
z: 0
i: 6
IsSpawnPos: 0
- x: 7
z: 0
i: 7
IsSpawnPos: 0
- x: 8
z: 0
i: 8
IsSpawnPos: 0
- x: 9
z: 0
i: 9
IsSpawnPos: 0
- x: 0
z: 1
i: 10
IsSpawnPos: 0
- x: 1
z: 1
i: 11
IsSpawnPos: 0
- x: 2
z: 1
i: 12
IsSpawnPos: 0
- x: 3
z: 1
i: 13
IsSpawnPos: 0
- x: 4
z: 1
i: 14
IsSpawnPos: 0
- x: 5
z: 1
i: 15
IsSpawnPos: 0
- x: 6
z: 1
i: 16
IsSpawnPos: 0
- x: 7
z: 1
i: 17
IsSpawnPos: 1
- x: 8
z: 1
i: 18
IsSpawnPos: 0
- x: 9
z: 1
i: 19
IsSpawnPos: 0
- x: 0
z: 2
i: 20
IsSpawnPos: 0
- x: 1
z: 2
i: 21
IsSpawnPos: 0
- x: 2
z: 2
i: 22
IsSpawnPos: 0
- x: 3
z: 2
i: 23
IsSpawnPos: 1
- x: 4
z: 2
i: 24
IsSpawnPos: 0
- x: 5
z: 2
i: 25
IsSpawnPos: 0
- x: 6
z: 2
i: 26
IsSpawnPos: 0
- x: 7
z: 2
i: 27
IsSpawnPos: 0
- x: 8
z: 2
i: 28
IsSpawnPos: 0
- x: 0
z: 3
i: 30
IsSpawnPos: 0
- x: 1
z: 3
i: 31
IsSpawnPos: 0
- x: 2
z: 3
i: 32
IsSpawnPos: 0
- x: 3
z: 3
i: 33
IsSpawnPos: 0
- x: 4
z: 3
i: 34
IsSpawnPos: 0
- x: 5
z: 3
i: 35
IsSpawnPos: 0
- x: 6
z: 3
i: 36
IsSpawnPos: 0
- x: 7
z: 3
i: 37
IsSpawnPos: 0
- x: 2
z: 4
i: 42
IsSpawnPos: 0
- x: 3
z: 4
i: 43
IsSpawnPos: 0
- x: 4
z: 4
i: 44
IsSpawnPos: 0
- x: 5
z: 4
i: 45
IsSpawnPos: 0
- x: 6
z: 4
i: 46
IsSpawnPos: 0
- x: 7
z: 4
i: 47
IsSpawnPos: 0
- x: 2
z: 5
i: 52
IsSpawnPos: 0
- x: 3
z: 5
i: 53
IsSpawnPos: 0
- x: 4
z: 5
i: 54
IsSpawnPos: 0
- x: 5
z: 5
i: 55
IsSpawnPos: 0
- x: 4
z: 6
i: 64
IsSpawnPos: 0
- x: 5
z: 6
i: 65
IsSpawnPos: 0
- x: 6
z: 6
i: 66
IsSpawnPos: 0
- x: 3
z: 7
i: 73
IsSpawnPos: 0
- x: 4
z: 7
i: 74
IsSpawnPos: 0
- x: 5
z: 7
i: 75
IsSpawnPos: 0
- x: 6
z: 7
i: 76
IsSpawnPos: 0
- x: 7
z: 7
i: 77
IsSpawnPos: 0
- x: 0
z: 8
i: 80
IsSpawnPos: 0
- x: 3
z: 8
i: 83
IsSpawnPos: 0
- x: 4
z: 8
i: 84
IsSpawnPos: 0
- x: 5
z: 8
i: 85
IsSpawnPos: 0
- x: 6
z: 8
i: 86
IsSpawnPos: 0
- x: 7
z: 8
i: 87
IsSpawnPos: 0
- x: 8
z: 8
i: 88
IsSpawnPos: 0
- x: 0
z: 9
i: 90
IsSpawnPos: 0
- x: 2
z: 9
i: 92
IsSpawnPos: 0
- x: 3
z: 9
i: 93
IsSpawnPos: 0
- x: 4
z: 9
i: 94
IsSpawnPos: 0
- x: 5
z: 9
i: 95
IsSpawnPos: 0
- x: 6
z: 9
i: 96
IsSpawnPos: 0
- x: 7
z: 9
i: 97
IsSpawnPos: 0
- x: 8
z: 9
i: 98
IsSpawnPos: 0
- x: 9
z: 9
i: 99
IsSpawnPos: 0
- x: 0
z: 10
i: 100
IsSpawnPos: 0
- x: 1
z: 10
i: 101
IsSpawnPos: 0
- x: 2
z: 10
i: 102
IsSpawnPos: 0
- x: 3
z: 10
i: 103
IsSpawnPos: 0
- x: 4
z: 10
i: 104
IsSpawnPos: 0
- x: 6
z: 10
i: 106
IsSpawnPos: 0
- x: 7
z: 10
i: 107
IsSpawnPos: 0
- x: 8
z: 10
i: 108
IsSpawnPos: 0
- x: 9
z: 10
i: 109
IsSpawnPos: 0
- x: 0
z: 11
i: 110
IsSpawnPos: 0
- x: 1
z: 11
i: 111
IsSpawnPos: 0
- x: 2
z: 11
i: 112
IsSpawnPos: 0
- x: 3
z: 11
i: 113
IsSpawnPos: 0
- x: 6
z: 11
i: 116
IsSpawnPos: 0
- x: 7
z: 11
i: 117
IsSpawnPos: 0
- x: 8
z: 11
i: 118
IsSpawnPos: 0
- x: 9
z: 11
i: 119
IsSpawnPos: 0
- x: 0
z: 12
i: 120
IsSpawnPos: 0
- x: 1
z: 12
i: 121
IsSpawnPos: 0
- x: 2
z: 12
i: 122
IsSpawnPos: 0
- x: 3
z: 12
i: 123
IsSpawnPos: 0
- x: 7
z: 12
i: 127
IsSpawnPos: 0
- x: 8
z: 12
i: 128
IsSpawnPos: 0
- x: 9
z: 12
i: 129
IsSpawnPos: 0
- x: 0
z: 13
i: 130
IsSpawnPos: 0
- x: 1
z: 13
i: 131
IsSpawnPos: 0
- x: 2
z: 13
i: 132
IsSpawnPos: 0
- x: 3
z: 13
i: 133
IsSpawnPos: 0
- x: 6
z: 13
i: 136
IsSpawnPos: 0
- x: 7
z: 13
i: 137
IsSpawnPos: 0
- x: 8
z: 13
i: 138
IsSpawnPos: 0
- x: 9
z: 13
i: 139
IsSpawnPos: 0
- x: 0
z: 14
i: 140
IsSpawnPos: 0
- x: 1
z: 14
i: 141
IsSpawnPos: 0
- x: 2
z: 14
i: 142
IsSpawnPos: 0
- x: 3
z: 14
i: 143
IsSpawnPos: 0
- x: 4
z: 14
i: 144
IsSpawnPos: 0
- x: 7
z: 14
i: 147
IsSpawnPos: 0
- x: 8
z: 14
i: 148
IsSpawnPos: 0
- x: 9
z: 14
i: 149
IsSpawnPos: 0
- x: 0
z: 15
i: 150
IsSpawnPos: 0
- x: 1
z: 15
i: 151
IsSpawnPos: 0
- x: 2
z: 15
i: 152
IsSpawnPos: 0
- x: 3
z: 15
i: 153
IsSpawnPos: 0
- x: 4
z: 15
i: 154
IsSpawnPos: 0
- x: 7
z: 15
i: 157
IsSpawnPos: 0
- x: 8
z: 15
i: 158
IsSpawnPos: 0
- x: 9
z: 15
i: 159
IsSpawnPos: 0
- x: 0
z: 16
i: 160
IsSpawnPos: 0
- x: 1
z: 16
i: 161
IsSpawnPos: 0
- x: 2
z: 16
i: 162
IsSpawnPos: 0
- x: 3
z: 16
i: 163
IsSpawnPos: 0
- x: 4
z: 16
i: 164
IsSpawnPos: 0
- x: 7
z: 16
i: 167
IsSpawnPos: 0
- x: 8
z: 16
i: 168
IsSpawnPos: 0
- x: 9
z: 16
i: 169
IsSpawnPos: 0
- x: 0
z: 17
i: 170
IsSpawnPos: 0
- x: 1
z: 17
i: 171
IsSpawnPos: 1
- x: 2
z: 17
i: 172
IsSpawnPos: 0
- x: 3
z: 17
i: 173
IsSpawnPos: 0
- x: 6
z: 17
i: 176
IsSpawnPos: 0
- x: 7
z: 17
i: 177
IsSpawnPos: 0
- x: 8
z: 17
i: 178
IsSpawnPos: 1
- x: 9
z: 17
i: 179
IsSpawnPos: 0
- x: 0
z: 18
i: 180
IsSpawnPos: 0
- x: 1
z: 18
i: 181
IsSpawnPos: 0
- x: 2
z: 18
i: 182
IsSpawnPos: 0
- x: 3
z: 18
i: 183
IsSpawnPos: 0
- x: 6
z: 18
i: 186
IsSpawnPos: 0
- x: 7
z: 18
i: 187
IsSpawnPos: 0
- x: 8
z: 18
i: 188
IsSpawnPos: 0
- x: 9
z: 18
i: 189
IsSpawnPos: 0
- x: 0
z: 19
i: 190
IsSpawnPos: 0
- x: 1
z: 19
i: 191
IsSpawnPos: 0
- x: 2
z: 19
i: 192
IsSpawnPos: 0
- x: 5
z: 19
i: 195
IsSpawnPos: 0
- x: 6
z: 19
i: 196
IsSpawnPos: 0
- x: 7
z: 19
i: 197
IsSpawnPos: 0
- x: 8
z: 19
i: 198
IsSpawnPos: 0
- x: 9
z: 19
i: 199
IsSpawnPos: 0
height: 20
width: 10
isSimpleField: 0
width: 6
height: 6
spawnFields: []
levelPath: Assets/Resources/Maps\Level 1
hexCaptureManaCost: 0
hexHardCaptureManaCost: 0
hexHardCaptureTime: 0
cellPrefab: {fileID: 1661242500252451528, guid: bcea5b4a96735bd4b936f8f3fefcc688, type: 3}
cellLabelPrefab: {fileID: 3836123284387241147, guid: efd47cbd22ddfee4aa2b1391914116fc, type: 3}
CoordinatesCanvas: {fileID: 4726489279989878083, guid: f31e0880dd078104bb31dc0fd7ef9f19, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: f36b4948389dce04c8a052650027db8a
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,24 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: effbc11b6ae8444c8d20e929ce28183e, type: 3}
m_Name: ItemsData
m_EditorClassIdentifier:
items:
- item: {fileID: 11400000, guid: e7adbedb55c5db341a823370b696f709, type: 2}
_spawnChance: 0.34
fromTimeSpawn: 3
toTimeSpawn: 10
icons:
- type: 0
prefab: {fileID: 3197816592181874056, guid: 2704c4f795b0d7748a3e3fa53be4d893, type: 3}
- type: 1
prefab: {fileID: 8639522512577941448, guid: 7b6a7f64e52da514d88aa97ad8f863df, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 91483f02befd0ce458fa7de27eb4872c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ad850cd32937403f853eb6043fd04112, type: 3}
m_Name: MusicData
m_EditorClassIdentifier:
_settingsDataPath:
startMusic: {fileID: 0}
backMusic: {fileID: 0}
sfxMusic:
steps: []
captures: []
hardCapture: {fileID: 0}
death: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3df1e975687da8c4397cbe8441c33f1e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,20 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d802c0065ac04effbd7685b3eddc7574, type: 3}
m_Name: UIData
m_EditorClassIdentifier:
_objectsToSpawn: []
_canvas: {fileID: 3022236851805642197, guid: 682042d5dd3e7d94bbe2a67ec2c1245a, type: 3}
joystickView: {fileID: 4385872142190176059, guid: 4df6913b39f4979429158c344680d83f, type: 3}
inventoryView: {fileID: 1527356263590969195, guid: ff3bc3b17ddefd14eb798b22cf0a854f, type: 3}
adsMob: {fileID: 3306115827101638291, guid: 829cf0211d46b58489f4cb061c784378, type: 3}
cheatMenu: {fileID: 791049004453965678, guid: 33deb58e3852451419239c8df4119f91, type: 3}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2f0b21c97cd29594a963172ee4f4e8d7
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,18 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 2d46325a4e4e45338d7e9733fb8d6013, type: 3}
m_Name: UnitData
m_EditorClassIdentifier:
_units: []
playerBarCanvas: {fileID: 0}
botBarCanvas: {fileID: 0}
attackAimCanvas: {fileID: 0}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: c0b9b6c300d91c944992792b20ec4eb3
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,15 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b06259b938024e6e8a1f34610d0b60db, type: 3}
m_Name: WeaponsData
m_EditorClassIdentifier:
_weapons: []

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 30a958d1e7a14e24db6cdd7693e03e2c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &551039422
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalPosition.x
value: 525.82
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalPosition.y
value: 971.79
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalRotation.w
value: 0.6532815
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalRotation.x
value: 0.27059805
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalRotation.y
value: 0.6532815
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalRotation.z
value: -0.27059805
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 45
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598641, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598643, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_Name
value: Directional Light _Global
objectReference: {fileID: 0}
- target: {fileID: 6899111088217598643, guid: cb4975459f71a664bb0f6657824962cf, type: 3}
propertyPath: m_TagString
value: Save
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: cb4975459f71a664bb0f6657824962cf, type: 3}

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: ed7b7b44956baa54bbe34fd0ec3564cf
guid: a25279a05a242784e943563e6f70bc65
PrefabImporter:
externalObjects: {}
userData:

View File

@ -1,95 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &578780478
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 578780480}
- component: {fileID: 578780479}
m_Layer: 0
m_Name: Directional Light
m_TagString: Save
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &578780480
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578780478}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 8.155565, y: -4.3975315, z: 10.040455}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}
--- !u!108 &578780479
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 578780478}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 1, b: 1, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 0
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d5f977e476cad2944ba390ba3812cfa8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 5fa336eb9d905ac42b309812379e38ab
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 68712026117522b40a9128928b307312
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 28d20672f5dfd514aa0ab28c9304c07b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,189 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &2267539444992813378
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1223254639636097048}
- component: {fileID: 4167112940421681381}
m_Layer: 3
m_Name: Directional Light _Global
m_TagString: Save
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1223254639636097048
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2267539444992813378}
m_LocalRotation: {x: 0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815}
m_LocalPosition: {x: 525.82, y: 971.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 2301559550879146132}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 45, y: 90, z: 0}
--- !u!108 &4167112940421681381
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2267539444992813378}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.7
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.617
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!1 &5088963501171464948
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2301559550879146132}
- component: {fileID: 1774902775368537649}
m_Layer: 0
m_Name: Directional Light _Global _2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2301559550879146132
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5088963501171464948}
m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.70710677}
m_LocalPosition: {x: -0.000061035156, y: 968.0922, z: 84.69711}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 1223254639636097048}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 135, y: 90, z: 0}
--- !u!108 &1774902775368537649
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5088963501171464948}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.6
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 032ad6695c97705438f1d10f1fb3c5b4
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7771a029b34db6a4c96a5edd6c0d3d98
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 648de59a81d8fb54eada949f02489092
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: be15b869610fa22458614b093dea5ac8
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 2012cb028a44ac44288a18e3fc499ce5
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 1a0c5bd8183313740a7314324db914fa
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e1c548d777b793a4fa88cc838da91321
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,63 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1001 &7229041163138807486
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalPosition.x
value: 10.982813
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalPosition.y
value: 0.0000019073486
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalPosition.z
value: -0.2388916
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 73672630868547665, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 742650227762578155, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_Name
value: Emir 1
objectReference: {fileID: 0}
- target: {fileID: 742650227762578155, guid: fae8461379aa0114b93f392d39147aa5, type: 3}
propertyPath: m_TagString
value: Save
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fae8461379aa0114b93f392d39147aa5, type: 3}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 94a74912784c02b459dbdcbe279a8859
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

File diff suppressed because one or more lines are too long

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: f4e946e2637acd040bde43fd17b211c6
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

345
Assets/Scenes/LEvel 2.unity Normal file
View File

@ -0,0 +1,345 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!29 &1
OcclusionCullingSettings:
m_ObjectHideFlags: 0
serializedVersion: 2
m_OcclusionBakeSettings:
smallestOccluder: 5
smallestHole: 0.25
backfaceThreshold: 100
m_SceneGUID: 00000000000000000000000000000000
m_OcclusionCullingData: {fileID: 0}
--- !u!104 &2
RenderSettings:
m_ObjectHideFlags: 0
serializedVersion: 9
m_Fog: 0
m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
m_FogMode: 3
m_FogDensity: 0.01
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
m_AmbientIntensity: 1
m_AmbientMode: 0
m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
m_HaloStrength: 0.5
m_FlareStrength: 1
m_FlareFadeSpeed: 3
m_HaloTexture: {fileID: 0}
m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
m_DefaultReflectionMode: 0
m_DefaultReflectionResolution: 128
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
m_ObjectHideFlags: 0
serializedVersion: 12
m_GIWorkflowMode: 1
m_GISettings:
serializedVersion: 2
m_BounceScale: 1
m_IndirectOutputScale: 1
m_AlbedoBoost: 1
m_EnvironmentLightingMode: 0
m_EnableBakedLightmaps: 1
m_EnableRealtimeLightmaps: 0
m_LightmapEditorSettings:
serializedVersion: 12
m_Resolution: 2
m_BakeResolution: 40
m_AtlasSize: 1024
m_AO: 0
m_AOMaxDistance: 1
m_CompAOExponent: 1
m_CompAOExponentDirect: 0
m_ExtractAmbientOcclusion: 0
m_Padding: 2
m_LightmapParameters: {fileID: 0}
m_LightmapsBakeMode: 1
m_TextureCompression: 1
m_FinalGather: 0
m_FinalGatherFiltering: 1
m_FinalGatherRayCount: 256
m_ReflectionCompression: 2
m_MixedBakeMode: 2
m_BakeBackend: 1
m_PVRSampling: 1
m_PVRDirectSampleCount: 32
m_PVRSampleCount: 512
m_PVRBounces: 2
m_PVREnvironmentSampleCount: 256
m_PVREnvironmentReferencePointCount: 2048
m_PVRFilteringMode: 1
m_PVRDenoiserTypeDirect: 1
m_PVRDenoiserTypeIndirect: 1
m_PVRDenoiserTypeAO: 1
m_PVRFilterTypeDirect: 0
m_PVRFilterTypeIndirect: 0
m_PVRFilterTypeAO: 0
m_PVREnvironmentMIS: 1
m_PVRCulling: 1
m_PVRFilteringGaussRadiusDirect: 1
m_PVRFilteringGaussRadiusIndirect: 5
m_PVRFilteringGaussRadiusAO: 2
m_PVRFilteringAtrousPositionSigmaDirect: 0.5
m_PVRFilteringAtrousPositionSigmaIndirect: 2
m_PVRFilteringAtrousPositionSigmaAO: 1
m_ExportTrainingData: 0
m_TrainingDataDestination: TrainingData
m_LightProbeSampleCountMultiplier: 4
m_LightingDataAsset: {fileID: 0}
m_LightingSettings: {fileID: 0}
--- !u!196 &4
NavMeshSettings:
serializedVersion: 2
m_ObjectHideFlags: 0
m_BuildSettings:
serializedVersion: 2
agentTypeID: 0
agentRadius: 0.5
agentHeight: 2
agentSlope: 45
agentClimb: 0.4
ledgeDropHeight: 0
maxJumpAcrossDistance: 0
minRegionArea: 2
manualCellSize: 0
cellSize: 0.16666667
manualTileSize: 0
tileSize: 256
accuratePlacement: 0
maxJobWorkers: 0
preserveTilesOutsideBounds: 0
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &20935796
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 20935799}
- component: {fileID: 20935798}
- component: {fileID: 20935797}
m_Layer: 0
m_Name: Main Camera
m_TagString: MainCamera
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!81 &20935797
AudioListener:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20935796}
m_Enabled: 1
--- !u!20 &20935798
Camera:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20935796}
m_Enabled: 1
serializedVersion: 2
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_projectionMatrixMode: 1
m_GateFitMode: 2
m_FOVAxisMode: 0
m_SensorSize: {x: 36, y: 24}
m_LensShift: {x: 0, y: 0}
m_FocalLength: 50
m_NormalizedViewPortRect:
serializedVersion: 2
x: 0
y: 0
width: 1
height: 1
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic size: 5
m_Depth: -1
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingPath: -1
m_TargetTexture: {fileID: 0}
m_TargetDisplay: 0
m_TargetEye: 3
m_HDR: 1
m_AllowMSAA: 1
m_AllowDynamicResolution: 0
m_ForceIntoRT: 0
m_OcclusionCulling: 1
m_StereoConvergence: 10
m_StereoSeparation: 0.022
--- !u!4 &20935799
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 20935796}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &593769875
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 593769877}
- component: {fileID: 593769876}
m_Layer: 0
m_Name: Controller
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &593769876
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 593769875}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: a9b0e558b7ef4935aa12905596c7b16d, type: 3}
m_Name:
m_EditorClassIdentifier:
data: {fileID: 11400000, guid: 640ee6f4fdeccad47b28ffd4439dfffa, type: 2}
--- !u!4 &593769877
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 593769875}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 6.4726253, y: -10.462517, z: 9.5477295}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1425420038
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1425420040}
- component: {fileID: 1425420039}
m_Layer: 0
m_Name: Directional Light
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1425420039
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1425420038}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 1
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 1
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1425420040
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1425420038}
m_LocalRotation: {x: 0.40821788, y: -0.23456968, z: 0.10938163, w: 0.8754261}
m_LocalPosition: {x: 0, y: 3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 50, y: -30, z: 0}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 65fe93b643a508549b0df7339450a1f4
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -37,7 +37,7 @@ RenderSettings:
m_ReflectionBounces: 1
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 169109249}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.450823, g: 0.50074303, b: 0.57469726, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
@ -123,99 +123,6 @@ NavMeshSettings:
debug:
m_Flags: 0
m_NavMeshData: {fileID: 0}
--- !u!1 &169109248
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 169109250}
- component: {fileID: 169109249}
m_Layer: 3
m_Name: Directional Light _Global
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &169109249
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 169109248}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.7
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0.669
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &169109250
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 169109248}
m_LocalRotation: {x: 0.27059805, y: 0.6532815, z: -0.27059805, w: 0.6532815}
m_LocalPosition: {x: 525.82, y: 971.79, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 45, y: 90, z: 0}
--- !u!1 &763084228
GameObject:
m_ObjectHideFlags: 0
@ -922,96 +829,3 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1948758524
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1948758526}
- component: {fileID: 1948758525}
m_Layer: 0
m_Name: Directional Light _Global _2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!108 &1948758525
Light:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1948758524}
m_Enabled: 1
serializedVersion: 10
m_Type: 1
m_Shape: 0
m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1}
m_Intensity: 0.6
m_Range: 10
m_SpotAngle: 30
m_InnerSpotAngle: 21.80208
m_CookieSize: 10
m_Shadows:
m_Type: 2
m_Resolution: -1
m_CustomResolution: -1
m_Strength: 0
m_Bias: 0.05
m_NormalBias: 0.4
m_NearPlane: 0.2
m_CullingMatrixOverride:
e00: 1
e01: 0
e02: 0
e03: 0
e10: 0
e11: 1
e12: 0
e13: 0
e20: 0
e21: 0
e22: 1
e23: 0
e30: 0
e31: 0
e32: 0
e33: 1
m_UseCullingMatrixOverride: 0
m_Cookie: {fileID: 0}
m_DrawHalo: 0
m_Flare: {fileID: 0}
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
m_Bits: 4294967295
m_RenderingLayerMask: 1
m_Lightmapping: 1
m_LightShadowCasterMode: 0
m_AreaSize: {x: 1, y: 1}
m_BounceIntensity: 1
m_ColorTemperature: 6570
m_UseColorTemperature: 0
m_BoundingSphereOverride: {x: 0, y: 0, z: 0, w: 0}
m_UseBoundingSphereOverride: 0
m_UseViewFrustumForShadowCasterCull: 1
m_ShadowRadius: 0
m_ShadowAngle: 0
--- !u!4 &1948758526
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1948758524}
m_LocalRotation: {x: 0.6532815, y: 0.27059805, z: -0.6532815, w: 0.27059805}
m_LocalPosition: {x: 1270.2544, y: 1596.4446, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 135, y: 90, z: 0}

File diff suppressed because it is too large Load Diff

View File

@ -92,7 +92,7 @@ namespace AI
public BotState GetNewBehaviour(AIAgent agent)
{
var attack = agent.Unit.Inventory.Where(x => x is Bonus { BonusType: BonusType.Attack }).ToList();
var attack = agent.Unit.Inventory.Where(x => x.Item is Bonus { BonusType: BonusType.Attack }).ToList();
if (agent.CurentState is BotState.Attack && agent.Unit.AttackBonus == 0 && attack.Count > 0)
{
SetBehaviour(BotState.AttackBonusUsage, agent);
@ -122,7 +122,9 @@ namespace AI
}
var item = GetNearestItem(agent);
if (((item.dist > 0 && item.dist <= _data.DistaceToCollectBonus) ||
if (item.hex != null)
{
if ((item.dist <= _data.DistaceToCollectBonus ||
agent.Unit.Mana <= agent.Unit.Data.maxMana * _data.ManaPercentToCollectBonus) &&
(item.hex.Item.Item.Type == ItemType.DEFENCE
? agent.Unit.InventoryDefence.Count
@ -131,8 +133,10 @@ namespace AI
SetBehaviour(BotState.CollectingBonus, agent);
return BotState.CollectingBonus;
}
}
var protect = agent.Unit.InventoryDefence.Where(x => x is Bonus { BonusType: BonusType.Defence }).ToList();
var protect = agent.Unit.InventoryDefence.Where(x => x.Item is Bonus { BonusType: BonusType.Defence })
.ToList();
if (protect.Count > 0 && agent.Unit.Hp <= agent.Unit.Data.maxHP * _data.PercentToUseProtectBonus &&
agent.Unit.DefenceBonus == 0)
{
@ -179,14 +183,14 @@ namespace AI
private void UseBonus(AIAgent agent, BonusType type)
{
var attack = agent.Unit.Inventory.Where(x => x is Bonus bonus && bonus.BonusType == type).ToList();
var attack = agent.Unit.Inventory.Where(x => x.Item is Bonus bonus && bonus.BonusType == type).ToList();
if (attack.Count == 0 || !agent.Unit.IsAlive)
{
GetNewBehaviour(agent);
return;
}
((Bonus)attack.First()).Invoke(agent.Unit);
((Bonus)attack.First().Item).Invoke(agent.Unit);
}
private void Retreet(AIAgent agent)

View File

@ -2,6 +2,7 @@
namespace Controller
{
public class GameController : MonoBehaviour
{
[SerializeField] private Data.Data data;

View File

@ -13,27 +13,27 @@ namespace GameUI
[SerializeField] private GameObject item;
[SerializeField] private GameObject grid;
public event Action<Unit, Item> OnBuildingInvoked;
public event Action<ItemContainer> OnBuildingInvoked;
private List<GameObject> itemsGo;
private List<Button> _buttons;
private List<Button> _buttonsAttack;
private List<Button> _buttonsDefence;
private Unit _unit;
public void SetUpUI(int inventoryCapacity, Unit unit)
{
if (_buttons != null && _buttons.Count > 0)
if (_buttonsAttack != null && _buttonsAttack.Count > 0)
{
itemsGo.ForEach(Destroy);
}
_unit = unit;
itemsGo = new List<GameObject>();
_buttons = new List<Button>();
_buttonsAttack = new List<Button>();
_buttonsDefence = new List<Button>();
SetUpButtons(inventoryCapacity / 2, _buttons);
SetUpButtons(inventoryCapacity / 2, _buttonsAttack);
SetUpButtons(inventoryCapacity / 2, _buttonsDefence);
}
@ -62,11 +62,11 @@ namespace GameUI
OnBuildingInvoked = null;
}
public void PickUpItem(Item Item)
public void PickUpItem(ItemContainer Item)
{
var button = Item.Type switch
var button = Item.Item.Type switch
{
ItemType.ATTACK => _buttons.First(x => !x.IsActive()),
ItemType.ATTACK => _buttonsAttack.First(x => !x.IsActive()),
ItemType.DEFENCE => _buttonsDefence.First(x => !x.IsActive()),
_ => throw new ArgumentOutOfRangeException()
};
@ -74,10 +74,10 @@ namespace GameUI
if (button == null)
return;
button.gameObject.SetActive(true);
button.image.sprite = Item.Icon;
button.image.sprite = Item.Item.Icon;
button.onClick.AddListener(() =>
{
switch (Item)
switch (Item.Item)
{
case Bonus bonus:
{
@ -89,20 +89,24 @@ namespace GameUI
break;
}
case Building building:
building.Invoke((u) => SwitchButton(button));
OnBuildingInvoked?.Invoke(_unit, building);
Item.OnItemUsed += () => SwitchButton(button);
building.Invoke(Item);
OnBuildingInvoked?.Invoke(Item);
break;
case CaptureAbility ability:
ability.Invoke((u) => SwitchButton(button), _unit);
OnBuildingInvoked?.Invoke(_unit, ability);
Item.OnItemUsed += () => SwitchButton(button);
ability.Invoke(Item);
OnBuildingInvoked?.Invoke(Item);
break;
case SpecialWeapon specialWeapon:
specialWeapon.Invoke((u) => SwitchButton(button), _unit);
OnBuildingInvoked?.Invoke(_unit, specialWeapon);
Item.OnItemUsed += () => SwitchButton(button);
specialWeapon.Invoke(Item);
OnBuildingInvoked?.Invoke(Item);
break;
case SwitchingPlaces switchingPlaces:
switchingPlaces.Invoke((u) => SwitchButton(button), _unit);
OnBuildingInvoked?.Invoke(_unit, switchingPlaces);
Item.OnItemUsed += () => SwitchButton(button);
switchingPlaces.Invoke(Item);
OnBuildingInvoked?.Invoke(Item);
break;
}
});

View File

@ -3,6 +3,7 @@ using DefaultNamespace;
using HexFiled;
using Units;
using UnityEngine;
using Object = UnityEngine.Object;
namespace Items
{
@ -11,28 +12,54 @@ namespace Items
{
[SerializeField] private GameObject buildingPrefab;
[SerializeField] private bool isVisiting = false;
[SerializeField] private GameObject aimCanvas;
public void Invoke(Action<Unit> action)
public override void Invoke(ItemContainer container)
{
if (container.AimInstance == null)
{
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
}
container.AimInstance.SetActive(false);
}
public void Aim(HexDirection direction, ItemContainer container)
{
if (container.AimInstance == null)
{
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
}
container.AimInstance.SetActive(true);
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell
.GetNeighbor(direction);
if (cell == null)
{
return;
}
container.AimInstance.transform.LookAt(cell.transform);
container.Direction = direction;
}
public void PlaceItem(HexCell cell, Unit unit)
public void PlaceItem(ItemContainer container)
{
unit.UseItem(this);
container.Unit.UseItem(this);
container.DeAim();
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell.GetNeighbor(container.Direction);
var obj = Instantiate(buildingPrefab,
cell.transform.position + buildingPrefab.transform.position, Quaternion.identity);
obj.GetComponent<ISetUp>().SetUp(unit);
obj.GetComponent<ISetUp>().SetUp(container.Unit);
if (!isVisiting)
{
cell.Building = buildingPrefab;
cell.BuildingInstance = obj;
}
OnItemUsed.Invoke(unit);
OnItemUsed = null;
container.OnItemUsed.Invoke();
}
}
}

View File

@ -24,98 +24,99 @@ namespace Items
[SerializeField] private GameObject aimCanvas;
[SerializeField] private List<Angls> itterationMove;
[SerializeField] private string animName;
private GameObject _aimInstance;
private HexDirection _direction;
public void Invoke(Action<Unit> action, Unit unit)
public override void Invoke(ItemContainer container)
{
OnItemUsed ??= action;
if(_aimInstance == null)
_aimInstance = Object.Instantiate(aimCanvas, unit.Instance.transform);
_aimInstance.SetActive(false);
if (container.AimInstance == null)
{
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
}
container.AimInstance.SetActive(false);
}
public void Aim(HexDirection direction, Unit unit)
public void Aim(HexDirection direction, ItemContainer container)
{
if(_aimInstance == null)
_aimInstance = Object.Instantiate(aimCanvas, unit.Instance.transform);
_aimInstance.SetActive(true);
var cell = HexManager.UnitCurrentCell[unit.Color].cell
if (container.AimInstance == null)
{
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
}
container.AimInstance.SetActive(true);
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell
.GetNeighbor(direction);
if (cell == null)
{
return;
}
_aimInstance.transform.LookAt(cell.transform);
_direction = direction;
container.AimInstance.transform.LookAt(cell.transform);
container.Direction = direction;
}
public void DeAim()
{
_aimInstance.SetActive(false);
}
private void DoPaint(Unit unit)
{
unit.UseItem(this);
HexManager.UnitCurrentCell[unit.Color].cell.PaintHex(unit.Color);
var cell = HexManager.UnitCurrentCell[unit.Color].cell.GetNeighbor(_direction);
OnItemUsed?.Invoke(unit);
unit.UnitView.AnimActionDic[animName] -= DoPaint;
OnItemUsed = null;
private void DoPaint(ItemContainer container)
{
container.Unit.UseItem(this);
HexManager.UnitCurrentCell[container.Unit.Color].cell.PaintHex(container.Unit.Color);
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell.GetNeighbor(container.Direction);
container.OnItemUsed?.Invoke();
container.Unit.UnitView.AnimActionDic[animName] = null;
container.OnItemUsed = null;
if (cell == null)
{
return;
}
cell.PaintHex(unit.Color);
cell.PaintHex(container.Unit.Color);
bool keepGoing = true;
itterationMove.ForEach(dir =>
{
if (!keepGoing) return;
_direction = dir switch
container.Direction = dir switch
{
Angls.FORWARD => _direction,
Angls.PLUS60 => _direction.PlusSixtyDeg(),
Angls.MINUS60 => _direction.MinusSixtyDeg(),
Angls.PLUS120 => _direction.Plus120Deg(),
Angls.MINUS120 => _direction.Minus120Deg(),
Angls.BACK => _direction.Back(),
Angls.FORWARD => container.Direction,
Angls.PLUS60 => container.Direction.PlusSixtyDeg(),
Angls.MINUS60 => container.Direction.MinusSixtyDeg(),
Angls.PLUS120 => container.Direction.Plus120Deg(),
Angls.MINUS120 => container.Direction.Minus120Deg(),
Angls.BACK => container.Direction.Back(),
_ => throw new ArgumentOutOfRangeException(nameof(dir), dir, null)
};
if (cell.GetNeighbor(_direction) == null)
if (cell.GetNeighbor(container.Direction) == null)
{
keepGoing = false;
return;
}
cell = cell.GetNeighbor(_direction);
cell.PaintHex(unit.Color);
cell = cell.GetNeighbor(container.Direction);
cell.PaintHex(container.Unit.Color);
});
}
public void UseAbility(Unit unit)
public void UseAbility(ItemContainer container)
{
var cell = HexManager.UnitCurrentCell[unit.Color].cell.GetNeighbor(_direction);
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell.GetNeighbor(container.Direction);
if (cell == null)
{
DeAim();
container.DeAim();
return;
}
unit.RotateUnit(new Vector2((cell.transform.position - unit.Instance.transform.position).normalized.x,
(cell.transform.position - unit.Instance.transform.position).normalized.z));
unit.Animator.SetTrigger(animName);
_aimInstance.SetActive(false);
unit.SetCell(cell);
unit.UnitView.AnimActionDic[animName] += DoPaint;
container.Unit.RotateUnit(new Vector2((cell.transform.position - container.Unit.Instance.transform.position).normalized.x,
(cell.transform.position - container.Unit.Instance.transform.position).normalized.z));
container.Unit.Animator.SetTrigger(animName);
container.DeAim();
container.Unit.SetCell(cell);
container.Unit.UnitView.AnimActionDic[animName] += () => DoPaint(container);
}
}
}

View File

@ -29,7 +29,7 @@ namespace Items
public GameObject Prefab => prefab;
}
public abstract class Item : ScriptableObject, IDisposable
public abstract class Item : ScriptableObject
{
private GameObject _instance;
[SerializeField] private Sprite icon;
@ -40,8 +40,10 @@ namespace Items
public Sprite Icon => icon;
protected Action<Unit> OnItemUsed;
public virtual void Invoke(ItemContainer container)
{
}
public GameObject Spawn(HexCell cell, GameObject parent, GameObject iconPrefab)
@ -56,9 +58,5 @@ namespace Items
}
public void Dispose()
{
OnItemUsed = null;
}
}
}

View File

@ -0,0 +1,40 @@
using System;
using HexFiled;
using Items.ItemViews;
using Units;
using UnityEngine;
namespace Items
{
public class ItemContainer
{
private ItemView _instance;
public Action OnItemUsed;
public Item Item { get; }
public ItemView Instance => _instance;
public Unit Unit { get; }
public GameObject AimInstance { get; set; }
public HexDirection Direction { get; set; }
public Unit Value { get; set; }
public ItemContainer(Item item, ItemView instance, Unit unit)
{
Item = item;
_instance = instance;
Unit = unit;
}
public void DeAim()
{
AimInstance.SetActive(false);
}
}
}

View File

@ -0,0 +1,3 @@
fileFormatVersion: 2
guid: 3483b48da7454be2a2bfbf4e771f9503
timeCreated: 1645030264

View File

@ -32,7 +32,9 @@ namespace Items.ItemViews
}
transform.DOMove(unit.UnitView.transform.position + new Vector3(0,1,0), 0.1f).OnComplete(() =>
{
unit.PickUpItem(_item);
ItemContainer itemContainer = new ItemContainer(Item, this, unit);
unit.PickUpItem(itemContainer);
Despawn();
});
}

View File

@ -17,6 +17,7 @@ namespace Items.ItemViews
private List<GameObject> listUnits;
[SerializeField] private GameObject _unit;
[SerializeField] private UnitColor _color;
[SerializeField] private float speed;
public void SetUp(Unit unit)
{
@ -43,7 +44,7 @@ namespace Items.ItemViews
transform.DOKill();
transform.LookAt(listUnits.First().transform);
transform.DOMove(listUnits.First().transform.position,
Vector3.Distance(listUnits.First().transform.position, _unit.transform.position) * 0.2f)
Vector3.Distance(listUnits.First().transform.position, _unit.transform.position) * speed)
.SetEase(Ease.Linear);
}
}

View File

@ -16,46 +16,47 @@ namespace Items
[SerializeField] private GameObject _aimGameObject;
[SerializeField] private float lifeTime;
private GameObject _aimInstance;
private HexDirection _direction;
public void Invoke(Action<Unit> action, Unit unit)
public override void Invoke(ItemContainer container)
{
OnItemUsed ??= action;
if(_aimInstance == null || !_aimInstance.activeSelf)
_aimInstance = Object.Instantiate(_aimGameObject, unit.Instance.transform);
_aimInstance.SetActive(false);
if(container.AimInstance == null)
container.AimInstance = Object.Instantiate(_aimGameObject, container.Unit.Instance.transform);
container.AimInstance.SetActive(false);
}
public void Aim(HexDirection direction, Unit unit)
public void Aim(ItemContainer container, HexDirection direction)
{
_aimInstance.SetActive(true);
_aimInstance.transform.LookAt(HexManager.UnitCurrentCell[unit.Color].cell
.GetNeighbor(direction).transform);
_direction = direction;
container.AimInstance.SetActive(true);
container.AimInstance.transform.LookAt(HexManager.UnitCurrentCell[container.Unit.Color].cell
.GetNeighbor(container.Direction).transform);
container.Direction = direction;
}
public void DeAim()
{
_aimInstance.SetActive(false);
}
public void Fire(Unit unit)
public void Fire(ItemContainer container)
{
OnItemUsed?.Invoke(unit);
unit.UseItem(this);
var cell = HexManager.UnitCurrentCell[unit.Color].cell.GetNeighbor(_direction);
unit.RotateUnit(new Vector2((cell.transform.position - unit.Instance.transform.position).normalized.x,
(cell.transform.position - unit.Instance.transform.position).normalized.z));
container.OnItemUsed.Invoke();
container.Unit.UseItem(this);
var cell = HexManager.UnitCurrentCell[container.Unit.Color].cell.GetNeighbor(container.Direction);
container.Unit.RotateUnit(new Vector2((cell.transform.position - container.Unit.Instance.transform.position).normalized.x,
(cell.transform.position - container.Unit.Instance.transform.position).normalized.z));
_weapon.SetModifiedDamage(0);
_weapon.objectToThrow.GetComponent<ISetUp>().SetUp(unit);
_aimInstance.SetActive(false);
var dir = DirectionHelper.DirectionTo(unit.Instance.transform.position, cell.transform.position);
_weapon.Fire(unit.Instance.transform, new Vector2(dir.x, dir.z), unit);
_weapon.objectToThrow.GetComponent<ISetUp>().SetUp(container.Unit);
container.DeAim();
var dir = DirectionHelper.DirectionTo(container.Unit.Instance.transform.position, cell.transform.position);
var ball = _weapon.Fire(container.Unit.Instance.transform, new Vector2(dir.x, dir.z), container.Unit);
TimerHelper.Instance.StartTimer(() =>
{
_weapon.DestroyBall();
if(ball == null)
return;
var vfx = VFXController.Instance.PlayEffect(_weapon.VFXGameObject, ball.transform.position, Quaternion.identity);
MusicController.Instance.AddAudioSource(vfx);
MusicController.Instance.PlayAudioClip(_weapon.hitSound, vfx);
ball.transform.DOKill();
Object.Destroy(ball);
}, lifeTime);
}

View File

@ -13,48 +13,46 @@ namespace Items
[SerializeField] private GameObject aimCanvas;
[SerializeField] private LayerMask _layerMask;
[SerializeField] private float time;
private GameObject _aimInstance;
private HexDirection _direction;
public void Invoke(Action<Unit> action, Unit unit)
public override void Invoke(ItemContainer container)
{
if (!unit.IsPlayer)
if (!container.Unit.IsPlayer)
{
return;
}
OnItemUsed ??= action;
if (_aimInstance == null)
_aimInstance = Object.Instantiate(aimCanvas, unit.Instance.transform);
_aimInstance.SetActive(false);
if (container.AimInstance == null)
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
container.AimInstance.SetActive(false);
}
public void Aim(Vector2 direction, Unit unit, out Unit chosenUnit)
public void Aim(Vector2 direction, ItemContainer container)
{
if (unit.IsPlayer)
if (container.Unit.IsPlayer)
{
if (_aimInstance == null)
_aimInstance = Object.Instantiate(aimCanvas, unit.Instance.transform);
_aimInstance.SetActive(true);
_aimInstance.transform.LookAt(
new Vector3(direction.x, 0, direction.y) + unit.Instance.transform.position);
if (container.AimInstance == null)
container.AimInstance = Object.Instantiate(aimCanvas, container.Unit.Instance.transform);
container.AimInstance.SetActive(true);
container.AimInstance.transform.LookAt(
new Vector3(direction.x, 0, direction.y) + container.Unit.Instance.transform.position);
}
RaycastHit hit;
Ray ray = new Ray(unit.Instance.transform.position + new Vector3(0, 1f, 0),
Ray ray = new Ray(container.Unit.Instance.transform.position + new Vector3(0, 1f, 0),
new Vector3(direction.x, 0, direction.y));
if (Physics.Raycast(ray, out hit, Mathf.Infinity, _layerMask))
{
Debug.Log($"Aimed {hit.collider.gameObject.name}");
chosenUnit = hit.collider.gameObject.GetComponent<UnitView>().Unit;
container.Value = hit.collider.gameObject.GetComponent<UnitView>().Unit;
}
else
{
chosenUnit = null;
container.Value = null;
}
Debug.DrawRay(ray.origin,
@ -62,37 +60,34 @@ namespace Items
}
public void UseAbility(Unit unit, Unit chosenUnit)
public void UseAbility(ItemContainer container)
{
if (chosenUnit == null || unit.isSwitched)
if (container.Value == null || container.Unit.isSwitched)
{
DeAim();
container.DeAim();
return;
}
unit.UseItem(this);
unit.isSwitched = true;
DeAim();
OnItemUsed?.Invoke(unit);
chosenUnit.IsBusy = true;
chosenUnit.IsStaned = true;
var unitCell = HexManager.UnitCurrentCell[unit.Color].cell;
var choseUnitCell = HexManager.UnitCurrentCell[chosenUnit.Color].cell;
unit.SetCell(choseUnitCell, true, true);
unit.SetEasyColor(chosenUnit.Color, time);
chosenUnit.SetCell(unitCell, true);
container.Unit.UseItem(this);
container.Unit.isSwitched = true;
container.DeAim();
container.OnItemUsed?.Invoke();
container.Value.IsBusy = true;
container.Value.IsStaned = true;
var unitCell = HexManager.UnitCurrentCell[container.Unit.Color].cell;
var choseUnitCell = HexManager.UnitCurrentCell[container.Value.Color].cell;
container.Unit.SetCell(choseUnitCell, true, true);
container.Unit.SetEasyColor(container.Value.Color, time);
container.Value.SetCell(unitCell, true);
TimerHelper.Instance.StartTimer(() =>
{
unit.isSwitched = false;
chosenUnit.SetCell(choseUnitCell, true, true);
unit.SetCell(unitCell, true);
chosenUnit.IsStaned = false;
chosenUnit.IsBusy = false;
container.Unit.isSwitched = false;
container.Value.SetCell(choseUnitCell, true, true);
container.Unit.SetCell(unitCell, true);
container.Value.IsStaned = false;
container.Value.IsBusy = false;
}, time);
}
public void DeAim()
{
_aimInstance.SetActive(false);
}
}
}

View File

@ -1,7 +1,7 @@
using System;
using System.Collections;
using System.Collections.Generic;
using Sirenix.OdinInspector;
using UnityEngine;
namespace DefaultNamespace
@ -24,7 +24,7 @@ namespace DefaultNamespace
}
}
[EditorButton]
[Button("Set Time Scale")]
public void SetTimerScale(float scale)
{
Time.timeScale = scale;

View File

@ -27,7 +27,7 @@ namespace Chars
private bool returnedMoveJoystick = false;
private PlayerInventoryView _inventoryView;
private Item _itemToPlace;
private ItemContainer _itemToPlace;
private HexCell _cellToPlace;
private Unit chosenUnit;
@ -54,12 +54,12 @@ namespace Chars
_placeJoystick.OnTouchUp += UseAbility;
}
private void AimPlaceItem(Unit unit, Item item)
private void AimPlaceItem(ItemContainer container)
{
if (unit.IsBusy || !unit.IsAlive) return;
if (_unit.IsBusy || !_unit.IsAlive) return;
_attackJoystick.gameObject.SetActive(false);
_placeJoystick.gameObject.SetActive(true);
_itemToPlace = item;
_itemToPlace = container;
}
private void UseAbility()
@ -72,30 +72,24 @@ namespace Chars
return;
}
switch (_itemToPlace)
switch (_itemToPlace.Item)
{
case Building building:
_unitView.AimCanvas.SetActive(false);
if (_cellToPlace == null)
{
return;
}
building.PlaceItem(_cellToPlace, _unit);
building.PlaceItem(_itemToPlace);
break;
case CaptureAbility ability:
ability.UseAbility(_unit);
ability.UseAbility(_itemToPlace);
break;
case SpecialWeapon weapon:
weapon.Fire(_unit);
weapon.Fire(_itemToPlace);
break;
case SwitchingPlaces switchingPlaces:
switchingPlaces.UseAbility(_unit, chosenUnit);
switchingPlaces.UseAbility(_itemToPlace);
break;
}
}
private void PickUp(Item item)
private void PickUp(ItemContainer item)
{
_inventoryView.PickUpItem(item);
}
@ -137,17 +131,17 @@ namespace Chars
_aimCount = -1;
}
switch (_itemToPlace)
switch (_itemToPlace.Item)
{
case Building building:
if (_aimCount == -1)
{
_aimCount = 2;
_unitView.AimCanvas.SetActive(false);
_itemToPlace.DeAim();
return;
}
_unitView.AimCanvas.SetActive(true);
building.Aim(DirectionHelper.VectorToDirection(placeDir.normalized), _itemToPlace);
_cellToPlace = _unit.PlaceItemAim(DirectionHelper.VectorToDirection(placeDir.normalized));
_aimCount = 1;
break;
@ -155,20 +149,21 @@ namespace Chars
if (_aimCount == -1)
{
_aimCount = 2;
ability.DeAim();
_itemToPlace.DeAim();
return;
}
ability.Aim(DirectionHelper.VectorToDirection(placeDir.normalized), _unit);
ability.Aim(DirectionHelper.VectorToDirection(placeDir.normalized), _itemToPlace);
_aimCount = 1;
break;
case SpecialWeapon weapon:
weapon.Aim(DirectionHelper.VectorToDirection(placeDir.normalized), _unit);
weapon.Aim(_itemToPlace, DirectionHelper.VectorToDirection(placeDir.normalized));
break;
case SwitchingPlaces switchingPlaces:
switchingPlaces.Aim(placeDir.normalized, _unit, out var unit);
if (unit != null)
switchingPlaces.Aim(placeDir.normalized, _itemToPlace);
if (_itemToPlace.Value != null)
{
chosenUnit = unit;
chosenUnit = _itemToPlace.Value;
}
break;
}
@ -187,21 +182,20 @@ namespace Chars
if (_placeJoystick.gameObject.activeSelf)
{
_placeJoystick.gameObject.SetActive(false);
switch (_itemToPlace)
switch (_itemToPlace.Item)
{
case CaptureAbility ability:
ability.DeAim();
_itemToPlace.DeAim();
break;
case Building building:
_unitView.AimCanvas.SetActive(false);
_itemToPlace.DeAim();
break;
case SpecialWeapon weapon:
weapon.DeAim();
_itemToPlace.DeAim();
break;
case SwitchingPlaces place:
place.DeAim();
_itemToPlace.DeAim();
break;
}
}

View File

@ -18,8 +18,8 @@ namespace Units
public class Unit
{
private GameObject _instance;
private List<Item> _inventory;
private List<Item> _inventoryDefence;
private List<ItemContainer> _inventory;
private List<ItemContainer> _inventoryDefence;
private AnimLength _animLength;
private HexCell _cell;
private HexGrid _hexGrid;
@ -56,15 +56,15 @@ namespace Units
public UnitColor Color => _data.color;
public int InventoryCapacity => _data.inventoryCapacity;
public event Action<Item> OnItemPickUp;
public event Action<ItemContainer> OnItemPickUp;
public event Action<Unit> OnDeath;
public BarCanvas BarCanvas => UnitView.BarCanvas;
public GameObject Instance => _instance;
public UnitInfo Data => _data;
public int Mana => _mana;
public int Hp => _hp;
public List<Item> Inventory => _inventory;
public List<Item> InventoryDefence => _inventoryDefence;
public List<ItemContainer> Inventory => _inventory;
public List<ItemContainer> InventoryDefence => _inventoryDefence;
public Weapon Weapon => _weapon;
public bool IsPlayer => _data.isPlayer;
public Animator Animator => _animator;
@ -257,8 +257,8 @@ namespace Units
_cell.PaintHex(_data.color, true);
_cell.GetListNeighbours().ForEach(x => { x?.PaintHex(Color, true); });
_inventory = new List<Item>();
_inventoryDefence = new List<Item>();
_inventory = new List<ItemContainer>();
_inventoryDefence = new List<ItemContainer>();
HexManager.UnitCurrentCell.Add(_data.color, (_cell, this));
@ -316,15 +316,14 @@ namespace Units
return false;
}
public void PickUpItem(Item item)
public void PickUpItem(ItemContainer item)
{
switch (item.Type)
switch (item.Item.Type)
{
case ItemType.ATTACK:
if (_inventory.Count < _data.inventoryCapacity / 2)
{
_inventory.Add(item);
OnItemPickUp?.Invoke(item);
_cell.Item = null;
}
@ -333,7 +332,6 @@ namespace Units
if (_inventoryDefence.Count < _data.inventoryCapacity / 2)
{
_inventoryDefence.Add(item);
OnItemPickUp?.Invoke(item);
_cell.Item = null;
}
@ -341,15 +339,20 @@ namespace Units
default:
throw new ArgumentOutOfRangeException();
}
OnItemPickUp?.Invoke(item);
}
public void UseItem(Item item)
{
if (item.Type == ItemType.ATTACK)
_inventory.Remove(item);
{
var i = _inventory.First(i => i.Item == item);
_inventory.Remove(i);
}
else
{
_inventoryDefence.Remove(item);
var i = _inventoryDefence.First(i => i.Item == item);
_inventoryDefence.Remove(i);
}
}
@ -431,7 +434,7 @@ namespace Units
Object.Destroy(_instance);
OnDeath?.Invoke(this);
}, _animLength.Death);
_inventory.ForEach(x => x.Dispose());
MusicController.Instance.AddAudioSource(vfx);
MusicController.Instance.PlayAudioClip(MusicController.Instance.MusicData.SfxMusic.Death, vfx);
MusicController.Instance.RemoveAudioSource(_instance);

View File

@ -30,13 +30,13 @@ public class UnitView : MonoBehaviour
private Action _startRegen;
private Coroutine _previosRegen;
private Coroutine _previosReload;
private Dictionary<string, Action<Unit>> animActionDic;
private Dictionary<string, Action> animActionDic;
private int _mana;
private event Action CaptureHex;
private AudioSource _audioSource;
private Unit _unit;
private float _hardCaptureTime;
private Action<Unit> onSupperJump;
private Action onSupperJump;
private Coroutine _previousRegenCoroutine;
public BarCanvas BarCanvas => _barCanvas;
@ -46,7 +46,7 @@ public class UnitView : MonoBehaviour
public Unit Unit => _unit;
public Dictionary<string, Action<Unit>> AnimActionDic => animActionDic;
public Dictionary<string, Action> AnimActionDic => animActionDic;
public void SetBar(BarCanvas barCanvas, GameObject aimCanvas)
{
@ -62,7 +62,7 @@ public class UnitView : MonoBehaviour
public void SetUp(Weapon weapon, Action regenMana, int manaRegen, Action captureHex,
Unit unit, float hardCaptureTime)
{
animActionDic = new Dictionary<string, Action<Unit>> { { "SuperJump", onSupperJump } };
animActionDic = new Dictionary<string, Action> { { "SuperJump", onSupperJump } };
_weapon = weapon;
_toReloadStack = new Stack<ShotUIView>();
@ -151,7 +151,7 @@ public class UnitView : MonoBehaviour
for (var i = 0; i < animActionDic.Count; i++)
{
var item = animActionDic.ElementAt(i);
item.Value?.Invoke(Unit);
item.Value?.Invoke();
}
}
@ -161,8 +161,9 @@ public class UnitView : MonoBehaviour
if (weaponView != null)
{
OnHit?.Invoke(weaponView.Weapon.modifiedDamage);
var vfx = VFXController.Instance.PlayEffect(weaponView.Weapon.VFXGameObject, weaponView.transform.position,
weaponView.transform.rotation);
var vfx = VFXController.Instance.PlayEffect(weaponView.Weapon.VFXGameObject, transform.position + new Vector3(0,2,0),
weaponView.Weapon.VFXGameObject.transform.rotation);
MusicController.Instance.AddAudioSource(vfx);
MusicController.Instance.PlayAudioClip(weaponView.Weapon.hitSound, vfx);
@ -178,6 +179,7 @@ public class UnitView : MonoBehaviour
if (itemView == null || itemView.pickedUp || !_unit.CanPickUpItem(itemView.Item)) return;
itemView.pickedUp = true;
itemView.PickUp(Unit);
ItemFabric.Items.Remove(itemView.gameObject);
}

View File

@ -24,15 +24,15 @@ namespace Weapons
public AudioClip shotSound;
public AudioClip hitSound;
private GameObject ball;
public void SetModifiedDamage(int bonus)
{
modifiedDamage = damage + bonus;
}
public void Fire(Transform start, Vector2 direction, Unit unit)
public GameObject Fire(Transform start, Vector2 direction, Unit unit)
{
ball = Object.Instantiate(objectToThrow,
var ball = Object.Instantiate(objectToThrow,
start.forward + start.transform.position + new Vector3(0, 2),
start.rotation);
@ -41,25 +41,24 @@ namespace Weapons
ball.AddComponent<WeaponView>().SetWeapon(this, unit);
Weapon tmpThis = this;
GameObject localBall = ball;
Weapon tmpThis1 = this;
localBall.transform.DOMove(new Vector3(direction.normalized.x,
0, direction.normalized.y) * tmpThis.disnatce * HexGrid.HexDistance +
start.position + new Vector3(0, 2, 0), tmpThis.speed)
.SetEase(Ease.Linear)
.OnComplete(() =>
{
tmpThis.DestroyBall();
});
}
public void DestroyBall()
{
if(ball == null)
return;
var vfx = VFXController.Instance.PlayEffect(VFXGameObject, ball.transform.position, ball.transform.rotation);
var vfx = VFXController.Instance.PlayEffect(tmpThis1.VFXGameObject, ball.transform.position, Quaternion.identity);
MusicController.Instance.AddAudioSource(vfx);
MusicController.Instance.PlayAudioClip(hitSound, vfx);
MusicController.Instance.PlayAudioClip(tmpThis1.hitSound, vfx);
ball.transform.DOKill();
Object.Destroy(ball);
}
});
return ball;
}
}
}

View File

@ -5,6 +5,7 @@
"com.unity.ads": "3.7.1",
"com.unity.analytics": "3.5.3",
"com.unity.collab-proxy": "1.7.1",
"com.unity.device-simulator": "3.0.3-preview",
"com.unity.ide.rider": "2.0.7",
"com.unity.ide.visualstudio": "2.0.11",
"com.unity.ide.vscode": "1.2.4",

View File

@ -39,6 +39,13 @@
},
"url": "https://packages.unity.com"
},
"com.unity.device-simulator": {
"version": "3.0.3-preview",
"depth": 0,
"source": "registry",
"dependencies": {},
"url": "https://packages.unity.com"
},
"com.unity.ext.nunit": {
"version": "1.0.6",
"depth": 1,

View File

@ -12,11 +12,11 @@ MonoBehaviour:
m_Script: {fileID: 13964, guid: 0000000000000000e000000000000000, type: 0}
m_Name:
m_EditorClassIdentifier:
m_EnablePreviewPackages: 0
m_EnablePreviewPackages: 1
m_EnablePackageDependencies: 0
m_AdvancedSettingsExpanded: 1
m_ScopedRegistriesSettingsExpanded: 1
oneTimeWarningShown: 0
oneTimeWarningShown: 1
m_Registries:
- m_Id: main
m_Name:

File diff suppressed because one or more lines are too long