Various fixes from meeting

This commit is contained in:
OceanSlim 2023-01-18 22:24:33 -05:00
parent 424578e1a2
commit d4bd296c7d
8 changed files with 254 additions and 16104 deletions

View File

@ -14618,48 +14618,32 @@ PrefabInstance:
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 37.5
objectReference: {fileID: 0}
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
value: -37.5
objectReference: {fileID: 0}
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
value: 75
objectReference: {fileID: 0}
- target: {fileID: 3581975831903561587, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4890405372601921261, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 1e7ba0abad7872140b6e139467a6e93e,
type: 3}
- target: {fileID: 6386556452886107047, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8033699182538870882, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_UseGravity
value: 0
value: 75
objectReference: {fileID: 0}
- target: {fileID: 8053794548077495502, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
@ -14671,91 +14655,26 @@ PrefabInstance:
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.69
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.6830127
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.y
value: 0.18301274
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.z
value: -0.6830127
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0.18301274
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 90
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8057961283841219706, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalPosition.z
value: -0.69
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.x
value: 0.9659258
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 180
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.y
@ -14766,6 +14685,21 @@ PrefabInstance:
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_RootOrder
value: 3
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 180
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
@ -14776,6 +14710,56 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 30
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_SizeDelta.x
value: 100
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_SizeDelta.y
value: 100
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 9046185764434667690, guid: 13568dd585cdb2841892c2f0a0f0f69d,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 13568dd585cdb2841892c2f0a0f0f69d, type: 3}
--- !u!224 &2032418234 stripped

View File

@ -13,6 +13,7 @@ GameObject:
- component: {fileID: 17770850141538735}
- component: {fileID: 1692523188556859208}
- component: {fileID: 974621872509663881}
- component: {fileID: 1852889065902832783}
m_Layer: 5
m_Name: 5.56x45 AP UI
m_TagString: Untagged
@ -27,13 +28,14 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 696630249496564076}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
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:
- {fileID: 8431357631664341716}
- {fileID: 5043287390925528364}
- {fileID: 6151680500157204104}
- {fileID: 4807739109685717149}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -118,7 +120,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: 1e7ba0abad7872140b6e139467a6e93e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@ -128,6 +130,20 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &1852889065902832783
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 696630249496564076}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: ec4b16f08baaf5648a7e5ebe9e562069, type: 3}
m_Name:
m_EditorClassIdentifier:
textMeshProUGUI: {fileID: 3862683786930864478}
value:
--- !u!1 &792405946186029016
GameObject:
m_ObjectHideFlags: 0
@ -202,6 +218,139 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &3563931072049080446
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4807739109685717149}
- component: {fileID: 8177230197549754435}
- component: {fileID: 3862683786930864478}
m_Layer: 0
m_Name: StackCount
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &4807739109685717149
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3563931072049080446}
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: 1655393829934303171}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 0}
m_AnchoredPosition: {x: -2, y: 0}
m_SizeDelta: {x: -2, y: 50}
m_Pivot: {x: 1, y: 0}
--- !u!222 &8177230197549754435
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3563931072049080446}
m_CullTransparentMesh: 0
--- !u!114 &3862683786930864478
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3563931072049080446}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 100
m_isRightToLeft: 0
m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2}
m_fontSharedMaterials: []
m_fontMaterial: {fileID: 0}
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4291151301
m_fontColor: {r: 0.7735849, g: 0.7735849, b: 0.7735849, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
topLeft: {r: 1, g: 1, b: 1, a: 1}
topRight: {r: 1, g: 1, b: 1, a: 1}
bottomLeft: {r: 1, g: 1, b: 1, a: 1}
bottomRight: {r: 1, g: 1, b: 1, a: 1}
m_fontColorGradientPreset: {fileID: 0}
m_spriteAsset: {fileID: 0}
m_tintAllSprites: 0
m_StyleSheet: {fileID: 0}
m_TextStyleHashCode: -1183493901
m_overrideHtmlColors: 0
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 12
m_fontSizeBase: 12
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18
m_fontSizeMax: 72
m_fontStyle: 1
m_HorizontalAlignment: 4
m_VerticalAlignment: 1024
m_textAlignment: 65535
m_characterSpacing: 0
m_wordSpacing: 0
m_lineSpacing: 0
m_lineSpacingMax: 0
m_paragraphSpacing: 0
m_charWidthMaxAdj: 0
m_enableWordWrapping: 1
m_wordWrappingRatios: 0.4
m_overflowMode: 0
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
m_parseCtrlCharacters: 1
m_isOrthographic: 1
m_isCullingEnabled: 0
m_horizontalMapping: 0
m_verticalMapping: 0
m_uvLineOffset: 0
m_geometrySortingOrder: 0
m_IsTextObjectScaleStatic: 0
m_VertexBufferAutoSizeReduction: 1
m_useMaxVisibleDescender: 1
m_pageToDisplay: 1
m_margin: {x: 0, y: 0, z: 0, w: 0}
m_isUsingLegacyAnimationComponent: 0
m_isVolumetricText: 0
m_hasFontAssetChanged: 0
m_baseMaterial: {fileID: 0}
m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
--- !u!1001 &3191205948414100664
PrefabInstance:
m_ObjectHideFlags: 0

View File

@ -1,584 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &8715477175483360852
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8715477175483360853}
- component: {fileID: 8715477175483360842}
- component: {fileID: 8715477175483360843}
- component: {fileID: 47521878755422833}
- component: {fileID: 2245991356252128075}
m_Layer: 5
m_Name: Helmet
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8715477175483360853
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477175483360852}
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:
- {fileID: 1792879050592906225}
- {fileID: 2062589871380170721}
- {fileID: 8715477176133586256}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 150, y: 150}
m_Pivot: {x: 0, y: 1}
--- !u!114 &8715477175483360842
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477175483360852}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: cc11508cb979f8b4b8253855ce8a0bc5, type: 3}
m_Name:
m_EditorClassIdentifier:
itemName: Helmet
image: {fileID: 8715477176133586257}
rarity: 0
ItemTag: 1
StackLimit: 1
width: 2
height: 2
containerUIPrefab: {fileID: 0}
backdropImage: {fileID: 6671067786205017148}
emptyGridContainer: {fileID: 1792879050592906225}
interactable: 1
overrideSortingCanvas: {fileID: 0}
Equipped: 0
ContainedItems: []
ParentContainer: {fileID: 0}
container: {fileID: 0}
canvas: {fileID: 0}
PickedUpOnFrame: 0
ContextWindows: []
IsLinkedSlotClone: 0
limitStackSlotCapacity: {fileID: 0}
pickUp: {fileID: 0}
targetAttachment: {fileID: 0}
--- !u!225 &8715477175483360843
CanvasGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477175483360852}
m_Enabled: 1
m_Alpha: 1
m_Interactable: 1
m_BlocksRaycasts: 1
m_IgnoreParentGroups: 0
--- !u!222 &47521878755422833
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477175483360852}
m_CullTransparentMesh: 0
--- !u!114 &2245991356252128075
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477175483360852}
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.39215687}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: cb5ccc4ed6e7f2e4990a99858e55f470, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8715477176133586259
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8715477176133586256}
- component: {fileID: 8715477176133586262}
- component: {fileID: 8715477176133586257}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &8715477176133586256
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477176133586259}
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: 8715477175483360853}
m_RootOrder: 2
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.5, y: 0.5}
--- !u!222 &8715477176133586262
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477176133586259}
m_CullTransparentMesh: 1
--- !u!114 &8715477176133586257
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8715477176133586259}
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: 1}
m_RaycastTarget: 1
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 0da4c6466a15ed64abde0e2b78749597, 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!1001 &1872955336009088126
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8715477175483360853}
m_Modifications:
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.y
value: 150
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 860381808568854092, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4686011728059556148, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_Name
value: Empty_Grid_2x2
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4824800165939448614, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7119338873438487715, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8481760378947941406, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 405ac89b13f6bf845a3e79a5fcd0ab15, type: 3}
--- !u!224 &1792879050592906225 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 80931800656517007, guid: 405ac89b13f6bf845a3e79a5fcd0ab15,
type: 3}
m_PrefabInstance: {fileID: 1872955336009088126}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8443089595807800949
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 8715477175483360853}
m_Modifications:
- target: {fileID: 7352792399522662056, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Name
value: Backdrop
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_SizeDelta.x
value: 150
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_SizeDelta.y
value: 150
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0a6f22dac390afc4b865b7c5efcd062e, type: 3}
--- !u!224 &2062589871380170721 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 7616761035097414036, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
m_PrefabInstance: {fileID: 8443089595807800949}
m_PrefabAsset: {fileID: 0}
--- !u!114 &6671067786205017148 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 3008269927508781641, guid: 0a6f22dac390afc4b865b7c5efcd062e,
type: 3}
m_PrefabInstance: {fileID: 8443089595807800949}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:

