Skip to content

Commit

Permalink
Fix Core features
Browse files Browse the repository at this point in the history
  • Loading branch information
osamadeep committed Nov 20, 2021
1 parent 5cdcd3a commit f7bda05
Show file tree
Hide file tree
Showing 16 changed files with 44,145 additions and 645 deletions.
248 changes: 206 additions & 42 deletions nekoyume/Assets/Resources/UI/Prefabs/UI_AvatarInfoPopup.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -845,6 +845,7 @@ MonoBehaviour:
avatarStats: {fileID: 7229480359242084152}
blur: {fileID: 2548730999175733050}
closeButton: {fileID: 9079972992155342913}
PriceText: {fileID: 4172228531021997400}
--- !u!82 &1589883110002112256
AudioSource:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1446,6 +1447,7 @@ RectTransform:
m_Children:
- {fileID: 1465817292662891181}
- {fileID: 2153415479715188534}
- {fileID: 6147516847837488969}
m_Father: {fileID: 7848676843099464785}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -3241,30 +3243,30 @@ PrefabInstance:
- {fileID: 2179182785938780357, guid: 47f8c7ccd12294594bc91d796d7bd0d1, type: 3}
- {fileID: 4387619842693125071, guid: 47f8c7ccd12294594bc91d796d7bd0d1, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: 47f8c7ccd12294594bc91d796d7bd0d1, type: 3}
--- !u!114 &5401068631062706562 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5694187535309377278, guid: 47f8c7ccd12294594bc91d796d7bd0d1,
--- !u!1 &8644062986545792723 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8215765656176947631, guid: 47f8c7ccd12294594bc91d796d7bd0d1,
type: 3}
m_PrefabInstance: {fileID: 428301737215784828}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8644062986545792723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &8302563649216631216 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8559376480781280972, guid: 47f8c7ccd12294594bc91d796d7bd0d1,
type: 3}
m_PrefabInstance: {fileID: 428301737215784828}
m_PrefabAsset: {fileID: 0}
--- !u!1 &8644062986545792723 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 8215765656176947631, guid: 47f8c7ccd12294594bc91d796d7bd0d1,
--- !u!114 &5401068631062706562 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5694187535309377278, guid: 47f8c7ccd12294594bc91d796d7bd0d1,
type: 3}
m_PrefabInstance: {fileID: 428301737215784828}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8644062986545792723}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &566907122139697100
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -4802,6 +4804,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5d633949e6ef14b458c0199e45af34c7, type: 3}
--- !u!224 &2985570747773473212 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 3352673610599835220}
m_PrefabAsset: {fileID: 0}
--- !u!114 &3163601224905407336 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 387389212801572156, guid: 5d633949e6ef14b458c0199e45af34c7,
Expand All @@ -4814,12 +4822,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31d16648271740229b605e99f40a2c8b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &2985570747773473212 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 3352673610599835220}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &3364163316102002383
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -5899,6 +5901,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9997a1efd421fe942a6a5042bf37cff3, type: 3}
--- !u!224 &5041225992773568406 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 423504588747394892, guid: 9997a1efd421fe942a6a5042bf37cff3,
type: 3}
m_PrefabInstance: {fileID: 4618053811275385050}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8980291075044533831 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4374957172746268317, guid: 9997a1efd421fe942a6a5042bf37cff3,
Expand All @@ -5911,12 +5919,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cbb8812915f44721a1dfb0512f74af2f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &5041225992773568406 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 423504588747394892, guid: 9997a1efd421fe942a6a5042bf37cff3,
type: 3}
m_PrefabInstance: {fileID: 4618053811275385050}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5022954395516157369
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6359,12 +6361,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9997a1efd421fe942a6a5042bf37cff3, type: 3}
--- !u!224 &4773795767312885151 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 423504588747394892, guid: 9997a1efd421fe942a6a5042bf37cff3,
type: 3}
m_PrefabInstance: {fileID: 5178993168153832147}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8892782454158214222 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 4374957172746268317, guid: 9997a1efd421fe942a6a5042bf37cff3,
Expand All @@ -6377,6 +6373,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cbb8812915f44721a1dfb0512f74af2f, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &4773795767312885151 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 423504588747394892, guid: 9997a1efd421fe942a6a5042bf37cff3,
type: 3}
m_PrefabInstance: {fileID: 5178993168153832147}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5230286842001100149
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7048,12 +7050,6 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5d633949e6ef14b458c0199e45af34c7, type: 3}
--- !u!224 &6049088983354221503 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 6060534780506297431}
m_PrefabAsset: {fileID: 0}
--- !u!114 &5871304312153524587 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 387389212801572156, guid: 5d633949e6ef14b458c0199e45af34c7,
Expand All @@ -7066,6 +7062,12 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31d16648271740229b605e99f40a2c8b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &6049088983354221503 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 6060534780506297431}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6297810558676841359
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8100,6 +8102,168 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d3a76360b9f74215998a5505e3394f19, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &7708617325659250720
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 7971603958617616476}
m_Modifications:
- target: {fileID: 2685976497489489691, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_Target
value:
objectReference: {fileID: 762829353963950295}
- target: {fileID: 2685976497489489691, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName
value: EnableMarketHelper
objectReference: {fileID: 0}
- target: {fileID: 2685976497489489691, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_OnClick.m_PersistentCalls.m_Calls.Array.data[0].m_TargetAssemblyTypeName
value: Nekoyume.UI.AvatarInfoPopup, Nekoyume
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_Pivot.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_RootOrder
value: 2
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchorMin.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_SizeDelta.x
value: 153.43549
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_SizeDelta.y
value: 87.99
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalScale.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalScale.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -215.3
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_AnchoredPosition.y
value: 67.3
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5809870781712335484, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
propertyPath: m_Name
value: MarketPriceHelper
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: e53eeea892017c945a8c8a8a5aa330f2, type: 3}
--- !u!224 &6147516847837488969 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 4587721737621358441, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
m_PrefabInstance: {fileID: 7708617325659250720}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4172228531021997400 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5988724430271382904, guid: e53eeea892017c945a8c8a8a5aa330f2,
type: 3}
m_PrefabInstance: {fileID: 7708617325659250720}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &8282623836330877083
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -8445,6 +8609,12 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 5d633949e6ef14b458c0199e45af34c7, type: 3}
--- !u!224 &8437560261872424819 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 8282623836330877083}
m_PrefabAsset: {fileID: 0}
--- !u!114 &8615810572576128423 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 387389212801572156, guid: 5d633949e6ef14b458c0199e45af34c7,
Expand All @@ -8457,12 +8627,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 31d16648271740229b605e99f40a2c8b, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!224 &8437560261872424819 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 570257463785617384, guid: 5d633949e6ef14b458c0199e45af34c7,
type: 3}
m_PrefabInstance: {fileID: 8282623836330877083}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &8813388672488219373
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Loading

0 comments on commit f7bda05

Please sign in to comment.