Skip to content

Commit

Permalink
Chrono Tool, equip any item
Browse files Browse the repository at this point in the history
  • Loading branch information
osamadeep committed Apr 26, 2022
1 parent 1ea3640 commit 6bc495a
Show file tree
Hide file tree
Showing 18 changed files with 1,297 additions and 545 deletions.
318 changes: 278 additions & 40 deletions nekoyume/Assets/Resources/UI/Prefabs/ChronoSlot.prefab

Large diffs are not rendered by default.

24 changes: 12 additions & 12 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_BattleResultPopup.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1462,7 +1462,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 65}
m_SizeDelta: {x: 200, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5763845858810283453
CanvasRenderer:
Expand Down Expand Up @@ -1838,7 +1838,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 200, y: 65}
m_SizeDelta: {x: 200, y: 46}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &128695271115349937
CanvasRenderer:
Expand Down Expand Up @@ -3566,7 +3566,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 520, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7953334354609671252
Expand Down Expand Up @@ -6942,7 +6942,7 @@ PrefabInstance:
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 92
objectReference: {fileID: 0}
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
Expand Down Expand Up @@ -7061,6 +7061,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 0c75875ee6d9a724ab977f6af0c747ab, type: 3}
--- !u!224 &2946634846980001026 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2855381624818415449, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
m_PrefabInstance: {fileID: 1100240318847875675}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8828973387584366379 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8485351490845318512, guid: 0c75875ee6d9a724ab977f6af0c747ab,
Expand All @@ -7073,12 +7079,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0e4bc746f35a40a28d25e70e7d5307a5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2946634846980001026 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 2855381624818415449, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
m_PrefabInstance: {fileID: 1100240318847875675}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &1141868800928187020
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8343,7 +8343,7 @@ PrefabInstance:
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 92
objectReference: {fileID: 0}
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
Expand Down Expand Up @@ -12183,7 +12183,7 @@ PrefabInstance:
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
value: 92
objectReference: {fileID: 0}
- target: {fileID: 8362013223337650660, guid: 0c75875ee6d9a724ab977f6af0c747ab,
type: 3}
Expand Down
109 changes: 2 additions & 107 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_ChronoSlotsPopup.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1378,11 +1378,6 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8651601265192141225}
m_Modifications:
- target: {fileID: 714665952803558946, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1849666679564753566, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
Expand All @@ -1393,21 +1388,6 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -9.700012
objectReference: {fileID: 0}
- target: {fileID: 6033486946117268058, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -200.6
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -33.95
objectReference: {fileID: 0}
- target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_Pivot.x
Expand Down Expand Up @@ -1513,19 +1493,14 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7875841342821198115, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8373136985122855380, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_Name
value: ChronoSlot (1)
objectReference: {fileID: 0}
- target: {fileID: 9115631703319336075, guid: fc24ce4f14eae6841881a10ece115a81,
- target: {fileID: 8684556999725256456, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
Expand Down Expand Up @@ -1974,61 +1949,16 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 8651601265192141225}
m_Modifications:
- target: {fileID: 714665952803558946, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1229783996724167744, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1229783996724167744, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 1849666679564753566, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9.700012
objectReference: {fileID: 0}
- target: {fileID: 2422510378129342012, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3787858095262186575, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9.700012
objectReference: {fileID: 0}
- target: {fileID: 5632487236220588107, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6031077379990603966, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 6033486946117268058, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -200.6
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -33.95
objectReference: {fileID: 0}
- target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_Pivot.x
Expand Down Expand Up @@ -2134,26 +2064,11 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 7875841342821198115, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8373136985122855380, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_Name
value: ChronoSlot (2)
objectReference: {fileID: 0}
- target: {fileID: 8684556999725256456, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 9115631703319336075, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: fc24ce4f14eae6841881a10ece115a81, type: 3}
--- !u!114 &6104299889505517346 stripped
Expand Down Expand Up @@ -2186,31 +2101,11 @@ PrefabInstance:
propertyPath: m_AnchoredPosition.y
value: -9.700012
objectReference: {fileID: 0}
- target: {fileID: 2422510378129342012, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3787858095262186575, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -9.700012
objectReference: {fileID: 0}
- target: {fileID: 5632487236220588107, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -200.6
objectReference: {fileID: 0}
- target: {fileID: 6454765294650210483, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -33.95
objectReference: {fileID: 0}
- target: {fileID: 7778286864631315859, guid: fc24ce4f14eae6841881a10ece115a81,
type: 3}
propertyPath: m_Pivot.x
Expand Down
Loading

0 comments on commit 6bc495a

Please sign in to comment.