Merge remote-tracking branch 'origin/master'

.gitignore

@@ -5,3 +5,4 @@
 Assembly-CSharp-Editor.csproj
 Assembly-CSharp.csproj
 ProjectSettings/*
+Packages/manifest.json

Assets/Resources/Pages/FullLoading.prefab

@@ -18,7 +18,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &5293469706244878279
 RectTransform:
   m_ObjectHideFlags: 0

Assets/Resources/Pages/Items/RankItem.prefab

@@ -140,9 +140,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 2
   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: -624.0454, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 108.95459, y: 1}
   m_SizeDelta: {x: 146, y: 117}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3401027207808727060
@@ -272,9 +272,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 5
   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: -117, y: 33}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 616, y: 33}
   m_SizeDelta: {x: 500, y: 70}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2065632500557345850
@@ -353,9 +353,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 3
   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: -624.0454, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 108.95459, y: 1}
   m_SizeDelta: {x: 146, y: 117}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4070773898140561217
@@ -485,9 +485,9 @@ RectTransform:
   m_Father: {fileID: 5208420332053913608}
   m_RootOrder: 0
   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_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 75, y: 0}
   m_SizeDelta: {x: 150, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4396838680283152715
@@ -563,9 +563,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 4
   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: -459, y: 0}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 274, y: 0}
   m_SizeDelta: {x: 150, y: 150}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7689826982745524803
@@ -696,9 +696,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 8
   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: 613, y: 0}
+  m_AnchorMin: {x: 1, y: 0.5}
+  m_AnchorMax: {x: 1, y: 0.5}
+  m_AnchoredPosition: {x: -119, y: 0}
   m_SizeDelta: {x: 186, y: 79}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3465063750973070359
@@ -828,9 +828,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 7
   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: -117, y: -45}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 616, y: -45}
   m_SizeDelta: {x: 500, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1318449554846355183
@@ -909,9 +909,9 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   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: -624.0454, y: 1}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 108.95459, y: 1}
   m_SizeDelta: {x: 146, y: 117}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1393646949464365111
@@ -1041,10 +1041,10 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 0
   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: -624.0454, y: -7.7866}
-  m_SizeDelta: {x: 158.2415, y: 118.26}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 108.95459, y: -7.7866}
+  m_SizeDelta: {x: 158.24152, y: 118.26}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3478823285495321147
 CanvasRenderer:
@@ -1121,10 +1121,10 @@ RectTransform:
   m_Father: {fileID: 6933162872003959254}
   m_RootOrder: 6
   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: 528, y: 0.5425}
-  m_SizeDelta: {x: 201.8939, y: 134.915}
+  m_AnchorMin: {x: 0, y: 0.5}
+  m_AnchorMax: {x: 0, y: 0.5}
+  m_AnchoredPosition: {x: 1261, y: 0.5425}
+  m_SizeDelta: {x: 201.89392, y: 134.915}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &859177965147185642
 CanvasRenderer:

Assets/Resources/Pages/Login.prefab

@@ -1025,14 +1025,14 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   animationSteps: []
   updateType: 0
-  timeScaleIndependent: 0
   autoplayMode: 0
-  startPaused: 0
-  playbackSpeed: 1
   playType: 0
-  loops: 0
   loopType: 0
+  timeScaleIndependent: 0
+  startPaused: 0
   autoKill: 1
+  playbackSpeed: 1
+  loops: 0
   onStartEvent:
     m_PersistentCalls:
       m_Calls: []
@@ -3435,6 +3435,11 @@ PrefabInstance:
   m_Modification:
     m_TransformParent: {fileID: 4430844013683612294}
     m_Modifications:
+    - target: {fileID: 395183135547816618, guid: 745c51e1240b440dc80c5cfb0013e482,
+        type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 2320301382847433757, guid: 745c51e1240b440dc80c5cfb0013e482,
         type: 3}
       propertyPath: m_Name

Assets/Resources/Pages/Rank.prefab

@@ -286,10 +286,10 @@ MonoBehaviour:
     m_Top: 0
     m_Bottom: 0
   m_ChildAlignment: 0
-  m_Spacing: 0
+  m_Spacing: 10
   m_ChildForceExpandWidth: 1
   m_ChildForceExpandHeight: 1
-  m_ChildControlWidth: 0
+  m_ChildControlWidth: 1
   m_ChildControlHeight: 0
   m_ChildScaleWidth: 0
   m_ChildScaleHeight: 0
@@ -897,8 +897,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 187.49622, y: -44.713745}
-  m_SizeDelta: {x: -520.9678, y: -193.5105}
+  m_AnchoredPosition: {x: 187.49622, y: -60.316772}
+  m_SizeDelta: {x: -520.9678, y: -224.7166}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1408923082932276326
 CanvasRenderer:
@@ -1222,7 +1222,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: -17}
+  m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &7238211704867666392
 CanvasRenderer:
@@ -1310,7 +1310,7 @@ PrefabInstance:
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
       propertyPath: m_AnchorMax.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
@@ -1320,12 +1320,12 @@ PrefabInstance:
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
       propertyPath: m_AnchorMin.y
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
       propertyPath: m_SizeDelta.x
-      value: 1465.0931
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
@@ -1370,12 +1370,12 @@ PrefabInstance:
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 732.5466
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 6933162872003959254, guid: e10f6cd1d955d4072a4fe0b7c1f057f7,
         type: 3}

Packages/manifest.json

@@ -0,0 +1,47 @@
+{
+  "dependencies": {
+    "com.brunomikoski.animationsequencer": "https://github.com/brunomikoski/Animation-Sequencer.git",
+    "com.unity.collab-proxy": "2.0.0",
+    "com.unity.ide.rider": "3.0.18",
+    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.vscode": "1.2.5",
+    "com.unity.nuget.newtonsoft-json": "3.0.2",
+    "com.unity.render-pipelines.universal": "12.1.10",
+    "com.unity.test-framework": "1.1.31",
+    "com.unity.textmeshpro": "3.0.6",
+    "com.unity.timeline": "1.6.4",
+    "com.unity.ugui": "1.0.0",
+    "com.unity.visualscripting": "1.8.0",
+    "com.unity.modules.ai": "1.0.0",
+    "com.unity.modules.androidjni": "1.0.0",
+    "com.unity.modules.animation": "1.0.0",
+    "com.unity.modules.assetbundle": "1.0.0",
+    "com.unity.modules.audio": "1.0.0",
+    "com.unity.modules.cloth": "1.0.0",
+    "com.unity.modules.director": "1.0.0",
+    "com.unity.modules.imageconversion": "1.0.0",
+    "com.unity.modules.imgui": "1.0.0",
+    "com.unity.modules.jsonserialize": "1.0.0",
+    "com.unity.modules.particlesystem": "1.0.0",
+    "com.unity.modules.physics": "1.0.0",
+    "com.unity.modules.physics2d": "1.0.0",
+    "com.unity.modules.screencapture": "1.0.0",
+    "com.unity.modules.terrain": "1.0.0",
+    "com.unity.modules.terrainphysics": "1.0.0",
+    "com.unity.modules.tilemap": "1.0.0",
+    "com.unity.modules.ui": "1.0.0",
+    "com.unity.modules.uielements": "1.0.0",
+    "com.unity.modules.umbra": "1.0.0",
+    "com.unity.modules.unityanalytics": "1.0.0",
+    "com.unity.modules.unitywebrequest": "1.0.0",
+    "com.unity.modules.unitywebrequestassetbundle": "1.0.0",
+    "com.unity.modules.unitywebrequestaudio": "1.0.0",
+    "com.unity.modules.unitywebrequesttexture": "1.0.0",
+    "com.unity.modules.unitywebrequestwww": "1.0.0",
+    "com.unity.modules.vehicles": "1.0.0",
+    "com.unity.modules.video": "1.0.0",
+    "com.unity.modules.vr": "1.0.0",
+    "com.unity.modules.wind": "1.0.0",
+    "com.unity.modules.xr": "1.0.0"
+  }
+}