Pick up and drop down fix + pause fix
This commit is contained in:
tonyomendoza
parent
034fa92352
commit
481bd7339b
@ -1,5 +1,150 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &284715783
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 284715784}
|
||||
- component: {fileID: 284715786}
|
||||
- component: {fileID: 284715785}
|
||||
m_Layer: 5
|
||||
m_Name: Display (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &284715784
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 284715783}
|
||||
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: 2770326606043385230}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 768, y: 762}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &284715786
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 284715783}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &284715785
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 284715783}
|
||||
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: 1, g: 1, b: 1, a: 0.25490198}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 47287c86357ff3d49a21dff2337d1b4e, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1877044252
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1877044253}
|
||||
- component: {fileID: 1877044255}
|
||||
- component: {fileID: 1877044254}
|
||||
m_Layer: 5
|
||||
m_Name: Display
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &1877044253
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1877044252}
|
||||
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: 2770326606043385230}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &1877044255
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1877044252}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &1877044254
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1877044252}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 1344c3c82d62a2a41a3576d8abb8e3ea, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Texture: {fileID: 8400000, guid: 5266952c67ddfd744883a603eebae2f8, type: 2}
|
||||
m_UVRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1
|
||||
height: 1
|
||||
--- !u!1 &2770326604690546522
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2621,7 +2766,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, y: 0.00024414062}
|
||||
m_AnchoredPosition: {x: -0.00048828125, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 2250}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2770326604978625766
|
||||
@ -2995,7 +3140,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -75, y: -75}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326605028313437
|
||||
CanvasRenderer:
|
||||
@ -3296,8 +3441,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
width: 1
|
||||
height: 1
|
||||
image: {fileID: 0}
|
||||
useImageAsSlotHolder: 0
|
||||
image: {fileID: 2770326605882732353}
|
||||
useImageAsSlotHolder: 1
|
||||
EquipSlot: 1
|
||||
FitItemImageInSlotImage: 1
|
||||
IgnoreItemSize: 1
|
||||
@ -3451,8 +3596,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
width: 1
|
||||
height: 1
|
||||
image: {fileID: 0}
|
||||
useImageAsSlotHolder: 0
|
||||
image: {fileID: 2770326606473405732}
|
||||
useImageAsSlotHolder: 1
|
||||
EquipSlot: 1
|
||||
FitItemImageInSlotImage: 1
|
||||
IgnoreItemSize: 1
|
||||
@ -7433,8 +7578,8 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 2770326605425540239}
|
||||
m_HandleRect: {fileID: 2770326605425540238}
|
||||
m_Direction: 2
|
||||
m_Value: 1.0000014
|
||||
m_Size: 0.52640384
|
||||
m_Value: 1.0000005
|
||||
m_Size: 0.5264038
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
@ -7857,8 +8002,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
width: 1
|
||||
height: 1
|
||||
image: {fileID: 0}
|
||||
useImageAsSlotHolder: 0
|
||||
image: {fileID: 2770326606088636631}
|
||||
useImageAsSlotHolder: 1
|
||||
EquipSlot: 1
|
||||
FitItemImageInSlotImage: 1
|
||||
IgnoreItemSize: 1
|
||||
@ -8478,7 +8623,7 @@ MonoBehaviour:
|
||||
m_HandleRect: {fileID: 2770326605532365201}
|
||||
m_Direction: 0
|
||||
m_Value: 1
|
||||
m_Size: 1
|
||||
m_Size: 0.99999994
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
m_PersistentCalls:
|
||||
@ -8864,8 +9009,8 @@ RectTransform:
|
||||
m_Father: {fileID: 2770326605828871661}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.000000044132438, y: 0}
|
||||
m_AnchorMax: {x: 0.56616056, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
@ -9335,7 +9480,7 @@ GameObject:
|
||||
- component: {fileID: 2770326605768611112}
|
||||
- component: {fileID: 2770326605768611111}
|
||||
m_Layer: 5
|
||||
m_Name: GameObject
|
||||
m_Name: BackpackContainerGrid
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
@ -9375,7 +9520,7 @@ MonoBehaviour:
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605768611109}
|
||||
m_Enabled: 0
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
@ -9429,8 +9574,8 @@ RectTransform:
|
||||
m_Father: {fileID: 2770326605717399321}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5424999}
|
||||
m_AnchorMax: {x: 1, y: 0.9999999}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: 20}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
@ -9575,7 +9720,10 @@ MonoBehaviour:
|
||||
slot: {fileID: 2770326606194450705}
|
||||
- itemTag: 17
|
||||
slot: {fileID: 2770326606302022802}
|
||||
TagSlotGridPairings: []
|
||||
TagSlotGridPairings:
|
||||
- itemTag: 0
|
||||
slot: {fileID: 8600850533622123873}
|
||||
grid: {fileID: 0}
|
||||
raritiesList:
|
||||
- rarityType: 0
|
||||
color: {r: 0.6, g: 0.6, b: 0.6, a: 0}
|
||||
@ -9588,8 +9736,9 @@ MonoBehaviour:
|
||||
- rarityType: 4
|
||||
color: {r: 1, g: 0.85098046, b: 0.40000004, a: 0}
|
||||
ItemBackdropTransparency: 0.15
|
||||
LootGrid: {fileID: 0}
|
||||
StorageWindowPrefab: {fileID: 0}
|
||||
LootGrid: {fileID: 2770326605807543574}
|
||||
StorageWindowPrefab: {fileID: 4417106255924003221, guid: da7a26b146274ee4783989b1ee055931,
|
||||
type: 3}
|
||||
CurrentState: 0
|
||||
--- !u!114 &2770326605790841688
|
||||
MonoBehaviour:
|
||||
@ -9887,10 +10036,10 @@ RectTransform:
|
||||
m_Father: {fileID: 2770326604978625765}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 767.5831, y: 2500}
|
||||
m_SizeDelta: {x: 767, y: 2500}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2770326605807543575
|
||||
MonoBehaviour:
|
||||
@ -9938,31 +10087,56 @@ MonoBehaviour:
|
||||
Height: 25
|
||||
testItem: {fileID: 0}
|
||||
testItems:
|
||||
- {fileID: 8715477175483360852, guid: 01f953bd89fc26a4cacc8fbabfd1ef5e, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 865bb1d25db619243acfffd7dccbf089, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 7f71d1b9da677d6479508317d9ce8e83, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 59ea82e5bfc99dd4880a4213c4bf9c3f, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 8e532c3b9400cc64a9fefde0b2a9787d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 07a59ff0200617b46a6439608d025a8d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 07a59ff0200617b46a6439608d025a8d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: bb027ab57e381d5439e993ff1541be2e, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: bb027ab57e381d5439e993ff1541be2e, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 7f71d1b9da677d6479508317d9ce8e83, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: f601e41e76489904ebf41a942395a9a0, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 69cbf65a3612aba46888d1beb942c53d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 4f670aa1131c2cb4cb667b0572dd9213, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: d2637852a8cec394d83b78963d117fff, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: bb027ab57e381d5439e993ff1541be2e, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 37b95ba1666e39940b577aaeeb193844, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 07a59ff0200617b46a6439608d025a8d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 6503a074877a8b94db2e933a435264f5, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 3ab8b2d73d5fb0e43a703a5f39121747, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 1068c9ece6c67514a959ba29af974f08, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: c3d1700a646119d44882c1b7f9aeb6f7, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: c3d1700a646119d44882c1b7f9aeb6f7, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 9c6a336610daf134f99e559d2874b2ae, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 7626fa06fb1e6fc45b4a650145cbf332, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 1e928ff0140d4274c988f9de23361f9a, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: fc2787a40b1c60e4fb0abc48e346dbad, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 8e532c3b9400cc64a9fefde0b2a9787d, type: 3}
|
||||
- {fileID: 8715477175483360852, guid: 13465dee6b0b1b44fa2af8d24809ad2c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: e3b8176cd12bdd3478af31129dc7928d, type: 3}
|
||||
- {fileID: 696630249496564076, guid: e3b8176cd12bdd3478af31129dc7928d, type: 3}
|
||||
- {fileID: 696630249496564076, guid: a34beb1b7007bbe4c82cb5bd81ef7d81, type: 3}
|
||||
- {fileID: 696630249496564076, guid: a34beb1b7007bbe4c82cb5bd81ef7d81, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
- {fileID: 696630249496564076, guid: 4bb47ecd7fe1d81428f8b3960bffcd3c, type: 3}
|
||||
--- !u!222 &2770326605807543577
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -10366,7 +10540,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -75, y: -75}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326605882732354
|
||||
CanvasRenderer:
|
||||
@ -10419,6 +10593,7 @@ GameObject:
|
||||
- component: {fileID: 2770326605902186955}
|
||||
- component: {fileID: 8600850533622123873}
|
||||
- component: {fileID: 2770326605902186954}
|
||||
- component: {fileID: 1294869445}
|
||||
m_Layer: 5
|
||||
m_Name: Backpack Slot
|
||||
m_TagString: Untagged
|
||||
@ -10551,6 +10726,22 @@ MonoBehaviour:
|
||||
AttachToTransform: {fileID: 2770326605768611110}
|
||||
FindAttachToScriptInAttachToTransform: 0
|
||||
StackAppend: 1
|
||||
--- !u!114 &1294869445
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326605902186952}
|
||||
m_Enabled: 0
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2d6be6f480d42d64e9794ec4af9f5d15, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
SlotTitlePairs:
|
||||
- itemTag: 12
|
||||
title: TEST
|
||||
text: {fileID: 2770326606046375101}
|
||||
--- !u!1 &2770326605902434096
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11645,14 +11836,14 @@ GameObject:
|
||||
m_Component:
|
||||
- component: {fileID: 2770326606043385230}
|
||||
- component: {fileID: 2770326606043385264}
|
||||
- component: {fileID: 2770326606043385231}
|
||||
- component: {fileID: 1082071285}
|
||||
m_Layer: 5
|
||||
m_Name: PlayerStats
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &2770326606043385230
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11663,15 +11854,17 @@ 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_Children: []
|
||||
m_Children:
|
||||
- {fileID: 1877044253}
|
||||
- {fileID: 284715784}
|
||||
m_Father: {fileID: 2770326604978625765}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 289.93506, y: -2960.1091}
|
||||
m_SizeDelta: {x: 579.8701, y: 920.21814}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 767.58325, y: 762.71313}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326606043385264
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -11680,7 +11873,7 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326606043385229}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2770326606043385231
|
||||
--- !u!114 &1082071285
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@ -11689,26 +11882,19 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 2770326606043385229}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 22f907ff240b7194384bddb99d5877f1, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_Sprite: {fileID: 21300000, guid: 47287c86357ff3d49a21dff2337d1b4e, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 1
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
_displayAnchor: {fileID: 0}
|
||||
_camera: {fileID: 0}
|
||||
_display: {fileID: 1877044253}
|
||||
_canvas: {fileID: 2770326605623600444}
|
||||
_rotationSensitivity: 15
|
||||
_minRotationX: -360
|
||||
_maxRotationX: 360
|
||||
_minRotationY: -30
|
||||
_maxRotationY: 30
|
||||
marker: {fileID: 0}
|
||||
--- !u!1 &2770326606046375099
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -12447,7 +12633,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -75, y: -75}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326606088636632
|
||||
CanvasRenderer:
|
||||
@ -12774,7 +12960,7 @@ RectTransform:
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -0.0012207031, y: -0.0008669805}
|
||||
m_AnchoredPosition: {x: -0.00024414062, y: -0.0002941991}
|
||||
m_SizeDelta: {x: 0, y: 1500}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &2770326606141421693
|
||||
@ -13235,6 +13421,7 @@ GameObject:
|
||||
- component: {fileID: 2770326606194450706}
|
||||
- component: {fileID: 2770326606194450705}
|
||||
- component: {fileID: 2770326606194450704}
|
||||
- component: {fileID: 677853447}
|
||||
m_Layer: 5
|
||||
m_Name: Tactical Rig Slot
|
||||
m_TagString: Untagged
|
||||
@ -13353,6 +13540,24 @@ MonoBehaviour:
|
||||
AttachToTransform: {fileID: 2770326605600926436}
|
||||
FindAttachToScriptInAttachToTransform: 0
|
||||
StackAppend: 0
|
||||
--- !u!114 &677853447
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2770326606194450798}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2d6be6f480d42d64e9794ec4af9f5d15, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
SlotTitlePairs:
|
||||
- itemTag: 9
|
||||
title: Tactical Rig
|
||||
- itemTag: 18
|
||||
title: Plate Carrier
|
||||
text: {fileID: 2770326604717474293}
|
||||
--- !u!1 &2770326606217848656
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -14955,9 +15160,9 @@ RectTransform:
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 20, y: -17}
|
||||
m_SizeDelta: {x: 20, y: 0}
|
||||
m_Pivot: {x: 1, y: 1}
|
||||
--- !u!222 &2770326606343437213
|
||||
CanvasRenderer:
|
||||
@ -15352,9 +15557,9 @@ RectTransform:
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -17, y: -17}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326606360111749
|
||||
CanvasRenderer:
|
||||
@ -16214,7 +16419,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -75, y: -75}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!222 &2770326606473405733
|
||||
CanvasRenderer:
|
||||
@ -17514,9 +17719,9 @@ RectTransform:
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: -17, y: 20}
|
||||
m_SizeDelta: {x: 0, y: 20}
|
||||
m_Pivot: {x: 0, y: 0}
|
||||
--- !u!222 &2770326606616300711
|
||||
CanvasRenderer:
|
||||
@ -18483,8 +18688,8 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
width: 1
|
||||
height: 1
|
||||
image: {fileID: 0}
|
||||
useImageAsSlotHolder: 0
|
||||
image: {fileID: 2770326605028313436}
|
||||
useImageAsSlotHolder: 1
|
||||
EquipSlot: 1
|
||||
FitItemImageInSlotImage: 1
|
||||
IgnoreItemSize: 1
|
||||
@ -19387,7 +19592,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 2770326606276845106}
|
||||
m_HandleRect: {fileID: 2770326606276845105}
|
||||
m_Direction: 2
|
||||
m_Value: 0.9999999
|
||||
m_Value: 1
|
||||
m_Size: 0.2979719
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
using System;
|
||||
#if (UNITY_EDITOR)
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEngine;
|
||||
@ -35,6 +37,8 @@ public class PhotoshootEditor : Editor
|
||||
}
|
||||
}
|
||||
}
|
||||
#endif
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
@ -80,12 +80,12 @@ namespace SimpleInventorySystem
|
||||
|
||||
public bool DropOntoSlot(ItemUI item)
|
||||
{
|
||||
return item.ItemTag == itemTag && slot != null && (!HasSlotOccupied() || slot.IsStacking()) && slot.DropOntoSlot(item.gameObject);
|
||||
return CanEquip(item) && slot.DropOntoSlot(item.gameObject);
|
||||
}
|
||||
|
||||
public bool CanEquip(ItemUI item)
|
||||
{
|
||||
return item.ItemTag == itemTag && slot != null && (!HasSlotOccupied() || slot.IsStacking());
|
||||
return item.ItemTag == itemTag && slot != null && (!HasSlotOccupied() || slot.IsStacking()) && slot.CanDropOntoSlot();
|
||||
}
|
||||
}
|
||||
|
||||
@ -258,6 +258,7 @@ namespace SimpleInventorySystem
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
|
||||
CheckForRequiredComponents();
|
||||
rotationKeyInput.Update();
|
||||
menuKeyInput.Update();
|
||||
@ -357,6 +358,10 @@ namespace SimpleInventorySystem
|
||||
Cursor.visible = true;
|
||||
Cursor.lockState = CursorLockMode.Confined;
|
||||
toolbarEvents.GetComponent<MoveChildrenUI>().MoveToTarget(false, true);
|
||||
if(GetComponent<NeoFPSPause>() != null)
|
||||
{
|
||||
GetComponent<NeoFPSPause>().pauseMenu.PopEscapeHandlerShow();
|
||||
}
|
||||
}
|
||||
|
||||
public void CloseInventory()
|
||||
@ -365,6 +370,10 @@ namespace SimpleInventorySystem
|
||||
Cursor.lockState = CursorLockMode.Locked;
|
||||
Cursor.visible = false;
|
||||
InventoryMenuUI.SetActive(false);
|
||||
if (GetComponent<NeoFPSPause>() != null)
|
||||
{
|
||||
GetComponent<NeoFPSPause>().pauseMenu.PushEscapeHandlerShow();
|
||||
}
|
||||
}
|
||||
|
||||
public void OpenContextMenu(MonoBehaviour uiContext)
|
||||
|
||||
@ -127,6 +127,22 @@ namespace SimpleInventorySystem
|
||||
else if (itemUI.Store())
|
||||
{
|
||||
Debug.Log("Pickup: Stored");
|
||||
itemUI.transform.localRotation = Quaternion.Euler(new Vector3());
|
||||
itemUI.transform.localScale = new Vector3(1, 1, 1);
|
||||
HadPickedUp = true;
|
||||
|
||||
if (InventorySystem.instance.player.AttachItemGameObject(ItemGameObject, itemUI.ItemTag, itemUI))
|
||||
{
|
||||
Debug.Log("Attached");
|
||||
ItemRigidBody.useGravity = false;
|
||||
ItemRigidBody.isKinematic = true;
|
||||
pickUpCollider.enabled = false;
|
||||
pickUpRange.GetComponent<Collider>().enabled = false;
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("Could not pick up");
|
||||
}
|
||||
// assume there is no tsp, then try to drop in most available backpack slot
|
||||
/*else if (PlaceInContainerOfItemInSlot != null)
|
||||
@ -160,8 +176,6 @@ namespace SimpleInventorySystem
|
||||
}
|
||||
}
|
||||
}*/
|
||||
|
||||
Debug.Log("Could not pick up");
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -12,8 +12,8 @@ namespace SimpleInventorySystem
|
||||
//public PickUp storedPickUp;
|
||||
public List<PickUp> pickUpsInRange = new List<PickUp>();
|
||||
[HideInInspector] public Inventory inventory;
|
||||
public List<TargetAttachment> targetAttachments;
|
||||
public PickUp SPU;
|
||||
public TargetAttachment[] targetAttachments;
|
||||
[HideInInspector] public PickUp SPU;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@ -31,6 +31,7 @@ namespace SimpleInventorySystem
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Debug.Log("FAIL");
|
||||
return false;
|
||||
}
|
||||
|
||||
|
||||
@ -4,6 +4,7 @@ using UnityEngine;
|
||||
using NeoFPS;
|
||||
using NeoCC;
|
||||
using NeoFPS.SinglePlayer;
|
||||
using NeoFPS.Samples;
|
||||
|
||||
namespace SimpleInventorySystem
|
||||
{
|
||||
@ -20,10 +21,30 @@ namespace SimpleInventorySystem
|
||||
Player_IS player;
|
||||
InputFirearm[] inputFirearms;
|
||||
NeoFPSAnimationController nfpsAC;
|
||||
public InGameMenu pauseMenu;
|
||||
bool paused;
|
||||
|
||||
public bool IsPaused()
|
||||
{
|
||||
return paused;
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
void Update()
|
||||
{
|
||||
paused = pauseMenu.IsPaused();
|
||||
|
||||
if (!InventorySystem.instance.IsUsingInventoryMenuUI())
|
||||
{
|
||||
pauseMenu.gameObject.SetActive(true);
|
||||
pauseMenu.enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
pauseMenu.gameObject.SetActive(false);
|
||||
pauseMenu.enabled = false;
|
||||
}
|
||||
|
||||
if (player == null && InventorySystem.instance.player != null)
|
||||
{
|
||||
player = InventorySystem.instance.player;
|
||||
|
||||
@ -1,4 +1,6 @@
|
||||
using System;
|
||||
#if (UNITY_EDITOR)
|
||||
|
||||
using System;
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using UnityEditor;
|
||||
@ -268,3 +270,5 @@ public class Photoshoot : MonoBehaviour
|
||||
#endif
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
@ -122,7 +122,7 @@ namespace SimpleInventorySystem
|
||||
//item.transform.SetParent(.gameObject.transform);
|
||||
}*/
|
||||
|
||||
if (testItems != null)
|
||||
/*if (testItems != null)
|
||||
{
|
||||
int i = 0;
|
||||
int x = 0, y = 0;
|
||||
@ -167,7 +167,7 @@ namespace SimpleInventorySystem
|
||||
// TODO: Make sure this works as expected
|
||||
nextAvailableCellCoords = new Vector2(i % gridSize.Width, i / gridSize.Width);
|
||||
}
|
||||
}
|
||||
}*/
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@ -14,6 +14,7 @@ namespace SimpleInventorySystem
|
||||
public SlotUI[] incompatibleSlots;
|
||||
public GameObject[] hideGameObjects;
|
||||
public List<ItemTags> AllowedItemTags;
|
||||
private bool conditionMet;
|
||||
|
||||
// Start is called before the first frame update
|
||||
void Start()
|
||||
@ -31,6 +32,40 @@ namespace SimpleInventorySystem
|
||||
}
|
||||
}
|
||||
|
||||
public bool IsSlotInShowGameObjects(SlotUI slotUI)
|
||||
{
|
||||
foreach(GameObject sgo in showGameObjects)
|
||||
{
|
||||
if(sgo.GetComponent<SlotUI>() == slotUI)
|
||||
{
|
||||
return true;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool IsSlotBeingShown(SlotUI slotUI)
|
||||
{
|
||||
foreach (GameObject sgo in showGameObjects)
|
||||
{
|
||||
if (sgo.GetComponent<SlotUI>() == slotUI)
|
||||
{
|
||||
return ConditionMet();
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
public bool HasSlotOccupied()
|
||||
{
|
||||
return slot.GetItemUI() != null;
|
||||
}
|
||||
|
||||
public bool ConditionMet()
|
||||
{
|
||||
return conditionMet;
|
||||
}
|
||||
|
||||
public void ShowUIContainer()
|
||||
{
|
||||
foreach(GameObject uiContainerGameObject in showGameObjects)
|
||||
@ -41,6 +76,7 @@ namespace SimpleInventorySystem
|
||||
{
|
||||
uiContainerGameObject.SetActive(false);
|
||||
}
|
||||
conditionMet = true;
|
||||
}
|
||||
|
||||
public void HideUIContainer()
|
||||
@ -54,6 +90,7 @@ namespace SimpleInventorySystem
|
||||
{
|
||||
uiContainerGameObject.SetActive(true);
|
||||
}
|
||||
conditionMet = false;
|
||||
}
|
||||
|
||||
// Update is called once per frame
|
||||
|
||||
@ -206,9 +206,10 @@ namespace SimpleInventorySystem
|
||||
{
|
||||
foreach (TagSlotPairing tsp in InventorySystem.instance.TagSlotPairings)
|
||||
{
|
||||
if (!tsp.CanEquip(this))
|
||||
if (tsp.CanEquip(this))
|
||||
{
|
||||
UnsetSlot();
|
||||
Debug.Log(tsp.slot.gameObject.name);
|
||||
bool value = tsp.DropOntoSlot(this);
|
||||
if (!value)
|
||||
{
|
||||
@ -246,7 +247,7 @@ namespace SimpleInventorySystem
|
||||
return false;
|
||||
}
|
||||
|
||||
public void DropItemOntoSlot()
|
||||
public void DropItemOntoSlot(bool fitImageInSlot = false)
|
||||
{
|
||||
//Debug.Log("OnEndDrag");
|
||||
if (image != null)
|
||||
@ -288,6 +289,16 @@ namespace SimpleInventorySystem
|
||||
{
|
||||
Inventory.RemoveOwnership(this, Inventory);
|
||||
}
|
||||
|
||||
if (!fitImageInSlot)
|
||||
{
|
||||
ApplyRectTransformResize();
|
||||
}
|
||||
}
|
||||
|
||||
public void ApplyRectTransformResize()
|
||||
{
|
||||
ResetTransform();
|
||||
}
|
||||
|
||||
public void GrabAndDragItem()
|
||||
@ -539,7 +550,6 @@ namespace SimpleInventorySystem
|
||||
SlotUI cellSlot = cell.GetSlot();
|
||||
if (cellSlot != null)
|
||||
{
|
||||
Debug.Log(cellSlot.cell.X + ", " + cellSlot.cell.Y + ", " + (cellSlot.image == previousCell.slot.image));
|
||||
// && !slot.useImageAsSlotHolder)
|
||||
cellSlot.HideImage();
|
||||
}
|
||||
@ -628,6 +638,7 @@ namespace SimpleInventorySystem
|
||||
|
||||
if (PointerIsHoveredOver && InventorySystem.instance.PressedDropItemKey(false))
|
||||
{
|
||||
Debug.Log("Should be throwing away...");
|
||||
DropItemAway();
|
||||
return;
|
||||
}
|
||||
|
||||
@ -120,7 +120,7 @@ namespace SimpleInventorySystem
|
||||
|
||||
/// STACKING
|
||||
/// This section concerns item stacks, not slot stacking
|
||||
if (!itemDrop.IsLinkedSlotClone && ((HasStack() && itemUI != null /*&& itemUI.itemPrefab == itemDrop.itemPrefab*/) || !dropStack))
|
||||
if (!itemDrop.IsLinkedSlotClone && ((HasStack() && itemUI != null /*&& itemUI.itemPrefab == itemDrop.itemPrefab*/ && itemUI.itemName == GetItemUI().itemName) || !dropStack))
|
||||
{
|
||||
Debug.Log("Handling Stack");
|
||||
int maxStackDrop = 1;
|
||||
@ -200,15 +200,17 @@ namespace SimpleInventorySystem
|
||||
item.GetComponent<Transform>().SetParent(parent);
|
||||
item.GetComponent<RectTransform>().anchoredPosition = GetComponent<RectTransform>().anchoredPosition;
|
||||
//item.GetComponent<RectTransform>().pivot = new Vector2(0, 1);
|
||||
if(FitItemImageInSlotImage)
|
||||
itemDrop.FitImageInSlot(new Vector2(Math.Abs(image.GetComponent<RectTransform>().sizeDelta.x), Math.Abs(image.GetComponent<RectTransform>().sizeDelta.y)));
|
||||
|
||||
itemDrop.SetSlot(this);
|
||||
|
||||
stackedItems.Push(itemDrop);
|
||||
|
||||
Debug.Log("SlotUI:Drop:" + itemUI + ", " + itemDrop);
|
||||
|
||||
itemUI.DropItemOntoSlot();
|
||||
itemUI.DropItemOntoSlot(FitItemImageInSlotImage);
|
||||
|
||||
if (FitItemImageInSlotImage)
|
||||
itemDrop.FitImageInSlot(new Vector2(Math.Abs(image.GetComponent<RectTransform>().sizeDelta.x), Math.Abs(image.GetComponent<RectTransform>().sizeDelta.y)));
|
||||
|
||||
if (itemUI.Stackable)
|
||||
{
|
||||
@ -493,6 +495,27 @@ namespace SimpleInventorySystem
|
||||
}
|
||||
}
|
||||
|
||||
public bool CanDropOntoSlot()
|
||||
{
|
||||
bool groupSlotsCheck = false;
|
||||
if (groupSlots.Count == 0)
|
||||
groupSlotsCheck = true;
|
||||
else
|
||||
{
|
||||
foreach (GroupSlotUI groupSlotUI in groupSlots)
|
||||
{
|
||||
if (groupSlotUI.IsSlotInShowGameObjects(this) && groupSlotUI.ConditionMet())
|
||||
{
|
||||
groupSlotsCheck = true;
|
||||
break;
|
||||
}
|
||||
}
|
||||
}
|
||||
// TODO: add check for Limit Slot Stack here
|
||||
|
||||
return (GetItemUI() == null || IsStacking()) && groupSlotsCheck;
|
||||
}
|
||||
|
||||
public bool IsSingleCellSlot()
|
||||
{
|
||||
return width == 1 && height == 1;
|
||||
@ -528,6 +551,7 @@ namespace SimpleInventorySystem
|
||||
{
|
||||
if (InventorySystem.instance.PressedDropItemKey(false) || InventorySystem.instance.PressedEquipItemKey(false))
|
||||
{
|
||||
Debug.Log("pressed");
|
||||
return;
|
||||
}
|
||||
|
||||
|
||||
@ -137,8 +137,8 @@ namespace NeoFPS
|
||||
if (s_EscapeHandlers[s_EscapeHandlers.Count - 1] != null)
|
||||
s_EscapeHandlers[s_EscapeHandlers.Count - 1].Invoke();
|
||||
}
|
||||
else
|
||||
captureMouseCursor = !captureMouseCursor;
|
||||
/*else
|
||||
captureMouseCursor = !captureMouseCursor;*/ // NOTE: Modified this
|
||||
}
|
||||
|
||||
protected abstract bool CheckForEscapeInput();
|
||||
|
||||
@ -617,7 +617,7 @@ MonoBehaviour:
|
||||
- m_Value: 22
|
||||
- m_Value: 1
|
||||
- m_Value: 2
|
||||
expanded: 0
|
||||
expanded: 1
|
||||
- m_Name: Alternative
|
||||
m_AnalogueSetup: 0
|
||||
m_ButtonMappings:
|
||||
|
||||
@ -57,12 +57,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1318915275320728}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -75,6 +76,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &114271669945887252
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -98,17 +100,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 114134458876115468}
|
||||
@ -177,12 +182,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1551154826070914}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -255,12 +261,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1959676693004780}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -287,7 +294,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1959676693004780}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
|
||||
@ -61,17 +61,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -142,12 +145,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1327703548061902}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -160,6 +164,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1348735992363290
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -216,12 +221,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1348735992363290}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -234,6 +240,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1600343610002040
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -289,12 +296,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1600343610002040}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -321,7 +329,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1600343610002040}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -387,12 +395,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1684693978495798}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -419,7 +428,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1684693978495798}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -485,12 +494,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1841644526495338}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -503,3 +513,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
||||
@ -55,12 +55,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1008726901587434}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -87,7 +88,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1008726901587434}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -152,12 +153,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1284608623666830}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -230,12 +232,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1302978718514452}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -248,6 +251,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1579528145041274
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -302,12 +306,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1579528145041274}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -379,12 +384,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1790135444051796}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -458,12 +464,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1851219335798104}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -476,6 +483,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1864013638005768
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -538,17 +546,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -619,12 +630,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1889794285725218}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -637,3 +649,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
||||
@ -54,12 +54,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1195652019174042}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -132,12 +133,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1245043466326650}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -164,7 +166,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1245043466326650}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -231,12 +233,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1686182250363212}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -249,6 +252,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1751269989764156
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -310,17 +314,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -387,12 +394,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1863517727359990}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -405,3 +413,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
||||
@ -56,12 +56,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1016775268347196}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -74,6 +75,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1177138055945776
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -128,12 +130,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1177138055945776}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -206,12 +209,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1305317090118334}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -224,6 +228,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1310630073903380
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -278,12 +283,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1310630073903380}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -296,6 +302,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1332841395217608
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -351,12 +358,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1332841395217608}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -383,7 +391,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1332841395217608}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -449,12 +457,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1393093011557428}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -467,6 +476,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1513919194692100
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -521,12 +531,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1513919194692100}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -539,6 +550,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1691891302256810
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -600,17 +612,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -695,12 +710,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1721544841433984}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -713,6 +729,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1940141811038950
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -767,12 +784,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1940141811038950}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@ -57,12 +57,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1175537133367930}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -75,6 +76,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!114 &114819172383202140
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -98,17 +100,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 114995916310957868}
|
||||
@ -178,12 +183,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1218923623646414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -210,7 +216,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1218923623646414}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -275,12 +281,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1645055669487700}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
|
||||
@ -61,17 +61,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -156,12 +159,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1198146644642568}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -174,6 +178,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1216299873342982
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -229,12 +234,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1216299873342982}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -247,6 +253,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1225232929447796
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -302,12 +309,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1225232929447796}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -320,6 +328,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1235415566022998
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -375,12 +384,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1235415566022998}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -393,6 +403,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1253040147865870
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -447,12 +458,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1253040147865870}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -465,6 +477,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1284812189974888
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -559,12 +572,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1307179351148710}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -577,6 +591,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1450072550905758
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -631,12 +646,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1450072550905758}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -709,12 +725,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1562401447466522}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -741,7 +758,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1562401447466522}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -807,12 +824,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1577013086644142}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -825,6 +843,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1882831585731728
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -879,12 +898,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1882831585731728}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -958,12 +978,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1972652686438640}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -976,6 +997,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1979487150829574
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1030,12 +1052,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1979487150829574}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -1048,3 +1071,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
||||
@ -54,12 +54,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1075239040307276}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -72,6 +73,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1092881596673218
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -171,17 +173,20 @@ MonoBehaviour:
|
||||
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: Highlighted
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 0}
|
||||
@ -261,12 +266,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1386742133602534}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -279,6 +285,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1436744612584042
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -334,12 +341,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1436744612584042}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f5f67c52d1564df4a8936ccd202a3bd8, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 0.54901963}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -366,7 +374,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1436744612584042}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 0
|
||||
@ -433,12 +441,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1452452480663924}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -451,6 +460,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1581512036458570
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -505,12 +515,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1581512036458570}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -583,12 +594,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1654992543454440}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -601,6 +613,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1705037540264692
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -655,12 +668,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1705037540264692}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 0
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -733,12 +747,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1875203353870150}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -751,6 +766,7 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
--- !u!1 &1999107687288660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -806,12 +822,13 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 1999107687288660}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
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.54901963}
|
||||
m_RaycastTarget: 1
|
||||
m_Maskable: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
@ -824,3 +841,4 @@ MonoBehaviour:
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
m_PixelsPerUnitMultiplier: 1
|
||||
|
||||
@ -15,7 +15,9 @@ namespace NeoFPS.Samples
|
||||
[SerializeField] private InGameMenuBackground m_Background = null;
|
||||
[SerializeField] private int m_MainMenuScene = 0;
|
||||
[SerializeField][Range (0f, 1f)] private float m_HudAlpha = 0.25f;
|
||||
[SerializeField] private bool m_PauseGame = false;
|
||||
[SerializeField] private bool m_PauseGame = false; // NOTE: Did I add this?
|
||||
[SerializeField] private bool isPaused = false;
|
||||
|
||||
|
||||
#if UNITY_EDITOR
|
||||
void OnValidate ()
|
||||
@ -23,7 +25,13 @@ namespace NeoFPS.Samples
|
||||
if (m_Background == null)
|
||||
m_Background = GetComponentInChildren<InGameMenuBackground> ();
|
||||
}
|
||||
#endif
|
||||
#endif
|
||||
|
||||
// NOTE: modified this
|
||||
public bool IsPaused()
|
||||
{
|
||||
return isPaused;
|
||||
}
|
||||
|
||||
protected override void Start ()
|
||||
{
|
||||
@ -55,7 +63,9 @@ namespace NeoFPS.Samples
|
||||
|
||||
if (m_PauseGame)
|
||||
NeoFpsTimeScale.FreezeTime();
|
||||
}
|
||||
|
||||
isPaused = true;
|
||||
}
|
||||
|
||||
public override void Hide ()
|
||||
{
|
||||
@ -68,7 +78,9 @@ namespace NeoFPS.Samples
|
||||
|
||||
if (m_PauseGame && NeoFpsTimeScale.isPaused)
|
||||
NeoFpsTimeScale.ResumeTime();
|
||||
}
|
||||
|
||||
isPaused = false;
|
||||
}
|
||||
|
||||
public void OnPressExit ()
|
||||
{
|
||||
@ -84,6 +96,18 @@ namespace NeoFPS.Samples
|
||||
{
|
||||
}
|
||||
|
||||
// NOTE: Added this too
|
||||
public void PopEscapeHandlerShow()
|
||||
{
|
||||
NeoFpsInputManagerBase.PopEscapeHandler(Show);
|
||||
}
|
||||
|
||||
// NOTE: Added this too
|
||||
public void PushEscapeHandlerShow()
|
||||
{
|
||||
NeoFpsInputManagerBase.PushEscapeHandler(Show);
|
||||
}
|
||||
|
||||
void CaptureInput ()
|
||||
{
|
||||
if (m_Background != null)
|
||||
|
||||
@ -11733,6 +11733,7 @@ MonoBehaviour:
|
||||
m_MainMenuScene: 0
|
||||
m_HudAlpha: 0.25
|
||||
m_PauseGame: 0
|
||||
isPaused: 0
|
||||
--- !u!225 &225611746072322848
|
||||
CanvasGroup:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -70,7 +70,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 2858546270670497085}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1980459831, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 0cd44c1031e13a943bb63640046fad76, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_UiScaleMode: 1
|
||||
@ -92,7 +92,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 2858546270670497085}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1301386320, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: dc42784cf147c0c48a680349fa168899, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreReversedGraphics: 1
|
||||
|
||||
@ -1179,7 +1179,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 2e1995b83dc84e94ab3796f192a1632b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
items: []
|
||||
hasBeenLooted: 0
|
||||
prefabs: []
|
||||
itemUIs: []
|
||||
--- !u!114 &5886551469688753053
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -1194,7 +1196,9 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
pickUpsInRange: []
|
||||
inventory: {fileID: 0}
|
||||
targetAttachments: []
|
||||
targetAttachments:
|
||||
- {fileID: 0}
|
||||
SPU: {fileID: 0}
|
||||
--- !u!1 &5070767157547266168
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -146,9 +146,9 @@ GameObject:
|
||||
- component: {fileID: 114944942557399428}
|
||||
- component: {fileID: 114063837814182896}
|
||||
- component: {fileID: 4072595722179989998}
|
||||
- component: {fileID: 1996718888946294581}
|
||||
- component: {fileID: 5185576749778133885}
|
||||
- component: {fileID: 5867336655114277382}
|
||||
- component: {fileID: 4018839317266936977}
|
||||
m_Layer: 13
|
||||
m_Name: Test NeoFpsSoloPlayerCharacter
|
||||
m_TagString: Player
|
||||
@ -562,24 +562,9 @@ MonoBehaviour:
|
||||
m_Script: {fileID: 11500000, guid: 2e1995b83dc84e94ab3796f192a1632b, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
items: []
|
||||
--- !u!114 &1996718888946294581
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1000010381446024}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 03c6b482ea6237c4789a74add4ca62f8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
pickUpsInRange: []
|
||||
inventory: {fileID: 0}
|
||||
targetAttachments:
|
||||
- {fileID: 1604667018}
|
||||
SPU: {fileID: 0}
|
||||
hasBeenLooted: 0
|
||||
prefabs: []
|
||||
itemUIs: []
|
||||
--- !u!114 &5185576749778133885
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -609,6 +594,24 @@ MonoBehaviour:
|
||||
animator: {fileID: 5481687305250822515}
|
||||
mc: {fileID: 0}
|
||||
state: 3
|
||||
--- !u!114 &4018839317266936977
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1000010381446024}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 03c6b482ea6237c4789a74add4ca62f8, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
pickUpsInRange: []
|
||||
inventory: {fileID: 0}
|
||||
targetAttachments:
|
||||
- {fileID: 1604667018}
|
||||
- {fileID: 3901908635471718057}
|
||||
SPU: {fileID: 0}
|
||||
--- !u!1 &1000011745390456
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -2468,6 +2471,55 @@ Animator:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &8752517690227938056
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 3687394082740333181}
|
||||
- component: {fileID: 3901908635471718057}
|
||||
m_Layer: 27
|
||||
m_Name: InventoryAttach
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &3687394082740333181
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8752517690227938056}
|
||||
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: 2017772459047828448}
|
||||
m_RootOrder: 79
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!114 &3901908635471718057
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8752517690227938056}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 6bba5ab18652a58438d3818d6575252d, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
itemTag: 0
|
||||
position: {x: 0, y: 0, z: 0}
|
||||
rotation: {x: 0, y: 0, z: 0}
|
||||
scale: {x: 1, y: 1, z: 1}
|
||||
hideGameObject: 1
|
||||
KeepOldRotationOnDrop: 0
|
||||
--- !u!1001 &5273948301595705802
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@ -1,4 +1,7 @@
|
||||
using System.IO;
|
||||
#if (UNITY_EDITOR)
|
||||
|
||||
|
||||
using System.IO;
|
||||
using UnityEditor;
|
||||
using UnityEditor.Presets;
|
||||
|
||||
@ -34,3 +37,5 @@ public class PresetsPerFolder : AssetPostprocessor
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
#endif
|
||||
|
||||
@ -5,13 +5,13 @@ EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/MainMenu/MainMenu.unity
|
||||
guid: 77d5557736483054eb2f3f00d8f8709e
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/LoadingScreen/Loading.unity
|
||||
guid: 223220eb03f54e74bb906fb42659ba97
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/DemoFacility/DemoFacility_Scene.unity
|
||||
guid: 7bf5c9ff45d591a47ae9fd2c838c63e8
|
||||
- enabled: 0
|
||||
@ -29,49 +29,52 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path:
|
||||
guid: 00000000000000000000000000000000
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/FiringRange/FeatureDemo_FiringRange.unity
|
||||
guid: 5d0a40e01fae31c4695912e8115d3bd2
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/InteractableDoors/FeatureDemo_InteractableDoors.unity
|
||||
guid: 7b06c6b253450ec4a847a3d3bb557c72
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Inventory/FeatureDemo_InventoryStacked.unity
|
||||
guid: 8a583da4519111d41b59835bbe5f48fa
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Inventory/FeatureDemo_InventoryStandard.unity
|
||||
guid: a8dac34d6f2daea468d0b6f443349a24
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Inventory/FeatureDemo_InventorySwappable.unity
|
||||
guid: 924eae9bd5845f04b826f1bb5efed197
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/JetpacksAndGuidedMissiles/FeatureDemo_JetpacksGuidedMissiles.unity
|
||||
guid: 9913313c98c3b3e438da91bb34bf0db9
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Ladders/FeatureDemo_Ladders.unity
|
||||
guid: e53abf0654e67e24fa28129a0fd10f55
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/MinimalCharacter/FeatureDemo_MinimalCharacter.unity
|
||||
guid: cca83b941239b8d468d35d5d078867cc
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/MovingPlatforms/FeatureDemo_MovingPlatforms.unity
|
||||
guid: 4de62b1a54e035743a0434cd2b96cabf
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/NeoCharacterController/FeatureDemo_NeoCharacterController.unity
|
||||
guid: 5fa9254727868284b9907ea7d63bea4d
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Parkour/FeatureDemo_Parkour.unity
|
||||
guid: 41bb820a3c2d1704f81d65ecd1cc0f9d
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Persistence/FeatureDemo_Persistence01.unity
|
||||
guid: 36f192c5bda5dd8478e6c379ca8b0cbe
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Persistence/FeatureDemo_Persistence02.unity
|
||||
guid: 2b931a16c8a1fd14fbbd37dea842a982
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Swimming/FeatureDemo_Swimming.unity
|
||||
guid: 613ad7bcc7512ac46a646ae9ba877675
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/NeoFPS/Samples/SinglePlayer/Scenes/FeatureDemos/Template/FeatureDemo_Template.unity
|
||||
guid: 2b96d9ab2d2ae0340969f6886e2c4c87
|
||||
- enabled: 1
|
||||
path: Assets/Scenes/NeoFPS Test.unity
|
||||
guid: bbd8fc34fec32d2499f9223b8bf7f442
|
||||
m_configObjects: {}
|
||||
|
||||
@ -3,7 +3,7 @@
|
||||
--- !u!30 &1
|
||||
GraphicsSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 12
|
||||
serializedVersion: 13
|
||||
m_Deferred:
|
||||
m_Mode: 1
|
||||
m_Shader: {fileID: 69, guid: 0000000000000000f000000000000000, type: 0}
|
||||
@ -35,6 +35,9 @@ GraphicsSettings:
|
||||
- {fileID: 15106, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 10753, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
|
||||
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
|
||||
m_PreloadedShaders: []
|
||||
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
|
||||
type: 0}
|
||||
@ -59,3 +62,5 @@ GraphicsSettings:
|
||||
m_AlbedoSwatchInfos: []
|
||||
m_LightsUseLinearIntensity: 0
|
||||
m_LightsUseColorTemperature: 0
|
||||
m_LogWhenShaderIsCompiled: 0
|
||||
m_AllowEnlightenSupportForUpgradedProject: 1
|
||||
|
||||
@ -13,13 +13,6 @@ PresetManager:
|
||||
- m_Preset: {fileID: 2655988077585873504, guid: 0cd792cc87e492d43b4e95b205fc5cc6,
|
||||
type: 2}
|
||||
m_Filter:
|
||||
- first:
|
||||
m_NativeTypeID: 1006
|
||||
m_ManagedTypePPtr: {fileID: 0}
|
||||
m_ManagedTypeFallback:
|
||||
second:
|
||||
- m_Preset: {fileID: 0}
|
||||
m_Filter:
|
||||
- first:
|
||||
m_NativeTypeID: 108
|
||||
m_ManagedTypePPtr: {fileID: 0}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user