jonas/flufflparty-
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Item Trap Added

Browse Source 
title
This commit is contained in:
AliIbnAbiTalib
2023-04-03 20:47:00 +02:00
parent 29999df486
commit 17eee95a74
6 changed files with 189 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
FlufflParty/Assets/Prefabs/Trap.prefab → FlufflParty/Assets/Prefabs/Items/Trap.prefab
+16
View File
@@ -11,6 +11,7 @@ GameObject:
- component: {fileID: 1261853142848542239}
- component: {fileID: 2750814446728092090}
- component: {fileID: 128401396820962672}
- component: {fileID: -9117868828834893705}
m_Layer: 0
m_Name: Trap
m_TagString: Untagged
@@ -83,3 +84,18 @@ MeshRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!114 &-9117868828834893705
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1930021224252099749}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: b369e867ce7bd2944baef65e2537086c, type: 3}
m_Name:
m_EditorClassIdentifier:
sprite: {fileID: 21300000, guid: 00828533b32c7964692b06d8fe99431d, type: 3}
type: 2
cost: 3
FlufflParty/Assets/Prefabs/Trap.prefab.meta → FlufflParty/Assets/Prefabs/Items/Trap.prefab.meta
View File
FlufflParty/Assets/Scenes/WesternMap.unity
+146 -14
View File
@@ -2471,7 +2471,7 @@ RectTransform:
m_Children:
- {fileID: 1783035526}
m_Father: {fileID: 200446443}
m_RootOrder: 0
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2533,7 +2533,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &200446443
RectTransform:
m_ObjectHideFlags: 0
@@ -2546,6 +2546,7 @@ RectTransform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 724726906}
- {fileID: 197303731}
- {fileID: 250772233}
m_Father: {fileID: 1235522789}
@@ -2568,7 +2569,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2133c87b176066c42bf8ebee13208124, type: 3}
m_Name:
m_EditorClassIdentifier:
item: {fileID: 0}
item: {fileID: -9117868828834893705, guid: e9ee30d34c9ed694cb593c65d4d5e803, type: 3}
--- !u!222 &200446445
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -3280,7 +3281,7 @@ RectTransform:
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 200446443}
m_RootOrder: 1
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -3307,7 +3308,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 00828533b32c7964692b06d8fe99431d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -6253,7 +6254,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.00012207031, y: -0.66537476}
m_AnchoredPosition: {x: -0.00012207031, y: -0.6654053}
m_SizeDelta: {x: -4.778, y: -1.3364}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &584878064
@@ -7962,6 +7963,139 @@ CanvasRenderer:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 719608961}
m_CullTransparentMesh: 1
--- !u!1 &724726905
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 724726906}
- component: {fileID: 724726909}
- component: {fileID: 724726908}
- component: {fileID: 724726907}
m_Layer: 5
m_Name: Button
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &724726906
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 724726905}
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: 200446443}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: -0.00029161, y: 0.416}
m_SizeDelta: {x: 259.43, y: 62.942}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &724726907
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 724726905}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Navigation:
m_Mode: 3
m_WrapAround: 0
m_SelectOnUp: {fileID: 0}
m_SelectOnDown: {fileID: 0}
m_SelectOnLeft: {fileID: 0}
m_SelectOnRight: {fileID: 0}
m_Transition: 1
m_Colors:
m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
m_ColorMultiplier: 1
m_FadeDuration: 0.1
m_SpriteState:
m_HighlightedSprite: {fileID: 0}
m_PressedSprite: {fileID: 0}
m_SelectedSprite: {fileID: 0}
m_DisabledSprite: {fileID: 0}
m_AnimationTriggers:
m_NormalTrigger: Normal
m_HighlightedTrigger: Highlighted
m_PressedTrigger: Pressed
m_SelectedTrigger: Selected
m_DisabledTrigger: Disabled
m_Interactable: 1
m_TargetGraphic: {fileID: 724726908}
m_OnClick:
m_PersistentCalls:
m_Calls:
- m_Target: {fileID: 200446444}
m_TargetAssemblyTypeName: UIItem, Assembly-CSharp
m_MethodName: BuyItem
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 &724726908
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 724726905}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0, g: 0, b: 0, a: 0.3137255}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: e888af39e7536424f91f7ac08415ec4d, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!222 &724726909
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 724726905}
m_CullTransparentMesh: 1
--- !u!1 &734282268
GameObject:
m_ObjectHideFlags: 0
@@ -12737,7 +12871,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &1235522789
RectTransform:
m_ObjectHideFlags: 0
@@ -12760,7 +12894,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.090026855, y: -0.90200806}
m_AnchoredPosition: {x: -0.090026855, y: -0.90197754}
m_SizeDelta: {x: 0.000061035, y: -1.331}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1235522790
@@ -14165,7 +14299,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: -0.113586426, y: 0.33139038}
m_AnchoredPosition: {x: -0.113586426, y: 0.3314209}
m_SizeDelta: {x: -0.22729, y: 0.16718}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1370614409
@@ -17484,7 +17618,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
m_AnchorMax: {x: 0.5, y: 1}
m_AnchoredPosition: {x: 0.0006, y: 1.8597717}
m_AnchoredPosition: {x: 0.0006, y: 1.8597412}
m_SizeDelta: {x: 491.8542, y: 227.4477}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &1681547878
@@ -18530,9 +18664,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_text: '0
'
m_text: 3
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 30b250cb342768045acde7309e218e46, type: 2}
m_sharedMaterial: {fileID: -996942129922571021, guid: 30b250cb342768045acde7309e218e46, type: 2}
@@ -19612,7 +19744,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0.13464355, y: -0.23825073}
m_AnchoredPosition: {x: 0.13464355, y: -0.23828125}
m_SizeDelta: {x: -0.17651, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!1 &1912330177
FlufflParty/Assets/Scripts/Items/Item.cs
+1 -1
View File
@@ -19,6 +19,6 @@ public class Item : MonoBehaviour
public enum Type
{
None = -1, Mushroom = 0, DoubleDice = 1
None = -1, Mushroom = 0, DoubleDice = 1, Trap = 2
}
}