فهرست منبع

Merge branch 'master' of http://192.168.123.2:3000/fort23/XY001

# Conflicts:
#	UserSettings/EditorUserSettings.asset   resolved by origin/master(远端) version
#	UserSettings/Layouts/default-2022.dwlt   resolved by origin/master(远端) version
李桃 8 ماه پیش
والد
کامیت
d3484facec
100فایلهای تغییر یافته به همراه3693 افزوده شده و 3484 حذف شده
  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. 1 1
      Assets/Art/ArtHero/Guaiwu01.prefab
  24. 62 24
      Assets/Art/ArtHero/Guaiwu01_gpu.prefab
  25. 3 3
      Assets/Art/ArtHero/New Animator Controller.controller
  26. 8 0
      Assets/Art/BakedAssets.meta
  27. 1 1
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01.meta
  28. 0 0
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset
  29. 1 1
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset.meta
  30. 109 109
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab
  31. 1 1
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab.meta
  32. 18 19
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat
  33. 2 2
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat.meta
  34. 0 0
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh
  35. 1 1
      Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh.meta
  36. 1 1
      Assets/Art/GuaiWuTimeline/Guaiwu01.playable
  37. 5 2
      Assets/Art/VFX/Materials/01lz.mat
  38. 6 2
      Assets/Art/VFX/Materials/Alpha_bd3.mat
  39. 6 2
      Assets/Art/VFX/Materials/anse04.mat
  40. 1 1
      Assets/Art/VFX/Materials/fx_603_ice_zd.mat
  41. 1 1
      Assets/Art/VFX/Materials/fx_dg_bo_an.mat
  42. 1 1
      Assets/Art/VFX/Materials/yx02_gun_tw.mat
  43. 2 0
      Assets/GPUECSAnimationBaker/Engine/Baker/GpuEcsAnimationBakeServices.cs
  44. 9 4
      Assets/GPUECSAnimationBaker/Engine/Baker/GpuEcsAnimationBakerEditor.cs
  45. 361 355
      Assets/GPUECSAnimationBaker/Samples/Shaders/GPUAnimation_urp_shader.shadergraph
  46. 1 1
      Assets/GPUECSAnimationBaker/Samples/Shaders/GPUAnimation_urp_shader.shadergraph.meta
  47. 0 2094
      Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_HDRP_SimpleShader.shadergraph
  48. 0 10
      Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_HDRP_SimpleShader.shadergraph.meta
  49. 339 14
      Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_URP_SimpleShader.shadergraph
  50. 152 0
      Assets/New Material.mat
  51. 8 0
      Assets/New Material.mat.meta
  52. 1 1
      Assets/Res/CombatHero/Guaiwu01.prefab
  53. 1 103
      Assets/Res/CombatHero/Guaiwu01_GpuEcsAnimator.prefab
  54. 31 96
      Assets/Res/CombatHero/Guaiwu01_gpu.prefab
  55. 170 170
      Assets/Res/CombatHero/GuaiwuBoss01.prefab
  56. 73 73
      Assets/Res/CombatHero/GuaiwuJY01.prefab
  57. 48 1
      Assets/Res/CombatHero/Hero01.prefab
  58. 75 75
      Assets/Res/CombatHero/Hero03.prefab
  59. 8 0
      Assets/Res/HeroAudio.meta
  60. 16 0
      Assets/Res/HeroAudio/MainAudio.asset
  61. 8 0
      Assets/Res/HeroAudio/MainAudio.asset.meta
  62. 92 27
      Assets/Res/UI/HeroDetailPanel.prefab
  63. 585 44
      Assets/Res/UI/MainUIPanel.prefab
  64. 70 24
      Assets/Res/UI/Widget_Hero.prefab
  65. 555 153
      Assets/Scenes/UITest.scene
  66. 3 0
      Assets/Scripts/Core/Audio.meta
  67. 31 0
      Assets/Scripts/Core/Audio/AudioBundleInfo.cs
  68. 3 0
      Assets/Scripts/Core/Audio/AudioBundleInfo.cs.meta
  69. 218 0
      Assets/Scripts/Core/Audio/AudioManager.cs
  70. 3 0
      Assets/Scripts/Core/Audio/AudioManager.cs.meta
  71. 18 0
      Assets/Scripts/Core/Audio/AudioMono.cs
  72. 3 0
      Assets/Scripts/Core/Audio/AudioMono.cs.meta
  73. 104 0
      Assets/Scripts/Core/Audio/AudioSourcePool.cs
  74. 3 0
      Assets/Scripts/Core/Audio/AudioSourcePool.cs.meta
  75. 38 0
      Assets/Scripts/Core/Audio/AudionSettingConfig.cs
  76. 3 0
      Assets/Scripts/Core/Audio/AudionSettingConfig.cs.meta
  77. 10 10
      Assets/Scripts/Core/GPUAnimtion.cs
  78. 11 1
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs
  79. 2 2
      Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs
  80. 1 0
      Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs
  81. 5 1
      Assets/Scripts/GameLogic/Combat/Hero/HeroAanimtion/CombatHeroGPUAnimtion.cs
  82. 3 0
      Assets/Scripts/GameLogic/Combat/Hero/HeroGPU.meta
  83. 27 0
      Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPUMono.cs
  84. 3 0
      Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPUMono.cs.meta
  85. 71 0
      Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPURenderManager.cs
  86. 3 0
      Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPURenderManager.cs.meta
  87. 10 0
      Assets/Scripts/GameLogic/CombatScenesTool/CombatHeroModelLoadManager.cs
  88. 3 0
      Assets/Scripts/GameLogic/CombatScenesTool/CombatHeroModelLoadManager.cs.meta
  89. 3 2
      Assets/Scripts/GameLogic/Fort23.GameLogic.asmdef
  90. 20 3
      Assets/Scripts/GameLogic/MyPlugin.cs
  91. 4 0
      Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAIBeelineBulletLogic.cs
  92. 2 1
      Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs
  93. 9 0
      Assets/Scripts/GameLogic/Player/PlayerManager.cs
  94. 16 16
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs
  95. 1 0
      Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudio.cs
  96. 3 5
      Assets/Scripts/GameUI/GameApplction.cs
  97. 32 17
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs
  98. 29 0
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs
  99. 11 0
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs.meta
  100. 35 9
      Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

+ 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"
+  ]
+}

+ 1 - 1
Assets/Art/ArtHero/Guaiwu01.prefab

@@ -1604,7 +1604,7 @@ MonoBehaviour:
       boneUsagesPerLoD: []
     transformUsageFlagsParent: 2
     transformUsageFlagsChildren: 1
-  gpuEcsAnimator: {fileID: 4573799512793257522, guid: e21c403bf42561e47844837b065cd211, type: 3}
+  gpuEcsAnimator: {fileID: 9060657196542888369, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
 --- !u!1 &7750704757169647667
 GameObject:
   m_ObjectHideFlags: 0

+ 62 - 24
Assets/Art/ArtHero/Guaiwu01_gpu.prefab

@@ -12,6 +12,7 @@ GameObject:
   - component: {fileID: 7626962916459775227}
   - component: {fileID: 4408512263679554551}
   - component: {fileID: 4770066491419026642}
+  - component: {fileID: 5885402928497064362}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Guaiwu01_gpu
@@ -33,7 +34,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8460209264768730837}
+  - {fileID: 6738595181147349779}
   - {fileID: 1187023392652981393}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -107,6 +108,42 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 1, y: 1.5, z: 1}
   m_Center: {x: 0, y: 0.7, z: 0}
+--- !u!114 &5885402928497064362
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1486648135052072193}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: a40d3c6a0de749f1b69a4fbe9950104c, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  Material: {fileID: 2100000, guid: acc768b484a890747965f7098bd6a760, type: 2}
+  Mesh: {fileID: 4300000, guid: 52eb24d4d019e3048a2a0ea37a921d4a, type: 2}
+  rootTrans: {fileID: 6738595181147349779}
+  animtionState:
+    c0:
+      x: 1
+      y: 0
+      z: 0
+      w: 0
+    c1:
+      x: 0
+      y: 1
+      z: 0
+      w: 0
+    c2:
+      x: 0
+      y: 0
+      z: 1
+      w: 0
+    c3:
+      x: 0
+      y: 0
+      z: 0
+      w: 1
 --- !u!1 &6192587680073998837
 GameObject:
   m_ObjectHideFlags: 0
@@ -139,7 +176,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2254773846348706746}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1001 &1782455331161705410
+--- !u!1001 &8035052475411266279
 PrefabInstance:
   m_ObjectHideFlags: 0
   serializedVersion: 2
@@ -147,57 +184,58 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 2254773846348706746}
     m_Modifications:
-    - target: {fileID: 4573799512793257522, guid: e21c403bf42561e47844837b065cd211, type: 3}
-      propertyPath: m_Name
-      value: Guaiwu01_GpuEcsAnimator
-      objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalPosition.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalPosition.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: 0.7071068
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0.7071068
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalRotation.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalRotation.z
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
+      value: -90
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
       value: 0
       objectReference: {fileID: 0}
-    - target: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
+    - target: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 9060657196542888369, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
+      propertyPath: m_Name
+      value: Guaiwu01_GpuEcsAnimator
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
-    m_RemovedGameObjects: []
+    m_RemovedGameObjects:
+    - {fileID: 7930897916449283379, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
     m_AddedGameObjects: []
     m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: e21c403bf42561e47844837b065cd211, type: 3}
---- !u!4 &8460209264768730837 stripped
+  m_SourcePrefab: {fileID: 100100000, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
+--- !u!4 &6738595181147349779 stripped
 Transform:
-  m_CorrespondingSourceObject: {fileID: 7914018815068294423, guid: e21c403bf42561e47844837b065cd211, type: 3}
-  m_PrefabInstance: {fileID: 1782455331161705410}
+  m_CorrespondingSourceObject: {fileID: 3604693049939106292, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
+  m_PrefabInstance: {fileID: 8035052475411266279}
   m_PrefabAsset: {fileID: 0}

+ 3 - 3
Assets/Art/ArtHero/New Animator Controller.controller

@@ -215,7 +215,7 @@ AnimatorStateMachine:
   m_ChildStates:
   - serializedVersion: 1
     m_State: {fileID: 5811431598696386155}
-    m_Position: {x: 186.07928, y: 220.7821, z: 0}
+    m_Position: {x: 180, y: 220, z: 0}
   - serializedVersion: 1
     m_State: {fileID: -5010781657122618946}
     m_Position: {x: 315.19397, y: 125.56003, z: 0}
@@ -233,7 +233,7 @@ AnimatorStateMachine:
     m_Position: {x: 430.40036, y: 285.14954, z: 0}
   - serializedVersion: 1
     m_State: {fileID: 4998145492315884334}
-    m_Position: {x: 289.8932, y: 340.21313, z: 0}
+    m_Position: {x: 290, y: 340, z: 0}
   m_ChildStateMachines: []
   m_AnyStateTransitions: []
   m_EntryTransitions: []
@@ -243,4 +243,4 @@ AnimatorStateMachine:
   m_EntryPosition: {x: 50, y: 120, z: 0}
   m_ExitPosition: {x: 800, y: 120, z: 0}
   m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
-  m_DefaultState: {fileID: 5811431598696386155}
+  m_DefaultState: {fileID: 4998145492315884334}

+ 8 - 0
Assets/Art/BakedAssets.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BywfsX/4U3PpUpC5bhDjO/ou8O8wToyyqEXPpyPK1FT/HkwLtv2ORBA=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Art/ArtHero/BakedAssets_Guaiwu01.meta → Assets/Art/BakedAssets/BakedAssets_Guaiwu01.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: WX4XtXykVXmkqdVKlQj7ZOQKWKGRvi+ktnhD2cgLpL/k5/1tX4LQohE=
+guid: DXoYtiKkUSiIMGSmeAYAo1Wuh+TVNJ+Ww2OmP3f/ZHbDXuPWxJkewY8=
 folderAsset: yes
 DefaultImporter:
   externalObjects: {}

+ 0 - 0
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset


+ 1 - 1
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset.meta → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_AnimationMatricesTexture_Snakelet.asset.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: DX9KsCyvAn+kYEeApSYYT6G+80XFBT2Kh8wH+1NzoYSc8oT57PCKSjs=
+guid: Wi4fvHytBnvNi6dopIMlNK0XLCU6ZvhKd1zveXrtW6X0utdmHRGcJEA=
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2800000

+ 109 - 109
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &4573799512793257522
+--- !u!1 &7930897916449283379
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,109 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7914018815068294423}
-  - component: {fileID: 2587504306462188448}
+  - component: {fileID: 6168874798896619622}
+  - component: {fileID: 7153186682694914557}
+  - component: {fileID: 3947973398619981516}
+  - component: {fileID: 5560601263921271554}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Snakelet
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6168874798896619622
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7930897916449283379}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: 3.7880957e-10, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3604693049939106292}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!33 &7153186682694914557
+MeshFilter:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7930897916449283379}
+  m_Mesh: {fileID: 4300000, guid: 52eb24d4d019e3048a2a0ea37a921d4a, type: 2}
+--- !u!23 &3947973398619981516
+MeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7930897916449283379}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 2
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: acc768b484a890747965f7098bd6a760, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 1
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  m_AdditionalVertexStreams: {fileID: 0}
+--- !u!114 &5560601263921271554
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7930897916449283379}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: b927b9dfd6f248378c3364a809fda80f, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  animator: {fileID: 4564747314389929569}
+  transformUsageFlags: 1
+--- !u!1 &9060657196542888369
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3604693049939106292}
+  - component: {fileID: 4564747314389929569}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Guaiwu01_GpuEcsAnimator
@@ -18,29 +119,29 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7914018815068294423
+--- !u!4 &3604693049939106292
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4573799512793257522}
+  m_GameObject: {fileID: 9060657196542888369}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8476578454633010118}
+  - {fileID: 6168874798896619622}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &2587504306462188448
+--- !u!114 &4564747314389929569
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4573799512793257522}
+  m_GameObject: {fileID: 9060657196542888369}
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 6dbd5b1412c14f19ba40d2188c5cd8c1, type: 3}
@@ -115,104 +216,3 @@ MonoBehaviour:
   animationEventOccurences: []
   transformUsageFlags: 2
   attachmentAnchorData: {fileID: 0}
---- !u!1 &5949725885898124089
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8476578454633010118}
-  - component: {fileID: 5516422998436364662}
-  - component: {fileID: 540543588441176530}
-  - component: {fileID: 2359220822075819078}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snakelet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8476578454633010118
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5949725885898124089}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 3.7880957e-10, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7914018815068294423}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &5516422998436364662
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5949725885898124089}
-  m_Mesh: {fileID: 4300000, guid: 71d66b7ab83b4be4296f04077623d138, type: 2}
---- !u!23 &540543588441176530
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5949725885898124089}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: b8213b7c35d096447a65ba2e1db69416, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &2359220822075819078
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5949725885898124089}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b927b9dfd6f248378c3364a809fda80f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  animator: {fileID: 2587504306462188448}
-  transformUsageFlags: 1

+ 1 - 1
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab.meta → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_GpuEcsAnimator.prefab.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: Wnge5i6tUCmAKNcV9bLHiE7BtLHEZ8HYrLU99/x6HzcoPqSSAvfs4Nk=
+guid: DH0c4SquV3tKKf55JCsd9gztnzhVHvGjWZJM97yuZKPfNedJdRzINTs=
 PrefabImporter:
   externalObjects: {}
   userData: 

+ 18 - 19
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat

@@ -1,5 +1,18 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-5359504604230748543
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -24,11 +37,7 @@ Material:
     serializedVersion: 3
     m_TexEnvs:
     - _AnimatedBoneMatrices:
-        m_Texture: {fileID: 2800000, guid: 25e562a4fef855446bd8af0f1c29e74a, type: 2}
-        m_Scale: {x: 1, y: 1}
-        m_Offset: {x: 0, y: 0}
-    - _Base:
-        m_Texture: {fileID: 2800000, guid: 5b35f2382631bdf47ab344060737b580, type: 3}
+        m_Texture: {fileID: 2800000, guid: ed09f0e07ce21b949bbda6b311f0d4da, type: 2}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
     - _BaseMap:
@@ -106,7 +115,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _DstBlendAlpha: 0
-    - _EnableAnimation: 1
+    - _EnableAnimation: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0
@@ -127,22 +136,12 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _metalic: 0
+    - _smoothess: 0
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _mainColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
---- !u!114 &4753996462854978707
-MonoBehaviour:
-  m_ObjectHideFlags: 11
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  version: 7

+ 2 - 2
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat.meta → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Material_Snakelet.mat.meta

@@ -1,8 +1,8 @@
 fileFormatVersion: 2
-guid: CXwcsSn/UnqH9aXilS+aTtYtgHToM4J/PntElikKghNSiphEy0aws+4=
+guid: XilMsiylAX+qQHh9ojruC8J1LR1Ye7aaNVSXzg45zyXqP+iu+CetlEk=
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: guaiwu01_material_snakelet
+  assetBundleName: 
   assetBundleVariant: 

+ 0 - 0
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh


+ 1 - 1
Assets/Art/ArtHero/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh.meta → Assets/Art/BakedAssets/BakedAssets_Guaiwu01/Guaiwu01_Mesh_Snakelet.mesh.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: CHtLsyz/VCpareuEfuQq7jGPcpjDkRjbsfMT3cGcLO2cQv0B3fTvTyU=
+guid: CnhK5yipB38KbYqD6KtCM6c//jFB2GrgduPP9thiqG5mYH+6U/NpVDw=
 NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 4300000

+ 1 - 1
Assets/Art/GuaiWuTimeline/Guaiwu01.playable

@@ -642,7 +642,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 0
+  m_Muted: 1
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}

+ 5 - 2
Assets/Art/VFX/Materials/01lz.mat

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -9,14 +9,17 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: 01lz
   m_Shader: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:

+ 6 - 2
Assets/Art/VFX/Materials/Alpha_bd3.mat

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -9,14 +9,17 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: Alpha_bd3
   m_Shader: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -82,6 +85,7 @@ Material:
     - _SrcBlend: 5
     - _Surface: 1
     - _ZWrite: 0
+    - _ca: 1
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}

+ 6 - 2
Assets/Art/VFX/Materials/anse04.mat

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!21 &2100000
 Material:
   serializedVersion: 8
@@ -9,14 +9,17 @@ Material:
   m_PrefabAsset: {fileID: 0}
   m_Name: anse04
   m_Shader: {fileID: 4800000, guid: 200ef425a7d005549abec1d23f7393d2, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}
   disabledShaderPasses: []
+  m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
@@ -64,6 +67,7 @@ Material:
     - _QueueOffset: 0
     - _RampDirection: 0.135
     - _RampPower: 3.87
+    - _ca: 1
     m_Colors:
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 1, b: 1, a: 1}

+ 1 - 1
Assets/Art/VFX/Materials/fx_603_ice_zd.mat

@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

