diff --git a/Assets/Scripts/Sword.asset.meta b/Assets/Prefabs/Items.meta
similarity index 52%
rename from Assets/Scripts/Sword.asset.meta
rename to Assets/Prefabs/Items.meta
index b3f4d9d8b782e4b7b6e6c7926d1eaaca78c3b537..87f2194255450d9bb39222b26f1534ef7674cd0b 100644
--- a/Assets/Scripts/Sword.asset.meta
+++ b/Assets/Prefabs/Items.meta
@@ -1,8 +1,8 @@
fileFormatVersion: 2
-guid: ceaa1b68500983e47ba61cc37403de50
-NativeFormatImporter:
+guid: 2ea9838eda7e8d94f9d19d5e86181512
+folderAsset: yes
+DefaultImporter:
externalObjects: {}
- mainObjectFileID: 11400000
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/Prefabs/Items/Sword.prefab b/Assets/Prefabs/Items/Sword.prefab
new file mode 100644
index 0000000000000000000000000000000000000000..2214202809ac5f42dd000a4d46472fa7def8eaae
--- /dev/null
+++ b/Assets/Prefabs/Items/Sword.prefab
@@ -0,0 +1,138 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1 &8812521412011608310
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 8812521412011906262}
+ - component: {fileID: 8812521412008482038}
+ - component: {fileID: 8812521412009612854}
+ - component: {fileID: 8812521411953401852}
+ - component: {fileID: 8812521411953401825}
+ - component: {fileID: 8812521411953401824}
+ m_Layer: 0
+ m_Name: Sword
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!4 &8812521412011906262
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+ m_LocalPosition: {x: 0.22810543, y: 0.021, z: 0.309744}
+ 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!33 &8812521412008482038
+MeshFilter:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ m_Mesh: {fileID: 4300000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+--- !u!23 &8812521412009612854
+MeshRenderer:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ m_Enabled: 1
+ m_CastShadows: 1
+ m_ReceiveShadows: 1
+ m_DynamicOccludee: 1
+ m_MotionVectors: 1
+ m_LightProbeUsage: 1
+ m_ReflectionProbeUsage: 1
+ m_RayTracingMode: 2
+ m_RenderingLayerMask: 1
+ m_RendererPriority: 0
+ m_Materials:
+ - {fileID: 2100000, guid: 5fea74ce992612b4e97c431f78002d2d, type: 2}
+ m_StaticBatchInfo:
+ firstSubMesh: 0
+ subMeshCount: 0
+ m_StaticBatchRoot: {fileID: 0}
+ m_ProbeAnchor: {fileID: 0}
+ m_LightProbeVolumeOverride: {fileID: 0}
+ m_ScaleInLightmap: 1
+ m_ReceiveGI: 1
+ m_PreserveUVs: 0
+ m_IgnoreNormalsForChartDetection: 0
+ m_ImportantGI: 0
+ m_StitchLightmapSeams: 1
+ m_SelectedEditorRenderState: 3
+ m_MinimumChartSize: 4
+ m_AutoUVMaxDistance: 0.5
+ m_AutoUVMaxAngle: 89
+ m_LightmapParameters: {fileID: 0}
+ m_SortingLayerID: 0
+ m_SortingLayer: 0
+ m_SortingOrder: 0
+--- !u!54 &8812521411953401852
+Rigidbody:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ serializedVersion: 2
+ m_Mass: 1
+ m_Drag: 0
+ m_AngularDrag: 0.05
+ m_UseGravity: 1
+ m_IsKinematic: 0
+ m_Interpolate: 0
+ m_Constraints: 0
+ m_CollisionDetection: 0
+--- !u!65 &8812521411953401825
+BoxCollider:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ m_Material: {fileID: 0}
+ m_IsTrigger: 0
+ m_Enabled: 1
+ serializedVersion: 2
+ m_Size: {x: 0.274567, y: 0.092615314, z: 0.83312476}
+ m_Center: {x: -0.13643682, y: 0.021933679, z: 0.20523708}
+--- !u!114 &8812521411953401824
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 8812521412011608310}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 2579761e16114d94d874d2a9a06887e1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ item:
+ itemName:
+ itemID: 1
+ itemDesc:
+ itemIcon: {fileID: 0}
+ itemModel: {fileID: 0}
+ itemValue: 1
+ itemType: 0
+ itemWeight: 0
+ maxStack: 1
+ indexItemInList: 999
+ rarity: 0
+ itemAttributes: []
diff --git a/Assets/Prefabs/Items/Sword.prefab.meta b/Assets/Prefabs/Items/Sword.prefab.meta
new file mode 100644
index 0000000000000000000000000000000000000000..dfe85ac0c70ca6d4ba42dcfbdd5ca3b2b9d4bd11
--- /dev/null
+++ b/Assets/Prefabs/Items/Sword.prefab.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: a3bc07799c6b8774289d04a132ccbb5a
+PrefabImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Scenes/SampleScene.unity b/Assets/Scenes/SampleScene.unity
index aba165b75d769d8446d8b35b4b2859da031e37cb..698b80290c0ed2010f23ce0332f1e4d4969e1364 100644
--- a/Assets/Scenes/SampleScene.unity
+++ b/Assets/Scenes/SampleScene.unity
@@ -287,6 +287,72 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a367f32b0351f2648a0e15f3444c6f86, type: 3}
+--- !u!1 &662579456
+GameObject:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ serializedVersion: 6
+ m_Component:
+ - component: {fileID: 662579459}
+ - component: {fileID: 662579458}
+ - component: {fileID: 662579457}
+ m_Layer: 0
+ m_Name: EventSystem
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &662579457
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 662579456}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 4f231c4fb786f3946a6b90b886c48677, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_HorizontalAxis: Horizontal
+ m_VerticalAxis: Vertical
+ m_SubmitButton: Submit
+ m_CancelButton: Cancel
+ m_InputActionsPerSecond: 10
+ m_RepeatDelay: 0.5
+ m_ForceModuleActive: 0
+--- !u!114 &662579458
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 662579456}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 76c392e42b5098c458856cdf6ecaaaa1, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+ m_FirstSelected: {fileID: 0}
+ m_sendNavigationEvents: 1
+ m_DragThreshold: 10
+--- !u!4 &662579459
+Transform:
+ m_ObjectHideFlags: 0
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_GameObject: {fileID: 662579456}
+ 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_Children: []
+ m_Father: {fileID: 0}
+ m_RootOrder: 5
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &705507993
GameObject:
m_ObjectHideFlags: 0
@@ -485,6 +551,23 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 453718933, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 241f624502754e74f8663fe592412f93,
+ type: 3}
+ - target: {fileID: 453718933, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.b
+ value: 0.099999905
+ objectReference: {fileID: 0}
+ - target: {fileID: 453718933, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.g
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 453718933, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.r
+ value: 0
+ objectReference: {fileID: 0}
- target: {fileID: 612475041, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
propertyPath: m_LocalPosition.x
value: -172
@@ -505,6 +588,23 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 1
objectReference: {fileID: 0}
+ - target: {fileID: 1443224361, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Sprite
+ value:
+ objectReference: {fileID: 21300000, guid: 241f624502754e74f8663fe592412f93,
+ type: 3}
+ - target: {fileID: 1443224361, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.b
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1443224361, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.g
+ value: 0
+ objectReference: {fileID: 0}
+ - target: {fileID: 1443224361, guid: 2035c7f28bbcea340a8d72d7e7cf828c, type: 3}
+ propertyPath: m_Color.r
+ value: 1
+ objectReference: {fileID: 0}
- target: {fileID: 6175370584576650865, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1465,10 +1565,30 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -252.5
objectReference: {fileID: 0}
+ - target: {fileID: 6175370585259829680, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_LocalScale.x
+ value: 0.58
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370585259829680, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_LocalScale.y
+ value: 0.58
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370585259829680, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_LocalScale.z
+ value: 0.58
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370585259829680, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 724
+ objectReference: {fileID: 0}
- target: {fileID: 6175370585259829681, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_IsActive
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6175370585263337198, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
@@ -1625,6 +1745,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.x
value: -198
objectReference: {fileID: 0}
+ - target: {fileID: 6175370585438310756, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 12
+ objectReference: {fileID: 0}
- target: {fileID: 6175370585502057672, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchorMax.y
@@ -1660,10 +1785,20 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6175370585539592299, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_SizeDelta.y
+ value: 40
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370585539592299, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 83.7
+ objectReference: {fileID: 0}
- target: {fileID: 6175370585539592299, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -21
+ value: -62
objectReference: {fileID: 0}
- target: {fileID: 6175370585573996399, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
@@ -2420,6 +2555,21 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
+ - target: {fileID: 6175370586033210396, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_IsActive
+ value: 1
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370586033210399, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 564
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370586033210399, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: 30
+ objectReference: {fileID: 0}
- target: {fileID: 6175370586086159143, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchorMax.y
@@ -2493,7 +2643,7 @@ PrefabInstance:
- target: {fileID: 6175370586315223813, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -21
+ value: -48.6
objectReference: {fileID: 0}
- target: {fileID: 6175370586417201149, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
@@ -2563,12 +2713,17 @@ PrefabInstance:
- target: {fileID: 6175370586514438584, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_SizeDelta.y
- value: 164
+ value: 130
objectReference: {fileID: 0}
- target: {fileID: 6175370586514438584, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchoredPosition.y
- value: -84
+ value: -115.3
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370586514438587, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_Text
+ value: ItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDescItemDesc
objectReference: {fileID: 0}
- target: {fileID: 6175370586520085012, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
@@ -2665,6 +2820,16 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -60
objectReference: {fileID: 0}
+ - target: {fileID: 6175370586580348948, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.x
+ value: 2
+ objectReference: {fileID: 0}
+ - target: {fileID: 6175370586580348948, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ propertyPath: m_AnchoredPosition.y
+ value: -6
+ objectReference: {fileID: 0}
- target: {fileID: 6175370586581277514, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
type: 3}
propertyPath: m_AnchorMax.y
@@ -2805,136 +2970,84 @@ Transform:
type: 3}
m_PrefabInstance: {fileID: 423848002}
m_PrefabAsset: {fileID: 0}
---- !u!1001 &1289278041
+--- !u!1 &1373597229 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6175370585438310757, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ m_PrefabInstance: {fileID: 1049895153}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1 &1494236988 stripped
+GameObject:
+ m_CorrespondingSourceObject: {fileID: 6175370586305218808, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
+ type: 3}
+ m_PrefabInstance: {fileID: 1049895153}
+ m_PrefabAsset: {fileID: 0}
+--- !u!1001 &8812521413289221135
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- - target: {fileID: 100000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011608310, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_Name
value: Sword
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalPosition.x
value: 0.22810543
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalPosition.y
value: 0.021
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalPosition.z
value: 0.309744
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 400000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
+ - target: {fileID: 8812521412011906262, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- - target: {fileID: 2300000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
- propertyPath: m_Materials.Array.data[0]
- value:
- objectReference: {fileID: 2100000, guid: 5fea74ce992612b4e97c431f78002d2d, type: 2}
m_RemovedComponents: []
- m_SourcePrefab: {fileID: 100100000, guid: da3980952f463b448b0d5c4aae46f1a4, type: 3}
---- !u!1 &1369506797 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 100000, guid: da3980952f463b448b0d5c4aae46f1a4,
- type: 3}
- m_PrefabInstance: {fileID: 1289278041}
- m_PrefabAsset: {fileID: 0}
---- !u!65 &1369506798
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1369506797}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 0.274567, y: 0.092615314, z: 0.83312476}
- m_Center: {x: -0.13643682, y: 0.021933679, z: 0.20523708}
---- !u!114 &1369506799
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1369506797}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 2579761e16114d94d874d2a9a06887e1, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- item:
- itemName:
- itemID: 1
- itemDesc:
- itemIcon: {fileID: 0}
- itemModel: {fileID: 0}
- itemValue: 1
- itemType: 0
- itemWeight: 0
- maxStack: 1
- indexItemInList: 999
- rarity: 0
- itemAttributes: []
---- !u!54 &1369506803
-Rigidbody:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 1369506797}
- serializedVersion: 2
- m_Mass: 1
- m_Drag: 0
- m_AngularDrag: 0.05
- m_UseGravity: 1
- m_IsKinematic: 0
- m_Interpolate: 0
- m_Constraints: 0
- m_CollisionDetection: 0
---- !u!1 &1373597229 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 6175370585438310757, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
- type: 3}
- m_PrefabInstance: {fileID: 1049895153}
- m_PrefabAsset: {fileID: 0}
---- !u!1 &1494236988 stripped
-GameObject:
- m_CorrespondingSourceObject: {fileID: 6175370586305218808, guid: 2035c7f28bbcea340a8d72d7e7cf828c,
- type: 3}
- m_PrefabInstance: {fileID: 1049895153}
- m_PrefabAsset: {fileID: 0}
+ m_SourcePrefab: {fileID: 100100000, guid: a3bc07799c6b8774289d04a132ccbb5a, type: 3}
diff --git a/Assets/Scripts/Sword.asset b/Assets/Scripts/Sword.asset
deleted file mode 100644
index 84e19034821576891fc1099cb620e7264de05c9a..0000000000000000000000000000000000000000
--- a/Assets/Scripts/Sword.asset
+++ /dev/null
@@ -1,17 +0,0 @@
-%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: 908dc56cfe2290d42b68865628d1c134, type: 3}
- m_Name: Sword
- m_EditorClassIdentifier:
- id: 1
- name: Basic Sword
- description: A basic sword.
diff --git a/Assets/Store/InventoryMaster/Resources/ItemDatabase.asset b/Assets/Store/InventoryMaster/Resources/ItemDatabase.asset
index 3ef07fb91dc1b37d42214167d754df2e702b43f6..b5f5809ab4b31ee474f481cb2928f83a464a7520 100644
--- a/Assets/Store/InventoryMaster/Resources/ItemDatabase.asset
+++ b/Assets/Store/InventoryMaster/Resources/ItemDatabase.asset
@@ -29,24 +29,18 @@ MonoBehaviour:
indexItemInList: 999
rarity: 0
itemAttributes: []
- - itemName: Leather Helmet
+ - itemName: "\xC9p\xE9e incurv\xE9e"
itemID: 1
- itemDesc: 'This helmet is created out of leather.
-
- + 10 Health
-
- +
- 10 Armor'
- itemIcon: {fileID: 21300000, guid: 63dca6d4e4e873a4cb09997656d54082, type: 3}
- itemModel: {fileID: 100000, guid: 40da790cc27843b45b9c255c8d996b43, type: 3}
- itemValue: 1
- itemType: 4
- itemWeight: 0
+ itemDesc: "Une \xE9p\xE9e incurv\xE9e en fer permettant de se battre."
+ itemIcon: {fileID: 21300000, guid: c863cadb09e05754e888c7fa7a68a142, type: 3}
+ itemModel: {fileID: 8812521412011608310, guid: a3bc07799c6b8774289d04a132ccbb5a,
+ type: 3}
+ itemValue: 10
+ itemType: 1
+ itemWeight: 5
maxStack: 1
indexItemInList: 999
- rarity: 23
+ rarity: 10
itemAttributes:
- - attributeName: Health
- attributeValue: 10
- - attributeName: Armor
+ - attributeName: Damage
attributeValue: 10
diff --git a/Assets/Store/InventoryMaster/Resources/Prefabs/DraggingItem.prefab b/Assets/Store/InventoryMaster/Resources/Prefabs/DraggingItem.prefab
index 110fc9040ddc4f67584684863ef85238e5bbb38f..6f46320fcee3fb0dfc9dac0784a9696494422337 100644
Binary files a/Assets/Store/InventoryMaster/Resources/Prefabs/DraggingItem.prefab and b/Assets/Store/InventoryMaster/Resources/Prefabs/DraggingItem.prefab differ
diff --git a/Assets/Store/InventoryMaster/Scripts/Item/ConsumeItem.cs b/Assets/Store/InventoryMaster/Scripts/Item/ConsumeItem.cs
index 039e0c54d70a7e0c283e9e84d1176d9c84294ece..871be5f1e824f8ce9802337c24d09d24b38ab6c7 100644
--- a/Assets/Store/InventoryMaster/Scripts/Item/ConsumeItem.cs
+++ b/Assets/Store/InventoryMaster/Scripts/Item/ConsumeItem.cs
@@ -76,6 +76,7 @@ public class ConsumeItem : MonoBehaviour, IPointerDownHandler
eS.gameObject.GetComponent<Inventory>().updateItemList();
inventory.updateItemList();
gearable = true;
+ tooltip.deactivateTooltip();
if (duplication != null)
Destroy(duplication.gameObject);
break;