View File

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

View File

@ -100,7 +100,7 @@ Rigidbody:
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 1
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
@ -143,12 +143,6 @@ PrefabInstance:
propertyPath: m_Name
value: 5.56x45 AP UI
objectReference: {fileID: 0}
- target: {fileID: 974621872509663881, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_Sprite
value:
objectReference: {fileID: 21300000, guid: 1e7ba0abad7872140b6e139467a6e93e,
type: 3}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_LocalPosition.x
@ -167,17 +161,17 @@ PrefabInstance:
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
@ -217,12 +211,12 @@ PrefabInstance:
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_SizeDelta.x
value: 75
value: 256
objectReference: {fileID: 0}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_SizeDelta.y
value: 75
value: 256
objectReference: {fileID: 0}
- target: {fileID: 1655393829934303171, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
@ -254,10 +248,20 @@ PrefabInstance:
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2475819916844783108, guid: 8a0ae100028bca24899af93f00f0abc1,
- target: {fileID: 4807739109685717149, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: pickUp
value:
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4807739109685717149, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4807739109685717149, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9218029102814966551, guid: 8a0ae100028bca24899af93f00f0abc1,
type: 3}

View File

@ -20384,6 +20384,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4830279484817901643, guid: 1fab8c9520621b84896290957c8ca856,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.50024414
objectReference: {fileID: 0}
- target: {fileID: 4830382125522673913, guid: 1fab8c9520621b84896290957c8ca856,
type: 3}
propertyPath: m_AnchorMin.y
@ -38759,6 +38764,10 @@ MonoBehaviour:
hasBeenLooted: 0
prefabs:
- {fileID: 1810053744485052, guid: a244ed413fceba3498141367a3a0fc47, type: 3}
- {fileID: 8053794548077495502, guid: 13568dd585cdb2841892c2f0a0f0f69d, type: 3}
- {fileID: 8053794548077495502, guid: 13568dd585cdb2841892c2f0a0f0f69d, type: 3}
- {fileID: 8053794548077495502, guid: 13568dd585cdb2841892c2f0a0f0f69d, type: 3}
- {fileID: 1241596305986958, guid: 27d010d9bce6c2c4db69a77df4c3723e, type: 3}
itemUIs: []
--- !u!1001 &1939682529
PrefabInstance:
@ -44038,7 +44047,7 @@ PrefabInstance:
type: 3}
propertyPath: testItems.Array.data[16]
value:
objectReference: {fileID: 696630249496564076, guid: 8a0ae100028bca24899af93f00f0abc1,
objectReference: {fileID: 8715477175483360852, guid: 69cbf65a3612aba46888d1beb942c53d,
type: 3}
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}
@ -44062,7 +44071,7 @@ PrefabInstance:
type: 3}
propertyPath: testItems.Array.data[20]
value:
objectReference: {fileID: 8715477175483360852, guid: c4d7adb2257663c48926c7ae5d5e729a,
objectReference: {fileID: 8715477175483360852, guid: f601e41e76489904ebf41a942395a9a0,
type: 3}
- target: {fileID: 2770326605807543574, guid: 9f005685dc17f4643b4a1156970fe2f6,
type: 3}

File diff suppressed because it is too large Load Diff

View File

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