Prechádzať zdrojové kódy

英雄详情界面搭建

liao 5 mesiacov pred
rodič
commit
9fedeb2ad1
32 zmenil súbory, kde vykonal 1119 pridanie a 984 odobranie
  1. 7 0
      .vs/VSWorkspaceState.json
  2. BIN
      .vs/XY001/FileContentIndex/00710d25-5a56-4f82-a5d9-086f8acc4674.vsidx
  3. BIN
      .vs/XY001/FileContentIndex/197e5b23-45dd-4a85-a0e3-35649f9b7ed4.vsidx
  4. BIN
      .vs/XY001/FileContentIndex/3bc37a73-f128-47d6-9c71-8f45e03b5f2c.vsidx
  5. BIN
      .vs/XY001/FileContentIndex/413721ea-75db-467d-aa20-92e7eaaa47c2.vsidx
  6. BIN
      .vs/XY001/FileContentIndex/59f01d61-36f3-41dd-9559-608264ae911a.vsidx
  7. BIN
      .vs/XY001/FileContentIndex/74102e3e-9ecf-4489-b102-f075cbea692e.vsidx
  8. BIN
      .vs/XY001/FileContentIndex/9013382a-9bbd-4a1b-ac0e-10a16a83f95a.vsidx
  9. BIN
      .vs/XY001/FileContentIndex/9886d5bb-e5f6-4a82-9ac3-6e54421b379b.vsidx
  10. BIN
      .vs/XY001/FileContentIndex/b8ee06ab-73f0-4c49-9020-8832d01ea619.vsidx
  11. BIN
      .vs/XY001/FileContentIndex/c2fa2e14-c17e-4f7c-b01b-392e04f380ce.vsidx
  12. BIN
      .vs/XY001/v17/.suo
  13. BIN
      .vs/XY001/v17/.wsuo
  14. 37 0
      .vs/XY001/v17/DocumentLayout.backup.json
  15. 37 0
      .vs/XY001/v17/DocumentLayout.json
  16. BIN
      .vs/XY001/v17/fileList.bin
  17. BIN
      .vs/XY001/v17/workspaceFileList.bin
  18. BIN
      .vs/slnx.sqlite
  19. 12 0
      .vscode/launch.json
  20. 3 0
      .vscode/settings.json
  21. 17 0
      .vscode/tasks.json
  22. 6 0
      .vsconfig
  23. 138 1
      Assets/Res/UI/MainUIPanel.prefab
  24. 239 285
      Assets/Scenes/UITest.scene
  25. 3 5
      Assets/Scripts/GameUI/GameApplction.cs
  26. 22 17
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs
  27. 23 3
      Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs
  28. 2 1
      Assets/Scripts/GameUI/UI/MainUIPanel.cs
  29. 93 1
      ProjectSettings/ProjectSettings.asset
  30. 266 0
      UpgradeLog.htm
  31. 27 9
      UserSettings/EditorUserSettings.asset
  32. 187 662
      UserSettings/Layouts/default-2022.dwlt

+ 7 - 0
.vs/VSWorkspaceState.json

@@ -0,0 +1,7 @@
+{
+  "ExpandedNodes": [
+    ""
+  ],
+  "SelectedNode": "\\XY001.sln",
+  "PreviewInSolutionExplorer": false
+}

BIN
.vs/XY001/FileContentIndex/00710d25-5a56-4f82-a5d9-086f8acc4674.vsidx


BIN
.vs/XY001/FileContentIndex/197e5b23-45dd-4a85-a0e3-35649f9b7ed4.vsidx


BIN
.vs/XY001/FileContentIndex/3bc37a73-f128-47d6-9c71-8f45e03b5f2c.vsidx


BIN
.vs/XY001/FileContentIndex/413721ea-75db-467d-aa20-92e7eaaa47c2.vsidx


BIN
.vs/XY001/FileContentIndex/59f01d61-36f3-41dd-9559-608264ae911a.vsidx