+ 1 - 1
Assets/Art/VFX/Materials/fx_dg_bo_an.mat

@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

+ 1 - 1
Assets/Art/VFX/Materials/yx02_gun_tw.mat

@@ -14,7 +14,7 @@ Material:
   m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
-  m_EnableInstancingVariants: 0
+  m_EnableInstancingVariants: 1
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
   stringTagMap: {}

+ 2 - 0
Assets/GPUECSAnimationBaker/Engine/Baker/GpuEcsAnimationBakeServices.cs

@@ -505,7 +505,9 @@ namespace GPUECSAnimationBaker.Engine.Baker
             if (!CheckEcsGpuMaterialInCache(cache, skinnedMeshRenderer, out Material ecsGpuMaterial))
             {
                 ecsGpuMaterial = Object.Instantiate<Material>(skinnedMeshRenderer.sharedMaterial);
+                ecsGpuMaterial.shader = Shader.Find("Shader Graphs/GPUECSAnimator_URP_SimpleShader");
                 ecsGpuMaterial.SetFloat(EnableAnimation, 0);
+                ecsGpuMaterial.enableInstancing = true;
                 SavePartAsAsset(ecsGpuMaterial, generatedAssetsFolder, animatorName, skinnedMeshRenderer,
                     materialPartSuffix, "mat");
                 cache.Add(new EcsGpuMaterial()

+ 9 - 4
Assets/GPUECSAnimationBaker/Engine/Baker/GpuEcsAnimationBakerEditor.cs

@@ -52,12 +52,17 @@ namespace GPUECSAnimationBaker.Engine.Baker
                     showPrefabError = true;
                 else
                 {
-                    string folder = Path.GetDirectoryName(path);
+                    string folder = "Assets/Art/BakedAssets/";
                     string subFolder = $"BakedAssets_{sourceModel.name}";
                     string generatedAssetsFolder = Path.Combine(folder, subFolder);
-                    if (!AssetDatabase.IsValidFolder(generatedAssetsFolder))
-                        generatedAssetsFolder = AssetDatabase.GUIDToAssetPath(AssetDatabase.CreateFolder(
-                            folder, subFolder));
+                   string dirPath= Application.dataPath.Replace("Assets", generatedAssetsFolder);
+                   if (!Directory.Exists(dirPath))
+                   {
+                       Directory.CreateDirectory(dirPath);
+                   }
+
+                   // if (!AssetDatabase.IsValidFolder(generatedAssetsFolder))
+                    //     generatedAssetsFolder = AssetDatabase.CreateFolder("Assets/","Art/BakedAssets/"+subFolder);
                     string animatorName = sourceModel.name;
 
                     GpuEcsAnimationBakerData bakerData = (GpuEcsAnimationBakerData)bakerDataProperty.boxedValue;

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 361 - 355
Assets/GPUECSAnimationBaker/Samples/Shaders/GPUAnimation_urp_shader.shadergraph


+ 1 - 1
Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_HDRP_ColorShader.shadergraph.meta → Assets/GPUECSAnimationBaker/Samples/Shaders/GPUAnimation_urp_shader.shadergraph.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 88226f9cbd0d0b14d9cf36adfd942905
+guid: Dywb4Hn/VS7CQ6gMKxQMrpSwSZXWcdrepvunUBD0oaSBzNetodbfbao=
 ScriptedImporter:
   internalIDToNameTable: []
   externalObjects: {}

+ 0 - 2094
Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_HDRP_SimpleShader.shadergraph

@@ -1,2094 +0,0 @@
-{
-    "m_SGVersion": 3,
-    "m_Type": "UnityEditor.ShaderGraph.GraphData",
-    "m_ObjectId": "82961f2fae2441a6bf64b84c38b29f16",
-    "m_Properties": [
-        {
-            "m_Id": "fcd8d00f83ba47fe937e894141694fea"
-        },
-        {
-            "m_Id": "8dd4a057c79b41fab4503442be9a70c4"
-        },
-        {
-            "m_Id": "de2fdaff579d46dcb386c56b011eb894"
-        },
-        {
-            "m_Id": "83a6edf4940144fcad26778b0f0053df"
-        },
-        {
-            "m_Id": "78278623520944abaa240cdda2ed0506"
-        }
-    ],
-    "m_Keywords": [],
-    "m_Dropdowns": [],
-    "m_CategoryData": [
-        {
-            "m_Id": "6486355b522e439daa25a0e053d83ba5"
-        }
-    ],
-    "m_Nodes": [
-        {
-            "m_Id": "cb63cc4b73cc45889a362832330fdffd"
-        },
-        {
-            "m_Id": "b8fbebb1f9de409eb2ab8d9725df6f74"
-        },
-        {
-            "m_Id": "21539434e7184a0fb1c9c686e4488085"
-        },
-        {
-            "m_Id": "29936b3a708243e099cb13d08a90729e"
-        },
-        {
-            "m_Id": "6327a434cf7a457e9ee78daef4ea718c"
-        },
-        {
-            "m_Id": "753b6a27413c4612bdd1be0925271486"
-        },
-        {
-            "m_Id": "62e323eedb2540839b0f972d20e109f8"
-        },
-        {
-            "m_Id": "4e1b6c2c4b2546fc91e488a4238cf97b"
-        },
-        {
-            "m_Id": "45fe22400dcf40048ee9834ce0f4f9bb"
-        },
-        {
-            "m_Id": "19d317bbf8264183a9d7f71bf44337ef"
-        },
-        {
-            "m_Id": "58266d4054cb498b8f46275aa1a1c2c6"
-        },
-        {
-            "m_Id": "b5392e583d464d93a3baa108242c8833"
-        },
-        {
-            "m_Id": "860b3e3395ff46c4809aed4314b2cb27"
-        },
-        {
-            "m_Id": "a7163e2c8e2f4a92ae56bc1099432b56"
-        },
-        {
-            "m_Id": "148c4eeb9dcc4ca28fd3975a552deb0f"
-        },
-        {
-            "m_Id": "de584511fdbf4892937caa833f3a17e3"
-        },
-        {
-            "m_Id": "944ce52e7d6340f4a502156134bdff2d"
-        },
-        {
-            "m_Id": "f74deac55c9445d6854d9948b06d56cc"
-        },
-        {
-            "m_Id": "d85aff4651514936b1bbb0eb65d14a02"
-        }
-    ],
-    "m_GroupDatas": [],
-    "m_StickyNoteDatas": [],
-    "m_Edges": [
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "148c4eeb9dcc4ca28fd3975a552deb0f"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "944ce52e7d6340f4a502156134bdff2d"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "860b3e3395ff46c4809aed4314b2cb27"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": -1310402938
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "944ce52e7d6340f4a502156134bdff2d"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "29936b3a708243e099cb13d08a90729e"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "a7163e2c8e2f4a92ae56bc1099432b56"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": -1805703276
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": 1
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "cb63cc4b73cc45889a362832330fdffd"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": 2
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b8fbebb1f9de409eb2ab8d9725df6f74"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": 3
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "21539434e7184a0fb1c9c686e4488085"
-                },
-                "m_SlotId": 0
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "d85aff4651514936b1bbb0eb65d14a02"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "b5392e583d464d93a3baa108242c8833"
-                },
-                "m_SlotId": -1422710115
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "de584511fdbf4892937caa833f3a17e3"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "f74deac55c9445d6854d9948b06d56cc"
-                },
-                "m_SlotId": 1
-            }
-        },
-        {
-            "m_OutputSlot": {
-                "m_Node": {
-                    "m_Id": "f74deac55c9445d6854d9948b06d56cc"
-                },
-                "m_SlotId": 0
-            },
-            "m_InputSlot": {
-                "m_Node": {
-                    "m_Id": "6327a434cf7a457e9ee78daef4ea718c"
-                },
-                "m_SlotId": 0
-            }
-        }
-    ],
-    "m_VertexContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 0.0
-        },
-        "m_Blocks": [
-            {
-                "m_Id": "cb63cc4b73cc45889a362832330fdffd"
-            },
-            {
-                "m_Id": "b8fbebb1f9de409eb2ab8d9725df6f74"
-            },
-            {
-                "m_Id": "21539434e7184a0fb1c9c686e4488085"
-            }
-        ]
-    },
-    "m_FragmentContext": {
-        "m_Position": {
-            "x": 0.0,
-            "y": 200.0
-        },
-        "m_Blocks": [
-            {
-                "m_Id": "29936b3a708243e099cb13d08a90729e"
-            },
-            {
-                "m_Id": "6327a434cf7a457e9ee78daef4ea718c"
-            },
-            {
-                "m_Id": "753b6a27413c4612bdd1be0925271486"
-            },
-            {
-                "m_Id": "62e323eedb2540839b0f972d20e109f8"
-            },
-            {
-                "m_Id": "4e1b6c2c4b2546fc91e488a4238cf97b"
-            },
-            {
-                "m_Id": "45fe22400dcf40048ee9834ce0f4f9bb"
-            },
-            {
-                "m_Id": "19d317bbf8264183a9d7f71bf44337ef"
-            },
-            {
-                "m_Id": "58266d4054cb498b8f46275aa1a1c2c6"
-            }
-        ]
-    },
-    "m_PreviewData": {
-        "serializedMesh": {
-            "m_SerializedMesh": "{\"mesh\":{\"instanceID\":0}}",
-            "m_Guid": ""
-        },
-        "preventRotation": false
-    },
-    "m_Path": "Shader Graphs",
-    "m_GraphPrecision": 1,
-    "m_PreviewMode": 2,
-    "m_OutputNode": {
-        "m_Id": ""
-    },
-    "m_ActiveTargets": [
-        {
-            "m_Id": "655224836b1f44a087fe2a9d4e1b1cf2"
-        }
-    ]
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "0342acdb8ad94910bc938d81db1d7fc2",
-    "m_Id": 6,
-    "m_DisplayName": "B",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "B",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "148c4eeb9dcc4ca28fd3975a552deb0f",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -645.9999389648438,
-            "y": 199.99993896484376,
-            "width": 110.66668701171875,
-            "height": 36.000030517578128
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "a91f55e40bc54fd19279b65f69573190"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "fcd8d00f83ba47fe937e894141694fea"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
-    "m_ObjectId": "1546b0f6a3c4482a95025b0b6bef86ea",
-    "m_Id": 0,
-    "m_DisplayName": "Normal",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_BareResource": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "19d317bbf8264183a9d7f71bf44337ef",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.Occlusion",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "2f11fd15171f4a6cb92ced407d780be0"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.Occlusion"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "21539434e7184a0fb1c9c686e4488085",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "VertexDescription.Tangent",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "6fdc03e32a36491ca73e021a68d6b741"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "VertexDescription.Tangent"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
-    "m_ObjectId": "249ff5fcdb0b499badb54edb127277df",
-    "m_Id": 1,
-    "m_DisplayName": "position",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "position",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
-    "m_ObjectId": "273f61b766084d9aa8c1fa0f118a029d",
-    "m_Id": 3,
-    "m_DisplayName": "tangent",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "tangent",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "28b2e8d9867a455fb967f9f0fd0a898e",
-    "m_Id": 5,
-    "m_DisplayName": "G",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "G",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "29936b3a708243e099cb13d08a90729e",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.BaseColor",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "6d3a1b5888ec46c7a2e7abe3208e977e"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "2f11fd15171f4a6cb92ced407d780be0",
-    "m_Id": 0,
-    "m_DisplayName": "Ambient Occlusion",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Occlusion",
-    "m_StageCapability": 2,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "340dbabc04da4827b00ea160d40481fe",
-    "m_Id": 5,
-    "m_DisplayName": "G",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "G",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "3670c56ec5de4ad781aeb3cc5cfdb2c3",
-    "m_Id": 0,
-    "m_DisplayName": "RGBA",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "RGBA",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "3788bc317bed43f8ad79ba78602c0b43",
-    "m_Id": 4,
-    "m_DisplayName": "R",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "R",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
-    "m_ObjectId": "386704f85d1d4e7f9691967cd6353b88",
-    "m_Id": 0,
-    "m_DisplayName": "Position",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Position",
-    "m_StageCapability": 1,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_Space": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.LightingData",
-    "m_ObjectId": "4068f9183daa4cdca37c2c8da89ffc6b",
-    "m_NormalDropOffSpace": 0,
-    "m_BlendPreserveSpecular": true,
-    "m_ReceiveDecals": true,
-    "m_ReceiveSSR": true,
-    "m_ReceiveSSRTransparent": false,
-    "m_SpecularAA": false,
-    "m_SpecularOcclusionMode": 1,
-    "m_OverrideBakedGI": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "45fe22400dcf40048ee9834ce0f4f9bb",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.Smoothness",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "50d971dbb16440a4a468434f779bc504"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.Smoothness"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
-    "m_ObjectId": "465fe4954b594459bdfebf1be2c3a739",
-    "m_Id": -1310402938,
-    "m_DisplayName": "AnimatedBoneMatrices",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_AnimatedBoneMatrices",
-    "m_StageCapability": 3,
-    "m_BareResource": false,
-    "m_Texture": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "m_DefaultType": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
-    "m_ObjectId": "48198fff2963448d83f83d48d1ebc46a",
-    "m_Id": 0,
-    "m_DisplayName": "Emission",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Emission",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_ColorMode": 1,
-    "m_DefaultColor": {
-        "r": 0.0,
-        "g": 0.0,
-        "b": 0.0,
-        "a": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Matrix4MaterialSlot",
-    "m_ObjectId": "4d24dc362cd540288b1d7b17f89c1da5",
-    "m_Id": 0,
-    "m_DisplayName": "AnimationState",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "e00": 1.0,
-        "e01": 0.0,
-        "e02": 0.0,
-        "e03": 0.0,
-        "e10": 0.0,
-        "e11": 1.0,
-        "e12": 0.0,
-        "e13": 0.0,
-        "e20": 0.0,
-        "e21": 0.0,
-        "e22": 1.0,
-        "e23": 0.0,
-        "e30": 0.0,
-        "e31": 0.0,
-        "e32": 0.0,
-        "e33": 1.0
-    },
-    "m_DefaultValue": {
-        "e00": 1.0,
-        "e01": 0.0,
-        "e02": 0.0,
-        "e03": 0.0,
-        "e10": 0.0,
-        "e11": 1.0,
-        "e12": 0.0,
-        "e13": 0.0,
-        "e20": 0.0,
-        "e21": 0.0,
-        "e22": 1.0,
-        "e23": 0.0,
-        "e30": 0.0,
-        "e31": 0.0,
-        "e32": 0.0,
-        "e33": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
-    "m_ObjectId": "4e06d2b13afb4c30986f3a73b85625a0",
-    "m_Id": 0,
-    "m_DisplayName": "Normal (Tangent Space)",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "NormalTS",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_Space": 3
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "4e1b6c2c4b2546fc91e488a4238cf97b",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.Emission",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "48198fff2963448d83f83d48d1ebc46a"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.Emission"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "50d971dbb16440a4a468434f779bc504",
-    "m_Id": 0,
-    "m_DisplayName": "Smoothness",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Smoothness",
-    "m_StageCapability": 2,
-    "m_Value": 0.10000000149011612,
-    "m_DefaultValue": 0.5,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
-    "m_ObjectId": "52d85ec52f524358a5bbce7373584fcb",
-    "m_Id": 2,
-    "m_DisplayName": "UV",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "UV",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": [],
-    "m_Channel": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "58266d4054cb498b8f46275aa1a1c2c6",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.Alpha",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "6f61328cfd124a5c860ddeddfd6b0679"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.Alpha"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "5b1e18d6a4934fef8c86d671e1c221fd",
-    "m_Id": -1422710115,
-    "m_DisplayName": "EnableAnimation",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_EnableAnimation",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
-    "m_ObjectId": "602291b3b713461b9e44cee13e90f19e",
-    "m_Id": 1,
-    "m_DisplayName": "Texture",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Texture",
-    "m_StageCapability": 3,
-    "m_BareResource": false,
-    "m_Texture": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "m_DefaultType": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
-    "m_ObjectId": "622a587e6f6c46439cb99912d4a40d25",
-    "m_Id": 3,
-    "m_DisplayName": "Sampler",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Sampler",
-    "m_StageCapability": 3,
-    "m_BareResource": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "62e323eedb2540839b0f972d20e109f8",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.Metallic",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "ba79d947ba584eaca1ccc8db1a3e41ae"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.Metallic"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "6327a434cf7a457e9ee78daef4ea718c",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.NormalTS",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "4e06d2b13afb4c30986f3a73b85625a0"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.NormalTS"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.CategoryData",
-    "m_ObjectId": "6486355b522e439daa25a0e053d83ba5",
-    "m_Name": "",
-    "m_ChildObjectList": [
-        {
-            "m_Id": "fcd8d00f83ba47fe937e894141694fea"
-        },
-        {
-            "m_Id": "8dd4a057c79b41fab4503442be9a70c4"
-        },
-        {
-            "m_Id": "78278623520944abaa240cdda2ed0506"
-        },
-        {
-            "m_Id": "de2fdaff579d46dcb386c56b011eb894"
-        },
-        {
-            "m_Id": "83a6edf4940144fcad26778b0f0053df"
-        }
-    ]
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SamplerStateMaterialSlot",
-    "m_ObjectId": "652653d909684dc4aabf3142b858a507",
-    "m_Id": 3,
-    "m_DisplayName": "Sampler",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Sampler",
-    "m_StageCapability": 3,
-    "m_BareResource": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDTarget",
-    "m_ObjectId": "655224836b1f44a087fe2a9d4e1b1cf2",
-    "m_ActiveSubTarget": {
-        "m_Id": "9f6c3afef5a64d6bac6aeae21763f9bd"
-    },
-    "m_Datas": [
-        {
-            "m_Id": "c091c6fa5b704d00b032954e40b1c097"
-        },
-        {
-            "m_Id": "f5bb8c54db774ecba38de316b3b7038e"
-        },
-        {
-            "m_Id": "4068f9183daa4cdca37c2c8da89ffc6b"
-        },
-        {
-            "m_Id": "899a8772c923468795c4b9bda81def2e"
-        }
-    ],
-    "m_CustomEditorGUI": "",
-    "m_SupportVFX": false,
-    "m_SupportComputeForVertexSetup": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "67176c0b61be42cab0cd04fb88ac9071",
-    "m_Id": 0,
-    "m_DisplayName": "EnableAnimation",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.ColorRGBMaterialSlot",
-    "m_ObjectId": "6d3a1b5888ec46c7a2e7abe3208e977e",
-    "m_Id": 0,
-    "m_DisplayName": "Base Color",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "BaseColor",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.5,
-        "y": 0.5,
-        "z": 0.5
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_ColorMode": 0,
-    "m_DefaultColor": {
-        "r": 0.5,
-        "g": 0.5,
-        "b": 0.5,
-        "a": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
-    "m_ObjectId": "6e846ee73f254d069cb025c1d8b278b9",
-    "m_Id": 0,
-    "m_DisplayName": "Bent Normal",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "BentNormal",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_Space": 3
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Matrix4MaterialSlot",
-    "m_ObjectId": "6f461a3b01b54daca2ed4e36248b0b3c",
-    "m_Id": -1805703276,
-    "m_DisplayName": "AnimationState",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "_AnimationState",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "e00": 1.0,
-        "e01": 0.0,
-        "e02": 0.0,
-        "e03": 0.0,
-        "e10": 0.0,
-        "e11": 1.0,
-        "e12": 0.0,
-        "e13": 0.0,
-        "e20": 0.0,
-        "e21": 0.0,
-        "e22": 1.0,
-        "e23": 0.0,
-        "e30": 0.0,
-        "e31": 0.0,
-        "e32": 0.0,
-        "e33": 1.0
-    },
-    "m_DefaultValue": {
-        "e00": 1.0,
-        "e01": 0.0,
-        "e02": 0.0,
-        "e03": 0.0,
-        "e10": 0.0,
-        "e11": 1.0,
-        "e12": 0.0,
-        "e13": 0.0,
-        "e20": 0.0,
-        "e21": 0.0,
-        "e22": 1.0,
-        "e23": 0.0,
-        "e30": 0.0,
-        "e31": 0.0,
-        "e32": 0.0,
-        "e33": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "6f61328cfd124a5c860ddeddfd6b0679",
-    "m_Id": 0,
-    "m_DisplayName": "Alpha",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Alpha",
-    "m_StageCapability": 2,
-    "m_Value": 1.0,
-    "m_DefaultValue": 1.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
-    "m_ObjectId": "6fdc03e32a36491ca73e021a68d6b741",
-    "m_Id": 0,
-    "m_DisplayName": "Tangent",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Tangent",
-    "m_StageCapability": 1,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_Space": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "7287ba06a13e4360bf9386b30aa0b208",
-    "m_Id": 6,
-    "m_DisplayName": "B",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "B",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "753b6a27413c4612bdd1be0925271486",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "SurfaceDescription.BentNormal",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "6e846ee73f254d069cb025c1d8b278b9"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "SurfaceDescription.BentNormal"
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Vector1ShaderProperty",
-    "m_ObjectId": "78278623520944abaa240cdda2ed0506",
-    "m_Guid": {
-        "m_GuidSerialized": "539e3b0b-5964-4b12-96b0-d964725300d0"
-    },
-    "m_Name": "EnableAnimation",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "EnableAnimation",
-    "m_DefaultReferenceName": "_EnableAnimation",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": true,
-    "hlslDeclarationOverride": 3,
-    "m_Hidden": false,
-    "m_Value": 0.0,
-    "m_FloatType": 0,
-    "m_RangeValues": {
-        "x": 0.0,
-        "y": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
-    "m_ObjectId": "827e353f8d604ed8929092cf8d14cb57",
-    "m_Id": 0,
-    "m_DisplayName": "AnimatedBoneMatrices",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_BareResource": false
-}
-
-{
-    "m_SGVersion": 1,
-    "m_Type": "UnityEditor.ShaderGraph.Matrix4ShaderProperty",
-    "m_ObjectId": "83a6edf4940144fcad26778b0f0053df",
-    "m_Guid": {
-        "m_GuidSerialized": "5d54bf0f-e771-466a-ab5f-99305693660e"
-    },
-    "m_Name": "AnimationState",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "AnimationState",
-    "m_DefaultReferenceName": "_AnimationState",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": false,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": true,
-    "hlslDeclarationOverride": 3,
-    "m_Hidden": false,
-    "m_Value": {
-        "e00": 1.0,
-        "e01": 0.0,
-        "e02": 0.0,
-        "e03": 0.0,
-        "e10": 0.0,
-        "e11": 1.0,
-        "e12": 0.0,
-        "e13": 0.0,
-        "e20": 0.0,
-        "e21": 0.0,
-        "e22": 1.0,
-        "e23": 0.0,
-        "e30": 0.0,
-        "e31": 0.0,
-        "e32": 0.0,
-        "e33": 1.0
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "860b3e3395ff46c4809aed4314b2cb27",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -772.6666259765625,
-            "y": 36.0,
-            "width": 206.6666259765625,
-            "height": 36.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "827e353f8d604ed8929092cf8d14cb57"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "de2fdaff579d46dcb386c56b011eb894"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.SystemData",
-    "m_ObjectId": "899a8772c923468795c4b9bda81def2e",
-    "m_MaterialNeedsUpdateHash": 529,
-    "m_SurfaceType": 0,
-    "m_RenderingPass": 1,
-    "m_BlendMode": 0,
-    "m_ZTest": 4,
-    "m_ZWrite": false,
-    "m_TransparentCullMode": 2,
-    "m_OpaqueCullMode": 2,
-    "m_SortPriority": 0,
-    "m_AlphaTest": false,
-    "m_TransparentDepthPrepass": false,
-    "m_TransparentDepthPostpass": false,
-    "m_SupportLodCrossFade": false,
-    "m_DoubleSidedMode": 0,
-    "m_DOTSInstancing": false,
-    "m_CustomVelocity": false,
-    "m_Tessellation": false,
-    "m_TessellationMode": 0,
-    "m_TessellationFactorMinDistance": 20.0,
-    "m_TessellationFactorMaxDistance": 50.0,
-    "m_TessellationFactorTriangleSize": 100.0,
-    "m_TessellationShapeFactor": 0.75,
-    "m_TessellationBackFaceCullEpsilon": -0.25,
-    "m_TessellationMaxDisplacement": 0.009999999776482582,
-    "m_Version": 1,
-    "inspectorFoldoutMask": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
-    "m_ObjectId": "8dd4a057c79b41fab4503442be9a70c4",
-    "m_Guid": {
-        "m_GuidSerialized": "bd16f6c6-1995-4cbc-97a9-ccb1394afc68"
-    },
-    "m_Name": "Normal",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Normal",
-    "m_DefaultReferenceName": "_Normal",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "isMainTexture": false,
-    "useTilingAndOffset": false,
-    "m_Modifiable": true,
-    "m_DefaultType": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
-    "m_ObjectId": "935eb1db90044a6289dd6e87bcb9e026",
-    "m_Id": 2,
-    "m_DisplayName": "UV",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "UV",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0
-    },
-    "m_Labels": [],
-    "m_Channel": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
-    "m_ObjectId": "944ce52e7d6340f4a502156134bdff2d",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Sample Texture 2D",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -447.99993896484377,
-            "y": 199.99993896484376,
-            "width": 209.33323669433595,
-            "height": 438.6666259765625
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "3670c56ec5de4ad781aeb3cc5cfdb2c3"
-        },
-        {
-            "m_Id": "d8e6d158c2a248e387cfa14d4059ba25"
-        },
-        {
-            "m_Id": "340dbabc04da4827b00ea160d40481fe"
-        },
-        {
-            "m_Id": "7287ba06a13e4360bf9386b30aa0b208"
-        },
-        {
-            "m_Id": "cdf21170357741baab17cc7182fe26d5"
-        },
-        {
-            "m_Id": "602291b3b713461b9e44cee13e90f19e"
-        },
-        {
-            "m_Id": "52d85ec52f524358a5bbce7373584fcb"
-        },
-        {
-            "m_Id": "652653d909684dc4aabf3142b858a507"
-        }
-    ],
-    "synonyms": [
-        "tex2d"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_TextureType": 0,
-    "m_NormalMapSpace": 0,
-    "m_EnableGlobalMipBias": true,
-    "m_MipSamplingMode": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
-    "m_ObjectId": "95839a0e21de4565a437596634277caa",
-    "m_Id": 0,
-    "m_DisplayName": "Normal",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Normal",
-    "m_StageCapability": 1,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": [],
-    "m_Space": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDLitSubTarget",
-    "m_ObjectId": "9f6c3afef5a64d6bac6aeae21763f9bd"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "a31065e2397a4511ab256bdf722554b5",
-    "m_Id": 7,
-    "m_DisplayName": "A",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "A",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "a7163e2c8e2f4a92ae56bc1099432b56",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -772.6666259765625,
-            "y": 71.9999771118164,
-            "width": 161.33331298828126,
-            "height": 36.000022888183597
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "4d24dc362cd540288b1d7b17f89c1da5"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "83a6edf4940144fcad26778b0f0053df"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
-    "m_ObjectId": "a91f55e40bc54fd19279b65f69573190",
-    "m_Id": 0,
-    "m_DisplayName": "Base",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Out",
-    "m_StageCapability": 3,
-    "m_BareResource": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
-    "m_ObjectId": "b5392e583d464d93a3baa108242c8833",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "GpuEcsAnimator",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -405.3333435058594,
-            "y": 0.000009473165846429765,
-            "width": 274.66668701171877,
-            "height": 328.0000305175781
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "5b1e18d6a4934fef8c86d671e1c221fd"
-        },
-        {
-            "m_Id": "465fe4954b594459bdfebf1be2c3a739"
-        },
-        {
-            "m_Id": "6f461a3b01b54daca2ed4e36248b0b3c"
-        },
-        {
-            "m_Id": "249ff5fcdb0b499badb54edb127277df"
-        },
-        {
-            "m_Id": "d04e069a290047bb9e2841e49c0ded8f"
-        },
-        {
-            "m_Id": "273f61b766084d9aa8c1fa0f118a029d"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"7ab285417ae253147953173b02b67332\",\n        \"type\": 3\n    }\n}",
-    "m_PropertyGuids": [
-        "0ed558c8-a80e-4d2f-afcf-d33bf4151ad3",
-        "a2609a09-bfa0-4ed5-b15b-b1349ea8e069",
-        "a3a0d3de-db02-4585-b3bc-40c1fb933ab3"
-    ],
-    "m_PropertyIds": [
-        -1422710115,
-        -1310402938,
-        -1805703276
-    ],
-    "m_Dropdowns": [],
-    "m_DropdownSelectedEntries": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "b8fbebb1f9de409eb2ab8d9725df6f74",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "VertexDescription.Normal",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "95839a0e21de4565a437596634277caa"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "VertexDescription.Normal"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "ba79d947ba584eaca1ccc8db1a3e41ae",
-    "m_Id": 0,
-    "m_DisplayName": "Metallic",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Metallic",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.HDLitData",
-    "m_ObjectId": "c091c6fa5b704d00b032954e40b1c097",
-    "m_RayTracing": false,
-    "m_MaterialType": 0,
-    "m_RefractionModel": 0,
-    "m_SSSTransmission": true,
-    "m_EnergyConservingSpecular": true,
-    "m_ClearCoat": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
-    "m_ObjectId": "cb63cc4b73cc45889a362832330fdffd",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "VertexDescription.Position",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": 0.0,
-            "y": 0.0,
-            "width": 0.0,
-            "height": 0.0
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "386704f85d1d4e7f9691967cd6353b88"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_SerializedDescriptor": "VertexDescription.Position"
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "cdf21170357741baab17cc7182fe26d5",
-    "m_Id": 7,
-    "m_DisplayName": "A",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "A",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
-    "m_ObjectId": "d04e069a290047bb9e2841e49c0ded8f",
-    "m_Id": 2,
-    "m_DisplayName": "normal",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "normal",
-    "m_StageCapability": 3,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "d85aff4651514936b1bbb0eb65d14a02",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -772.6666259765625,
-            "y": 0.000005995432729832828,
-            "width": 163.33331298828126,
-            "height": 35.99998474121094
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "67176c0b61be42cab0cd04fb88ac9071"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "78278623520944abaa240cdda2ed0506"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
-    "m_ObjectId": "d8e6d158c2a248e387cfa14d4059ba25",
-    "m_Id": 4,
-    "m_DisplayName": "R",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "R",
-    "m_StageCapability": 2,
-    "m_Value": 0.0,
-    "m_DefaultValue": 0.0,
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
-    "m_ObjectId": "de2fdaff579d46dcb386c56b011eb894",
-    "m_Guid": {
-        "m_GuidSerialized": "eebf840f-48fa-4f6f-892d-0ea3fba3a568"
-    },
-    "m_Name": "AnimatedBoneMatrices",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "AnimatedBoneMatrices",
-    "m_DefaultReferenceName": "_AnimatedBoneMatrices",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "isMainTexture": false,
-    "useTilingAndOffset": false,
-    "m_Modifiable": true,
-    "m_DefaultType": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
-    "m_ObjectId": "de584511fdbf4892937caa833f3a17e3",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Property",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -645.9999389648438,
-            "y": 436.66668701171877,
-            "width": 122.6666259765625,
-            "height": 35.99993896484375
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "1546b0f6a3c4482a95025b0b6bef86ea"
-        }
-    ],
-    "synonyms": [],
-    "m_Precision": 0,
-    "m_PreviewExpanded": true,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_Property": {
-        "m_Id": "8dd4a057c79b41fab4503442be9a70c4"
-    }
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
-    "m_ObjectId": "f1febd4d71b045caac3da9d18a60a130",
-    "m_Id": 0,
-    "m_DisplayName": "RGBA",
-    "m_SlotType": 1,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "RGBA",
-    "m_StageCapability": 2,
-    "m_Value": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_DefaultValue": {
-        "x": 0.0,
-        "y": 0.0,
-        "z": 0.0,
-        "w": 0.0
-    },
-    "m_Labels": []
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
-    "m_ObjectId": "f40d821f576d4f6dac665993f1b7bb7a",
-    "m_Id": 1,
-    "m_DisplayName": "Texture",
-    "m_SlotType": 0,
-    "m_Hidden": false,
-    "m_ShaderOutputName": "Texture",
-    "m_StageCapability": 3,
-    "m_BareResource": false,
-    "m_Texture": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "m_DefaultType": 3
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.Rendering.HighDefinition.ShaderGraph.BuiltinData",
-    "m_ObjectId": "f5bb8c54db774ecba38de316b3b7038e",
-    "m_Distortion": false,
-    "m_DistortionMode": 0,
-    "m_DistortionDepthTest": true,
-    "m_AddPrecomputedVelocity": false,
-    "m_TransparentWritesMotionVec": false,
-    "m_DepthOffset": false,
-    "m_ConservativeDepthOffset": false,
-    "m_TransparencyFog": true,
-    "m_AlphaTestShadow": false,
-    "m_BackThenFrontRendering": false,
-    "m_TransparentDepthPrepass": false,
-    "m_TransparentDepthPostpass": false,
-    "m_SupportLodCrossFade": false
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
-    "m_ObjectId": "f74deac55c9445d6854d9948b06d56cc",
-    "m_Group": {
-        "m_Id": ""
-    },
-    "m_Name": "Sample Texture 2D",
-    "m_DrawState": {
-        "m_Expanded": true,
-        "m_Position": {
-            "serializedVersion": "2",
-            "x": -447.9999694824219,
-            "y": 472.6666259765625,
-            "width": 184.66659545898438,
-            "height": 254.66680908203126
-        }
-    },
-    "m_Slots": [
-        {
-            "m_Id": "f1febd4d71b045caac3da9d18a60a130"
-        },
-        {
-            "m_Id": "3788bc317bed43f8ad79ba78602c0b43"
-        },
-        {
-            "m_Id": "28b2e8d9867a455fb967f9f0fd0a898e"
-        },
-        {
-            "m_Id": "0342acdb8ad94910bc938d81db1d7fc2"
-        },
-        {
-            "m_Id": "a31065e2397a4511ab256bdf722554b5"
-        },
-        {
-            "m_Id": "f40d821f576d4f6dac665993f1b7bb7a"
-        },
-        {
-            "m_Id": "935eb1db90044a6289dd6e87bcb9e026"
-        },
-        {
-            "m_Id": "622a587e6f6c46439cb99912d4a40d25"
-        }
-    ],
-    "synonyms": [
-        "tex2d"
-    ],
-    "m_Precision": 0,
-    "m_PreviewExpanded": false,
-    "m_DismissedVersion": 0,
-    "m_PreviewMode": 0,
-    "m_CustomColors": {
-        "m_SerializableColors": []
-    },
-    "m_TextureType": 1,
-    "m_NormalMapSpace": 0,
-    "m_EnableGlobalMipBias": true,
-    "m_MipSamplingMode": 0
-}
-
-{
-    "m_SGVersion": 0,
-    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
-    "m_ObjectId": "fcd8d00f83ba47fe937e894141694fea",
-    "m_Guid": {
-        "m_GuidSerialized": "cc3ef1e5-c598-4e03-8262-999693c6ee8e"
-    },
-    "m_Name": "Base",
-    "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Base",
-    "m_DefaultReferenceName": "_Base",
-    "m_OverrideReferenceName": "",
-    "m_GeneratePropertyBlock": true,
-    "m_UseCustomSlotLabel": false,
-    "m_CustomSlotLabel": "",
-    "m_DismissedVersion": 0,
-    "m_Precision": 0,
-    "overrideHLSLDeclaration": false,
-    "hlslDeclarationOverride": 0,
-    "m_Hidden": false,
-    "m_Value": {
-        "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
-        "m_Guid": ""
-    },
-    "isMainTexture": false,
-    "useTilingAndOffset": false,
-    "m_Modifiable": true,
-    "m_DefaultType": 0
-}
-

