Merge branch 'lmg' of http://gitea.capers.co.kr:3000/capers/CapersRepo into ntg
# Conflicts: # Assets/StreamingAssets/google-services-desktop.json.meta
This commit is contained in:
Nam Tae Gun
commit
5a86a6b609
@ -826,7 +826,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &25012553
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
@ -3874,7 +3874,6 @@ MonoBehaviour:
|
||||
m_EditorClassIdentifier:
|
||||
_panel: {fileID: 25012552}
|
||||
rankRow: {fileID: 1361510178396898636, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
firebaseManager: {fileID: 0}
|
||||
rankContents: {fileID: 1962520163}
|
||||
yourRank: {fileID: 1975218144}
|
||||
nameTextField:
|
||||
@ -5088,7 +5087,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -5096,15 +5095,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -5136,11 +5135,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -273
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -5285,7 +5284,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -5293,15 +5292,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -5333,11 +5332,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -501
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -5601,6 +5600,7 @@ MonoBehaviour:
|
||||
_totalGoldDuration: 1
|
||||
_playTime: 0
|
||||
_rankUi: {fileID: 167369646}
|
||||
_firebaseManager: {fileID: 2143470872}
|
||||
--- !u!4 &292147867 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 1582116343231843844, guid: 9a394d3c65c71084d8345c36df67c89c, type: 3}
|
||||
@ -5641,9 +5641,9 @@ RectTransform:
|
||||
m_Father: {fileID: 991489483}
|
||||
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: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &304965722
|
||||
MonoBehaviour:
|
||||
@ -6107,7 +6107,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -6115,15 +6115,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -6155,11 +6155,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -330
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -7633,7 +7633,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -7641,15 +7641,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -7681,11 +7681,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -558
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -11526,7 +11526,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -11534,15 +11534,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -11574,11 +11574,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -159
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -15185,7 +15185,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -15193,15 +15193,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -15233,11 +15233,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -444
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -15684,7 +15684,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -15692,15 +15692,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -15732,11 +15732,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -216
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -17586,7 +17586,7 @@ MonoBehaviour:
|
||||
m_TargetGraphic: {fileID: 1982592769}
|
||||
m_HandleRect: {fileID: 1982592768}
|
||||
m_Direction: 2
|
||||
m_Value: 0.9999953
|
||||
m_Value: 1
|
||||
m_Size: 0.9784411
|
||||
m_NumberOfSteps: 0
|
||||
m_OnValueChanged:
|
||||
@ -17770,7 +17770,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -17778,15 +17778,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -17818,11 +17818,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -387
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -27751,7 +27751,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -27759,15 +27759,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -27799,11 +27799,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -45
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -28465,7 +28465,7 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
@ -28473,15 +28473,15 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 1
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 1100
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 50
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
@ -28513,11 +28513,11 @@ PrefabInstance:
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 576.5
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: -102
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 2925474769406969026, guid: 361efad0f06bf814784acb3ded76dbdf, type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
@ -37035,7 +37035,7 @@ RectTransform:
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 603}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0, y: 1}
|
||||
--- !u!114 &1962520165
|
||||
MonoBehaviour:
|
||||
@ -37189,7 +37189,7 @@ MonoBehaviour:
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_text: 101
|
||||
m_text: 999
|
||||
m_isRightToLeft: 0
|
||||
m_fontAsset: {fileID: 11400000, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
|
||||
m_sharedMaterial: {fileID: 1328173432319114220, guid: 2f35c40df3d2a1a41b57c8b9eca40913, type: 2}
|
||||
@ -37335,8 +37335,8 @@ RectTransform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1096074423}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.021558778}
|
||||
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}
|
||||
@ -39999,6 +39999,17 @@ CanvasRenderer:
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2135845442}
|
||||
m_CullTransparentMesh: 1
|
||||
--- !u!114 &2143470872 stripped
|
||||
MonoBehaviour:
|
||||
m_CorrespondingSourceObject: {fileID: 7204948474817615305, guid: 66478a43aa089f4478c42ca83b3c5897, type: 3}
|
||||
m_PrefabInstance: {fileID: 107770450}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 0}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: a59d6a9358e846e4d91664e5054aa273, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
--- !u!1 &2144187556
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@ -32,8 +32,8 @@ namespace BlueWater
|
||||
public List<BlueWaterRankUserData> UserDatas;
|
||||
private string _lastDatasName;
|
||||
|
||||
[SerializeField]
|
||||
private TycoonResultUi resultUi;
|
||||
[NonSerialized]
|
||||
public TycoonResultUi resultUi;
|
||||
|
||||
public BlueWaterRankUserData thisUser;
|
||||
|
||||
@ -48,11 +48,16 @@ namespace BlueWater
|
||||
UserDatas.Clear();
|
||||
}
|
||||
|
||||
public FirebaseManager GetFirebaseManger()
|
||||
{
|
||||
return this;
|
||||
}
|
||||
|
||||
[Button("랭크 최신화")]
|
||||
async Task UpdateUserData(Action action = null)
|
||||
{
|
||||
UserDatas.Clear();
|
||||
UserDatas = new List<BlueWaterRankUserData>();
|
||||
|
||||
var snapshot = await FirebaseDatabase.DefaultInstance.GetReference("Users").GetValueAsync();
|
||||
string nextID = "__Root";
|
||||
|
||||
@ -84,6 +89,7 @@ namespace BlueWater
|
||||
break; // 다음 nextID 유효하지 않으면 루프 종료
|
||||
}
|
||||
|
||||
// Debug.Log($"Name : {user.Name} / Round : {user.Round} / Gold : {user.Gold} / Time : {user.Time}");
|
||||
// Debug.Log("ADD");
|
||||
UserDatas.Add(user);
|
||||
}
|
||||
@ -100,20 +106,24 @@ namespace BlueWater
|
||||
public void CreateRank(Action action = null)
|
||||
{
|
||||
// 통신 가능 여부 체크
|
||||
if (Application.internetReachability == NetworkReachability.NotReachable) return;
|
||||
if (Application.internetReachability == NetworkReachability.NotReachable) {Debug.Log("Network ERROR!!"); return;}
|
||||
|
||||
_ = UpdateUserData(() =>
|
||||
{
|
||||
Debug.Log("Start Set this User");
|
||||
thisUser = new BlueWaterRankUserData();
|
||||
thisUser.Id = GetOriginalUserID();
|
||||
thisUser.Round = int.Parse(TycoonManager.Instance.GetCurrentLevelData().Idx);
|
||||
thisUser.Gold = resultUi._goldSpent;
|
||||
thisUser.Time = (int)resultUi._playTime;
|
||||
thisUser.Tries = ES3.Load(SaveData.Tries, 0);
|
||||
Debug.Log("End Set this User");
|
||||
|
||||
int i = 0;
|
||||
for (; i < 102; i++) //__Root포함 탐색 (최대 랭크 100위 + Root + 자기자신 = 102)
|
||||
{
|
||||
|
||||
Debug.Log(i);
|
||||
if (i < UserDatas.Count)
|
||||
{
|
||||
if (UserDatas[i].Round > thisUser.Round) {continue;}
|
||||
@ -138,13 +148,13 @@ namespace BlueWater
|
||||
{
|
||||
_reference.Child("Users").Child("__Root").Child("NextID").SetValueAsync(thisUser.Id);
|
||||
thisUser.NextID = UserDatas[0].NextID;
|
||||
Debug.Log("thisUser.NextID = " + thisUser.NextID);
|
||||
//Debug.Log("thisUser.NextID = " + thisUser.NextID);
|
||||
}
|
||||
else
|
||||
{
|
||||
_reference.Child("Users").Child(UserDatas[i - 2].NextID).Child("NextID").SetValueAsync(thisUser.Id);
|
||||
thisUser.NextID = UserDatas[i-1].NextID;
|
||||
Debug.Log("thisUser.NextID = " + thisUser.NextID);
|
||||
//Debug.Log("thisUser.NextID = " + thisUser.NextID);
|
||||
}
|
||||
|
||||
WriteUserData(thisUser);
|
||||
@ -170,13 +180,12 @@ namespace BlueWater
|
||||
|
||||
}
|
||||
|
||||
[Button("이름변경하기")]
|
||||
public void WirteUserDataName(string changename) //이름변경
|
||||
{
|
||||
_reference.Child("Users").Child(thisUser.Id).Child("Name").SetValueAsync(changename);
|
||||
}
|
||||
|
||||
string GetOriginalUserID()
|
||||
private string GetOriginalUserID()
|
||||
{
|
||||
string uniqueID = Environment.MachineName;
|
||||
DateTime utcNow = DateTime.UtcNow;
|
||||
|
||||
@ -94,7 +94,6 @@ namespace BlueWater
|
||||
}
|
||||
|
||||
_rankOpen = true;
|
||||
|
||||
StartCoroutine(CenterOnTarget());
|
||||
|
||||
});
|
||||
@ -131,6 +130,13 @@ namespace BlueWater
|
||||
|
||||
private IEnumerator CenterOnTarget()
|
||||
{
|
||||
|
||||
var ranker = rankContents.transform.Find(yourRank.text).GetComponent<RankRow>();
|
||||
var target = ranker.transform;
|
||||
//Debug.Log(target.position.y);
|
||||
|
||||
ranker.StartAlpha();
|
||||
|
||||
float timer = 0f;
|
||||
while (timer < 0.5f)
|
||||
{
|
||||
@ -138,12 +144,6 @@ namespace BlueWater
|
||||
yield return null;
|
||||
}
|
||||
|
||||
var rankrow = rankContents.transform.Find(yourRank.text).GetComponent<RankRow>();
|
||||
var target = rankrow.transform;
|
||||
//Debug.Log(target.position.y);
|
||||
|
||||
rankrow.StartAlpha();
|
||||
|
||||
content.offsetMin = new Vector2(0, content.offsetMin.y); // Left
|
||||
content.offsetMax = new Vector2(0, content.offsetMax.y); // Right
|
||||
|
||||
|
||||
@ -235,7 +235,7 @@ namespace BlueWater.Uis
|
||||
[Title("[다음]랭킹")]
|
||||
[SerializeField]
|
||||
private RankUi _rankUi;
|
||||
|
||||
private FirebaseManager _firebaseManager;
|
||||
|
||||
private void Awake()
|
||||
{
|
||||
@ -255,6 +255,9 @@ namespace BlueWater.Uis
|
||||
{
|
||||
Destroy(element.gameObject);
|
||||
}
|
||||
|
||||
_firebaseManager = FirebaseManager.Instance.GetFirebaseManger();
|
||||
_firebaseManager.resultUi = this;
|
||||
|
||||
_nextButton.onClick.AddListener(() => _rankUi.RunRank());
|
||||
|
||||
|
||||
File diff suppressed because one or more lines are too long
Loading…
Reference in New Issue
Block a user