Items - restore Dropping & Saving module

This commit is contained in:
kabix09 2023-01-06 03:44:07 +01:00
parent 2d088ba775
commit f7e99ede60
24 changed files with 13382 additions and 155 deletions

View File

@ -150,6 +150,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -659.28564, y: -370.71426, z: 0}
m_LocalScale: {x: 1.4285713, y: 1.4285713, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 286215656}
m_RootOrder: 0
@ -165,6 +166,7 @@ SpriteRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
@ -236,6 +238,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 337149901}
m_RootOrder: 3
@ -403,6 +406,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1873963897}
m_RootOrder: 2
@ -566,6 +570,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 3
@ -613,6 +618,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1590806309}
m_RootOrder: 0
@ -719,6 +725,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.36, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 1
@ -751,6 +758,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 337149901}
m_RootOrder: 2
@ -828,6 +836,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.45, y: -8.22, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 5
@ -860,6 +869,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 48463740}
m_Father: {fileID: 2104115633}
@ -935,6 +945,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 321112481}
m_RootOrder: 0
@ -983,6 +994,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1475557202}
m_RootOrder: 0
@ -1145,6 +1157,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 308038388}
- {fileID: 1560868854}
@ -1251,6 +1264,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: -10}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 1
@ -1283,6 +1297,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1872802748}
- {fileID: 2142684861}
@ -1362,6 +1377,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1676315066}
m_RootOrder: 2
@ -1437,6 +1453,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1443125922}
m_RootOrder: 0
@ -1452,6 +1469,7 @@ TilemapRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -11098,6 +11116,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 37.864067, y: -5.0793505, z: -14.286615}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 9
@ -11132,6 +11151,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1.48, y: 1.48, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 922665671}
m_RootOrder: 0
@ -11277,6 +11297,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1802590641}
m_RootOrder: 1
@ -11357,6 +11378,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1443125922}
m_RootOrder: 1
@ -11372,6 +11394,7 @@ TilemapRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -14146,6 +14169,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 2
@ -14211,6 +14235,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1560234013}
m_RootOrder: 1
@ -14531,6 +14556,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 431601327}
m_TargetAssemblyTypeName: SaveController, Assembly-CSharp
m_MethodName: SaveItemsOnMap
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &431601330
MonoBehaviour:
m_ObjectHideFlags: 0
@ -14599,6 +14636,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1044274175}
m_Father: {fileID: 1094955537}
@ -14636,6 +14674,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 5
@ -14681,6 +14720,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 524799963}
m_RootOrder: 2
@ -14757,6 +14797,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1414550739}
- {fileID: 1372366485}
@ -14882,6 +14923,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 4.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 852779020}
m_RootOrder: 0
@ -14976,6 +15018,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1676315066}
m_RootOrder: 0
@ -15052,6 +15095,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 524799963}
m_RootOrder: 4
@ -15144,6 +15188,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2096156761}
m_RootOrder: 2
@ -15226,6 +15271,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1560234013}
m_RootOrder: 3
@ -15392,6 +15438,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1560234013}
m_RootOrder: 0
@ -15500,6 +15547,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.9, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1562526899}
m_RootOrder: 0
@ -15575,6 +15623,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2096156761}
m_RootOrder: 0
@ -15652,6 +15701,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.45, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 0
@ -15684,6 +15734,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 570435097}
m_Father: {fileID: 1537009611}
@ -15847,6 +15898,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1467027545}
- {fileID: 321112481}
@ -15888,6 +15940,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
m_Name:
m_EditorClassIdentifier:
m_SendPointerHoverToParent: 1
m_HorizontalAxis: Horizontal
m_VerticalAxis: Vertical
m_SubmitButton: Submit
@ -15920,6 +15973,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 4
@ -16014,6 +16068,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 366805452}
- {fileID: 1519075568}
@ -16081,6 +16136,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 13
@ -16113,6 +16169,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1052797815}
m_RootOrder: 0
@ -16193,6 +16250,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1590806309}
m_RootOrder: 1
@ -16381,6 +16439,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1443125922}
m_RootOrder: 2
@ -16396,6 +16455,7 @@ TilemapRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -49286,6 +49346,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2096156761}
m_RootOrder: 3
@ -49448,6 +49509,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.36, y: 7.36, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 2
@ -49479,6 +49541,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 321112481}
m_RootOrder: 4
@ -49528,6 +49591,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.8, y: 0.9, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 447873359}
m_RootOrder: 0
@ -49602,6 +49666,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 2}
m_LocalScale: {x: 2, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 934145151}
- {fileID: 2019051569}
@ -49706,6 +49771,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 4.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1387529180}
m_RootOrder: 0
@ -49799,6 +49865,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 1.9589837}
m_LocalScale: {x: 2, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1565855736}
- {fileID: 2075437072}
@ -49902,6 +49969,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2019051569}
m_RootOrder: 0
@ -49975,6 +50043,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 7.45, y: -8.22, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 3
@ -50007,6 +50076,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1614746956}
- {fileID: 1762716938}
@ -50087,6 +50157,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1676315066}
m_RootOrder: 1
@ -50161,6 +50232,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 321112481}
m_RootOrder: 2
@ -50207,6 +50279,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1676315066}
m_RootOrder: 3
@ -50286,6 +50359,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1590806309}
m_RootOrder: 3
@ -50360,6 +50434,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 321112481}
m_RootOrder: 3
@ -50408,6 +50483,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1560234013}
m_RootOrder: 2
@ -50570,6 +50646,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1537009611}
m_RootOrder: 1
@ -50649,6 +50726,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1443125922}
m_RootOrder: 4
@ -50664,6 +50742,7 @@ TilemapRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -52411,6 +52490,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 524799963}
m_RootOrder: 1
@ -52486,6 +52566,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1074120399}
m_Father: {fileID: 1802590641}
@ -52586,6 +52667,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 20, z: 60}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 10
@ -52618,6 +52700,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 524799963}
m_RootOrder: 0
@ -52704,6 +52787,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 351610902}
- {fileID: 407612202}
@ -52744,6 +52828,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1590806309}
m_RootOrder: 2
@ -52932,6 +53017,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.4530646, y: -3.8489263, z: 4.197498}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 5
@ -53030,6 +53116,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 6
@ -53107,6 +53194,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 0
@ -53248,6 +53336,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 317014144}
- {fileID: 2021738495}
@ -53330,6 +53419,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1475557202}
m_RootOrder: 2
@ -53496,6 +53586,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 100}
m_LocalScale: {x: 1.5, y: 1.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 922665671}
m_RootOrder: 1
@ -53641,6 +53732,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9500031, y: 0.20000178, z: 4.8}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1849206081}
- {fileID: 1348390129}
@ -53758,6 +53850,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 713226932}
- {fileID: 431601324}
@ -53799,6 +53892,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 321112481}
m_RootOrder: 1
@ -53841,6 +53935,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 725206834}
m_Father: {fileID: 1052797815}
@ -53879,6 +53974,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1094955537}
m_RootOrder: 0
@ -53954,6 +54050,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1443125922}
m_RootOrder: 3
@ -53969,6 +54066,7 @@ TilemapRenderer:
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
@ -54119,6 +54217,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1873963897}
m_RootOrder: 3
@ -54283,6 +54382,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 141600212}
- {fileID: 948322515}
@ -54364,6 +54464,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1127174150}
m_RootOrder: 0
@ -54474,6 +54575,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2, y: 2, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2104115633}
m_RootOrder: 2
@ -54619,6 +54721,7 @@ Transform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 857141515}
m_RootOrder: 4
@ -54682,6 +54785,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 591513750}
- {fileID: 1136302501}
@ -54809,6 +54913,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1127174150}
m_RootOrder: 2
@ -54971,6 +55076,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 8
@ -55004,6 +55110,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1127174150}
m_RootOrder: 1
@ -55101,6 +55208,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1475557202}
m_RootOrder: 3
@ -55265,6 +55373,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 6, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1802590641}
m_RootOrder: 0
@ -55370,6 +55479,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 25, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 833322047}
- {fileID: 215490326}
@ -55408,6 +55518,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9499999, y: 0.2, z: 4.799999}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1777565460}
- {fileID: 405730991}
@ -55487,6 +55598,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.95, y: 4.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1837678899}
m_RootOrder: 0
@ -55581,6 +55693,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 1.2, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1816368506}
m_Father: {fileID: 1537009611}
@ -55683,6 +55796,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1.2, y: 6, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1537009611}
m_RootOrder: 0
@ -55765,6 +55879,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 337149901}
m_RootOrder: 0
@ -55927,6 +56042,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2131617879}
- {fileID: 1880106645}
@ -56009,6 +56125,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1873963897}
m_RootOrder: 1
@ -56173,6 +56290,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2075437072}
m_RootOrder: 0
@ -56248,6 +56366,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2096156761}
m_RootOrder: 1
@ -56407,6 +56526,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: -3.5, z: 0}
m_LocalScale: {x: 1.975, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 12
@ -56437,6 +56557,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1104999883}
m_Father: {fileID: 1052797815}
@ -56479,6 +56600,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1475557202}
m_RootOrder: 1
@ -56775,6 +56897,18 @@ MonoBehaviour:
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
- m_Target: {fileID: 2021738498}
m_TargetAssemblyTypeName: SaveController, Assembly-CSharp
m_MethodName: SaveItemsOnMap
m_Mode: 1
m_Arguments:
m_ObjectArgument: {fileID: 0}
m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine
m_IntArgument: 0
m_FloatArgument: 0
m_StringArgument:
m_BoolArgument: 0
m_CallState: 2
--- !u!114 &2021738500
MonoBehaviour:
m_ObjectHideFlags: 0
@ -56845,6 +56979,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1560234013}
m_RootOrder: 4
@ -56921,6 +57056,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 524799963}
m_RootOrder: 3
@ -57011,6 +57147,7 @@ RectTransform:
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 1950286028}
m_Father: {fileID: 1094955537}
@ -57047,6 +57184,7 @@ Transform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -7.45, y: 8.3, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1797967006}
m_RootOrder: 4
@ -57079,6 +57217,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 784642466}
- {fileID: 1980931167}
@ -57158,6 +57297,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 4, y: 4, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2104115633}
m_RootOrder: 0
@ -57237,6 +57377,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.7, y: 0.7, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 2098727640}
- {fileID: 286215656}
@ -57318,6 +57459,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1873963897}
m_RootOrder: 0
@ -57465,7 +57607,7 @@ GameObject:
- component: {fileID: 2133489403}
m_Layer: 0
m_Name: Items
m_TagString: Untagged
m_TagString: ItemCollection
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
@ -57478,8 +57620,9 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2133489402}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -1.4602706, y: -0.8430535, z: -2.7875266}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 3
@ -57515,6 +57658,7 @@ RectTransform:
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 2.5, y: 2.5, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 337149901}
m_RootOrder: 1

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -70,6 +70,8 @@ public class AnimatedDoorBehaviour : TriggerDoor
SaveController.GetComponent<SaveController>().SaveDialogues();
SaveController.GetComponent<SaveController>().SaveMissions();
SaveController.GetComponent<SaveController>().SaveItemsOnMap();
// 2. Change scene
SceneManager.LoadScene(gateway.nextMapName);