+ 0 - 10
Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_HDRP_SimpleShader.shadergraph.meta

@@ -1,10 +0,0 @@
-fileFormatVersion: 2
-guid: 2f73eeb94c664d24aba5c5ba4e081458
-ScriptedImporter:
-  internalIDToNameTable: []
-  externalObjects: {}
-  serializedVersion: 2
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 
-  script: {fileID: 11500000, guid: 625f186215c104763be7675aa2d941aa, type: 3}

+ 339 - 14
Assets/GPUECSAnimationBaker/Samples/Shaders/GPUECSAnimator_URP_SimpleShader.shadergraph

@@ -17,6 +17,9 @@
         },
         {
             "m_Id": "412a60b8a4d444a095ad645edcc9b675"
+        },
+        {
+            "m_Id": "438bd94ca2424032af0dc1d080ba2cad"
         }
     ],
     "m_Keywords": [],
@@ -77,6 +80,12 @@
         },
         {
             "m_Id": "7826927e0822449e85eea6317fe3f088"
+        },
+        {
+            "m_Id": "5844fb22b6bf4f638c4d4cf3d6ee363e"
+        },
+        {
+            "m_Id": "9a3906fc7f7f4659bc382bad478c7e5a"
         }
     ],
     "m_GroupDatas": [],
@@ -91,7 +100,7 @@
             },
             "m_InputSlot": {
                 "m_Node": {
-                    "m_Id": "965f9b1069bc4d048ae4cf706ce2cf42"
+                    "m_Id": "9a3906fc7f7f4659bc382bad478c7e5a"
                 },
                 "m_SlotId": 0
             }
@@ -124,6 +133,20 @@
                 "m_SlotId": 0
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "5844fb22b6bf4f638c4d4cf3d6ee363e"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "9a3906fc7f7f4659bc382bad478c7e5a"
+                },
+                "m_SlotId": 1
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -138,6 +161,20 @@
                 "m_SlotId": -1422710115
             }
         },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "9a3906fc7f7f4659bc382bad478c7e5a"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "965f9b1069bc4d048ae4cf706ce2cf42"