BIN
.vs/XY001/FileContentIndex/74102e3e-9ecf-4489-b102-f075cbea692e.vsidx


BIN
.vs/XY001/FileContentIndex/9013382a-9bbd-4a1b-ac0e-10a16a83f95a.vsidx


BIN
.vs/XY001/FileContentIndex/9886d5bb-e5f6-4a82-9ac3-6e54421b379b.vsidx


BIN
.vs/XY001/FileContentIndex/b8ee06ab-73f0-4c49-9020-8832d01ea619.vsidx


BIN
.vs/XY001/FileContentIndex/c2fa2e14-c17e-4f7c-b01b-392e04f380ce.vsidx


BIN
.vs/XY001/v17/.suo


BIN
.vs/XY001/v17/.wsuo


+ 37 - 0
.vs/XY001/v17/DocumentLayout.backup.json

@@ -0,0 +1,37 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "E:\\workspaces\\XY001\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{9A972289-0071-C23A-8B6D-B37F70A05DC5}|Fort23.Mono.csproj|e:\\workspaces\\xy001\\assets\\scripts\\gameui\\gameapplction.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{9A972289-0071-C23A-8B6D-B37F70A05DC5}|Fort23.Mono.csproj|solutionrelative:assets\\scripts\\gameui\\gameapplction.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "GameApplction.cs",
+              "DocumentMoniker": "E:\\workspaces\\XY001\\Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "RelativeDocumentMoniker": "Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "ToolTip": "E:\\workspaces\\XY001\\Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "RelativeToolTip": "Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "ViewState": "AgIAABwAAAAAAAAAAAAWwDIAAAApAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2024-11-25T07:26:25.583Z",
+              "EditorCaption": ""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

+ 37 - 0
.vs/XY001/v17/DocumentLayout.json