View File

@ -51,6 +51,8 @@ public class DoorBehaviour : MonoBehaviour
SaveController.GetComponent<SaveController>().SaveDialogues();
SaveController.GetComponent<SaveController>().SaveMissions();
SaveController.GetComponent<SaveController>().SaveItemsOnMap();
// 2. Change scene
SceneManager.LoadScene(gateway.nextMapName);
}

View File

@ -190,8 +190,6 @@ public class FollowingEnemy : Enemy
if (collision.tag == "AttackHitbox")
{
Debug.Log("Hit in - TriggerEnter2D");
hit = true;
}
}
@ -225,6 +223,9 @@ public class FollowingEnemy : Enemy
// pass info about killing assigned enemy to mission manager listener
// pass enemy name from script NOT object name (thats allow to have many different objects variantsa with this same aggregate key (private name - not preffab name) )
ConditionManager.Instance.UpdateKillCondition(gameObject.GetComponent<Enemy>().MinionName);
// drop item process
gameObject.GetComponent<EnemyDrop>().Drop();
}
}

View File

@ -200,6 +200,8 @@ public class FollowingPatrollingEnemy : Enemy
// pass info about killing assigned enemy to mission manager listener
// pass enemy name from script NOT object name (thats allow to have many different objects variantsa with this same aggregate key (private name - not preffab name) )
ConditionManager.Instance.UpdateKillCondition(gameObject.GetComponent<Enemy>().MinionName);
gameObject.GetComponent<EnemyDrop>().Drop();
}
}