+                },
+                "m_SlotId": 0
+            }
+        },
         {
             "m_OutputSlot": {
                 "m_Node": {
@@ -279,6 +316,7 @@
     "m_OutputNode": {
         "m_Id": ""
     },
+    "m_SubDatas": [],
     "m_ActiveTargets": [
         {
             "m_Id": "727c1358ca584a42adb19c6842e22808"
@@ -350,6 +388,54 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "0d6347b4406f45b0b41c706641115aae",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "e00": 2.0,
+        "e01": 2.0,
+        "e02": 2.0,
+        "e03": 2.0,
+        "e10": 2.0,
+        "e11": 2.0,
+        "e12": 2.0,
+        "e13": 2.0,
+        "e20": 2.0,
+        "e21": 2.0,
+        "e22": 2.0,
+        "e23": 2.0,
+        "e30": 2.0,
+        "e31": 2.0,
+        "e32": 2.0,
+        "e33": 2.0
+    },
+    "m_DefaultValue": {
+        "e00": 1.0,
+        "e01": 0.0,
+        "e02": 0.0,
+        "e03": 0.0,
+        "e10": 0.0,
+        "e11": 1.0,
+        "e12": 0.0,
+        "e13": 0.0,
+        "e20": 0.0,
+        "e21": 0.0,
+        "e22": 1.0,
+        "e23": 0.0,
+        "e30": 0.0,
+        "e31": 0.0,
+        "e32": 0.0,
+        "e33": 1.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
@@ -502,10 +588,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -474.0,
-            "y": 176.00001525878907,
-            "width": 184.66665649414063,
-            "height": 254.66664123535157
+            "x": -695.0,
+            "y": 148.00001525878907,
+            "width": 183.0,
+            "height": 250.99998474121095
         }
     },
     "m_Slots": [
@@ -594,7 +680,7 @@
     "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
     "m_ObjectId": "384ea08a2eab422692ea831f1f7c5e14",
     "m_Id": 0,
-    "m_DisplayName": "Base",
+    "m_DisplayName": "BaseMap",
     "m_SlotType": 1,
     "m_Hidden": false,
     "m_ShaderOutputName": "Out",
@@ -704,6 +790,7 @@
     "overrideHLSLDeclaration": true,
     "hlslDeclarationOverride": 3,
     "m_Hidden": false,
+    "m_Priority": 10,
     "m_Value": 0.0,
     "m_FloatType": 0,
     "m_RangeValues": {
@@ -725,6 +812,37 @@
     "m_BareResource": false
 }
 
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
+    "m_ObjectId": "438bd94ca2424032af0dc1d080ba2cad",
+    "m_Guid": {
+        "m_GuidSerialized": "df39b494-4611-4a81-88b6-9bebb3b8f972"
+    },
+    "m_Name": "mainColor",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "mainColor",
+    "m_DefaultReferenceName": "_mainColor",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": true,
+    "hlslDeclarationOverride": 3,
+    "m_Hidden": false,
+    "m_Priority": 10,
+    "m_Value": {
+        "r": 1.0,
+        "g": 1.0,
+        "b": 1.0,
+        "a": 1.0
+    },
+    "isMainColor": false,
+    "m_ColorMode": 0
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.SampleTexture2DNode",
@@ -800,6 +918,42 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "5844fb22b6bf4f638c4d4cf3d6ee363e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -458.0,
+            "y": 351.0000305175781,
+            "width": 130.0,
+            "height": 34.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "c355c1ae47e8496e907aef4b9e35c5a7"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "438bd94ca2424032af0dc1d080ba2cad"
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
@@ -837,6 +991,54 @@
     "m_Labels": []
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "6702185edab848e7bb59e67273197961",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "e00": 0.0,
+        "e01": 0.0,
+        "e02": 0.0,
+        "e03": 0.0,
+        "e10": 0.0,
+        "e11": 0.0,
+        "e12": 0.0,
+        "e13": 0.0,
+        "e20": 0.0,
+        "e21": 0.0,
+        "e22": 0.0,
+        "e23": 0.0,
+        "e30": 0.0,
+        "e31": 0.0,
+        "e32": 0.0,
+        "e33": 0.0
+    },
+    "m_DefaultValue": {
+        "e00": 1.0,
+        "e01": 0.0,
+        "e02": 0.0,
+        "e03": 0.0,
+        "e10": 0.0,
+        "e11": 1.0,
+        "e12": 0.0,
+        "e13": 0.0,
+        "e20": 0.0,
+        "e21": 0.0,
+        "e22": 1.0,
+        "e23": 0.0,
+        "e30": 0.0,
+        "e31": 0.0,
+        "e32": 0.0,
+        "e33": 1.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.BlockNode",
@@ -881,7 +1083,7 @@
     "m_Hidden": false,
     "m_ShaderOutputName": "Smoothness",
     "m_StageCapability": 2,
-    "m_Value": 0.10000000149011612,
+    "m_Value": 0.0,
     "m_DefaultValue": 0.5,
     "m_Labels": []
 }
@@ -962,6 +1164,9 @@
         },
         {
             "m_Id": "bace56d82e7c4777bc9c30ead9abb9d6"
+        },
+        {
+            "m_Id": "438bd94ca2424032af0dc1d080ba2cad"
         }
     ]
 }
@@ -1177,6 +1382,54 @@
     "m_SerializedDescriptor": "VertexDescription.Tangent"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "88f7a06bf45d4f1ba10c1b4c72078e81",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "e00": 0.0,
+        "e01": 0.0,
+        "e02": 0.0,
+        "e03": 0.0,
+        "e10": 0.0,
+        "e11": 0.0,
+        "e12": 0.0,
+        "e13": 0.0,
+        "e20": 0.0,
+        "e21": 0.0,
+        "e22": 0.0,
+        "e23": 0.0,
+        "e30": 0.0,
+        "e31": 0.0,
+        "e32": 0.0,
+        "e33": 0.0
+    },
+    "m_DefaultValue": {
+        "e00": 1.0,
+        "e01": 0.0,
+        "e02": 0.0,
+        "e03": 0.0,
+        "e10": 0.0,
+        "e11": 1.0,
+        "e12": 0.0,
+        "e13": 0.0,
+        "e20": 0.0,
+        "e21": 0.0,
+        "e22": 1.0,
+        "e23": 0.0,
+        "e30": 0.0,
+        "e31": 0.0,
+        "e32": 0.0,
+        "e33": 1.0
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
@@ -1237,6 +1490,7 @@
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 2,
     "m_Hidden": false,
+    "m_Priority": 10,
     "m_Value": {
         "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
         "m_Guid": ""
@@ -1329,6 +1583,49 @@
     "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "9a3906fc7f7f4659bc382bad478c7e5a",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -237.99996948242188,
+            "y": 210.99998474121095,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "6702185edab848e7bb59e67273197961"
+        },
+        {
+            "m_Id": "0d6347b4406f45b0b41c706641115aae"
+        },
+        {
+            "m_Id": "88f7a06bf45d4f1ba10c1b4c72078e81"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
@@ -1349,6 +1646,7 @@
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
+    "m_Priority": 10,
     "m_Value": {
         "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
         "m_Guid": ""
@@ -1515,6 +1813,7 @@
     "overrideHLSLDeclaration": true,
     "hlslDeclarationOverride": 3,
     "m_Hidden": false,
+    "m_Priority": 10,
     "m_Value": {
         "e00": 1.0,
         "e01": 0.0,
@@ -1606,10 +1905,10 @@
         "m_Expanded": true,
         "m_Position": {
             "serializedVersion": "2",
-            "x": -695.3333129882813,
-            "y": 210.66664123535157,
-            "width": 110.66668701171875,
-            "height": 36.000030517578128
+            "x": -916.0,
+            "y": 183.00003051757813,
+            "width": 110.0,
+            "height": 34.0
         }
     },
     "m_Slots": [
@@ -1637,10 +1936,10 @@
     "m_Guid": {
         "m_GuidSerialized": "2507b0e0-be9d-4d32-a49c-3bfb14fcdcbd"
     },
-    "m_Name": "Base",
+    "m_Name": "BaseMap",
     "m_DefaultRefNameVersion": 1,
-    "m_RefNameGeneratedByDisplayName": "Base",
-    "m_DefaultReferenceName": "_Base",
+    "m_RefNameGeneratedByDisplayName": "BaseMap",
+    "m_DefaultReferenceName": "_BaseMap",
     "m_OverrideReferenceName": "",
     "m_GeneratePropertyBlock": true,
     "m_UseCustomSlotLabel": false,
@@ -1650,6 +1949,7 @@
     "overrideHLSLDeclaration": false,
     "hlslDeclarationOverride": 0,
     "m_Hidden": false,
+    "m_Priority": 10,
     "m_Value": {
         "m_SerializedTexture": "{\"texture\":{\"instanceID\":0}}",
         "m_Guid": ""
@@ -1660,6 +1960,31 @@
     "m_DefaultType": 0
 }
 
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "c355c1ae47e8496e907aef4b9e35c5a7",
+    "m_Id": 0,
+    "m_DisplayName": "mainColor",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_Labels": []
+}
+
 {
     "m_SGVersion": 0,
     "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",

+ 152 - 0
Assets/New Material.mat

@@ -0,0 +1,152 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!21 &2100000
+Material:
+  serializedVersion: 8
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: New Material
+  m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 0
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap: {}
+  disabledShaderPasses:
+  - GRABPASS
+  m_LockedProperties: 
+  m_SavedProperties:
+    serializedVersion: 3
+    m_TexEnvs:
+    - _BaseMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _BumpMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailAlbedoMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailMask:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _DetailNormalMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _EmissionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MainTex:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _MetallicGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _OcclusionMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _ParallaxMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - _SpecGlossMap:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_Lightmaps:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_LightmapsInd:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    - unity_ShadowMasks:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
+    m_Ints: []
+    m_Floats:
+    - _AlphaClip: 0
+    - _AlphaToMask: 0
+    - _Blend: 0
+    - _BlendModePreserveSpecular: 1
+    - _BlendOp: 0
+    - _BumpScale: 1
+    - _CameraFadingEnabled: 0
+    - _CameraFarFadeDistance: 2
+    - _CameraNearFadeDistance: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _ColorMode: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DistortionBlend: 0.5
+    - _DistortionEnabled: 0
+    - _DistortionStrength: 1
+    - _DistortionStrengthScaled: 0
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EmissionEnabled: 0
+    - _EnvironmentReflections: 1
+    - _FlipbookMode: 0
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _LightingEnabled: 0
+    - _Metallic: 0
+    - _Mode: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SoftParticlesEnabled: 0
+    - _SoftParticlesFarFadeDistance: 1
+    - _SoftParticlesNearFadeDistance: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
+    - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &1754755168180462139
+MonoBehaviour:
+  m_ObjectHideFlags: 11
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  version: 7

+ 8 - 0
Assets/New Material.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Xn8csXuuAHgO/IZsGBqkL4GTRuh/EYdAtfGGmicVqa1d99iUtYmwkE4=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu01.prefab

@@ -1424,7 +1424,7 @@ MonoBehaviour:
       boneUsagesPerLoD: []
     transformUsageFlagsParent: 2
     transformUsageFlagsChildren: 1
-  gpuEcsAnimator: {fileID: 4573799512793257522, guid: e21c403bf42561e47844837b065cd211, type: 3}
+  gpuEcsAnimator: {fileID: 9060657196542888369, guid: 373d03406f57a6b46869501b8a32380e, type: 3}
 --- !u!1 &7946432799924740719
 GameObject:
   m_ObjectHideFlags: 0

+ 1 - 103
Assets/Res/CombatHero/Guaiwu01_GpuEcsAnimator.prefab

@@ -30,8 +30,7 @@ Transform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 181097351247511326}
+  m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &6636979633004791938
@@ -115,104 +114,3 @@ MonoBehaviour:
   animationEventOccurences: []
   transformUsageFlags: 2
   attachmentAnchorData: {fileID: 0}
---- !u!1 &3036172259901314912
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 181097351247511326}
-  - component: {fileID: 7347126770058517527}
-  - component: {fileID: 8690708010351161121}
-  - component: {fileID: 1142691925985141960}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snakelet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &181097351247511326
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3036172259901314912}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 3.7880957e-10, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3173634401759830233}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &7347126770058517527
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3036172259901314912}
-  m_Mesh: {fileID: 4300000, guid: 71d66b7ab83b4be4296f04077623d138, type: 2}
---- !u!23 &8690708010351161121
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3036172259901314912}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 66343b110f2173a40978afdb851ace4e, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &1142691925985141960
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3036172259901314912}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b927b9dfd6f248378c3364a809fda80f, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  animator: {fileID: 6636979633004791938}
-  transformUsageFlags: 1

+ 31 - 96
Assets/Res/CombatHero/Guaiwu01_gpu.prefab

@@ -44,6 +44,7 @@ GameObject:
   - component: {fileID: 8673169286772817642}
   - component: {fileID: 4415628645752679277}
   - component: {fileID: 2892433542714645435}
+  - component: {fileID: 3258964763911789566}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Guaiwu01_gpu
@@ -139,107 +140,42 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 1, y: 1.5, z: 1}
   m_Center: {x: 0, y: 0.7, z: 0}
---- !u!1 &7204150797485102449
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6549708520966434592}
-  - component: {fileID: 2234233578460446934}
-  - component: {fileID: 6241186324446602425}
-  - component: {fileID: 469672685699455207}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snakelet
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6549708520966434592
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7204150797485102449}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: 3.7880957e-10, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8623905629328046775}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!33 &2234233578460446934
-MeshFilter:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7204150797485102449}
-  m_Mesh: {fileID: 4300000, guid: 71d66b7ab83b4be4296f04077623d138, type: 2}
---- !u!23 &6241186324446602425
-MeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7204150797485102449}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 2
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 66343b110f2173a40978afdb851ace4e, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 1
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  m_AdditionalVertexStreams: {fileID: 0}
---- !u!114 &469672685699455207
+--- !u!114 &3258964763911789566
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7204150797485102449}
+  m_GameObject: {fileID: 5464987892042446858}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: b927b9dfd6f248378c3364a809fda80f, type: 3}
+  m_Script: {fileID: 11500000, guid: a40d3c6a0de749f1b69a4fbe9950104c, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  animator: {fileID: 5433346960036875739}
-  transformUsageFlags: 1
+  Material: {fileID: 2100000, guid: acc768b484a890747965f7098bd6a760, type: 2}
+  Mesh: {fileID: 4300000, guid: 52eb24d4d019e3048a2a0ea37a921d4a, type: 2}
+  rootTrans: {fileID: 8623905629328046775}
+  animtionState:
+    c0:
+      x: 1
+      y: 0
+      z: 0
+      w: 0
+    c1:
+      x: 0
+      y: 1
+      z: 0
+      w: 0
+    c2:
+      x: 0
+      y: 0
+      z: 1
+      w: 0
+    c3:
+      x: 0
+      y: 0
+      z: 0
+      w: 1
 --- !u!1 &9158364458775329982
 GameObject:
   m_ObjectHideFlags: 0
@@ -266,14 +202,13 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9158364458775329982}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0.7071068, y: 0, z: 0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 6549708520966434592}
+  m_Children: []
   m_Father: {fileID: 6173544940227861028}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!114 &5433346960036875739
 MonoBehaviour:
   m_ObjectHideFlags: 0

+ 170 - 170
Assets/Res/CombatHero/GuaiwuBoss01.prefab

@@ -170,7 +170,7 @@ Transform:
   - {fileID: 5604520466445514036}
   - {fileID: 7152154869661391420}
   - {fileID: 186394833937686985}
-  - {fileID: 4905979327640517659}
+  - {fileID: 2853736156576194330}
   m_Father: {fileID: 9186905882593900606}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &185306020276039974
@@ -1253,6 +1253,175 @@ Transform:
   m_Children: []
   m_Father: {fileID: 3506611539735992363}
   m_LocalEulerAnglesHint: {x: -0.13269703, y: -100.19447, z: 13.085332}
+--- !u!1 &2455629779752780190
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2853736156576194330}
+  - component: {fileID: 2615654218923727681}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Snake Naga
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2853736156576194330
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2455629779752780190}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
+  m_LocalPosition: {x: -0.00015357562, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3506611539735992363}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2615654218923727681
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2455629779752780190}
+  m_Enabled: 1
+  m_CastShadows: 1
+  m_ReceiveShadows: 1
+  m_DynamicOccludee: 1
+  m_StaticShadowCaster: 0
+  m_MotionVectors: 1
+  m_LightProbeUsage: 1
+  m_ReflectionProbeUsage: 1
+  m_RayTracingMode: 3
+  m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f3ffe8a1659fa484ab8dfbdbcc86d2c0, type: 2}
+  m_StaticBatchInfo:
+    firstSubMesh: 0
+    subMeshCount: 0
+  m_StaticBatchRoot: {fileID: 0}
+  m_ProbeAnchor: {fileID: 0}
+  m_LightProbeVolumeOverride: {fileID: 0}
+  m_ScaleInLightmap: 1
+  m_ReceiveGI: 1
+  m_PreserveUVs: 0
+  m_IgnoreNormalsForChartDetection: 0
+  m_ImportantGI: 0
+  m_StitchLightmapSeams: 0
+  m_SelectedEditorRenderState: 3
+  m_MinimumChartSize: 4
+  m_AutoUVMaxDistance: 0.5
+  m_AutoUVMaxAngle: 89
+  m_LightmapParameters: {fileID: 0}
+  m_SortingLayerID: 0
+  m_SortingLayer: 0
+  m_SortingOrder: 0
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: 4300012, guid: 56dd1c59a27e08a48b52d25989c46eaf, type: 3}
+  m_Bones:
+  - {fileID: 8684248612825461903}
+  - {fileID: 7848617762368157355}
+  - {fileID: 7615136760858222747}
+  - {fileID: 2360096382715338032}
+  - {fileID: 1273180218187790951}
+  - {fileID: 6575351459676362009}
+  - {fileID: 8772929726381357402}
+  - {fileID: 4705746175770072434}
+  - {fileID: 8567915752481089600}
+  - {fileID: 568114682532526111}
+  - {fileID: 3212430801861921411}
+  - {fileID: 1472307336645622628}
+  - {fileID: 7576260207511051711}
+  - {fileID: 1471519300583271657}
+  - {fileID: 5536519681405179078}
+  - {fileID: 7065992909484136661}
+  - {fileID: 8099548644093501754}
+  - {fileID: 2663355705917346182}
+  - {fileID: 2395373723625032885}
+  - {fileID: 1577729633248969363}
+  - {fileID: 8557276127581814096}
+  - {fileID: 722709168289681653}
+  - {fileID: 8770773769941151548}
+  - {fileID: 3762546868142799813}
+  - {fileID: 6887044235896176738}
+  - {fileID: 7084663215195366309}
+  - {fileID: 6614307007623921420}
+  - {fileID: 7572440970567933092}
+  - {fileID: 4364374098188844442}
+  - {fileID: 460749045765171845}
+  - {fileID: 6483702444462202340}
+  - {fileID: 3704955700275525601}
+  - {fileID: 385137281013094857}
+  - {fileID: 5793558758688584478}
+  - {fileID: 4222378861415565306}
+  - {fileID: 6064926725660801988}
+  - {fileID: 7476688359350209250}
+  - {fileID: 1680409490359051016}
+  - {fileID: 4955803892646688081}
+  - {fileID: 3166417931178366471}
+  - {fileID: 7970448180560165032}
+  - {fileID: 1137570478438367192}
+  - {fileID: 82461769213800776}
+  - {fileID: 6218354558533214390}
+  - {fileID: 4947111582429602973}
+  - {fileID: 550660714355134565}
+  - {fileID: 4448623087376528104}
+  - {fileID: 3239655829727480852}
+  - {fileID: 8044910768931508311}
+  - {fileID: 2520658530913993966}
+  - {fileID: 1749708118238801025}
+  - {fileID: 3148190171913077656}
+  - {fileID: 4157005748144925791}
+  - {fileID: 6983888326192427305}
+  - {fileID: 3399288132298630563}
+  - {fileID: 4982298390286083261}
+  - {fileID: 4593615582079333134}
+  - {fileID: 1239693437226710530}
+  - {fileID: 7955001359911357038}
+  - {fileID: 1552838576670509646}
+  - {fileID: 3706722098629703778}
+  - {fileID: 2969598778214206056}
+  - {fileID: 2660333797489600128}
+  - {fileID: 1188314041870792049}
+  - {fileID: 7440256923030130344}
+  - {fileID: 5711776609026815646}
+  - {fileID: 7303254475707296240}
+  - {fileID: 1559972068473476665}
+  - {fileID: 6243247794339573190}
+  - {fileID: 6188137163190283309}
+  - {fileID: 8020182800256829635}
+  - {fileID: 257462064006723395}
+  - {fileID: 4532660097433680384}
+  - {fileID: 7282240395114335893}
+  - {fileID: 5494198129253211837}
+  - {fileID: 5842436686954796164}
+  - {fileID: 4430780002469931888}
+  - {fileID: 8176269555628364002}
+  - {fileID: 3524597963351565075}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6575351459676362009}
+  m_AABB:
+    m_Center: {x: -0.580421, y: -2.2199645, z: 0.00015312433}
+    m_Extent: {x: 1.9573529, y: 2.9779105, z: 1.4714735}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &2502323007935954548
 GameObject:
   m_ObjectHideFlags: 0