@@ -0,0 +1,37 @@
+{
+  "Version": 1,
+  "WorkspaceRootPath": "E:\\workspaces\\XY001\\",
+  "Documents": [
+    {
+      "AbsoluteMoniker": "D:0:0:{9A972289-0071-C23A-8B6D-B37F70A05DC5}|Fort23.Mono.csproj|e:\\workspaces\\xy001\\assets\\scripts\\gameui\\gameapplction.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}",
+      "RelativeMoniker": "D:0:0:{9A972289-0071-C23A-8B6D-B37F70A05DC5}|Fort23.Mono.csproj|solutionrelative:assets\\scripts\\gameui\\gameapplction.cs||{A6C744A8-0E4A-4FC6-886A-064283054674}"
+    }
+  ],
+  "DocumentGroupContainers": [
+    {
+      "Orientation": 0,
+      "VerticalTabListWidth": 256,
+      "DocumentGroups": [
+        {
+          "DockedWidth": 200,
+          "SelectedChildIndex": 0,
+          "Children": [
+            {
+              "$type": "Document",
+              "DocumentIndex": 0,
+              "Title": "GameApplction.cs",
+              "DocumentMoniker": "E:\\workspaces\\XY001\\Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "RelativeDocumentMoniker": "Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "ToolTip": "E:\\workspaces\\XY001\\Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "RelativeToolTip": "Assets\\Scripts\\GameUI\\GameApplction.cs",
+              "ViewState": "AgIAABwAAAAAAAAAAAAWwDIAAAApAAAAAAAAAA==",
+              "Icon": "ae27a6b0-e345-4288-96df-5eaf394ee369.000738|",
+              "WhenOpened": "2024-11-25T07:26:25.583Z",
+              "EditorCaption": ""
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

BIN
.vs/XY001/v17/fileList.bin


BIN
.vs/XY001/v17/workspaceFileList.bin


BIN
.vs/slnx.sqlite


+ 12 - 0
.vscode/launch.json

@@ -0,0 +1,12 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Unity Editor",
+            "type": "mono",
+            "request": "attach",
+            "address": "localhost",
+            "port": 56000
+        }
+    ]
+}

+ 3 - 0
.vscode/settings.json

@@ -0,0 +1,3 @@
+{
+    "dotnet.defaultSolution": "XY001.sln"
+}

+ 17 - 0
.vscode/tasks.json

@@ -0,0 +1,17 @@
+{
+    "version": "2.0.0",
+    "tasks": [
+        {
+            "label": "build",
+            "command": "dotnet",
+            "type": "process",
+            "args": [
+                "build",
+                "${workspaceFolder}/Assembly-CSharp.csproj",
+                "/property:GenerateFullPaths=true",
+                "/consoleloggerparameters:NoSummary"
+            ],
+            "problemMatcher": "$msCompile"
+        }
+    ]
+} 

+ 6 - 0
.vsconfig

@@ -0,0 +1,6 @@
+{
+  "version": "1.0",
+  "components": [
+    "Microsoft.VisualStudio.Workload.ManagedGame"
+  ]
+}

+ 138 - 1
Assets/Res/UI/MainUIPanel.prefab

@@ -4227,6 +4227,38 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 9073062006211861286}
     m_Modifications:
+    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 36.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 2192921615180975605, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -16.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 84.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 2248459876073487429, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -16.5
+      objectReference: {fileID: 0}
     - target: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -4311,11 +4343,116 @@ PrefabInstance:
       propertyPath: m_Name
       value: WidgetHero
       objectReference: {fileID: 0}
+    - target: {fileID: 5424729500125663363, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 68.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 7229761929894092049, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -16.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 20.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 7878371381901126332, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -16.5
+      objectReference: {fileID: 0}
+    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 52.29
+      objectReference: {fileID: 0}
+    - target: {fileID: 8498367243636987744, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -16.5
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
-    m_AddedComponents: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 5424729500125663363, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4244621408606067346}
   m_SourcePrefab: {fileID: 100100000, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+--- !u!1 &8551751597144763614 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5424729500125663363, guid: ea104609bd8374412bdaedf093dff35c, type: 3}
+  m_PrefabInstance: {fileID: 4460092474410663005}
+  m_PrefabAsset: {fileID: 0}
+--- !u!61 &4244621408606067346
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8551751597144763614}
+  m_Enabled: 0
+  m_Density: 1
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_ForceSendLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ForceReceiveLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_ContactCaptureLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_CallbackLayers:
+    serializedVersion: 2
+    m_Bits: 4294967295
+  m_IsTrigger: 0
+  m_UsedByEffector: 0
+  m_UsedByComposite: 0
+  m_Offset: {x: 0, y: 0}
+  m_SpriteTilingProperty:
+    border: {x: 0, y: 0, z: 0, w: 0}
+    pivot: {x: 0, y: 0}
+    oldSize: {x: 0, y: 0}
+    newSize: {x: 0, y: 0}
+    adaptiveTilingThreshold: 0
+    drawMode: 0
+    adaptiveTiling: 0
+  m_AutoTiling: 0
+  serializedVersion: 2
+  m_Size: {x: 150, y: 200}
+  m_EdgeRadius: 0
 --- !u!224 &8879947183720841500 stripped
 RectTransform:
   m_CorrespondingSourceObject: {fileID: 5106666997551906113, guid: ea104609bd8374412bdaedf093dff35c, type: 3}

+ 239 - 285
Assets/Scenes/UITest.scene

@@ -1090,107 +1090,111 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 27.42
       objectReference: {fileID: 0}
     - target: {fileID: 633556119156740559, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -29
       objectReference: {fileID: 0}
     - target: {fileID: 1304097413173983624, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 84
       objectReference: {fileID: 0}
     - target: {fileID: 1603543821887793293, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 2210322157374921795, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.622
       objectReference: {fileID: 0}
     - target: {fileID: 2210322157374921795, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 140
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 540
       objectReference: {fileID: 0}
     - target: {fileID: 2358080822167749276, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 662.6
       objectReference: {fileID: 0}
     - target: {fileID: 2485815262242607507, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 2554430180816756616, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Name
       value: Lobby
       objectReference: {fileID: 0}
+    - target: {fileID: 2554430180816756616, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 140
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 210
       objectReference: {fileID: 0}
     - target: {fileID: 3596372810887163893, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 3601374386839329079, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -1198,55 +1202,55 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 190
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 375
       objectReference: {fileID: 0}
     - target: {fileID: 3894586330948321654, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -85.20001
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 140
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 680
       objectReference: {fileID: 0}
     - target: {fileID: 3942119357474447327, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 4029056082544636664, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 54.84
       objectReference: {fileID: 0}
     - target: {fileID: 5122476276599886461, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.279
       objectReference: {fileID: 0}
     - target: {fileID: 5122476276599886461, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 5141569825535939786, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_IsActive
@@ -1254,19 +1258,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 27.42
       objectReference: {fileID: 0}
     - target: {fileID: 6464757117435473793, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -29
       objectReference: {fileID: 0}
     - target: {fileID: 6678662444514587225, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Pivot.x
@@ -1350,39 +1354,39 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 371.5
       objectReference: {fileID: 0}
     - target: {fileID: 7926931914951179676, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -28
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMin.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_SizeDelta.x
-      value: 0
+      value: 140
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: 0
+      value: 70
       objectReference: {fileID: 0}
     - target: {fileID: 8581528108883261822, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 0
+      value: -89.85001
       objectReference: {fileID: 0}
     - target: {fileID: 8773814986703145784, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_Enabled
@@ -1390,11 +1394,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8814903607347438053, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.x
-      value: 0
+      value: 0.526
       objectReference: {fileID: 0}
     - target: {fileID: 8814903607347438053, guid: 054a1c105e5ed42cf970235ada8b72fd, type: 3}
       propertyPath: m_AnchorMax.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -1464,6 +1468,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -1682,6 +1688,22 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2083107210}
     m_Modifications:
+    - target: {fileID: 88680617453124351, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 88680617453124351, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 88680617453124351, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 329.3
+      objectReference: {fileID: 0}
+    - target: {fileID: 88680617453124351, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
     - target: {fileID: 95437761547748053, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1698,6 +1720,22 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1265696420539956585, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265696420539956585, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265696420539956585, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 420.7
+      objectReference: {fileID: 0}
+    - target: {fileID: 1265696420539956585, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
     - target: {fileID: 2649923975045798197, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_Color.b
       value: 1
@@ -1722,6 +1760,70 @@ PrefabInstance:
       propertyPath: m_Color.r
       value: 1
       objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 520
+      objectReference: {fileID: 0}
+    - target: {fileID: 2917498642724729902, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -150
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 3052677063158753528, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -50
+      objectReference: {fileID: 0}
+    - target: {fileID: 3120500857608675158, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3120500857608675158, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 3120500857608675158, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 466.40002
+      objectReference: {fileID: 0}
+    - target: {fileID: 3120500857608675158, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
     - target: {fileID: 3158233926214000975, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1738,6 +1840,38 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 4009204296129428762, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4009204296129428762, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4009204296129428762, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 283.59998
+      objectReference: {fileID: 0}
+    - target: {fileID: 4009204296129428762, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
+    - target: {fileID: 4691365183195838969, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4691365183195838969, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4691365183195838969, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 375
+      objectReference: {fileID: 0}
+    - target: {fileID: 4691365183195838969, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -40
+      objectReference: {fileID: 0}
     - target: {fileID: 4720498086717842237, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_IsActive
       value: 0
@@ -1758,10 +1892,62 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 6061781029632302041, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -150
+      objectReference: {fileID: 0}
     - target: {fileID: 6213300356282155384, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_Name
       value: HeroDetailPanel
       objectReference: {fileID: 0}
+    - target: {fileID: 6213300356282155384, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_IsActive
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMax.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchorMin.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 230
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 80
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 520
+      objectReference: {fileID: 0}
+    - target: {fileID: 6253539736651280788, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: -50
+      objectReference: {fileID: 0}
     - target: {fileID: 6404690624462050643, guid: dc5d458eb43b244f18ce778f536bf44f, type: 3}
       propertyPath: m_AnchorMax.y
       value: 0
@@ -1971,58 +2157,6 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2083107208}
     m_Modifications:
-    - target: {fileID: 397899105639740, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 397899105639740, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 397899105639740, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 397899105639740, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 711202643630758425, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1045649953624476975, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1045649953624476975, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 1222237385420729871, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_IsActive
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 161.19998
-      objectReference: {fileID: 0}
-    - target: {fileID: 1722181438945693490, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 2120651646428104405, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_Enabled
-      value: 1
-      objectReference: {fileID: 0}
     - target: {fileID: 2306360978136577391, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_Pivot.x
       value: 0.5
@@ -2103,170 +2237,10 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 2508870175256199192, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2508870175256199192, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2508870175256199192, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2508870175256199192, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2561348546557161896, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2561348546557161896, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2561348546557161896, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2561348546557161896, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2992533829775124376, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 2992533829775124376, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 588.8
-      objectReference: {fileID: 0}
-    - target: {fileID: 3215950451646426847, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.5
-      objectReference: {fileID: 0}
-    - target: {fileID: 3469845461661622283, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3469845461661622283, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3469845461661622283, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 3469845461661622283, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5194107784923163453, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5194107784923163453, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5194107784923163453, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5194107784923163453, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5814419240957122273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5814419240957122273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5814419240957122273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 5814419240957122273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6107101496507914859, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6107101496507914859, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6107101496507914859, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6107101496507914859, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 375
-      objectReference: {fileID: 0}
-    - target: {fileID: 6372682890431576924, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: -3.5
-      objectReference: {fileID: 0}
     - target: {fileID: 6456987062960064067, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_Name
       value: MainUIPanel
       objectReference: {fileID: 0}
-    - target: {fileID: 6462709798119481676, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462709798119481676, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462709798119481676, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6462709798119481676, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6555347639630219273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 6555347639630219273, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
     - target: {fileID: 7503648074123454508, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
       propertyPath: m_AnchorMax.x
       value: 0
@@ -2275,26 +2249,6 @@ PrefabInstance:
       propertyPath: m_AnchorMax.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 8597987399180378164, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9073062006211861286, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMax.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9073062006211861286, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchorMin.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9073062006211861286, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 9073062006211861286, guid: d9053178bf0c143ad881bd1f2bd79690, type: 3}
-      propertyPath: m_AnchoredPosition.y
-      value: 0
-      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []

+ 3 - 5
Assets/Scripts/GameUI/GameApplction.cs

@@ -1,6 +1,3 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
 using Core.AssetLoadTool.Asset;
 using Fort23.Core;
 using Fort23.Mono;
@@ -50,10 +47,11 @@ public class GameApplction : MonoBehaviour
         await UIManager.Instance.InitUI();
         CustomTweenManager.Init();
        
+       // PlayerManager.Instance.TestInit(3);
         //主UI加载
         MainSceneController.Instance.Init();
-        
-        CombatDrive.Instance.AddCombatController(new CombatController());
+
+        await CombatDrive.Instance.AddCombatController(new CombatController());
     }
 
     public void Update()

+ 22 - 17
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -1,20 +1,25 @@
 namespace Fort23.Mono
 {
-[UIBinding(prefab = "HeroDetailPanel"  )]
-	public partial class HeroDetailPanel : UIPanel
-	{
-	private void Init()
-	{
-	}
-	protected override void AddEvent()
-	{
-	}
-	protected override void DelEvent()
-	{
-	}
-	public override void AddButtonEvent()
-	{
-	}
+    [UIBinding(prefab = "HeroDetailPanel"  )]
+    public partial class HeroDetailPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+        protected override void AddEvent()
+        {
+        }
+        protected override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+        }
 
-	}
-}
+        public void InitHeroDetailPanel()
+        {
+            
+        }
+
+    }
+}

+ 23 - 3
Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -1,6 +1,8 @@
+using System.Threading.Tasks;
+using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
-using UnityEngine.UI;
+using UnityEngine.UIElements;
 
 namespace Fort23.Mono
 {
@@ -18,12 +20,30 @@ namespace Fort23.Mono
         }
         public override void AddButtonEvent()
         {
+            LogTool.Log("添加英雄点击事件");
             btnHero.onClick.AddListener(OnHeroClick);
         }
 
-        private void OnHeroClick()
+        private async void OnHeroClick()
         {
-            
+            LogTool.Log("点击英雄");
+            await OpenHeroDetailPanel();
+        }
+
+        private async Task OpenHeroDetailPanel()
+        {
+            HeroDetailPanel heroDetailPanel = UIManager.Instance.GetComponent<HeroDetailPanel>();
+            if (heroDetailPanel == null)
+            {
+                await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
+            }
+
+            heroDetailPanel.InitHeroDetailPanel();
+        }
+
+        private void Callback(HeroDetailPanel obj)
+        {
+            LogTool.Log("HeroDetailPanel 加载完成");
         }
 
         /// <summary>

+ 2 - 1
Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -9,6 +9,7 @@ namespace Fort23.Mono
     {
         private void Init()
         {
+            InitBattleHero();
         }
         protected override void AddEvent()
         {
@@ -21,7 +22,7 @@ namespace Fort23.Mono
         }
 
 
-        private async Task InitBattleHero()
+        private async void InitBattleHero()
         {
 
             for (int i = 0; i < PlayerManager.Instance.heroListInLead.Count; i++)

+ 93 - 1
ProjectSettings/ProjectSettings.asset

@@ -313,7 +313,99 @@ PlayerSettings:
   AndroidValidateAppBundleSize: 1
   AndroidAppBundleSizeToValidate: 200
   m_BuildTargetIcons: []
-  m_BuildTargetPlatformIcons: []
+  m_BuildTargetPlatformIcons:
+  - m_BuildTarget: Android
+    m_Icons:
+    - m_Textures: []
+      m_Width: 432
+      m_Height: 432
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 324
+      m_Height: 324
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 216
+      m_Height: 216
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 162
+      m_Height: 162
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 108
+      m_Height: 108
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 81
+      m_Height: 81
+      m_Kind: 2
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 1
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 192
+      m_Height: 192
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 144
+      m_Height: 144
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 96
+      m_Height: 96
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 72
+      m_Height: 72
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 48
+      m_Height: 48
+      m_Kind: 0
+      m_SubKind: 
+    - m_Textures: []
+      m_Width: 36
+      m_Height: 36
+      m_Kind: 0
+      m_SubKind: 
   m_BuildTargetBatching: []
   m_BuildTargetShaderSettings: []
   m_BuildTargetGraphicsJobs: []

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 266 - 0
UpgradeLog.htm


+ 27 - 9
UserSettings/EditorUserSettings.asset

@@ -21,19 +21,37 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 010802545d055a0e0f5e597614250c44454e1a7a787973357a704f35b4e3673e
       flags: 0
-    Systems Window:
-      value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
+    RecentlyUsedSceneGuid-1:
+      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      flags: 0
+    RecentlyUsedSceneGuid-2:
+      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      flags: 0
+    RecentlyUsedSceneGuid-3:
+      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      flags: 0
+    RecentlyUsedSceneGuid-4:
+      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
       flags: 0
-    UnityEditor.ShaderGraph.Blackboard:
-      value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
+    RecentlyUsedSceneGuid-5:
+      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
       flags: 0
-    UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
+    RecentlyUsedSceneGuid-6:
+      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
       flags: 0
-    UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
+    RecentlyUsedSceneGuid-7:
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      flags: 0
+    RecentlyUsedSceneGuid-8:
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      flags: 0
+    RecentlyUsedSceneGuid-9:
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      flags: 0
+    Systems Window:
+      value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 187 - 662
UserSettings/Layouts/default-2022.dwlt


Niektoré súbory nie sú zobrazené, pretože je v týchto rozdielových dátach zmenené mnoho súborov