View File

@ -6,7 +6,7 @@ using System;
public class PickableController : MonoBehaviour
{
public Item item;
public string name;
public string itemName;
//public string name2; //TODO Clear here
public bool triggered;
public int isPicked;
@ -15,8 +15,17 @@ public class PickableController : MonoBehaviour
public void Awake()
{
item = Resources.Load<Item>("Items/" + name);
//item.Name = gameObject.name;
// IT DONT WORK - equippable item with the same name isn't finding
/* Debug.Log("Items/" + itemName);
item = Resources.Load<Item>("Items/" + itemName);
if (item = null)
{
item = Resources.Load<EquippableItem>("Items/" + itemName);
}*/
}
public void Start()
@ -31,7 +40,11 @@ public class PickableController : MonoBehaviour
// {
// isPicked = PlayerPrefs.GetInt(name);
// }
if(isPicked == 1)
//name = item.ItemModel.name;
if (isPicked == 1)
{
//gameObject.SetActive(false);
Destroy(gameObject);
@ -46,9 +59,14 @@ public class PickableController : MonoBehaviour
{
if(!InventoryUIManager.Instance.IsFull())
{
InventoryUIManager.Instance.Add(new EquippableItem(this.item));
var castedItem = this.item as EquippableItem;
if(InventoryUIManager.Instance.GetPanelStatus())
if(castedItem == null)
InventoryUIManager.Instance.Add(new EquippableItem(this.item));
else
InventoryUIManager.Instance.Add(new EquippableItem(castedItem));
if (InventoryUIManager.Instance.GetPanelStatus())
GameObject.FindObjectOfType<InventoryPanelController>().BuildPanelContent(InventoryUIManager.Instance.GetList());
isPicked = 1;
@ -75,9 +93,12 @@ public class PickableController : MonoBehaviour
}
private void OnTriggerExit2D(Collider2D collision)
{
if (collision.tag == "Player")
{
triggered = false;
}
}
// public void SaveCheckpoint()
// {

View File

@ -42,16 +42,18 @@ public class NPCQuest : MonoBehaviour
public void DropItem()
{
GameObject globalGUI = GameObject.FindGameObjectsWithTag("GUI")[0];
GameObject globalGUI = GameObject.FindGameObjectWithTag("ItemCollection");
if(globalGUI)
{
// 1. Drop item on map
GameObject _axe = Instantiate(axe, new Vector3(37.1f, -31.7f, 0), Quaternion.identity, globalGUI.transform);
_axe.transform.localScale = new Vector3(1,1,1);
// 1.2 Fix names (prevent add "(Clone)" postfix)
_axe.name = axe.GetComponent<PickableController>().item.Name;
_axe.GetComponent<PickableController>().item.name = axe.name;
//_axe.GetComponent<PickableController>().item.name = axe.name;
// 2. Add object to DynamicList in LocalSceneManager
SceneEquippableItemManager.Instance.AddDynamicItem(_axe);

View File

@ -20,15 +20,16 @@ public class GoldOre : MonoBehaviour
public void DropItem()
{
GameObject globalGUI = GameObject.FindGameObjectsWithTag("GUI")[0];
GameObject globalGUI = GameObject.FindGameObjectWithTag("ItemCollection");
if(globalGUI)
{
GameObject droppedItem = Instantiate(goldOre, gameObject.transform.position, Quaternion.identity, globalGUI.transform);
// Object and also ith binded piclable object gets "(Clone)" to its names - we must cut it
droppedItem.name = goldOre.name;
Debug.Log(goldOre.name);
droppedItem.GetComponent<PickableController>().item.name = goldOre.name;
droppedItem.transform.localScale = new Vector3(1, 1, 1);
//droppedItem.GetComponent<PickableController>().item.name = goldOre.name;
//droppedItem.GetComponent<PickableController>().HandleIndexInScelenObjectList =
SceneEquippableItemManager.Instance.AddDynamicItem(droppedItem);

View File

@ -85,7 +85,7 @@ public class AStarPathfindingAgent : MonoBehaviour
{
targetIndex++;
bool reachedPosition = targetIndex >= path.Count;
Debug.Log( targetIndex >= path.Count);
if (reachedPosition)
{
//myAnim.SetBool("isRunning", false);

View File

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

View File

@ -0,0 +1,55 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using UnityEngine;
[RequireComponent(typeof(Enemy))]
class EnemyDrop : MonoBehaviour
{
// [chance of drop, dropped item]
[SerializeField]
List<IndexValuePair<int, Item>> DropList = new List<IndexValuePair<int, Item>>();
public void Drop()
{
if (DropList.Count == 0)
return;
// 1. Decide if element will be dropped
for(int i=0; i < DropList.Count; i++)
{
if (UnityEngine.Random.Range(0.0f, 1.0f) <= DropList[i].Key / 100f)
{
var sceneGui = GameObject.FindGameObjectWithTag("ItemCollection");
if (sceneGui == null)
{
throw new Exception("GUI not found on scene!!!");
break;
}
var x = gameObject.transform.position.x + UnityEngine.Random.Range(-0.8f, 0.8f);
var y = gameObject.transform.position.y + UnityEngine.Random.Range(-0.8f, 0.8f);
var newItem = Instantiate(DropList[i].Value.ItemModel, new Vector3(x, y, 10), Quaternion.identity, sceneGui.transform);
newItem.transform.localScale = new Vector3(1, 1, 1);
newItem.name = DropList[i].Value.name;
SceneEquippableItemManager.Instance.AddDynamicItem(newItem);
//newItem.GetComponent<PickableController>().itemName = DropList[i].Value.ItemModel.name;
}
}
// 2. Build on map
// 2.1 Generate coords
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f00cdc5e90991dd4f9a294041b9dee56
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -1,4 +1,5 @@
using System;
using System.Linq;
using UnityEngine;
[System.Serializable]
@ -48,4 +49,54 @@ public class EquippableItemData : ItemData
isStackable = true;
equipmentType = EquipmentTypeEnum.Other;
}
public override Item MapDataToObject(string prefarbAssetName)
{
/* Debug.Log(MODEL_LOCALIZATION + prefarbAssetName + ".asset"); */
return TryFindResource(prefarbAssetName);
///
// DONT OVERWRITE PROPERTIES BECOUSE ITS EDIT MAIN OBJECT IN ASSET/
///
// equippableItem.StrengthBonus = strengthBonus;
// equippableItem.EnduranceBonus = enduranceBonus;
// equippableItem.InteligenceBonus = inteligenceBonus;
// equippableItem.VitalityBonus = vitalityBonus;
// equippableItem.isStackable = isStackable;
// equippableItem.EquipmentTypeEnum = equipmentType;
// Item item = base.MapDataToItem(prefarbAssetName);
// equippableItem.Name = item.Name;
// equippableItem.Description = item.Description;
// equippableItem.Level = item.Level;
// equippableItem.ItemModel = item.ItemModel;
// equippableItem.Image = item.Image;
}
public override Item MapDataToObject()
{
return TryFindResource(modelName);
}
protected override Item TryFindResource(string modelName)
{
/* Debug.Log(MODEL_LOCALIZATION + modelName);
*/
var resource = Resources.Load<EquippableItem>(MODEL_LOCALIZATION + modelName);
if (resource == null)
{
string trimmed = String.Concat(modelName.Where(c => !Char.IsWhiteSpace(c)));
resource = Resources.Load<EquippableItem>(MODEL_LOCALIZATION + trimmed);
if(resource == null)
throw new System.Exception($"Resource {modelName} not found!!");
}
return resource;
}
}

View File

@ -1,4 +1,5 @@
using System;
using System.Linq;
using UnityEngine;
@ -64,11 +65,21 @@ public abstract class ItemData : ModelData<Item, Item>
protected override Item TryFindResource(string modelName)
{
var resource = Resources.Load<Item>(MODEL_LOCALIZATION + modelName);
/* Debug.Log(MODEL_LOCALIZATION + modelName);
*/
var resource = Resources.Load<Item> (MODEL_LOCALIZATION + modelName);
if (!resource)
if (resource == null)
{
string trimmed = String.Concat(modelName.Where(c => !Char.IsWhiteSpace(c)));
resource = Resources.Load<Item> (MODEL_LOCALIZATION + trimmed);
if (resource == null)
throw new System.Exception($"Resource {modelName} not found!!");
}
return resource;
}
}

View File

@ -83,4 +83,12 @@ public class SaveController : MonoBehaviour
MissionConditionDataManager.Instance.SaveDynamicData();
}
}
public void SaveItemsOnMap()
{
if (SceneEquippableItemManager.Instance) //&& MissionConditionDataManager.Instance
{
SceneEquippableItemManager.Instance.SaveEquippableItems();
}
}
}

View File

@ -5,6 +5,7 @@ using UnityEditor;
using UnityEngine.SceneManagement;
using System.IO;
using System.Linq;
using System;
// only for eqipptable items
public class SceneEquippableItemManager : MonoBehaviour
@ -51,6 +52,7 @@ public class SceneEquippableItemManager : MonoBehaviour
}else
{
Debug.Log("SceneEquippableItemManager - Load");
LoadEquippableItems();
BuildItems(DynamicElements);
@ -112,17 +114,25 @@ public class SceneEquippableItemManager : MonoBehaviour
foreach(EquippableItemPrefabAsset equippableItemPrefarbAsset in equippableItemPrefarbAssetList)
{
Debug.Log(GameObjectLocalization + equippableItemPrefarbAsset.PrefabAssetName);
GameObject newEquippableItemObject = Resources.Load<GameObject>(GameObjectLocalization + equippableItemPrefarbAsset.PrefabAssetName);
if (!newEquippableItemObject)
{
string trimmed = String.Concat(equippableItemPrefarbAsset.PrefabAssetName.Where(c => !Char.IsWhiteSpace(c)));
newEquippableItemObject = Resources.Load<GameObject>(GameObjectLocalization + trimmed);
if(!newEquippableItemObject)
{
Debug.Log("Can't find prefarb by name " + equippableItemPrefarbAsset.PrefabAssetName);
break;
}
}
GameObject globalGUI = GameObject.FindGameObjectsWithTag("GUI")[0];
GameObject globalGUI = GameObject.FindGameObjectWithTag("ItemCollection");
if(globalGUI)
{
@ -134,7 +144,12 @@ public class SceneEquippableItemManager : MonoBehaviour
// 2.2 Set name
equippableItem.name = equippableItemPrefarbAsset.Name;
equippableItem.transform.localScale = new Vector3(1, 1, 1);
equippableItem.transform.SetParent(globalGUI.transform);
// 2.3 Set pransform
//equippableItem.transform.localScale = new Vector3(0.4f, 0.4f, 1);
// Debug.Log(equippableItemPrefarbAsset.position);
@ -144,11 +159,13 @@ public class SceneEquippableItemManager : MonoBehaviour
// 3.1 find object
// 3.2 set EquippableItem object
equippableItem.GetComponent<PickableController>().item = Resources.Load<EquippableItem>("Items/"+equippableItemPrefarbAsset.PrefabAssetName);
// DONT DO IT
//equippableItem.GetComponent<PickableController>().item = Resources.Load<EquippableItem>("Items/"+equippableItemPrefarbAsset.PrefabAssetName);
} else {
}
else {
Debug.Log("Can't find global GUI object!!!");
break;
}
@ -158,8 +175,8 @@ public class SceneEquippableItemManager : MonoBehaviour
/// Save both list of EquippableItems
public void SaveEquippableItems()
{
// 1. staticElements
this.SaveStaticEquippableItemsList();
// 1. staticElements - uselles
//this.SaveStaticEquippableItemsList();
// 2. dynamicItems
this.SaveDynamicEquippableItemsList();