@@ -4786,175 +4955,6 @@ Transform:
   - {fileID: 6553220541571655652}
   m_Father: {fileID: 3506611539735992363}
   m_LocalEulerAnglesHint: {x: -6.482905, y: -94.91219, z: -177.50635}
---- !u!1 &8959456114669105182
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4905979327640517659}
-  - component: {fileID: 6087738744627833331}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Snake Naga
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4905979327640517659
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8959456114669105182}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
-  m_LocalPosition: {x: -0.00015357562, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 3506611539735992363}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6087738744627833331
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8959456114669105182}
-  m_Enabled: 1
-  m_CastShadows: 1
-  m_ReceiveShadows: 1
-  m_DynamicOccludee: 1
-  m_StaticShadowCaster: 0
-  m_MotionVectors: 1
-  m_LightProbeUsage: 1
-  m_ReflectionProbeUsage: 1
-  m_RayTracingMode: 3
-  m_RayTraceProcedural: 0
-  m_virtualGeometry: 0
-  m_virtualGeometryShadow: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: f3ffe8a1659fa484ab8dfbdbcc86d2c0, type: 2}
-  m_StaticBatchInfo:
-    firstSubMesh: 0
-    subMeshCount: 0
-  m_StaticBatchRoot: {fileID: 0}
-  m_ProbeAnchor: {fileID: 0}
-  m_LightProbeVolumeOverride: {fileID: 0}
-  m_ScaleInLightmap: 1
-  m_ReceiveGI: 1
-  m_PreserveUVs: 0
-  m_IgnoreNormalsForChartDetection: 0
-  m_ImportantGI: 0
-  m_StitchLightmapSeams: 0
-  m_SelectedEditorRenderState: 3
-  m_MinimumChartSize: 4
-  m_AutoUVMaxDistance: 0.5
-  m_AutoUVMaxAngle: 89
-  m_LightmapParameters: {fileID: 0}
-  m_SortingLayerID: 0
-  m_SortingLayer: 0
-  m_SortingOrder: 0
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: 4300012, guid: 56dd1c59a27e08a48b52d25989c46eaf, type: 3}
-  m_Bones:
-  - {fileID: 8684248612825461903}
-  - {fileID: 7848617762368157355}
-  - {fileID: 7615136760858222747}
-  - {fileID: 2360096382715338032}
-  - {fileID: 1273180218187790951}
-  - {fileID: 6575351459676362009}
-  - {fileID: 8772929726381357402}
-  - {fileID: 4705746175770072434}
-  - {fileID: 8567915752481089600}
-  - {fileID: 568114682532526111}
-  - {fileID: 3212430801861921411}
-  - {fileID: 1472307336645622628}
-  - {fileID: 7576260207511051711}
-  - {fileID: 1471519300583271657}
-  - {fileID: 5536519681405179078}
-  - {fileID: 7065992909484136661}
-  - {fileID: 8099548644093501754}
-  - {fileID: 2663355705917346182}
-  - {fileID: 2395373723625032885}
-  - {fileID: 1577729633248969363}
-  - {fileID: 8557276127581814096}
-  - {fileID: 722709168289681653}
-  - {fileID: 8770773769941151548}
-  - {fileID: 3762546868142799813}
-  - {fileID: 6887044235896176738}
-  - {fileID: 7084663215195366309}
-  - {fileID: 6614307007623921420}
-  - {fileID: 7572440970567933092}
-  - {fileID: 4364374098188844442}
-  - {fileID: 460749045765171845}
-  - {fileID: 6483702444462202340}
-  - {fileID: 3704955700275525601}
-  - {fileID: 385137281013094857}
-  - {fileID: 5793558758688584478}
-  - {fileID: 4222378861415565306}
-  - {fileID: 6064926725660801988}
-  - {fileID: 7476688359350209250}
-  - {fileID: 1680409490359051016}
-  - {fileID: 4955803892646688081}
-  - {fileID: 3166417931178366471}
-  - {fileID: 7970448180560165032}
-  - {fileID: 1137570478438367192}
-  - {fileID: 82461769213800776}
-  - {fileID: 6218354558533214390}
-  - {fileID: 4947111582429602973}
-  - {fileID: 550660714355134565}
-  - {fileID: 4448623087376528104}
-  - {fileID: 3239655829727480852}
-  - {fileID: 8044910768931508311}
-  - {fileID: 2520658530913993966}
-  - {fileID: 1749708118238801025}
-  - {fileID: 3148190171913077656}
-  - {fileID: 4157005748144925791}
-  - {fileID: 6983888326192427305}
-  - {fileID: 3399288132298630563}
-  - {fileID: 4982298390286083261}
-  - {fileID: 4593615582079333134}
-  - {fileID: 1239693437226710530}
-  - {fileID: 7955001359911357038}
-  - {fileID: 1552838576670509646}
-  - {fileID: 3706722098629703778}
-  - {fileID: 2969598778214206056}
-  - {fileID: 2660333797489600128}
-  - {fileID: 1188314041870792049}
-  - {fileID: 7440256923030130344}
-  - {fileID: 5711776609026815646}
-  - {fileID: 7303254475707296240}
-  - {fileID: 1559972068473476665}
-  - {fileID: 6243247794339573190}
-  - {fileID: 6188137163190283309}
-  - {fileID: 8020182800256829635}
-  - {fileID: 257462064006723395}
-  - {fileID: 4532660097433680384}
-  - {fileID: 7282240395114335893}
-  - {fileID: 5494198129253211837}
-  - {fileID: 5842436686954796164}
-  - {fileID: 4430780002469931888}
-  - {fileID: 8176269555628364002}
-  - {fileID: 3524597963351565075}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6575351459676362009}
-  m_AABB:
-    m_Center: {x: -0.580421, y: -2.2199645, z: 0.00015312433}
-    m_Extent: {x: 1.9573529, y: 2.9779105, z: 1.4714735}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &8963339440406373874
 GameObject:
   m_ObjectHideFlags: 0

+ 73 - 73
Assets/Res/CombatHero/GuaiwuJY01.prefab

@@ -1146,7 +1146,7 @@ Transform:
   - {fileID: 1758221673950266174}
   - {fileID: 5337298767159027132}
   - {fileID: 4611672840595664709}
-  - {fileID: 9140808163471418861}
+  - {fileID: 7188733052039169985}
   m_Father: {fileID: 7760812738003230115}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5790529394969636121
@@ -1898,72 +1898,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4907045407575232226}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8534250538830052090
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2487469171082322192}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: RigNeck1IKPt
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2487469171082322192
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8534250538830052090}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000058069343, y: -0.000000022049923, z: 0.37874317, w: 0.9255018}
-  m_LocalPosition: {x: -0.032699395, y: 0.003477993, z: -0.0000000023841857}
-  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1578446248419833778}
-  m_Father: {fileID: 4840958454781872170}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8627969184973208162
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8150081944373040972}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: RigTail8Gizmo
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8150081944373040972
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8627969184973208162}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.07794053, y: 0.86985517, z: -0.04283499, w: 0.48522425}
-  m_LocalPosition: {x: 0.23860233, y: 0.06345127, z: -0.5675118}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4907045407575232226}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8803874564747054150
+--- !u!1 &8416280484677882974
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1971,8 +1906,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 9140808163471418861}
-  - component: {fileID: 2352261999658937341}
+  - component: {fileID: 7188733052039169985}
+  - component: {fileID: 2210981601143750242}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Snake
@@ -1981,13 +1916,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &9140808163471418861
+--- !u!4 &7188733052039169985
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8803874564747054150}
+  m_GameObject: {fileID: 8416280484677882974}
   serializedVersion: 2
   m_LocalRotation: {x: -0.7071068, y: 0, z: -0, w: 0.7071068}
   m_LocalPosition: {x: 0, y: 0, z: 0}
@@ -1996,13 +1931,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4907045407575232226}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2352261999658937341
+--- !u!137 &2210981601143750242
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8803874564747054150}
+  m_GameObject: {fileID: 8416280484677882974}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -2079,6 +2014,71 @@ SkinnedMeshRenderer:
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &8534250538830052090
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2487469171082322192}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: RigNeck1IKPt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2487469171082322192
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8534250538830052090}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000058069343, y: -0.000000022049923, z: 0.37874317, w: 0.9255018}
+  m_LocalPosition: {x: -0.032699395, y: 0.003477993, z: -0.0000000023841857}
+  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 1578446248419833778}
+  m_Father: {fileID: 4840958454781872170}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8627969184973208162
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8150081944373040972}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: RigTail8Gizmo
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8150081944373040972
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8627969184973208162}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.07794053, y: 0.86985517, z: -0.04283499, w: 0.48522425}
+  m_LocalPosition: {x: 0.23860233, y: 0.06345127, z: -0.5675118}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4907045407575232226}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8812476211955197584
 GameObject:
   m_ObjectHideFlags: 0

+ 48 - 1
Assets/Res/CombatHero/Hero01.prefab

@@ -1081,6 +1081,52 @@ MeshRenderer:
   m_SortingLayer: 0
   m_SortingOrder: 0
   m_AdditionalVertexStreams: {fileID: 0}
+--- !u!1 &3392977107321075450
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7026930872773357242}
+  - component: {fileID: 1864300356242925292}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7026930872773357242
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3392977107321075450}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.59, z: 0.62}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7147530501131920534}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &1864300356242925292
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3392977107321075450}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos
 --- !u!1 &3619202239764433156
 GameObject:
   m_ObjectHideFlags: 0
@@ -1405,6 +1451,7 @@ Transform:
   - {fileID: 3999261170560408891}
   - {fileID: 6173809668919009486}
   - {fileID: 1706276288271688283}
+  - {fileID: 7026930872773357242}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4364153793629314448
@@ -1892,7 +1939,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!4 &1706276288271688283
 Transform:
   m_ObjectHideFlags: 0

+ 75 - 75
Assets/Res/CombatHero/Hero03.prefab

@@ -25,8 +25,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 23317646746309166}
   serializedVersion: 2
-  m_LocalRotation: {x: -3.3404168e-30, y: -7.565273e-29, z: 0.058328282, w: 0.99829745}
-  m_LocalPosition: {x: -0.19922544, y: -1.9984014e-17, z: 2.1316282e-16}
+  m_LocalRotation: {x: -0.12484894, y: -0.036703117, z: 0.3257498, w: 0.9364576}
+  m_LocalPosition: {x: -0.19922559, y: -0.000000011175853, z: 0.000000040978094}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -91,8 +91,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 573781573001814389}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.004321334, y: 0.002589848, z: 0.88637555, w: -0.4629396}
-  m_LocalPosition: {x: 0.084993325, y: -0.00000055632756, z: 6.6904715e-10}
+  m_LocalRotation: {x: -0.0025581133, y: 0.0019262859, z: 0.88638145, w: -0.4629446}
+  m_LocalPosition: {x: 0.08499332, y: -0.0000005393973, z: 6.678476e-10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -296,8 +296,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 706006425913732826}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7700337, y: 0.10418877, z: 0.6286141, w: 0.032202303}
-  m_LocalPosition: {x: -0.01944353, y: -0.021992618, z: 0.0628901}
+  m_LocalRotation: {x: -0.7700339, y: -0.10418882, z: -0.62861407, w: -0.032202397}
+  m_LocalPosition: {x: -0.0194436, y: -0.021992628, z: 0.062890135}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -332,11 +332,11 @@ Transform:
   m_GameObject: {fileID: 734675211222781256}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.521, z: -0}
+  m_LocalPosition: {x: 0.016, y: 0.472, z: 1.338}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3659170751059264042}
+  m_Father: {fileID: 7997587425070003535}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!114 &1652323813812221465
 MonoBehaviour:
@@ -376,8 +376,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 828051885250597545}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0.08751218, w: 0.9961635}
-  m_LocalPosition: {x: -0.07696576, y: -1.5099033e-16, z: 1.13396255e-17}
+  m_LocalRotation: {x: 0.21249422, y: -0.07437654, z: 0.17120671, w: -0.9591677}
+  m_LocalPosition: {x: -0.07696583, y: -0.000000034342502, z: 0.000000022351745}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -409,8 +409,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 905169206685197934}
   serializedVersion: 2
-  m_LocalRotation: {x: 5.082376e-17, y: -5.15409e-17, z: 0.042781048, w: 0.9990845}
-  m_LocalPosition: {x: -0.09346745, y: 8.8817837e-17, z: 6.418694e-17}
+  m_LocalRotation: {x: 0.095719665, y: -0.085076235, z: 0.12277816, w: 0.9841368}
+  m_LocalPosition: {x: -0.09346751, y: -0.000000030107906, z: 0.00000003715831}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -597,8 +597,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2000842079523764143}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000105187725, y: 6.145883e-10, z: 0.058328282, w: 0.99829745}
-  m_LocalPosition: {x: 0.19922526, y: -1.1510433e-11, z: 2.5579537e-15}
+  m_LocalRotation: {x: -0.49129698, y: -0.05084298, z: 0.11727757, w: 0.86156154}
+  m_LocalPosition: {x: 0.19922604, y: 0.00000005215401, z: 0.00000032037488}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -630,8 +630,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2071078190530564388}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.036186904, y: 0.039763007, z: -0.0027689135, w: 0.9985498}
-  m_LocalPosition: {x: 0.029832672, y: -0.0141515955, z: -0.09502096}
+  m_LocalRotation: {x: -0.013457063, y: 0.065565854, z: -0.17032228, w: 0.98311263}
+  m_LocalPosition: {x: 0.029832713, y: -0.014151618, z: -0.09502109}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -749,8 +749,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2174488015649929177}
   serializedVersion: 2
-  m_LocalRotation: {x: 4.2292428e-17, y: 5.3793756e-17, z: -0.13413732, w: 0.9909628}
-  m_LocalPosition: {x: -0.107710324, y: 0.011222288, z: 6.8414275e-17}
+  m_LocalRotation: {x: -0.09218167, y: 0.0042400947, z: 0.0024622725, w: -0.99573016}
+  m_LocalPosition: {x: -0.107710406, y: 0.011222272, z: 0.00000002456366}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -782,8 +782,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2393793700750895627}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.015122188, y: -0.03924476, z: -0.85717356, w: 0.5133076}
-  m_LocalPosition: {x: -0.052380655, y: -4.6629366e-17, z: 0}
+  m_LocalRotation: {x: -0.013516089, y: 0.35560983, z: -0.76256585, w: 0.5402337}
+  m_LocalPosition: {x: -0.05238067, y: -0.00000003911514, z: -0.000000033527343}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -883,8 +883,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2788215696191193884}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.039633952, y: 0.13932489, z: 0.9894442, w: -0.004238037}
-  m_LocalPosition: {x: 0.02983256, y: 0.019493982, z: 0.094070405}
+  m_LocalRotation: {x: -0.09478579, y: 0.17332713, z: 0.9793771, w: 0.042356256}
+  m_LocalPosition: {x: 0.029832564, y: 0.019494053, z: 0.094070494}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -916,8 +916,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2931255998206469369}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7066251, y: 0.02609513, z: -0.02609513, w: 0.7066251}
-  m_LocalPosition: {x: 0.13859951, y: 9.530944e-10, z: 1.563194e-15}
+  m_LocalRotation: {x: -0.72558624, y: 0.32698655, z: -0.55732185, w: 0.23663668}
+  m_LocalPosition: {x: 0.13859959, y: -0.00000024959414, z: 0.00000019371451}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -951,8 +951,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3229411569226446457}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0009789699, y: 0.0023777445, z: -0.3786951, w: 0.9255179}
-  m_LocalPosition: {x: 0.078995995, y: 0.029178, z: -0.00503602}
+  m_LocalRotation: {x: -0.027194206, y: 0.009150921, z: 0.3785919, w: -0.9251189}
+  m_LocalPosition: {x: 0.078996025, y: 0.029177979, z: -0.0050360207}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -990,7 +990,6 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4671787398161153408}
-  - {fileID: 5241352190156543695}
   m_Father: {fileID: 2450270977946639245}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &3468404261507816066
@@ -1018,8 +1017,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3468404261507816066}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0026571923, y: 0.010807793, z: -0.03571127, w: 0.9993002}
-  m_LocalPosition: {x: -0.063433915, y: -4.2632563e-16, z: 2.7755574e-18}
+  m_LocalRotation: {x: -0.0031687913, y: 0.01095665, z: -0.035716403, w: 0.9992969}
+  m_LocalPosition: {x: -0.06343393, y: -0.000000024214037, z: -7.275855e-11}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1050,8 +1049,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3849293619982120579}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: 0.020222384, y: -0.10951788, z: -0.0015459505}
+  m_LocalRotation: {x: -0.00000005960453, y: -0.000000074505664, z: -0.7071068, w: -0.70710677}
+  m_LocalPosition: {x: 0.02022237, y: -0.10951794, z: -0.0015459987}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1082,8 +1081,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4041905997374343064}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7066251, y: 0.02609513, z: -0.02609513, w: 0.7066251}
-  m_LocalPosition: {x: -0.13859957, y: -3.5527136e-17, z: -1.065814e-15}
+  m_LocalRotation: {x: 0.7602915, y: 0.22099262, z: 0.08799467, w: -0.6044636}
+  m_LocalPosition: {x: -0.13859996, y: 0.000000046566104, z: -0.00000025704492}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1117,8 +1116,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4660812095648460716}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.025034064, y: -0.06244233, z: 0.0012542871, w: 0.9977338}
-  m_LocalPosition: {x: -0.12562485, y: -0.012257216, z: -0.0020234145}
+  m_LocalRotation: {x: 0.05617446, y: -0.124310054, z: -0.11278829, w: 0.9842105}
+  m_LocalPosition: {x: -0.12588276, y: -0.012273421, z: -0.001883928}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1150,8 +1149,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4663401709785600463}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0026571923, y: 0.010807793, z: -0.03571127, w: 0.9993002}
-  m_LocalPosition: {x: 0.063433595, y: -0.00000008902263, z: -0.0000000019323867}
+  m_LocalRotation: {x: 0.0031691252, y: -0.0109567, z: 0.035716467, w: -0.9992969}
+  m_LocalPosition: {x: 0.06343357, y: -0.00000006710212, z: -0.0000000019126565}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1182,8 +1181,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4825314311878332940}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0009789666, y: 0.0023777457, z: -0.37869388, w: 0.9255184}
-  m_LocalPosition: {x: -0.078995824, y: -0.029177444, z: 0.005036025}
+  m_LocalRotation: {x: 0.027193878, y: -0.009150637, z: -0.37859073, w: 0.92511934}
+  m_LocalPosition: {x: -0.078995846, y: -0.029177487, z: 0.005036034}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1215,8 +1214,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5018624130582764353}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.011902718, y: 0.10369651, z: 0.070935935, w: 0.9920048}
-  m_LocalPosition: {x: 0.10173414, y: 0.000000103064025, z: 0.000000544563}
+  m_LocalRotation: {x: -0.19286357, y: 0.15193276, z: 0.5441367, w: 0.8022689}
+  m_LocalPosition: {x: 0.10173438, y: 0.000000061467226, z: 0.0000003129242}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1317,7 +1316,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5119068772294302576}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: 0.013756339, z: -0, w: 0.9999054}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1326,8 +1325,9 @@ Transform:
   - {fileID: 5139658906938405972}
   - {fileID: 8956626842180546784}
   - {fileID: 656111658581237766}
+  - {fileID: 5241352190156543695}
   m_Father: {fileID: 0}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 1.576, z: 0}
 --- !u!95 &5250060488684882498
 Animator:
   serializedVersion: 5
@@ -1545,8 +1545,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5215454719591705626}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.012497515, y: -0.0024274308, z: -0.07109492, w: 0.99738836}
-  m_LocalPosition: {x: -0.045099992, y: 1.7763568e-17, z: -1.4210854e-16}
+  m_LocalRotation: {x: -0.05503388, y: 0.0018129589, z: -0.06707482, w: 0.9962274}
+  m_LocalPosition: {x: -0.045100037, y: 0.0000000083818135, z: -0.00000004470299}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1577,8 +1577,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5307936834384563216}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5924439, y: -0.3929715, z: -0.22398683, w: 0.6666436}
-  m_LocalPosition: {x: -0.062028673, y: 0.025731737, z: -0.046623435}
+  m_LocalRotation: {x: -0.60024357, y: 0.39557883, z: 0.2193492, w: -0.6596295}
+  m_LocalPosition: {x: -0.062028646, y: 0.025731778, z: -0.046623528}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1610,8 +1610,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5315052734886939530}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.026913026, y: 0.022706468, z: -0.0010662322, w: 0.99937934}
-  m_LocalPosition: {x: -0.13777272, y: 0.0059483806, z: 0.0027488763}
+  m_LocalRotation: {x: -0.0077894735, y: 0.032274228, z: 0.18150185, w: 0.98283005}
+  m_LocalPosition: {x: -0.13805245, y: 0.0059605157, z: 0.002754501}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1643,8 +1643,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5361395710708524556}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.004321334, y: 0.002589848, z: 0.88637555, w: -0.4629396}
-  m_LocalPosition: {x: -0.084993236, y: -2.842171e-16, z: -2.8366196e-16}
+  m_LocalRotation: {x: 0.0025579026, y: -0.0019258903, z: -0.8863815, w: 0.46294463}
+  m_LocalPosition: {x: -0.084993206, y: 0.000000009575062, z: 6.402781e-10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1874,8 +1874,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5737386947630291252}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.10418877, y: -0.7700337, z: -0.032202303, w: 0.6286141}
-  m_LocalPosition: {x: -0.01944315, y: -0.021992614, z: -0.062890135}
+  m_LocalRotation: {x: -0.104188815, y: 0.7700338, z: 0.032202303, w: -0.6286142}
+  m_LocalPosition: {x: -0.019443149, y: -0.021992657, z: -0.06289019}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1908,8 +1908,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5881802463462509580}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.026913026, y: 0.022706468, z: -0.0010662322, w: 0.99937934}
-  m_LocalPosition: {x: 0.1377729, y: -0.0059484076, z: -0.0027491562}
+  m_LocalRotation: {x: -0.0013993438, y: -0.034507245, z: -0.17295508, w: -0.9843241}
+  m_LocalPosition: {x: 0.13813086, y: -0.0059637744, z: -0.002756414}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1941,8 +1941,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6221377704011295837}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.012497515, y: -0.0024274308, z: -0.07109492, w: 0.99738836}
-  m_LocalPosition: {x: 0.045099515, y: -0.00000023024785, z: 0.000000114253595}
+  m_LocalRotation: {x: 0.055032723, y: -0.0018131624, z: 0.067074925, w: -0.9962275}
+  m_LocalPosition: {x: 0.045099527, y: -0.00000018440102, z: 0.000000094994036}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2059,8 +2059,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6854624048392639750}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0.7071068, w: 0.7071068}
-  m_LocalPosition: {x: -0.020222299, y: 0.109517895, z: 0.0015459999}
+  m_LocalRotation: {x: -0.000000074505735, y: -0.000000037252867, z: 0.7071067, w: 0.7071068}
+  m_LocalPosition: {x: -0.020222317, y: 0.109517954, z: 0.0015459936}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2091,8 +2091,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6858648570508178350}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7093532, y: 0, z: 0, w: 0.7048532}
-  m_LocalPosition: {x: -0, y: 0, z: 0}
+  m_LocalRotation: {x: -0.7093532, y: -0, z: -0, w: 0.7048532}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2124,8 +2124,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6899312948474064072}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.062176824, y: 0.7043679, z: -0.062176824, w: 0.7043679}
-  m_LocalPosition: {x: -1.0845211e-17, y: 2.0566881e-16, z: 0.33355397}
+  m_LocalRotation: {x: 0.062176697, y: 0.70436776, z: -0.062177114, w: 0.704368}
+  m_LocalPosition: {x: 0.00000006239861, y: 0.00007387992, z: 0.3216499}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2245,8 +2245,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7329290802928990242}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: -0.04595571, w: 0.9989435}
-  m_LocalPosition: {x: -0.20523393, y: -3.5527136e-17, z: 1.09031954e-16}
+  m_LocalRotation: {x: -0, y: -0.000000029802273, z: 0.06849645, w: -0.99765146}
+  m_LocalPosition: {x: -0.20523423, y: -0.000000102445306, z: 0.00000013597291}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2282,8 +2282,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7485554449438608134}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.559414, y: -0.457008, z: -0.26324454, w: 0.6394545}
-  m_LocalPosition: {x: 0.062028997, y: -0.025731001, z: 0.046623457}
+  m_LocalRotation: {x: -0.5935301, y: 0.47071397, z: 0.23787057, w: -0.607921}
+  m_LocalPosition: {x: 0.062029, y: -0.025731014, z: 0.04662346}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2315,8 +2315,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7695483815198725541}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.010048218, y: -0.040839504, z: -0.7855352, w: 0.6173861}
-  m_LocalPosition: {x: 0.052380603, y: -0.000000021094301, z: 0.00000059586444}
+  m_LocalRotation: {x: 0.022808418, y: -0.3182297, z: 0.6924705, w: -0.64706594}
+  m_LocalPosition: {x: 0.052380614, y: 0.00000000745054, z: 0.00000061466847}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2380,8 +2380,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8113437887450903385}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.011902718, y: 0.10369651, z: 0.070935935, w: 0.9920048}
-  m_LocalPosition: {x: -0.10173372, y: 4.440892e-18, z: -1.4210854e-16}
+  m_LocalRotation: {x: 0.047435485, y: -0.1468385, z: 0.18350181, w: 0.9708324}
+  m_LocalPosition: {x: -0.10173412, y: -0.000000037252825, z: -0.000000022351712}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2413,8 +2413,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8688516409605697430}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.025008949, y: -0.062441748, z: 0.0012532085, w: 0.9977345}
-  m_LocalPosition: {x: 0.12562445, y: 0.012257197, z: 0.002024065}
+  m_LocalRotation: {x: 0.072158486, y: -0.09957286, z: 0.009103192, w: 0.9923687}
+  m_LocalPosition: {x: 0.12595311, y: 0.01228251, z: 0.0019205133}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2447,8 +2447,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8841717109280710575}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.08780653, y: 0.0046826205, z: 0.053046897, w: 0.99471307}
-  m_LocalPosition: {x: -0.09894391, y: -0.01896602, z: 0.0033746792}
+  m_LocalRotation: {x: 0.023197768, y: 0.0045741196, z: 0.1585053, w: 0.987075}
+  m_LocalPosition: {x: -0.098943956, y: -0.018966056, z: 0.0033747146}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 8 - 0
Assets/Res/HeroAudio.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: CH9N4Cr/VHjZ5VNfWO/KVLWoJTmpx6oSYwhRX0qD5AvJPLa3W0EGFMs=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 16 - 0
Assets/Res/HeroAudio/MainAudio.asset

@@ -0,0 +1,16 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1b099297e0f149559e4f5adf700639ce, type: 3}
+  m_Name: MainAudio
+  m_EditorClassIdentifier: 
+  useCount: 0
+  configs: []

+ 8 - 0
Assets/Res/HeroAudio/MainAudio.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DS4XsCKvWyhsbkY4qgqe5GvVyDUI4pRNTZ2Ymb+7rdxau0dCMUjyxGQ=
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 92 - 27
Assets/Res/UI/HeroDetailPanel.prefab

@@ -1517,9 +1517,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 413.90503, y: -52.426}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 104.91, y: 104.852}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5332182815579845383
@@ -2487,9 +2487,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 653.72504, y: -52.426}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 104.91, y: 104.852}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7824608224951082196
@@ -4341,9 +4341,9 @@ RectTransform:
   - {fileID: 3833624058764431271}
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 52.885, y: -52.425}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 105.77, y: 104.85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &2965468426891781613
@@ -6493,10 +6493,10 @@ RectTransform:
   - {fileID: 4751700166828939658}
   m_Father: {fileID: 3158233926214000975}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: -2, y: -2}
+  m_SizeDelta: {x: 104, y: 102}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1173919489491627322
 CanvasRenderer:
@@ -6776,14 +6776,14 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.16862746, g: 0.23921569, b: 0.22352941, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 21300000, guid: 55efdebed769a4f2fb81998fb87a2df5, type: 3}
+  m_Sprite: {fileID: 21300000, guid: 03cc62a06f5fc44639b0a7ec241ee65f, type: 3}
   m_Type: 1
   m_PreserveAspect: 0
   m_FillCenter: 1
@@ -7636,6 +7636,7 @@ GameObject:
   - component: {fileID: 2022108163571940334}
   - component: {fileID: 3023931315167218065}
   - component: {fileID: 1914518845719667720}
+  - component: {fileID: 4897809077674143419}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Button_Back
@@ -7702,6 +7703,50 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!114 &4897809077674143419
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5297465538665595607}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 1914518845719667720}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &5315175790152181287
 GameObject:
   m_ObjectHideFlags: 0
@@ -8888,6 +8933,7 @@ GameObject:
   - component: {fileID: 3592094474613093350}
   - component: {fileID: 8042150479497634541}
   - component: {fileID: 8963168838308406584}
+  - component: {fileID: 5422228824707887719}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroDetailPanel
@@ -8972,6 +9018,25 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_ShowMaskGraphic: 1
+--- !u!114 &5422228824707887719
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6213300356282155384}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: btnBack
+    gameObject: {fileID: 4897809077674143419}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
 --- !u!1 &6353668298983276286
 GameObject:
   m_ObjectHideFlags: 0
@@ -10825,9 +10890,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 533.815, y: -52.426}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 104.91, y: 104.852}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7667148337186413625
@@ -11321,9 +11386,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 293.995, y: -52.426}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 104.91, y: 104.852}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2801858260357082583
@@ -12249,10 +12314,10 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 3158233926214000975}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 0, y: 0}
+  m_SizeDelta: {x: 106, y: 104}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2818195331324928631
 CanvasRenderer:
@@ -12965,9 +13030,9 @@ RectTransform:
   - {fileID: 7791108021754917289}
   m_Father: {fileID: 1526221853363365866}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 173.655, y: -52.425}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 105.77, y: 104.85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &8735990052835232682
@@ -13399,7 +13464,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &2528804613874651346
 RectTransform:
   m_ObjectHideFlags: 0

+ 585 - 44
Assets/Res/UI/MainUIPanel.prefab

@@ -319,11 +319,12 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3456306615374035144}
+  - {fileID: 3769348636957715381}
   m_Father: {fileID: 2306360978136577391}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -56.5}
+  m_AnchoredPosition: {x: 0, y: -105}
   m_SizeDelta: {x: 750, y: 64.599976}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2408033288920626530
@@ -398,9 +399,9 @@ RectTransform:
   - {fileID: 1125220131462145608}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 22, y: 0}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &1019618551045907487
@@ -1082,6 +1083,129 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &2372439341952219427
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8091112176597121872}
+  - component: {fileID: 3965420227716831052}
+  - component: {fileID: 4754362989316858534}
+  - component: {fileID: 1277215176106341}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: HeroBags
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8091112176597121872
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2372439341952219427}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7362160405140399304}
+  - {fileID: 4391858190883622590}
+  m_Father: {fileID: 5407905478464383173}
+  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: 295, y: 232.04987}
+  m_SizeDelta: {x: 116.66666, y: 179.70001}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3965420227716831052
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2372439341952219427}
+  m_CullTransparentMesh: 1
+--- !u!114 &4754362989316858534
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2372439341952219427}
+  m_Enabled: 0
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.11764706, g: 0.14117648, b: 0.2509804, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 03cc62a06f5fc44639b0a7ec241ee65f, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &1277215176106341
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2372439341952219427}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 4754362989316858534}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
 --- !u!1 &2764896937034663281
 GameObject:
   m_ObjectHideFlags: 0
@@ -1232,7 +1356,7 @@ RectTransform:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2784682568499014237}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1240,11 +1364,11 @@ RectTransform:
   - {fileID: 5521065678043945688}
   - {fileID: 5534452814957956837}
   - {fileID: 2100703262940690265}
-  m_Father: {fileID: 2306360978136577391}
+  m_Father: {fileID: 3100148146476530636}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 1}
   m_AnchorMax: {x: 0.5, y: 1}
-  m_AnchoredPosition: {x: 0, y: -137}
+  m_AnchoredPosition: {x: 0, y: -112.8}
   m_SizeDelta: {x: 600, y: 60}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4840535412922784437
@@ -1729,6 +1853,103 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &3448175583277746731
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 9120029036529632753}
+  - component: {fileID: 5455270301715299168}
+  - component: {fileID: 6864125694973355175}
+  - component: {fileID: 5605121588562016193}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &9120029036529632753
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3448175583277746731}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4391858190883622590}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 2, y: 2}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5455270301715299168
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3448175583277746731}
+  m_CullTransparentMesh: 1
+--- !u!114 &6864125694973355175
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3448175583277746731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.007843138, g: 0.30588236, b: 0.21176471, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: 1307fbb8952fb4e8f8169aa09bd692ed, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &5605121588562016193
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3448175583277746731}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_IgnoreLayout: 1
+  m_MinWidth: -1
+  m_MinHeight: -1
+  m_PreferredWidth: -1
+  m_PreferredHeight: -1
+  m_FlexibleWidth: -1
+  m_FlexibleHeight: -1
+  m_LayoutPriority: 1
 --- !u!1 &3546345666168643637
 GameObject:
   m_ObjectHideFlags: 0
@@ -1975,9 +2196,9 @@ RectTransform:
   - {fileID: 8879947183720841500}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -290, y: 0}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3769501664327749828
@@ -2285,7 +2506,6 @@ GameObject:
   serializedVersion: 7
   m_Component:
   - component: {fileID: 6466028004710776003}
-  - component: {fileID: 5193857405195372012}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: hero_battle
@@ -2317,32 +2537,6 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 1}
   m_SizeDelta: {x: 750, y: 240}
   m_Pivot: {x: 0.5, y: 0.5}
---- !u!114 &5193857405195372012
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4416260798122965244}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Padding:
-    m_Left: 10
-    m_Right: 0
-    m_Top: 0
-    m_Bottom: 0
-  m_ChildAlignment: 3
-  m_Spacing: 6
-  m_ChildForceExpandWidth: 0
-  m_ChildForceExpandHeight: 0
-  m_ChildControlWidth: 0
-  m_ChildControlHeight: 0
-  m_ChildScaleWidth: 0
-  m_ChildScaleHeight: 0
-  m_ReverseArrangement: 0
 --- !u!1 &4456428262461174911
 GameObject:
   m_ObjectHideFlags: 0
@@ -2630,6 +2824,98 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &4804264927101951070
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7362160405140399304}
+  - component: {fileID: 7796557343502220076}
+  - component: {fileID: 3014597195209789819}
+  - component: {fileID: 3056601540023571549}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7362160405140399304
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4804264927101951070}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8091112176597121872}
+  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: 2.6, y: 11}
+  m_SizeDelta: {x: 117, y: 109}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7796557343502220076
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4804264927101951070}
+  m_CullTransparentMesh: 1
+--- !u!114 &3014597195209789819
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4804264927101951070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: a52e1372e66954bcf8dfac5f52044251, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &3056601540023571549
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4804264927101951070}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 0, y: -4}
+  m_UseGraphicAlpha: 1
 --- !u!1 &4820970414644533842
 GameObject:
   m_ObjectHideFlags: 0
@@ -3042,9 +3328,9 @@ RectTransform:
   - {fileID: 5532971017468151339}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 178, y: 0}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5345206875650113673
@@ -3234,9 +3520,9 @@ RectTransform:
   - {fileID: 1772377454253642209}
   m_Father: {fileID: 6466028004710776003}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: -134, y: 0}
   m_SizeDelta: {x: 150, y: 200}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5997383203689388094
@@ -3362,7 +3648,6 @@ RectTransform:
   m_Children:
   - {fileID: 3100148146476530636}
   - {fileID: 5407905478464383173}
-  - {fileID: 3769348636957715381}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
@@ -3426,6 +3711,7 @@ RectTransform:
   m_Children:
   - {fileID: 6466028004710776003}
   - {fileID: 2795529932863041108}
+  - {fileID: 8091112176597121872}
   m_Father: {fileID: 2306360978136577391}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0}
@@ -3471,6 +3757,141 @@ CanvasRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6780802483241756600}
   m_CullTransparentMesh: 1
+--- !u!1 &6789756013667246598
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4325603635048879701}
+  - component: {fileID: 321649979549736233}
+  - component: {fileID: 4942945834179944820}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (TMP)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4325603635048879701
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6789756013667246598}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 4391858190883622590}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 18.84, y: 49}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &321649979549736233
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6789756013667246598}
+  m_CullTransparentMesh: 1
+--- !u!114 &4942945834179944820
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6789756013667246598}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_text: 2
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 715855d65a80d4bd1afb15a96bcf5a78, type: 2}
+  m_sharedMaterial: {fileID: 8923021707789016035, guid: 715855d65a80d4bd1afb15a96bcf5a78, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 34
+  m_fontSizeBase: 34
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 72
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: -5, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &6927447534267390032
 GameObject:
   m_ObjectHideFlags: 0
@@ -3739,6 +4160,126 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &7803319478472451267
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4391858190883622590}
+  - component: {fileID: 5791296258592111927}
+  - component: {fileID: 6820583644934673956}
+  - component: {fileID: 241381334777847186}
+  - component: {fileID: 7545739860512140264}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Alert_Circle_s_Green
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4391858190883622590
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7803319478472451267}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4325603635048879701}
+  - {fileID: 9120029036529632753}
+  m_Father: {fileID: 8091112176597121872}
+  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: 48.09996, y: 46.635864}
+  m_SizeDelta: {x: 0, y: 58}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5791296258592111927
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7803319478472451267}
+  m_CullTransparentMesh: 1
+--- !u!114 &6820583644934673956
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7803319478472451267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.03529412, g: 0.7764706, b: 0.3137255, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: fe62dbba2502e4766a8150113c51bef0, type: 3}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+--- !u!114 &241381334777847186
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7803319478472451267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 18
+    m_Right: 18
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: 0
+  m_ChildForceExpandWidth: 0
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!114 &7545739860512140264
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7803319478472451267}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 0
 --- !u!1 &8160896584844719095
 GameObject:
   m_ObjectHideFlags: 0

+ 70 - 24
Assets/Res/UI/Widget_Hero.prefab

@@ -187,9 +187,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 20.29, y: -16.5}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8144389359825814294
@@ -474,9 +474,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 84.29, y: -16.5}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2739737631316204749
@@ -550,9 +550,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 68.29, y: -16.5}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2708601044019718149
@@ -626,9 +626,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 36.29, y: -16.5}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8783385350428690739
@@ -900,6 +900,7 @@ GameObject:
   - component: {fileID: 5106666997551906113}
   - component: {fileID: 8653829958343529847}
   - component: {fileID: 8641256824108606021}
+  - component: {fileID: 1237577693768947228}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Widget_Hero
@@ -907,7 +908,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5106666997551906113
 RectTransform:
   m_ObjectHideFlags: 0
@@ -927,9 +928,9 @@ RectTransform:
   - {fileID: 469899750509314430}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 92.1, y: -128.7}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 175, y: 235}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &8653829958343529847
@@ -960,11 +961,11 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 1
     ListCollectorDatas:
-    - gameObject: {fileID: 1893654776998886885}
-    - gameObject: {fileID: 3829851137653808305}
-    - gameObject: {fileID: 586281481670808277}
-    - gameObject: {fileID: 8196141183824375260}
-    - gameObject: {fileID: 1242894183903934781}
+    - gameObject: {fileID: 2054454074167662785}
+    - gameObject: {fileID: 2068292004882907889}
+    - gameObject: {fileID: 7524693852372550712}
+    - gameObject: {fileID: 3035075031006461083}
+    - gameObject: {fileID: 1235474140743937961}
   - key: lv
     gameObject: {fileID: 1775347105584567144}
     isAssetBundle: 0
@@ -1040,6 +1041,51 @@ MonoBehaviour:
   m_OnClick:
     m_PersistentCalls:
       m_Calls: []
+--- !u!61 &1237577693768947228
+BoxCollider2D:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5424729500125663363}
+  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!1 &5677483184485922613
 GameObject:
   m_ObjectHideFlags: 0
@@ -1301,9 +1347,9 @@ RectTransform:
   m_Children: []
   m_Father: {fileID: 8309734339275653843}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 52.29, y: -16.5}
   m_SizeDelta: {x: 21, y: 23}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &6307304734260365425

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 555 - 153
Assets/Scenes/UITest.scene


+ 3 - 0
Assets/Scripts/Core/Audio.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 051ae1eeb6ea4e608ef5d3e49455e7d5
+timeCreated: 1732522479

+ 31 - 0
Assets/Scripts/Core/Audio/AudioBundleInfo.cs

@@ -0,0 +1,31 @@
+using System;
+using Fort23.Core;
+using UnityEngine;
+
+namespace Core.Audio
+{
+    public class AudioBundleInfo : IDisposable
+    {
+
+        private string _audioClipName;
+
+        public AudioBundleInfo(string audioClipName, float volume)
+        {
+            _audioClipName = audioClipName;
+        }
+
+        public async CTask<AssetHandle> GetAudioClip()
+        {
+
+            AssetHandle _audioClip = await AssetBundleLoadManager.Instance.LoadAssetAsyncTask<AudioClip>(_audioClipName);
+            return _audioClip;
+        }
+
+
+
+        public void Dispose()
+        {
+
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/Audio/AudioBundleInfo.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 9e6e0116362d492db2edfcfe0d6b474f
+timeCreated: 1732522569

+ 218 - 0
Assets/Scripts/Core/Audio/AudioManager.cs

@@ -0,0 +1,218 @@
+using System.Collections.Generic;
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine;
+using UnityEngine.Audio;
+using Utility;
+
+namespace Core.Audio
+{
+    public class AudioManager : Singleton<AudioManager>
+    {
+        private GameObject _root;
+        public AudioMixerGroup AudioMixerGroup;
+        private Map<string, AudioBundleInfo> _allAduionBundleInfos = new Map<string, AudioBundleInfo>();
+
+        private Queue<AudioSourcePool> _audioSourcePools = new Queue<AudioSourcePool>();
+        private List<AudioSourcePool> _currPlayAudio = new List<AudioSourcePool>();
+
+        private List<string> _bgmQueue = new List<string>();
+        private AudioSourcePool _currBgm;
+
+        private List<string> _audion = new List<string>();
+
+        public AudioManager()
+        {
+            // UIAudio.AudioPlayManager = this;
+            _root = new GameObject();
+            _root.name = "audio";
+            Object.DontDestroyOnLoad(_root);
+        }
+
+        /// <summary>
+        /// 设置音效音量
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetAudioValue(float value)
+        {
+        }
+
+        /// <summary>
+        /// 设置背景音乐音量
+        /// </summary>
+        /// <param name="value"></param>
+        public void SetBgmValue(float value)
+        {
+        }
+
+        public async CTask Init()
+        {
+        }
+
+
+        public async CTask LoadAudio(AudionSettingConfig audionSettingConfig)
+        {
+            CTaskAwaitBuffer cTaskAwaitBuffer = new CTaskAwaitBuffer();
+            for (int i = 0; i < audionSettingConfig.configs.Count; i++)
+            {
+                CTask cTask = LoadAudio(audionSettingConfig.configs[i]);
+                cTaskAwaitBuffer.AddTask(cTask);
+            }
+
+            await cTaskAwaitBuffer.WaitAll();
+        }
+
+        public async CTask LoadAudio(AudionSettingConfig.AudionConfig audionConfig)
+        {
+            await GetAduionBundleInfo(audionConfig.audionClipName, audionConfig.volume);
+        }
+
+        public async CTask<AudioBundleInfo> GetAduionBundleInfo(string audionName, float volume = 1)
+        {
+            if (_allAduionBundleInfos.TryGetValue(audionName, out AudioBundleInfo abi))
+            {
+                return abi;
+            }
+
+            AudioBundleInfo audioBundleInfo = new AudioBundleInfo(audionName, volume);
+            return audioBundleInfo;
+        }
+
+
+        public void Recycle(AudioSourcePool audioSourcePool)
+        {
+            if (!_audioSourcePools.Contains(audioSourcePool))
+            {
+                _audioSourcePools.Enqueue(audioSourcePool);
+            }
+
+            _currPlayAudio.Remove(audioSourcePool);
+        }
+
+        private AudioSourcePool GetAudioSourcePool()
+        {
+            if (_audioSourcePools.Count <= 0)
+            {
+                AudioSourcePool audioSourcePool = new AudioSourcePool();
+                audioSourcePool.Init(_root.transform);
+                return audioSourcePool;
+            }
+
+            AudioSourcePool asp = _audioSourcePools.Dequeue();
+            return asp;
+        }
+
+        public void Stop(string audionName)
+        {
+            for (int i = 0; i < _currPlayAudio.Count; i++)
+            {
+                if (_currPlayAudio[i].CurrPlayName.Equals(audionName))
+                {
+                    _currPlayAudio[i].Finish();
+                    i--;
+                }
+            }
+        }
+
+        public async void PlayBGM(string bgmName)
+        {
+            if (_currBgm != null && _currBgm.CurrPlayName != null && _currBgm.CurrPlayName.Equals(bgmName))
+            {
+                return;
+            }
+
+            if (_currBgm != null && _currBgm.IsPlay)
+            {
+                _bgmQueue.Add(_currBgm.CurrPlayName);
+            }
+
+            AudioBundleInfo audioBundleInfo = await GetAduionBundleInfo(bgmName);
+
+            AssetHandle audioClip = await audioBundleInfo.GetAudioClip();
+            if (_currBgm == null)
+            {
+                _currBgm = GetAudioSourcePool();
+            }
+
+            _currBgm.Play(bgmName, audioClip, true);
+        }
+
+        public void PauseBGM()
+        {
+            if (_currBgm != null)
+            {
+                _currBgm.Pause();
+            }
+        }
+
+        public void UnPauseBGM()
+        {
+            if (_currBgm != null)
+            {
+                _currBgm.UnPause();
+            }
+        }
+
+        public async void StopBGM(string bgmName)
+        {
+            if (_currBgm == null || _currBgm._currPlayName == null)
+            {
+                return;
+            }
+
+            if (_currBgm.CurrPlayName.Equals(bgmName))
+            {
+                _currBgm.Stop();
+                if (_bgmQueue.Count > 0)
+                {
+                    string nextBgmName = _bgmQueue[^1];
+                    _bgmQueue.RemoveAt(_bgmQueue.Count - 1);
+                    PlayBGM(nextBgmName);
+                }
+
+                return;
+            }
+
+            if (_bgmQueue.Count > 0)
+            {
+                for (int i = _bgmQueue.Count - 1; i >= 0; i--)
+                {
+                    if (_bgmQueue[i].Equals(bgmName))
+                    {
+                        _bgmQueue.RemoveAt(i);
+                    }
+                }
+            }
+        }
+
+        public async CTask<AudioSourcePool> PlayAudio(string audionName, bool isLoop = false, float speed = 1)
+        {
+            if (string.IsNullOrEmpty(audionName))
+            {
+                return null;
+            }
+
+            AudioBundleInfo audioBundleInfo = await GetAduionBundleInfo(audionName);
+
+            AssetHandle audioClip = await audioBundleInfo.GetAudioClip();
+            if (audioClip == null)
+            {
+                return null;
+            }
+
+            AudioSourcePool audioSourcePool = GetAudioSourcePool();
+            audioSourcePool.Play(audionName, audioClip, isLoop, speed);
+            return audioSourcePool;
+        }
+
+        public void Play(string audionName, bool isLoop)
+        {
+            PlayAudio(audionName, isLoop);
+        }
+
+        public void TimeLinePlayAudio(string audioName, bool isLoop, float speed)
+        {
+            PlayAudio(audioName, isLoop);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/Audio/AudioManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 5c7b45b24dd14740ae4523eb6e3516b3
+timeCreated: 1732522485

+ 18 - 0
Assets/Scripts/Core/Audio/AudioMono.cs

@@ -0,0 +1,18 @@
+using System;
+using UnityEngine;
+
+namespace Core.Audio
+{
+    [AddComponentMenu("特效脚本/音效/显示时播放音效")]
+    public class AudioMono : MonoBehaviour
+    {
+        public string audioName;
+
+        public bool isLoop;
+
+        private void Awake()
+        {
+            AudioManager.Instance.Play(audioName, isLoop);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/Audio/AudioMono.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 8090a4f6337843418425d1bbab544918
+timeCreated: 1732523087

+ 104 - 0
Assets/Scripts/Core/Audio/AudioSourcePool.cs

@@ -0,0 +1,104 @@
+using System;
+using Fort23.Core;
+using UnityEngine;
+
+namespace Core.Audio
+{
+    public class AudioSourcePool: IDisposable
+    {
+        private AudioSource _audioSource;
+
+        private TimerEntity _timerEntity;
+
+
+        private AssetHandle _assetHandle;
+        public bool IsPlay;
+
+        public System.Action OnFinish;
+        public string CurrPlayName
+        {
+            get { return _currPlayName; }
+        }
+
+        public string _currPlayName;
+
+        public void Init(Transform root)
+        {
+            GameObject gameObject = new GameObject();
+            _audioSource = gameObject.AddComponent<AudioSource>();
+            gameObject.transform.SetParent(root);
+        }
+
+        public void Play(string audioName, AssetHandle audioClip, bool isLoop, float speed = 1)
+        {
+            if (audioClip == null)
+            {
+                return;
+            }
+
+            if (_assetHandle != null)
+            {
+                _assetHandle.Release();
+            }
+
+            IsPlay = true;
+            _currPlayName = audioName;
+            _assetHandle = audioClip;
+            _audioSource.clip = _assetHandle.AssetObject<AudioClip>();
+            _audioSource.loop = isLoop;
+            _audioSource.pitch = speed;
+            if (speed > 1)
+            {
+                _audioSource.outputAudioMixerGroup = AudioManager.Instance.AudioMixerGroup;
+                _audioSource.outputAudioMixerGroup.audioMixer.SetFloat("path", 1f / speed);
+            }
+            else
+            {
+                _audioSource.outputAudioMixerGroup = null;
+            }
+
+
+            _audioSource.Play();
+            if (!isLoop)
+            {
+                _timerEntity = TimerComponent.Instance.AddTimer((long) (_audioSource.clip.length * 1000L),
+                    delegate { Finish(); });
+            }
+        }
+
+
+        public void Finish()
+        {
+            IsPlay = false;
+            OnFinish?.Invoke();
+            _audioSource.Stop();
+            AudioManager.Instance.Recycle(this);
+            TimerComponent.Instance.Remove(_timerEntity);
+            _timerEntity = null;
+        }
+
+        public void Stop()
+        {
+            IsPlay = false;
+            _audioSource.Stop();
+        }
+
+        public void Pause()
+        {
+            _audioSource.Pause();
+        }
+
+        public void UnPause()
+        {
+            _audioSource.UnPause();
+        }
+
+        public void Dispose()
+        {
+            if (_assetHandle != null)
+            {
+                _assetHandle.Release();
+            }
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/Audio/AudioSourcePool.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 083a4c7ae7eb4604b8bf8e26c3749ae6
+timeCreated: 1732522533

+ 38 - 0
Assets/Scripts/Core/Audio/AudionSettingConfig.cs

@@ -0,0 +1,38 @@
+using System.Collections.Generic;
+using UnityEngine;
+
+namespace Core.Audio
+{
+    [CreateAssetMenu(menuName = "Asset/AudionSettingConfig", fileName = "AudionSettingConfig")]
+    public class AudionSettingConfig: ScriptableObject
+    {
+        public int useCount;
+
+        [System.Serializable]
+        public class AudionConfig
+        {
+            public string describe = "描述这个音效作用";
+            public string audionClipName;
+            [Range(0, 1)] public float volume = 1;
+        }
+
+        // [HideInInspector]
+        // [SerializeField]
+        public List<AudionConfig> configs = new List<AudionConfig>();
+
+        public AudionConfig GetAudionConfig(string clipName)
+        {
+            if (configs == null)
+                return null;
+            for (int i = 0; i < configs.Count; i++)
+            {
+                if (configs[i].audionClipName==null)
+                    continue;
+                if (configs[i].audionClipName.Equals(clipName))
+                    return configs[i];
+            }
+
+            return null;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/Audio/AudionSettingConfig.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1b099297e0f149559e4f5adf700639ce
+timeCreated: 1732522666

+ 10 - 10
Assets/Scripts/Core/GPUAnimtion.cs

@@ -36,8 +36,8 @@ public class GPUAnimtion
     public int animtionIndex;
 
 
-    private MaterialPropertyBlock _materialPropertyBlock;
-    private Renderer renderer;
+    // private MaterialPropertyBlock _materialPropertyBlock;
+    // private Renderer renderer;
 
     public void SetSpeed(float speed)
     {
@@ -58,19 +58,19 @@ public class GPUAnimtion
     public void Update()
     {
         Execute();
-        _materialPropertyBlock.SetMatrix("_AnimationState", gpuEcsAnimatorShaderData.shaderData);
-        _materialPropertyBlock.SetFloat("_EnableAnimation", 1);
-        renderer.SetPropertyBlock(_materialPropertyBlock);
+        // _materialPropertyBlock.SetMatrix("_AnimationState", gpuEcsAnimatorShaderData.shaderData);
+        // _materialPropertyBlock.SetFloat("_EnableAnimation", 1);
+        // renderer.SetPropertyBlock(_materialPropertyBlock);
     }
 
     public void Init(GpuEcsAnimatorBehaviour gpuEcsAnimatorBehaviour)
     {
-        _materialPropertyBlock = new MaterialPropertyBlock();
+        // _materialPropertyBlock = new MaterialPropertyBlock();
 
-        GpuEcsAnimatedMeshBehaviour ecsAnimatedMeshBehaviour = gpuEcsAnimatorBehaviour.gameObject.transform
-            .GetComponentInChildren<GpuEcsAnimatedMeshBehaviour>();
-        renderer = ecsAnimatedMeshBehaviour.GetComponent<Renderer>();
-        renderer.GetPropertyBlock(_materialPropertyBlock);
+        // GpuEcsAnimatedMeshBehaviour ecsAnimatedMeshBehaviour = gpuEcsAnimatorBehaviour.gameObject.transform
+        //     .GetComponentInChildren<GpuEcsAnimatedMeshBehaviour>();
+        // renderer = ecsAnimatedMeshBehaviour.GetComponent<Renderer>();
+        // renderer.GetPropertyBlock(_materialPropertyBlock);
         gpuEcsAnimationData = new GpuEcsAnimationDataComponent()
         {
             nbrOfAttachmentAnchors = gpuEcsAnimatorBehaviour.nbrOfAttachmentAnchors,

+ 11 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/CombatController.cs

@@ -1,15 +1,19 @@
 using Common.Utility.CombatEvent;
+using Core.Audio;
 using Core.State;
 using Fort23.Core;
 using GameLogic.Combat.CombatState;
 using GameLogic.Combat.CombatType;
+using GameLogic.Combat.Hero.HeroGPU;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
+using Utility.CustomizeTimeLogic.FxLogic.TimeLineEvent;
 using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
+using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic;
 
 namespace GameLogic.Combat.CombatTool
 {
-    public class CombatController
+    public class CombatController : ITimeLineAudio
     {
         public static CombatController currActiveCombat;
         public CombatHeroController CombatHeroController;
@@ -29,6 +33,7 @@ namespace GameLogic.Combat.CombatTool
 
         public async CTask InitCombat()
         {
+            TimeLineSingletonEventManager.Instance.AddTimeLineBasic(this);
             GameTimeLineParticleFactory = new GameTimeLineParticleFactory();
             TimeLineFxParticleTool.Instance.Init(GameTimeLineParticleFactory);
             currActiveCombat = this;
@@ -71,5 +76,10 @@ namespace GameLogic.Combat.CombatTool
             stateControl.Update(t);
             CombatTypeBasic?.Update(t);
         }
+
+        public void PlayAudio(string audioName, bool isLoop)
+        {
+            AudioManager.Instance.PlayAudio(audioName, isLoop);
+        }
     }
 }

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatType/TestCombatType.cs

@@ -21,9 +21,9 @@ namespace GameLogic.Combat.CombatType
         protected List<string> equipName = new List<string>()
         {
             "fx_down_zb_blue",
+            "fx_down_zb_gold",
             "fx_down_zb_green",
-            "fx_down_zb_red",
-            "fx_down_zb_yellow",
+            "fx_down_zb_orange",
             "fx_down_zb_purple",
         };
 

+ 1 - 0
Assets/Scripts/GameLogic/Combat/Hero/CombatHeroEntity.cs

@@ -58,6 +58,7 @@ public class CombatHeroEntity : ITimeLineSpecialDotPos, ILifeCycle, ITimeLineAni
             modelName += "_gpu";
         }
 
+        // GameTimeLineParticleFactory
         GameObjectPool poolInterface =
             await GObjectPool.Instance.FetchAsync<GameObjectPool>(modelName + ".prefab", null);
 #if !COMBAT_SERVER

+ 5 - 1
Assets/Scripts/GameLogic/Combat/Hero/HeroAanimtion/CombatHeroGPUAnimtion.cs

@@ -1,4 +1,5 @@
-using GPUECSAnimationBaker.Engine.AnimatorSystem;
+using GameLogic.Combat.Hero.HeroGPU;
+using GPUECSAnimationBaker.Engine.AnimatorSystem;
 
 namespace GameLogic.Combat.Hero
 {
@@ -10,6 +11,7 @@ namespace GameLogic.Combat.Hero
         private GpuEcsAnimationData[] animations;
         private HeroGPUAnimtionStateInfo _heroPlayStateInfoBasic;
 
+        protected HeroGPUMono _heroGPUMono;
         protected override void ProInit()
         {
             GpuEcsAnimatorBehaviour = combatHeroEntity.GameObject.transform.GetComponentInChildren<GpuEcsAnimatorBehaviour>();
@@ -17,11 +19,13 @@ namespace GameLogic.Combat.Hero
             GPUAnimtion = new GPUAnimtion();
             GPUAnimtion.Init(GpuEcsAnimatorBehaviour);
             _heroPlayStateInfoBasic = new HeroGPUAnimtionStateInfo();
+            _heroGPUMono = combatHeroEntity.GameObject.GetComponent<HeroGPUMono>();
         }
 
         protected override void ProUpdate(float t)
         {
             GPUAnimtion.Update();
+            _heroGPUMono.animtionState = GPUAnimtion.gpuEcsAnimatorShaderData.shaderData;
         }
 
         private int GetAnimtionIndex(string name)

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Hero/HeroGPU.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 917df73f66c04d82bc654fb1557aca59
+timeCreated: 1732513902

+ 27 - 0
Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPUMono.cs

@@ -0,0 +1,27 @@
+using System;
+using Unity.Mathematics;
+using UnityEngine;
+
+namespace GameLogic.Combat.Hero.HeroGPU
+{
+    public class HeroGPUMono : MonoBehaviour
+    {
+      
+        // public string monoName;
+        public Material Material;
+        public Mesh Mesh;
+
+        public Transform rootTrans;
+        public float4x4 animtionState= float4x4.identity;
+        
+        private void OnEnable()
+        {
+            HeroGPURenderManager.Instance.AddHeroGpuRender(this);
+        }
+
+        private void OnDisable()
+        {
+            HeroGPURenderManager.Instance.RemoveHeroGpuRender(this);
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPUMono.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: a40d3c6a0de749f1b69a4fbe9950104c
+timeCreated: 1732513917

+ 71 - 0
Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPURenderManager.cs

@@ -0,0 +1,71 @@
+using UnityEngine;
+using Utility;
+
+namespace GameLogic.Combat.Hero.HeroGPU
+{
+    public class HeroGPURenderManager : Singleton<HeroGPURenderManager>
+    {
+        protected Map<string, BetterList<HeroGPUMono>> gpuRenderMap = new Map<string, BetterList<HeroGPUMono>>();
+
+        int enableShaderId = Shader.PropertyToID("_EnableAnimation");
+        int animtionStateId = Shader.PropertyToID("_AnimationState");
+
+        public HeroGPURenderManager()
+        {
+            StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+        }
+
+        public void AddHeroGpuRender(HeroGPUMono gpuMono)
+        {
+            if (gpuRenderMap.TryGetValue(gpuMono.gameObject.name, out BetterList<HeroGPUMono> list))
+            {
+                list.Add(gpuMono);
+            }
+            else
+            {
+                list = new BetterList<HeroGPUMono>();
+                list.Add(gpuMono);
+                gpuRenderMap.Add(gpuMono.gameObject.name, list);
+            }
+        }
+
+        public void RemoveHeroGpuRender(HeroGPUMono gpuMono)
+        {
+            if (gpuRenderMap.TryGetValue(gpuMono.gameObject.name, out BetterList<HeroGPUMono> list))
+            {
+                list.Remove(gpuMono);
+            }
+        }
+
+        public void Update()
+        {
+            for (gpuRenderMap.Begin(); gpuRenderMap.Next();)
+            {
+                int count = gpuRenderMap.Value.Count;
+                if (count <= 0)
+                {
+                    continue;
+                }
+
+                MaterialPropertyBlock _materialPropertyBlock = new MaterialPropertyBlock();
+                RenderParams rp = new RenderParams(gpuRenderMap.Value[0].Material);
+                rp.matProps = _materialPropertyBlock;
+              
+                Matrix4x4[] instData = new Matrix4x4[count];
+                Matrix4x4[] animtionStata = new Matrix4x4[count];
+                float[] enableAnimations = new float[count];
+                for (int i = 0; i < count; i++)
+                {
+                    HeroGPUMono heroGPUMono = gpuRenderMap.Value[i];
+                    instData[i] = heroGPUMono.rootTrans.localToWorldMatrix;
+                    animtionStata[i] = heroGPUMono.animtionState;
+                    enableAnimations[i] = 1;
+                }
+
+                _materialPropertyBlock.SetFloatArray(enableShaderId, enableAnimations);
+                _materialPropertyBlock.SetMatrixArray(animtionStateId, animtionStata);
+                Graphics.RenderMeshInstanced(rp, gpuRenderMap.Value[0].Mesh, 0, instData);
+            }
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Combat/Hero/HeroGPU/HeroGPURenderManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 185fbe31273c4ae4b48c90fd82a86f3f
+timeCreated: 1732513934

+ 10 - 0
Assets/Scripts/GameLogic/CombatScenesTool/CombatHeroModelLoadManager.cs

@@ -0,0 +1,10 @@
+using Utility;
+
+namespace GameLogic.CombatScenesTool
+{
+    // public class CombatHeroModelLoadManager: Singleton<CombatHeroModelLoadManager>
+    // {
+    //     public BetterList<string> gpuModelList = new BetterList<string>();
+    //     public void 
+    // }
+}

+ 3 - 0
Assets/Scripts/GameLogic/CombatScenesTool/CombatHeroModelLoadManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 173bd22b7f85431a9fe02b2a9e4aef06
+timeCreated: 1732513700

+ 3 - 2
Assets/Scripts/GameLogic/Fort23.GameLogic.asmdef

@@ -6,8 +6,9 @@
         "GUID:8686510298c0d4b4eb1f222eb30ff079",
         "GUID:8c4dd21966739024fbd72155091d199e",
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
-        "Fort23.GameData",
-        "GUID:fdb14afa911c65e4982db867bfd7afce"
+        "GUID:fa5baf2c58faab54689c976e76104564",
+        "GUID:fdb14afa911c65e4982db867bfd7afce",
+        "GUID:d8b63aba1907145bea998dd612889d6b"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 20 - 3
Assets/Scripts/GameLogic/MyPlugin.cs

@@ -2,6 +2,7 @@ using System;
 using UnityEngine;
 using System.Runtime.InteropServices;
 using GPUECSAnimationBaker.Engine.AnimatorSystem;
+using Random = UnityEngine.Random;
 
 public class MyPlugin : MonoBehaviour
 {
@@ -35,11 +36,27 @@ public class MyPlugin : MonoBehaviour
     
     void Update()
     {
+        MaterialPropertyBlock  _materialPropertyBlock = new MaterialPropertyBlock();
+        
         RenderParams rp = new RenderParams(material);
+       
         Matrix4x4[] instData = new Matrix4x4[numInstances];
-        for(int i=0; i<numInstances; ++i)
-            instData[i] = Matrix4x4.Translate(new Vector3(-4.5f+i, 0.0f, 5.0f));
-        Graphics.RenderMeshInstanced(rp, mesh, 0, instData);
+        Vector4[] colors = new Vector4[numInstances];
+        Matrix4x4[] animMatrix4X4s = new Matrix4x4[numInstances];
+        for (int i = 0; i < numInstances; ++i)
+        {
+            colors[i] = new Color(Random.Range(0f,1f), Random.Range(0f,1f), Random.Range(0f,1f));
+            instData[i] = Matrix4x4.Translate(new Vector3(-4.5f + i, 0.0f, 5.0f));
+            animMatrix4X4s[i]= Matrix4x4.TRS(new Vector3(0, 0, 0), Quaternion.identity, new Vector3(1, 1, 1));
+        }
+
+        // colors[0] = Color.green;
+        // colors[1] = Color.red;
+        // _materialPropertyBlock.
+        _materialPropertyBlock.SetVectorArray("_mainColor",colors);
+        _materialPropertyBlock.SetMatrixArray("_AnimationState",animMatrix4X4s);
+        rp.matProps = _materialPropertyBlock;
+        Graphics.RenderMeshInstanced(rp, mesh, 0, instData, numInstances,0);
     }
     
     

+ 4 - 0
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAIBeelineBulletLogic.cs

@@ -1,4 +1,5 @@
 using System;
+using Core.Audio;
 using Core.Triiger;
 using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
@@ -7,6 +8,7 @@ using UTool.CustomizeTimeLogic.FxLogic.TimeLineEventinterface;
 
 namespace Common.Combat.FxAILogic
 {
+    [AddComponentMenu("特效脚本/弹道/直线飞行弹道")]
     public class FxAIBeelineBulletLogic : FxAILogicBasic
     {
         public float speed;
@@ -59,6 +61,8 @@ namespace Common.Combat.FxAILogic
                         collision.ClosestPoint(gameObject.transform.position), null, false, null, null);
                 }
 
+                AudioManager.Instance.PlayAudio(hitAudioName, false);
+
                 if (!isPenetrate)
                 {
                     Dispose();

+ 2 - 1
Assets/Scripts/GameLogic/Paritcle/ParitcleLogic/FxAILogicBasic.cs

@@ -20,7 +20,8 @@ namespace Common.Combat.FxAILogic
         private ILifetCycleHitPoint _attTarget;
 
         [Header("碰撞时的特效")] public string hitFxName;
-
+        [Header("碰撞音效")]
+        public string hitAudioName;
         public ILifetCycleHitPoint AttTarget
         {
             get { return _attTarget; }

+ 9 - 0
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -11,4 +11,13 @@ public class PlayerManager : Singleton<PlayerManager>
     /// 上阵的英雄,也可以叫主力,替补英雄等级=主力英雄的最低等级(和afk一样的)
     /// </summary>
     public List<HeroInfo> heroListInLead = new List<HeroInfo>();
+
+    public void TestInit(int n = 3)
+    {
+        for (int i = 0; i < n; i++)
+        {
+            HeroInfo heroInfo = new HeroInfo();
+            heroListInLead.Add(heroInfo);
+        }
+    }
 }

+ 16 - 16
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventLogic/TimeLineAudioEventLogic.cs

@@ -18,22 +18,22 @@ namespace UTool.CustomizeTimeLogic.FxLogic.TimeLineEventLogic
 
         protected override void ProEnter()
         {
-// #if !COMBAT_SERVER
-//
-//             TimeLineAudioSeralization timeLineAudioSeralization =
-//                 mTimeLineAssetSerialization as TimeLineAudioSeralization;
-//             if (!string.IsNullOrEmpty(timeLineAudioSeralization.audioName))
-//             {
-//          
-//                 ITimeLineAudio iTimeLineSkillStart =
-//                     TimeLineSingletonEventManager.Instance.GetTimeLine<ITimeLineAudio>();
-//                 if (iTimeLineSkillStart != null)
-//                 {
-//                     iTimeLineSkillStart.TimeLinePlayAudio(timeLineAudioSeralization.audioName,
-//                         timeLineAudioSeralization.isLoop);
-//                 }
-//             }
-// #endif
+#if !COMBAT_SERVER
+
+            TimeLineAudioSeralization timeLineAudioSeralization =
+                mTimeLineAssetSerialization as TimeLineAudioSeralization;
+            if (!string.IsNullOrEmpty(timeLineAudioSeralization.audioName))
+            {
+         
+                ITimeLineAudio iTimeLineSkillStart =
+                    TimeLineSingletonEventManager.Instance.GetTimeLine<ITimeLineAudio>();
+                if (iTimeLineSkillStart != null)
+                {
+                    iTimeLineSkillStart.PlayAudio(timeLineAudioSeralization.audioName,
+                        timeLineAudioSeralization.isLoop);
+                }
+            }
+#endif
         }
 
         protected override void ProLeave()

+ 1 - 0
Assets/Scripts/GameTimeLine/CustomizeTimeLogic/FxLogic/TimeLineEventinterface/ITimeLineAudio.cs

@@ -4,6 +4,7 @@
     public interface ITimeLineAudio:ITimeLineEventBasic
     {
 
+        void PlayAudio(string audioName,bool isLoop);
     }
 
 }

+ 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()

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

@@ -1,20 +1,35 @@
+using Fort23.UTool;
+using GameLogic.Hero;
+
 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()
+        {
+            // InitHeroDetailPanel();
+        }
+        protected override void AddEvent()
+        {
+        }
+        protected override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+            btnBack.onClick.AddListener(OnClickClose);
+        }
+
+        private void OnClickClose()
+        {
+            UIManager.Instance.HideUIUIPanel(this);
+        }
+
+        public void InitHeroDetailPanel(HeroInfo heroInfo)
+        {
+            LogTool.Log(heroInfo);
+        }
 
-	}
-}
+    }
+}

+ 29 - 0
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs

@@ -0,0 +1,29 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class HeroDetailPanel 
+	{
+	  #region 自定义数据 
+	  private Button _btnBack;
+	  public Button btnBack
+	   {
+	   get{
+	      if (_btnBack == null)
+	       {
+	         _btnBack  = GetUIUnit<Button>("btnBack"); 
+	       }
+	      return _btnBack;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XC9NsyilVi0fvoKPXCaRImghdCcky30Dv9kp1ohcDGHhR2khQ4FdbDQ=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 35 - 9
Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -1,3 +1,5 @@
+using System.Threading.Tasks;
+using Fort23.UTool;
 using GameLogic.Hero;
 using UnityEngine;
 using UnityEngine.UI;
@@ -18,20 +20,44 @@ 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)
+            // {
+            //     heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
+            // }
+            HeroDetailPanel heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(Callback);
+            heroDetailPanel.InitHeroDetailPanel(heroInfo);
         }
 
+        private void Callback(HeroDetailPanel obj)
+        {
+            LogTool.Log("HeroDetailPanel 加载完成");
+        }
+
+
+        private HeroInfo heroInfo;
+        
         /// <summary>
         /// 
         /// </summary>
         /// <param name="heroInfo"></param>
         public void InitHero(HeroInfo heroInfo)
         {
+            // GetComponent<RectTransform>().anchorMin = new Vector2(0.5f, 0.5f);
+            // GetComponent<RectTransform>().anchorMax = new Vector2(0.5f, 0.5f);
+            this.heroInfo = heroInfo;
             lv.text = heroInfo.lv.ToString();
             
             // 最大星级展示个数(6星,只显示一颗星星,换颜色)
@@ -40,22 +66,22 @@ namespace Fort23.Mono
             // 计算 当前星级 应该用什么星星的表现
             int group = (heroInfo.star - 1) / maxShowStar;
 
-     
-            
+
+
             int i = 1;
-            foreach (var star in stars)
+            foreach (GameObject star in stars)
             {
-                GameObject starObj = star as GameObject;
+                // Image image = star.GetComponent<Image>();
 
-                SetStarImg(group, starObj);
+                SetStarImg(group, star);
                 
                 if (heroInfo.star >= i)
                 {
-                    starObj.SetActive(true);
+                    star.SetActive(true);
                 }
                 else
                 {
-                    starObj.SetActive(false);
+                    star.SetActive(false);
                 }
                 i++;
             }

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است