Browse Source

Merge branch 'master' of http://192.168.123.2:3000/ck/XiuXianGame

# Conflicts:
#	Excel2Json/Excel/EventConfig.xlsx   resolved by master version
邹舸 2 tuần trước cách đây
mục cha
commit
d2b8c93684
64 tập tin đã thay đổi với 6415 bổ sung1570 xóa
  1. 7 7
      Assets/Art/ArtHero/FaBao/fb_linglongta.prefab
  2. 121 5
      Assets/Art/ArtHero/FaBao/fb_wulonglun.prefab
  3. 49 0
      Assets/Art/ArtHero/Nanzhu.prefab
  4. 8 3
      Assets/Art/Character/Zuoqi_feijian1/Zq_feijian1.mat
  5. 30 1
      Assets/Art/FaBaoMesh/2wulonglun/wulonglun_jihuo.fbx.meta
  6. BIN
      Assets/Art/FaBaoMesh/2wulonglun/wulonglun_show.fbx
  7. 1 1
      Assets/Art/FaBaoMesh/8linglongta/fb_linglongta_jihuo.FBX.meta
  8. 1 1
      Assets/Art/HeroTimeLine/fb_linglongtaTimeline.playable
  9. 191 345
      Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable
  10. 2 2
      Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat
  11. 4 4
      Assets/Art/VFX/FXPrefabs/fx_fb_ta_sk1_hit.prefab
  12. 39 6
      Assets/Art/VFX/FXPrefabs/fx_fb_wulonglun_sk1.prefab
  13. 37 4
      Assets/Art/VFX/FXPrefabs/fx_fb_wulonglun_sk1_hit.prefab
  14. 2 2
      Assets/Art/VFX/FXPrefabs/fx_gf_jianjue.prefab
  15. 68 87
      Assets/Art/cs3.scene
  16. 8 0
      Assets/Art/nanzhujiao/Materials.meta
  17. 133 0
      Assets/Art/nanzhujiao/Materials/body.mat
  18. 8 0
      Assets/Art/nanzhujiao/Materials/body.mat.meta
  19. 10 5
      Assets/Art/nanzhujiao/nanzhujiao.mat
  20. 8 3
      Assets/Art/nanzhujiao/nanzhujiao_chuwudai.mat
  21. 4138 0
      Assets/Art/shader/RenWuShader.shadergraph
  22. 10 0
      Assets/Art/shader/RenWuShader.shadergraph.meta
  23. 111 62
      Assets/Res/CombatHero/Nanzhu.prefab
  24. 118 118
      Assets/Res/CombatHero/fb_dao1.prefab
  25. 127 127
      Assets/Res/CombatHero/fb_ding1.prefab
  26. 121 50
      Assets/Res/CombatHero/fb_huohulu.prefab
  27. 70 70
      Assets/Res/CombatHero/fb_jian1.prefab
  28. 119 119
      Assets/Res/CombatHero/fb_jian2.prefab
  29. 115 115
      Assets/Res/CombatHero/fb_linglongta.prefab
  30. 99 99
      Assets/Res/CombatHero/fb_wulonglun.prefab
  31. 136 136
      Assets/Res/CombatHero/fb_yuping.prefab
  32. 30 4
      Assets/Res/Config/DivineSenseConfig.json
  33. 0 30
      Assets/Res/Config/DivineSenseIntervalConfig.json
  34. 0 7
      Assets/Res/Config/DivineSenseIntervalConfig.json.meta
  35. 16 0
      Assets/Res/Config/EventConditionConfig.json
  36. 4 16
      Assets/Res/Config/EventConfig.json
  37. 2 1
      Assets/Res/Config/GameConstantConfig.json
  38. 21 21
      Assets/Res/HeroAnimtion/fb_wulonglun.asset
  39. 0 0
      Assets/Res/TimeLineAssets/fb_linglongta_TD.txt
  40. 0 0
      Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt
  41. 1 1
      Assets/Res/UI/CombatPanel.prefab
  42. 62 0
      Assets/Scenes/testCombat.scene
  43. 50 0
      Assets/Scripts/Core/UI/UTool/UtilTools.cs
  44. 4 16
      Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs
  45. 0 44
      Assets/Scripts/GameData/ExcelConfig/DivineSenseIntervalConfig.cs
  46. 6 18
      Assets/Scripts/GameData/ExcelConfig/EventConfig.cs
  47. 6 0
      Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs
  48. 1 1
      Assets/Scripts/GameLogic/Combat/CombatTool/RandomEventController.cs
  49. 2 1
      Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs
  50. 47 30
      Assets/Scripts/GameLogic/EventManager/EventManager.cs
  51. 11 0
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  52. 3 0
      Assets/Scripts/GameUI/DialogueManager.meta
  53. 6 0
      Assets/Scripts/GameUI/DialogueManager/DialogueManager.cs
  54. 0 0
      Assets/Scripts/GameUI/DialogueManager/DialogueManager.cs.meta
  55. 19 2
      Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs
  56. 3 3
      Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs
  57. 8 0
      Assets/Scripts/GameUI/UI/DialoguePanel.meta
  58. 146 0
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs
  59. 1 1
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs.meta
  60. 62 0
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs
  61. 11 0
      Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs.meta
  62. 0 0
      Assets/StreamingAssets/assetConfig.txt
  63. BIN
      Excel2Json/Excel/DivineSenseConfig.xlsx
  64. 2 2
      UserSettings/EditorUserSettings.asset

+ 7 - 7
Assets/Art/ArtHero/FaBao/fb_linglongta.prefab

@@ -828,15 +828,15 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -2.041
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 1.0900002
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 17.029999
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalRotation.w
@@ -844,19 +844,19 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalRotation.x
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalRotation.y
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalRotation.z
-      value: -0
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8141432056947319039, guid: b0969c088ad129545a054e2162a546a3, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y

+ 121 - 5
Assets/Art/ArtHero/FaBao/fb_wulonglun.prefab

@@ -186,10 +186,17 @@ PlayableDirector:
     value: {fileID: 0}
   - key: {fileID: -6338035570506245065, guid: 79367b323f768974099c92ff8555fee1, type: 2}
     value: {fileID: 3497124856034794264}
+  - key: {fileID: -6683161270338213082, guid: 79367b323f768974099c92ff8555fee1, type: 2}
+    value: {fileID: 3497124856034794264}
+  - key: {fileID: -7990616991488039303, guid: 79367b323f768974099c92ff8555fee1, type: 2}
+    value: {fileID: 3497124856034794264}
+  - key: {fileID: 1501360367786949402, guid: 79367b323f768974099c92ff8555fee1, type: 2}
+    value: {fileID: 3497124856034794264}
   m_ExposedReferences:
     m_References:
     - 7bbfbdabf79b23649bf2ea641db23905: {fileID: 3833415742594987859}
-    - 6d3eccffe167dab44a0dcdbbfb0423b2: {fileID: 2654909058069149989}
+    - 6d3eccffe167dab44a0dcdbbfb0423b2: {fileID: 518231936030810897}
+    - d44334d3fa7fc3c42b8e32bf982a182d: {fileID: 8446980630875972984}
     - 8d54be6cf3d11b84fabb6b3083a56325: {fileID: 820428951433757688}
     - 859bfc0d224e6314d90dfd10568a05e8: {fileID: 2654909058069149989}
     - 510073d11a064b44b81d5efc39bc6cae: {fileID: 2153277615486557210}
@@ -523,6 +530,7 @@ Transform:
   - {fileID: 7051549026306058452}
   - {fileID: 3031425856407842255}
   - {fileID: 1184882461353292494}
+  - {fileID: 2040387171121999928}
   m_Father: {fileID: 2607217762360650163}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7675618136784784816
@@ -997,6 +1005,11 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 1848716642415766029, guid: 93f95ebb1f1e6754c8617a38aa94644a, type: 3}
   m_PrefabInstance: {fileID: 3161602375743310338}
   m_PrefabAsset: {fileID: 0}
+--- !u!1 &8446980630875972984 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 6834758604734705530, guid: 93f95ebb1f1e6754c8617a38aa94644a, type: 3}
+  m_PrefabInstance: {fileID: 3161602375743310338}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &4645803222311945302
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1005,6 +1018,34 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 3251510278098087895}
     m_Modifications:
+    - target: {fileID: 1670580103606818993, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: randomSeed
+      value: 3705
+      objectReference: {fileID: 0}
+    - target: {fileID: 1670580103606818993, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4471614490941716829, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 4471614490941716829, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 4471614490941716829, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498051401983318970, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: randomSeed
+      value: 3705
+      objectReference: {fileID: 0}
+    - target: {fileID: 4498051401983318970, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7667656180664854937, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0
@@ -1035,7 +1076,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 7667656180664854937, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 7667656180664854937, guid: 3d1c2af0fee51e64fbd154af7a1ed969, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
@@ -1131,6 +1172,73 @@ Transform:
   m_CorrespondingSourceObject: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
   m_PrefabInstance: {fileID: 5053187491018432164}
   m_PrefabAsset: {fileID: 0}
+--- !u!1001 &5418750025387845736
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3251510278098087895}
+    m_Modifications:
+    - target: {fileID: 5477051435533241209, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_Name
+      value: fx_fb_jin_xiaoshi
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+--- !u!1 &518231936030810897 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 5477051435533241209, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+  m_PrefabInstance: {fileID: 5418750025387845736}
+  m_PrefabAsset: {fileID: 0}
+--- !u!4 &2040387171121999928 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 6297067067398690896, guid: 2f02e581142d3b542b21a39e661596fa, type: 3}
+  m_PrefabInstance: {fileID: 5418750025387845736}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1001 &5576946767679639679
 PrefabInstance:
   m_ObjectHideFlags: 0
@@ -1335,6 +1443,14 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 3251510278098087895}
     m_Modifications:
+    - target: {fileID: 6285575712868172257, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
+      propertyPath: randomSeed
+      value: 2619
+      objectReference: {fileID: 0}
+    - target: {fileID: 6285575712868172257, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 7438131189927720277, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_Name
       value: fx_fb_wulonglun_sk1_hit
@@ -1345,11 +1461,11 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8947174108157658211, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_LocalPosition.y
-      value: -0.09
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8947174108157658211, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 0.445
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8947174108157658211, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_LocalRotation.w
@@ -1369,7 +1485,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 8947174108157658211, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8947174108157658211, guid: cd63a7c5235c8d64b92c2089bee395d7, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y

+ 49 - 0
Assets/Art/ArtHero/Nanzhu.prefab

@@ -388,6 +388,54 @@ Transform:
   m_Children: []
   m_Father: {fileID: 4028940007624978259}
   m_LocalEulerAnglesHint: {x: -5.0216765, y: -5.644926, z: 9.655}
+--- !u!1 &871546385983954465
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1996138378932227819}
+  - component: {fileID: 6361220309531557204}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1996138378932227819
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871546385983954465}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.21, z: 1.53}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5226940908611843665}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &6361220309531557204
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 871546385983954465}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &992400731866501293
 GameObject:
   m_ObjectHideFlags: 0
@@ -1825,6 +1873,7 @@ Transform:
   - {fileID: 403839676904944609}
   - {fileID: 1335242097579043043}
   - {fileID: 5857502490606678529}
+  - {fileID: 1996138378932227819}
   - {fileID: 2179347405586335515}
   - {fileID: 2948314593894703323}
   - {fileID: 4884646209561884663}

+ 8 - 3
Assets/Art/Character/Zuoqi_feijian1/Zq_feijian1.mat

@@ -8,11 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Zq_feijian1
-  m_Shader: {fileID: -6465566751694194690, guid: 3bb35f7f86ffc45c2aa6fc4291f787fc, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: d1ba3a475e53be04c9bb3365e1e94a9e, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _SHADING_STYLE_SKIN_AND_TEXTILES
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -28,6 +27,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 9ffba8d91daad454b8e8ca5f32e45fe1, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Base_map:
+        m_Texture: {fileID: 2800000, guid: 9ffba8d91daad454b8e8ca5f32e45fe1, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -163,8 +166,10 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighColor: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _RimColor: {r: 0.21172799, g: 0.24817115, b: 0.264, a: 0}
     - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1}

+ 30 - 1
Assets/Art/FaBaoMesh/2wulonglun/wulonglun_jihuo.fbx.meta

@@ -33,7 +33,36 @@ ModelImporter:
     animationWrapMode: 0
     extraExposedTransformPaths: []
     extraUserProperties: []
-    clipAnimations: []
+    clipAnimations:
+    - serializedVersion: 16
+      name: jihuo
+      takeName: Take 001
+      internalID: 1827226128182048838
+      firstFrame: 0
+      lastFrame: 10
+      wrapMode: 0
+      orientationOffsetY: 0
+      level: 0
+      cycleOffset: 0
+      loop: 0
+      hasAdditiveReferencePose: 0
+      loopTime: 1
+      loopBlend: 0
+      loopBlendOrientation: 0
+      loopBlendPositionY: 0
+      loopBlendPositionXZ: 0
+      keepOriginalOrientation: 0
+      keepOriginalPositionY: 1
+      keepOriginalPositionXZ: 0
+      heightFromFeet: 0
+      mirror: 0
+      bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
+      curves: []
+      events: []
+      transformMask: []
+      maskType: 3
+      maskSource: {instanceID: 0}
+      additiveReferencePoseFrame: 0
     isReadable: 0
     virtualGeometry: 0
     hasBoneWeight: 0

BIN
Assets/Art/FaBaoMesh/2wulonglun/wulonglun_show.fbx


+ 1 - 1
Assets/Art/FaBaoMesh/8linglongta/fb_linglongta_jihuo.FBX.meta

@@ -46,7 +46,7 @@ ModelImporter:
       cycleOffset: 0
       loop: 0
       hasAdditiveReferencePose: 0
-      loopTime: 0
+      loopTime: 1
       loopBlend: 0
       loopBlendOrientation: 0
       loopBlendPositionY: 0

+ 1 - 1
Assets/Art/HeroTimeLine/fb_linglongtaTimeline.playable

@@ -2069,7 +2069,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}

+ 191 - 345
Assets/Art/HeroTimeLine/fb_wulonglunTimeline.playable

@@ -130,98 +130,6 @@ MonoBehaviour:
   m_Markers:
     m_Objects: []
   m_PostPlaybackState: 3
---- !u!114 &-8822091992167157315
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: 4125267898300374450}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: 4343726249989337701}
-    m_Duration: 1
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: -8822091992167157315}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_fb_tw_mu
-  m_Markers:
-    m_Objects: []
 --- !u!114 &-8734228703646629367
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -373,10 +281,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.004029042087495327
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -4790161396510054636}
-    m_Duration: 0.3333333333333333
+    m_Asset: {fileID: -6581642168561528495}
+    m_Duration: 1
     m_TimeScale: 1
     m_ParentTrack: {fileID: -7990616991488039303}
     m_EaseInDuration: 0
@@ -439,8 +347,8 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 0.004029042087495327
-    m_DisplayName: Take 001
+    m_PreExtrapolationTime: 0
+    m_DisplayName: jihuo
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -479,7 +387,7 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
+  m_Parent: {fileID: -5875317742908195551}
   m_Children: []
   m_Clips:
   - m_Version: 1
@@ -737,6 +645,99 @@ MonoBehaviour:
     m_DisplayName: fx_fb_bao
   m_Markers:
     m_Objects: []
+--- !u!114 &-6697791818425324012
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 21bf7f712d84d26478ebe6a299f21738, type: 3}
+  m_Name: Activation Track
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 0
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: -3132860492426191746}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -5214606025780425291}
+    m_Duration: 0.01666667
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -6697791818425324012}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: 0
+    m_BlendOutDuration: 0
+    m_MixInCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_MixOutCurve:
+      serializedVersion: 2
+      m_Curve:
+      - serializedVersion: 3
+        time: 0
+        value: 1
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      - serializedVersion: 3
+        time: 1
+        value: 0
+        inSlope: 0
+        outSlope: 0
+        tangentMode: 0
+        weightedMode: 0
+        inWeight: 0
+        outWeight: 0
+      m_PreInfinity: 2
+      m_PostInfinity: 2
+      m_RotationOrder: 4
+    m_BlendInCurveMode: 0
+    m_BlendOutCurveMode: 0
+    m_ExposedParameterNames: []
+    m_AnimationCurves: {fileID: 0}
+    m_Recordable: 0
+    m_PostExtrapolationMode: 0
+    m_PreExtrapolationMode: 0
+    m_PostExtrapolationTime: 0
+    m_PreExtrapolationTime: 0
+    m_DisplayName: Active
+  m_Markers:
+    m_Objects: []
+  m_PostPlaybackState: 3
 --- !u!114 &-6683161270338213082
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -759,10 +760,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.004029042087495327
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -4570304171498953636}
-    m_Duration: 0.5
+    m_Asset: {fileID: -4549963630819176586}
+    m_Duration: 0.3333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6683161270338213082}
     m_EaseInDuration: 0
@@ -825,8 +826,8 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 0.004029042087495327
-    m_DisplayName: show
+    m_PreExtrapolationTime: 0
+    m_DisplayName: jihuo
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -847,6 +848,30 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
+--- !u!114 &-6581642168561528495
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &-6338035570506245065
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -972,13 +997,14 @@ 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}
   m_Children:
   - {fileID: -6338035570506245065}
   - {fileID: 212739854551984720}
+  - {fileID: -7544242966777951075}
   - {fileID: -2583586318041871126}
   m_Clips: []
   m_Markers:
@@ -1093,7 +1119,7 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
---- !u!114 &-4790161396510054636
+--- !u!114 &-5214606025780425291
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1102,45 +1128,9 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &-4570304171498953636
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 631d581160118a643bdf747b97af7938, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
 --- !u!114 &-4563258645991923433
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1233,6 +1223,30 @@ MonoBehaviour:
     m_DisplayName: TimeLineMagicWeaponShowPointAsset
   m_Markers:
     m_Objects: []
+--- !u!114 &-4549963630819176586
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &-4270298856469144039
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1544,7 +1558,7 @@ MonoBehaviour:
   m_Children:
   - {fileID: -6683161270338213082}
   - {fileID: -4563258645991923433}
-  - {fileID: 9170510795377562389}
+  - {fileID: -6697791818425324012}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -1715,6 +1729,30 @@ MonoBehaviour:
   m_Clips: []
   m_Markers:
     m_Objects: []
+--- !u!114 &-1317467783677806590
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
 --- !u!114 &-1263126036946143950
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -1738,9 +1776,9 @@ MonoBehaviour:
   searchHierarchy: 0
   active: 1
   postPlayback: 2
-  targetType: 2
-  LocationType: 6
-  targetSpecialDotName: hitpos2
+  targetType: 1
+  LocationType: 5
+  targetSpecialDotName: hitpos
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -1813,43 +1851,6 @@ MonoBehaviour:
   isActivityCustomTargetPos: 0
   CustomTargetPosIndex: 0
   intervalTime: 0
---- !u!114 &-801085179303812374
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset(Clone)(Clone)
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 859bfc0d224e6314d90dfd10568a05e8
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
-  updateParticle: 1
-  particleRandomSeed: 8766
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: hitpos
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 0
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 0
-  loopAlone: 0
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -1874,7 +1875,6 @@ MonoBehaviour:
   - {fileID: -3132860492426191746}
   - {fileID: -2327424553049336028}
   - {fileID: -5875317742908195551}
-  - {fileID: -7544242966777951075}
   - {fileID: 6066816933775845479}
   m_FixedDuration: 0
   m_EditorSettings:
@@ -2045,10 +2045,10 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.004029042087495327
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 8340200925696115098}
-    m_Duration: 0.3333333333333333
+    m_Asset: {fileID: -1317467783677806590}
+    m_Duration: 1
     m_TimeScale: 1
     m_ParentTrack: {fileID: 1501360367786949402}
     m_EaseInDuration: 0
@@ -2111,8 +2111,8 @@ MonoBehaviour:
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
-    m_PreExtrapolationTime: 0.004029042087495327
-    m_DisplayName: Take 001
+    m_PreExtrapolationTime: 0
+    m_DisplayName: jihuo
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -2387,7 +2387,6 @@ MonoBehaviour:
   m_Parent: {fileID: 11400000}
   m_Children:
   - {fileID: -5309653085008744609}
-  - {fileID: -8822091992167157315}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -2406,43 +2405,6 @@ MonoBehaviour:
   targetEntityType: 2
   tineLineTrigerType: 0
   tineLineTrigerData: 
---- !u!114 &4343726249989337701
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: f1fc88ca9f5b46d2929d20f65fbe5c4e, type: 3}
-  m_Name: TimeLineParticleSystemAsset
-  m_EditorClassIdentifier: 
-  sourceGameObject:
-    exposedName: 7bbfbdabf79b23649bf2ea641db23905
-    defaultValue: {fileID: 0}
-  prefabGameObject: {fileID: 0}
-  updateParticle: 1
-  particleRandomSeed: 8152
-  updateDirector: 1
-  updateITimeControl: 1
-  searchHierarchy: 0
-  active: 1
-  postPlayback: 2
-  targetType: 1
-  LocationType: 5
-  targetSpecialDotName: hitpos
-  hitPointGroupName: 
-  isGround: 0
-  isFollowTarget: 1
-  isNotRotate: 0
-  isFollowRootTarget: 0
-  isAttSpeed: 0
-  isLoop: 1
-  loopAlone: 1
-  isActivityCustomTargetPos: 0
-  CustomTargetPosIndex: 0
-  intervalTime: 0
 --- !u!114 &4448712841006758773
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2884,7 +2846,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 1698660071088957519}
-    m_Duration: 0.33736237542082864
+    m_Duration: 1
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6868245914243662454}
     m_EaseInDuration: 0
@@ -2966,119 +2928,3 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   showPointType: 1
   customizePointName: hitpos2
---- !u!114 &8340200925696115098
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: a0099887950fd0b47b22c72df744a257, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &9170510795377562389
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  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: 15e0374501f39d54eb30235764636e0e, type: 3}
-  m_Name: Control Track
-  m_EditorClassIdentifier: 
-  m_Version: 3
-  m_AnimClip: {fileID: 0}
-  m_Locked: 0
-  m_Muted: 0
-  m_CustomPlayableFullTypename: 
-  m_Curves: {fileID: 0}
-  m_Parent: {fileID: -3132860492426191746}
-  m_Children: []
-  m_Clips:
-  - m_Version: 1
-    m_Start: 0
-    m_ClipIn: 0
-    m_Asset: {fileID: -801085179303812374}
-    m_Duration: 0.5040290420874953
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 9170510795377562389}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: 0
-    m_BlendOutDuration: 0
-    m_MixInCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_MixOutCurve:
-      serializedVersion: 2
-      m_Curve:
-      - serializedVersion: 3
-        time: 0
-        value: 1
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      - serializedVersion: 3
-        time: 1
-        value: 0
-        inSlope: 0
-        outSlope: 0
-        tangentMode: 0
-        weightedMode: 0
-        inWeight: 0
-        outWeight: 0
-      m_PreInfinity: 2
-      m_PostInfinity: 2
-      m_RotationOrder: 4
-    m_BlendInCurveMode: 0
-    m_BlendOutCurveMode: 0
-    m_ExposedParameterNames: []
-    m_AnimationCurves: {fileID: 0}
-    m_Recordable: 0
-    m_PostExtrapolationMode: 0
-    m_PreExtrapolationMode: 0
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: fx_fb_ta_show
-  m_Markers:
-    m_Objects: []

+ 2 - 2
Assets/Art/ParallaxCloud/Material/ParallaxCloud.mat

@@ -58,8 +58,8 @@ Material:
     - _AlphaContrast: 0.5
     - _AlphaExtent: 5
     - _MoveSpeed: 0.05
-    - _ParallaxLayers: 50
-    - _ParallaxSize: 0.0971
+    - _ParallaxLayers: 15
+    - _ParallaxSize: 0.1
     - _ParallaxType: 4
     - _SteepParallax: 1
     - _ViewOffset: 0

+ 4 - 4
Assets/Art/VFX/FXPrefabs/fx_fb_ta_sk1_hit.prefab

@@ -5067,7 +5067,7 @@ ParticleSystem:
       m_RotationOrder: 4
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
-  scalingMode: 1
+  scalingMode: 0
   randomSeed: 1274568212
   InitialModule:
     serializedVersion: 3
@@ -9888,8 +9888,8 @@ Transform:
   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_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 3287395345242571616}
   - {fileID: 8761699591654697735}
@@ -44147,7 +44147,7 @@ ParticleSystem:
       m_RotationOrder: 4
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
-  scalingMode: 1
+  scalingMode: 0
   randomSeed: 1274568212
   InitialModule:
     serializedVersion: 3

+ 39 - 6
Assets/Art/VFX/FXPrefabs/fx_fb_wulonglun_sk1.prefab

@@ -1,5 +1,38 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &409721016206777482
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4471614490941716829}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4471614490941716829
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 409721016206777482}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 5061607431630680147}
+  m_Father: {fileID: 7667656180664854937}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &1015027728113335795
 GameObject:
   m_ObjectHideFlags: 0
@@ -5055,7 +5088,7 @@ ParticleSystem:
       m_RotationOrder: 4
   moveWithTransform: 0
   moveWithCustomTransform: {fileID: 0}
-  scalingMode: 1
+  scalingMode: 0
   randomSeed: 0
   InitialModule:
     serializedVersion: 3
@@ -9865,14 +9898,14 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7702972858623858669}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.111032926, y: 0.71582526, z: 0.68497616, w: 0.07793303}
-  m_LocalPosition: {x: 0.078, y: -0.05, z: -0.55}
-  m_LocalScale: {x: 0.40023467, y: 0.40023467, z: 0.40023467}
+  m_LocalRotation: {x: -0.68497616, y: -0.07793303, z: 0.111032926, w: 0.71582526}
+  m_LocalPosition: {x: -0.07799998, y: -0.05000019, z: 0.5500002}
+  m_LocalScale: {x: 0.4002347, y: 0.4002347, z: 0.40023464}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3233087819606609685}
   - {fileID: 8018926897222650007}
-  m_Father: {fileID: 7667656180664854937}
+  m_Father: {fileID: 4471614490941716829}
   m_LocalEulerAnglesHint: {x: -74.438, y: 100.625, z: 82.082}
 --- !u!198 &7153348417631211654
 ParticleSystem:
@@ -14827,7 +14860,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 5061607431630680147}
+  - {fileID: 4471614490941716829}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!198 &4498051401983318970

+ 37 - 4
Assets/Art/VFX/FXPrefabs/fx_fb_wulonglun_sk1_hit.prefab

@@ -27,12 +27,12 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6391466465445991837}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.16263078, y: 0.70785934, z: 0.67459023, w: 0.1319643}
+  m_LocalRotation: {x: -0.6745902, y: -0.1319643, z: 0.16263077, w: 0.70785934}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 0.34067994, y: 0.25043276, z: 0.14192836}
+  m_LocalScale: {x: 0.17034002, y: 0.12521638, z: 0.07096419}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8947174108157658211}
+  m_Father: {fileID: 1526130964485090445}
   m_LocalEulerAnglesHint: {x: -65.798, y: 97.714, z: 84.828}
 --- !u!198 &2147450539188125434
 ParticleSystem:
@@ -4955,6 +4955,39 @@ ParticleSystemRenderer:
   m_MeshWeighting2: 1
   m_MeshWeighting3: 1
   m_MaskInteraction: 0
+--- !u!1 &6641351839680995805
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1526130964485090445}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1526130964485090445
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6641351839680995805}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 2, y: 2, z: 2}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 3936606139908197807}
+  m_Father: {fileID: 8947174108157658211}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &7438131189927720277
 GameObject:
   m_ObjectHideFlags: 0
@@ -4987,7 +5020,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3936606139908197807}
+  - {fileID: 1526130964485090445}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
 --- !u!198 &6285575712868172257

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx_gf_jianjue.prefab

@@ -24687,8 +24687,8 @@ MonoBehaviour:
     isActive: 0
     controlPoints:
     - {x: 0, y: 0, z: 0}
-    - {x: -3.4864006, y: 2.3623633, z: -1.9866285}
-    - {x: 0, y: 0, z: 2}
+    - {x: -2.4016674, y: 1.8948584, z: -0.3446406}
+    - {x: -0.7815881, y: 0, z: 2.6557693}
     - {x: 0, y: 0, z: 5}
     allDis: 0
   maxDis: 20

+ 68 - 87
Assets/Art/cs3.scene

@@ -146381,7 +146381,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 9218637542153191202, guid: 1e0581faedb50ae4896018eac71ff697, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
@@ -177462,47 +177462,47 @@ PrefabInstance:
   serializedVersion: 2
   m_Modification:
     serializedVersion: 3
-    m_TransformParent: {fileID: 0}
+    m_TransformParent: {fileID: 7772257135064333437}
     m_Modifications:
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalScale.x
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalScale.y
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalScale.z
-      value: 2
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalPosition.x
-      value: -0.82
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalPosition.y
-      value: 20.42
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalPosition.z
-      value: 17.08
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalRotation.w
-      value: 1
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalRotation.x
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalRotation.y
-      value: 0
+      value: 1
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalRotation.z
-      value: 0
+      value: -0
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalEulerAnglesHint.x
@@ -177510,22 +177510,66 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
+      value: 180
       objectReference: {fileID: 0}
     - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 3151049965263733402, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_ExposedReferences.m_References.Array.data[8].second
       value: 
       objectReference: {fileID: 7546303411434518119}
+    - target: {fileID: 4278959431780562764, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: randomSeed
+      value: 2619
+      objectReference: {fileID: 0}
+    - target: {fileID: 4278959431780562764, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5828256341004794286, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5828256341004794286, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5828256341004794286, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 5828256341004794286, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 6293255644012420327, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: randomSeed
+      value: 3705
+      objectReference: {fileID: 0}
+    - target: {fileID: 6293255644012420327, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 8690168045956676201, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_Name
       value: fb_wulonglun
       objectReference: {fileID: 0}
     - target: {fileID: 8690168045956676201, guid: ffb59aaf78242804e840e93463700e85, type: 3}
       propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 9085304719314591724, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: randomSeed
+      value: 3705
+      objectReference: {fileID: 0}
+    - target: {fileID: 9085304719314591724, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+      propertyPath: autoRandomSeed
       value: 0
       objectReference: {fileID: 0}
     m_RemovedComponents: []
@@ -177533,6 +177577,11 @@ PrefabInstance:
     m_AddedGameObjects: []
     m_AddedComponents: []
   m_SourcePrefab: {fileID: 100100000, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+--- !u!4 &1932413943 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: 2607217762360650163, guid: ffb59aaf78242804e840e93463700e85, type: 3}
+  m_PrefabInstance: {fileID: 1932413942}
+  m_PrefabAsset: {fileID: 0}
 --- !u!1 &1934811102
 GameObject:
   m_ObjectHideFlags: 0
@@ -219248,7 +219297,7 @@ PrefabInstance:
       objectReference: {fileID: 0}
     - target: {fileID: 4541853673269616998, guid: 4d3d0d6c30bc2e14295e598df3b29cab, type: 3}
       propertyPath: m_IsActive
-      value: 1
+      value: 0
       objectReference: {fileID: 0}
     - target: {fileID: 8715868861197182186, guid: 4d3d0d6c30bc2e14295e598df3b29cab, type: 3}
       propertyPath: m_LocalPosition.y
@@ -264739,7 +264788,7 @@ PlayableDirector:
     - 510073d11a064b44b81d5efc39bc6cae: {fileID: 836779554270472797}
     - 2820b2085f57c41488400dc1f02017f3: {fileID: 3418479585831810710}
     - 2ecb826e4625459428c45aa1b78005ef: {fileID: 1292462064}
-    - 8e45c6601e86261469d4da532a6c0453: {fileID: 6100325386495398951}
+    - 8e45c6601e86261469d4da532a6c0453: {fileID: 0}
     - 1d30d80212af7ea4ab8a1de8419b3a9b: {fileID: 3801486746725227614}
     - 8f4afe1992ed43640872dbaa60713fe9: {fileID: 4045216777411661585}
     - 5397c4924c3fec0459b837dbe4a1d757: {fileID: 5212295757846128141}
@@ -276557,73 +276606,6 @@ MonoBehaviour:
   DotName: hitpos2
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1001 &6100325386495398949
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 7671507230386900683}
-    m_Modifications:
-    - target: {fileID: 1056791506408647642, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_Name
-      value: fx_fb_show_jin_bd
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: -90
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: c997e5604ec363f4da643326f9f89462, type: 3}
---- !u!4 &6100325386495398950 stripped
-Transform:
-  m_CorrespondingSourceObject: {fileID: 4438834010710660405, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-  m_PrefabInstance: {fileID: 6100325386495398949}
-  m_PrefabAsset: {fileID: 0}
---- !u!1 &6100325386495398951 stripped
-GameObject:
-  m_CorrespondingSourceObject: {fileID: 1056791506408647642, guid: c997e5604ec363f4da643326f9f89462, type: 3}
-  m_PrefabInstance: {fileID: 6100325386495398949}
-  m_PrefabAsset: {fileID: 0}
 --- !u!1 &6120877361748645363
 GameObject:
   m_ObjectHideFlags: 0
@@ -276796,9 +276778,9 @@ Transform:
   m_GameObject: {fileID: 5568829953276539578}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: -2.041, y: 2.291, z: 0.823}
+  m_LocalPosition: {x: 0.54, y: 2.8, z: -0.1}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 2523205357091499570}
   - {fileID: 4092537012682223328}
@@ -277658,7 +277640,7 @@ Transform:
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: -0.378, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
+  m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 8581321863651072645}
   - {fileID: 4138549158091947665}
@@ -284599,7 +284581,6 @@ Transform:
   m_Children:
   - {fileID: 3676837944881848454}
   - {fileID: 4700571606969581510}
-  - {fileID: 6100325386495398950}
   - {fileID: 4045216777411661584}
   - {fileID: 836779554270472796}
   - {fileID: 1115627555221665518}
@@ -289648,6 +289629,7 @@ Transform:
   - {fileID: 6529364365058944474}
   - {fileID: 8681441029093292514}
   - {fileID: 4097705409919722337}
+  - {fileID: 1932413943}
   m_Father: {fileID: 396356005}
   m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
 --- !u!1 &7777691156524691774
@@ -306723,4 +306705,3 @@ SceneRoots:
   - {fileID: 1804278311}
   - {fileID: 1707834042}
   - {fileID: 4499317816330835408}
-  - {fileID: 1932413942}

+ 8 - 0
Assets/Art/nanzhujiao/Materials.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: BnlJvCn/AXK2fbLTrWEBdo049iIcv9kSqOkoBB3Xg+Sgmd8NONr8SgdWnGvH
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 133 - 0
Assets/Art/nanzhujiao/Materials/body.mat

@@ -0,0 +1,133 @@
+%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: body
+  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Parent: {fileID: 0}
+  m_ModifiedSerializedProperties: 0
+  m_ValidKeywords: []
+  m_InvalidKeywords: []
+  m_LightmapFlags: 4
+  m_EnableInstancingVariants: 0
+  m_DoubleSidedGI: 0
+  m_CustomRenderQueue: -1
+  stringTagMap:
+    RenderType: Opaque
+  disabledShaderPasses: []
+  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
+    - _BumpScale: 1
+    - _ClearCoatMask: 0
+    - _ClearCoatSmoothness: 0
+    - _Cull: 2
+    - _Cutoff: 0.5
+    - _DetailAlbedoMapScale: 1
+    - _DetailNormalMapScale: 1
+    - _DstBlend: 0
+    - _DstBlendAlpha: 0
+    - _EnvironmentReflections: 1
+    - _GlossMapScale: 0
+    - _Glossiness: 0
+    - _GlossyReflections: 0
+    - _Metallic: 0
+    - _OcclusionStrength: 1
+    - _Parallax: 0.005
+    - _QueueOffset: 0
+    - _ReceiveShadows: 1
+    - _Smoothness: 0.5
+    - _SmoothnessTextureChannel: 0
+    - _SpecularHighlights: 1
+    - _SrcBlend: 1
+    - _SrcBlendAlpha: 1
+    - _Surface: 0
+    - _WorkflowMode: 1
+    - _ZWrite: 1
+    m_Colors:
+    - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
+    - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+    - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+  m_BuildTextureStacks: []
+--- !u!114 &1352241441840553063
+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/Art/nanzhujiao/Materials/body.mat.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: Bywf4SyoUH/SrOFGrsvykiqvePZt4Fv+RU4zolZCoxHYxIb/JpWxgZ2Nrapr
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 2100000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 10 - 5
Assets/Art/nanzhujiao/nanzhujiao.mat

@@ -8,11 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: nanzhujiao
-  m_Shader: {fileID: -6465566751694194690, guid: 3bb35f7f86ffc45c2aa6fc4291f787fc, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: d1ba3a475e53be04c9bb3365e1e94a9e, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _SHADING_STYLE_SKIN_AND_TEXTILES
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -28,6 +27,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 903323c301d8cfc43b4028c6a9b785e8, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Base_map:
+        m_Texture: {fileID: 2800000, guid: 903323c301d8cfc43b4028c6a9b785e8, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -142,7 +145,7 @@ Material:
     - _ShadowStep: 0.575
     - _ShadowStepSmooth: 0
     - _ShadowsFloor: 0.5
-    - _Smoothness: 0.55
+    - _Smoothness: 0.668
     - _SmoothnessTextureChannel: 0
     - _SpecularHighlights: 1
     - _SpecularNoiseSize: 1.23
@@ -163,13 +166,15 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Emission: {r: 0, g: 0, b: 0, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighColor: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _RimColor: {r: 0.21172799, g: 0.24817115, b: 0.264, a: 0}
     - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
-    - _SpecularColor: {r: 0.5660378, g: 0.5660378, b: 0.5660378, a: 1}
+    - _SpecularColor: {r: 0.8773585, g: 0.028969401, b: 0.028969401, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &6509361561548853018
 MonoBehaviour:

+ 8 - 3
Assets/Art/nanzhujiao/nanzhujiao_chuwudai.mat

@@ -8,11 +8,10 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: nanzhujiao_chuwudai
-  m_Shader: {fileID: -6465566751694194690, guid: 3bb35f7f86ffc45c2aa6fc4291f787fc, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: d1ba3a475e53be04c9bb3365e1e94a9e, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _SHADING_STYLE_SKIN_AND_TEXTILES
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 4
   m_EnableInstancingVariants: 0
@@ -28,6 +27,10 @@ Material:
         m_Texture: {fileID: 2800000, guid: 304348f4218a7de4eb13049584eb9d09, type: 3}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Base_map:
+        m_Texture: {fileID: 2800000, guid: 304348f4218a7de4eb13049584eb9d09, type: 3}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BumpMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -163,8 +166,10 @@ Material:
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
+    - _Emission: {r: 1, g: 1, b: 1, a: 0}
     - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
     - _HighColor: {r: 1, g: 1, b: 1, a: 1}
+    - _MainColor: {r: 1, g: 1, b: 1, a: 0}
     - _OutlineColor: {r: 0, g: 0, b: 0, a: 1}
     - _RimColor: {r: 0.21172799, g: 0.24817115, b: 0.264, a: 0}
     - _ShadowColor: {r: 0.8, g: 0.8, b: 1, a: 1}

+ 4138 - 0
Assets/Art/shader/RenWuShader.shadergraph

@@ -0,0 +1,4138 @@
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.GraphData",
+    "m_ObjectId": "1ebfbb393c1943478eee1dd7bad729bc",
+    "m_Properties": [
+        {
+            "m_Id": "38bd2f3ce3a74e5bbc895cad0262fb80"
+        },
+        {
+            "m_Id": "bca4c824a259437eb51ab73e93ab5f3b"
+        },
+        {
+            "m_Id": "592b0ef343074ff1a1287004fca7adb0"
+        }
+    ],
+    "m_Keywords": [],
+    "m_Dropdowns": [],
+    "m_CategoryData": [
+        {
+            "m_Id": "80d2cc06b6264d588e67513de5b51205"
+        }
+    ],
+    "m_Nodes": [
+        {
+            "m_Id": "42ce1f0535034feca700e15c9536b176"
+        },
+        {
+            "m_Id": "a9e1e33e9ba547ae9ecfd88c3a6722fa"
+        },
+        {
+            "m_Id": "536ea3c10bcf4c03b2dac03d206a6d70"
+        },
+        {
+            "m_Id": "b079924139ca445cbd5803a3c20acc51"
+        },
+        {
+            "m_Id": "6d99f103d6d149918e1a81ffbdd77a63"
+        },
+        {
+            "m_Id": "2c60fe94f07044e29c35d964fdca2dc6"
+        },
+        {
+            "m_Id": "521e7d8216734cc3ba9910215c26432c"
+        },
+        {
+            "m_Id": "56360a263570466dbf411b220fb75a0e"
+        },
+        {
+            "m_Id": "024a4147a2964ef6aaafaa458b3c16a0"
+        },
+        {
+            "m_Id": "a8daeaf6269a45ccb85c271e8c38edad"
+        },
+        {
+            "m_Id": "6e9b6ef5097947809d95b8d773abf846"
+        },
+        {
+            "m_Id": "c2c3f6c7a02a445d86e0f3549f95cfd4"
+        },
+        {
+            "m_Id": "9c4954c57f404d4b8cb3d3d9bfc6b538"
+        },
+        {
+            "m_Id": "a5804fe7ac2043eca221245e2f77149b"
+        },
+        {
+            "m_Id": "709bc37f413b43989e10344af564bd3b"
+        },
+        {
+            "m_Id": "a46c58e738f841c0917436944b14191b"
+        },
+        {
+            "m_Id": "a784b9c54f424d5f8747957ee2a13fd9"
+        },
+        {
+            "m_Id": "b4318b0903004fbc8bb26e70defa6bda"
+        },
+        {
+            "m_Id": "0177573947854419828655204bf54937"
+        },
+        {
+            "m_Id": "c43ef0741d654db6bbc0da1a2742675c"
+        },
+        {
+            "m_Id": "27a5fa842e7d4e85baeba93ff84852fa"
+        },
+        {
+            "m_Id": "4bab3ac1e5cb43a68af9973ba26f5d3b"
+        },
+        {
+            "m_Id": "b3a6d1995d60421b8865243f09e5d4a0"
+        },
+        {
+            "m_Id": "49fdce9f0a314f459424e2177532894b"
+        },
+        {
+            "m_Id": "67e93072f3b846439921b765ef398ef3"
+        },
+        {
+            "m_Id": "a3f7cb1f17914838af71811b64c90d4e"
+        },
+        {
+            "m_Id": "752d361598f34802bdabb2006893ee8c"
+        },
+        {
+            "m_Id": "48d0f66864a74caa9604850bc071fb4b"
+        },
+        {
+            "m_Id": "3f1dceb9f74845159cf241b2c143b136"
+        },
+        {
+            "m_Id": "92925db0efae4737bd2fd9e1ad019362"
+        }
+    ],
+    "m_LocalVariables": [],
+    "m_RegisterIDs": [],
+    "m_GroupDatas": [],
+    "m_StickyNoteDatas": [],
+    "m_Edges": [
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "024a4147a2964ef6aaafaa458b3c16a0"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a46c58e738f841c0917436944b14191b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "2c60fe94f07044e29c35d964fdca2dc6"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "521e7d8216734cc3ba9910215c26432c"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "3f1dceb9f74845159cf241b2c143b136"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "92925db0efae4737bd2fd9e1ad019362"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "48d0f66864a74caa9604850bc071fb4b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3f1dceb9f74845159cf241b2c143b136"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "49fdce9f0a314f459424e2177532894b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "67e93072f3b846439921b765ef398ef3"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "4bab3ac1e5cb43a68af9973ba26f5d3b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "27a5fa842e7d4e85baeba93ff84852fa"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "4bab3ac1e5cb43a68af9973ba26f5d3b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b3a6d1995d60421b8865243f09e5d4a0"
+                },
+                "m_SlotId": 745104271
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "521e7d8216734cc3ba9910215c26432c"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "49fdce9f0a314f459424e2177532894b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "521e7d8216734cc3ba9910215c26432c"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a8daeaf6269a45ccb85c271e8c38edad"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "56360a263570466dbf411b220fb75a0e"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "024a4147a2964ef6aaafaa458b3c16a0"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "67e93072f3b846439921b765ef398ef3"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "752d361598f34802bdabb2006893ee8c"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "6d99f103d6d149918e1a81ffbdd77a63"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "521e7d8216734cc3ba9910215c26432c"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "6d99f103d6d149918e1a81ffbdd77a63"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a46c58e738f841c0917436944b14191b"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "6e9b6ef5097947809d95b8d773abf846"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a784b9c54f424d5f8747957ee2a13fd9"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "709bc37f413b43989e10344af564bd3b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "4bab3ac1e5cb43a68af9973ba26f5d3b"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "752d361598f34802bdabb2006893ee8c"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "a3f7cb1f17914838af71811b64c90d4e"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "92925db0efae4737bd2fd9e1ad019362"
+                },
+                "m_SlotId": 3
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "56360a263570466dbf411b220fb75a0e"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "9c4954c57f404d4b8cb3d3d9bfc6b538"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "709bc37f413b43989e10344af564bd3b"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "9c4954c57f404d4b8cb3d3d9bfc6b538"
+                },
+                "m_SlotId": 7
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b4318b0903004fbc8bb26e70defa6bda"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a3f7cb1f17914838af71811b64c90d4e"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "48d0f66864a74caa9604850bc071fb4b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a46c58e738f841c0917436944b14191b"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "4bab3ac1e5cb43a68af9973ba26f5d3b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a5804fe7ac2043eca221245e2f77149b"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "709bc37f413b43989e10344af564bd3b"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a784b9c54f424d5f8747957ee2a13fd9"
+                },
+                "m_SlotId": 3
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "3f1dceb9f74845159cf241b2c143b136"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "a8daeaf6269a45ccb85c271e8c38edad"
+                },
+                "m_SlotId": 2
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "6e9b6ef5097947809d95b8d773abf846"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "b3a6d1995d60421b8865243f09e5d4a0"
+                },
+                "m_SlotId": 1
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "b079924139ca445cbd5803a3c20acc51"
+                },
+                "m_SlotId": 0
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "c2c3f6c7a02a445d86e0f3549f95cfd4"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "9c4954c57f404d4b8cb3d3d9bfc6b538"
+                },
+                "m_SlotId": 1
+            }
+        },
+        {
+            "m_OutputSlot": {
+                "m_Node": {
+                    "m_Id": "c43ef0741d654db6bbc0da1a2742675c"
+                },
+                "m_SlotId": 0
+            },
+            "m_InputSlot": {
+                "m_Node": {
+                    "m_Id": "27a5fa842e7d4e85baeba93ff84852fa"
+                },
+                "m_SlotId": 0
+            }
+        }
+    ],
+    "m_VertexContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 0.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "42ce1f0535034feca700e15c9536b176"
+            },
+            {
+                "m_Id": "a9e1e33e9ba547ae9ecfd88c3a6722fa"
+            },
+            {
+                "m_Id": "536ea3c10bcf4c03b2dac03d206a6d70"
+            }
+        ]
+    },
+    "m_FragmentContext": {
+        "m_Position": {
+            "x": 0.0,
+            "y": 200.0
+        },
+        "m_Blocks": [
+            {
+                "m_Id": "b079924139ca445cbd5803a3c20acc51"
+            },
+            {
+                "m_Id": "b4318b0903004fbc8bb26e70defa6bda"
+            },
+            {
+                "m_Id": "0177573947854419828655204bf54937"
+            }
+        ]
+    },
+    "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_SubDatas": [],
+    "m_ActiveTargets": [
+        {
+            "m_Id": "5e0eb21f5a49403a9902dd8f76c06a02"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "014b053346d341d589888e2d67c88010",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "0177573947854419828655204bf54937",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "SurfaceDescription.AlphaClipThreshold",
+    "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": "cd7636688cc142b5abb6dcd4387f63c1"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.AlphaClipThreshold"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AddNode",
+    "m_ObjectId": "024a4147a2964ef6aaafaa458b3c16a0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Add",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1486.0001220703125,
+            "y": -1007.0000610351563,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "96777b5ccb2b44b9bce9c4bd6bb3c90b"
+        },
+        {
+            "m_Id": "6b1bf1f4845b4a46bc6430c6da5ef623"
+        },
+        {
+            "m_Id": "6973aec5741e4abaa273d717207edb63"
+        }
+    ],
+    "synonyms": [
+        "addition",
+        "sum",
+        "plus"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "05f2d914ce6f45e5925a01d8c76d2cb1",
+    "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": "09f9bf10b5e847b5a2e7fa8730c51446",
+    "m_Id": 745104271,
+    "m_DisplayName": "Colour",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Vector3_4F58AA3D",
+    "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": "0bf8204cf2ea4339a8dbc8c27b116f54",
+    "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": 2,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalUnlitSubTarget",
+    "m_ObjectId": "0c7d5ead8913483d962da1a0ec67b0dc",
+    "m_RemovedVariants": [],
+    "m_RemovedPasses": [],
+    "keywordsStatus": [
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true
+    ],
+    "passStatus": [
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true,
+        true
+    ],
+    "surfaceOptionsFoldout": true,
+    "passesFoldout": true,
+    "variantsFoldout": true
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "0cbb3a5439e243ada8b7cb2de572431d",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "0d6dc1c6dcfd45cfbf21a92d12f614bc",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.3799999952316284,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "0fe6541c12914fc8b07db948eb944ac8",
+    "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",
+    "m_ObjectId": "1574f4a46a5a47aea5ea483a74ba13ab",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "1c8331418a7c485fa1ddc84bad1c6615",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "1ccbb511c0ac486da6fd4434b36b4183",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "1cd7bcceeb8a475a953a5aafcc140f30",
+    "m_Id": 1,
+    "m_DisplayName": "Min",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Min",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "22c6010301ba4a1987cf15c9fdb467ae",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "24ff5ac2bec3473282a8d65583afbdc6",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AddNode",
+    "m_ObjectId": "27a5fa842e7d4e85baeba93ff84852fa",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Add",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1054.0,
+            "y": -297.0,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "665e8b4fa5774c9fa00fa7a8d4939d19"
+        },
+        {
+            "m_Id": "014b053346d341d589888e2d67c88010"
+        },
+        {
+            "m_Id": "c454dc7c902c4266b5f5bd0a12641875"
+        }
+    ],
+    "synonyms": [
+        "addition",
+        "sum",
+        "plus"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "27ad0067a1ac423699225f7bd6af03b2",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "2919ed53641446b6be984976a3b20e7f",
+    "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.NormalVectorNode",
+    "m_ObjectId": "2c60fe94f07044e29c35d964fdca2dc6",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Normal Vector",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -4585.0,
+            "y": -1110.9998779296875,
+            "width": 208.0,
+            "height": 315.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "96ddb3644d8c43c285cbb5f21d8eb5f3"
+        }
+    ],
+    "synonyms": [
+        "surface direction"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 2,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Space": 2
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "31eefef0adb24104a551c7613bbf2f91",
+    "m_Id": 1,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "34f9686843a3465fa430f405a2b699e1",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.Texture2DShaderProperty",
+    "m_ObjectId": "38bd2f3ce3a74e5bbc895cad0262fb80",
+    "m_Guid": {
+        "m_GuidSerialized": "cb650603-9dd7-42f5-ad38-c577e1f80639"
+    },
+    "m_Name": "Base map",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Base map",
+    "m_DefaultReferenceName": "_Base_map",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Priority": 10,
+    "m_Value": {
+        "m_SerializedTexture": "",
+        "m_Guid": ""
+    },
+    "isMainTexture": false,
+    "useTilingAndOffset": false,
+    "m_Modifiable": true,
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "3f1dceb9f74845159cf241b2c143b136",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2259.0,
+            "y": -1246.0,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "4608eadbfe984f1aa35dddb3e46fd15c"
+        },
+        {
+            "m_Id": "22c6010301ba4a1987cf15c9fdb467ae"
+        },
+        {
+            "m_Id": "4aa1353e73554ee796414ed8e2e18a7a"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "42ce1f0535034feca700e15c9536b176",
+    "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": "7c7517f9694240619843bbd4ec64eb7e"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Position"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "43eec44d8c5d439dae0ee84e05a1b1c2",
+    "m_Id": 1,
+    "m_DisplayName": "Direction",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Direction",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "4608eadbfe984f1aa35dddb3e46fd15c",
+    "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.AddNode",
+    "m_ObjectId": "48d0f66864a74caa9604850bc071fb4b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Add",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2577.0,
+            "y": -1401.0,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "24ff5ac2bec3473282a8d65583afbdc6"
+        },
+        {
+            "m_Id": "0d6dc1c6dcfd45cfbf21a92d12f614bc"
+        },
+        {
+            "m_Id": "8ebb1780453b43dc98b45f6067833959"
+        }
+    ],
+    "synonyms": [
+        "addition",
+        "sum",
+        "plus"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.AddNode",
+    "m_ObjectId": "49fdce9f0a314f459424e2177532894b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Add",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -3806.0,
+            "y": -1418.0,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "1ccbb511c0ac486da6fd4434b36b4183"
+        },
+        {
+            "m_Id": "58b7e139b951450489b34cc7aa85689a"
+        },
+        {
+            "m_Id": "c63a8e6c192942a293aae14886da3249"
+        }
+    ],
+    "synonyms": [
+        "addition",
+        "sum",
+        "plus"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "4aa1353e73554ee796414ed8e2e18a7a",
+    "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.MultiplyNode",
+    "m_ObjectId": "4bab3ac1e5cb43a68af9973ba26f5d3b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1464.000244140625,
+            "y": -145.99996948242188,
+            "width": 130.0,
+            "height": 117.99991607666016
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "afc5266cc7b54b348bb39d148a19a336"
+        },
+        {
+            "m_Id": "2919ed53641446b6be984976a3b20e7f"
+        },
+        {
+            "m_Id": "0fe6541c12914fc8b07db948eb944ac8"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "4d34e063080648b0a3465081705618c8",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "4e51c60876b44de2936c1c3fc116d5d8",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "511b158a4cc84d2b9cc2972716afda5b",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "513b39a009294c129f856da96ab57ab8",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "521ddca3b31c40df8b29bbe13e589afd",
+    "m_Id": 2,
+    "m_DisplayName": "Max",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Max",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DotProductNode",
+    "m_ObjectId": "521e7d8216734cc3ba9910215c26432c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Dot Product",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -4111.0,
+            "y": -1077.9998779296875,
+            "width": 208.0,
+            "height": 301.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "c50cb113ea1b48b2a75f2b2de2d6e8db"
+        },
+        {
+            "m_Id": "7389827cd11c45e09df335a39b70d995"
+        },
+        {
+            "m_Id": "860b019439c2493e97d133b759d9fc9a"
+        }
+    ],
+    "synonyms": [
+        "scalar product"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "536ea3c10bcf4c03b2dac03d206a6d70",
+    "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": "b7b27e90d2854b28bb1aec99fe59bfae"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Tangent"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "56360a263570466dbf411b220fb75a0e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1764.0,
+            "y": -937.0,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "5f38ea441f874e08a86c93a854134198"
+        },
+        {
+            "m_Id": "fc3004f4e0fd4beabbafd246eb2a651f"
+        },
+        {
+            "m_Id": "f7fa29e55141464aae56a6ff447e75e1"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "58b7e139b951450489b34cc7aa85689a",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.5,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DInputMaterialSlot",
+    "m_ObjectId": "592872ef058c4c2499daedc804f7b8dc",
+    "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": "",
+        "m_Guid": ""
+    },
+    "m_DefaultType": 0
+}
+
+{
+    "m_SGVersion": 3,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
+    "m_ObjectId": "592b0ef343074ff1a1287004fca7adb0",
+    "m_Guid": {
+        "m_GuidSerialized": "ce4f11ac-b9a2-4143-ab96-b3d57fa1a19c"
+    },
+    "m_Name": "Emission",
+    "m_DefaultRefNameVersion": 1,
+    "m_RefNameGeneratedByDisplayName": "Emission",
+    "m_DefaultReferenceName": "_Emission",
+    "m_OverrideReferenceName": "",
+    "m_GeneratePropertyBlock": true,
+    "m_UseCustomSlotLabel": false,
+    "m_CustomSlotLabel": "",
+    "m_DismissedVersion": 0,
+    "m_Precision": 0,
+    "overrideHLSLDeclaration": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Priority": 10,
+    "m_Value": {
+        "r": 0.0,
+        "g": 0.0,
+        "b": 0.0,
+        "a": 0.0
+    },
+    "isMainColor": false,
+    "m_ColorMode": 0
+}
+
+{
+    "m_SGVersion": 1,
+    "m_Type": "UnityEditor.Rendering.Universal.ShaderGraph.UniversalTarget",
+    "m_ObjectId": "5e0eb21f5a49403a9902dd8f76c06a02",
+    "m_Datas": [],
+    "m_ActiveSubTarget": {
+        "m_Id": "0c7d5ead8913483d962da1a0ec67b0dc"
+    },
+    "m_AllowMaterialOverride": false,
+    "m_SurfaceType": 0,
+    "m_ZTestMode": 4,
+    "m_ZWriteControl": 0,
+    "m_AlphaMode": 0,
+    "m_RenderFace": 2,
+    "m_AlphaClip": true,
+    "m_CastShadows": true,
+    "m_ReceiveShadows": true,
+    "m_SupportsLODCrossFade": false,
+    "m_CustomEditorGUI": "",
+    "m_SupportVFX": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "5f38ea441f874e08a86c93a854134198",
+    "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.ColorRGBMaterialSlot",
+    "m_ObjectId": "63a7d9e20a7f49e4b2422928d6e7baaf",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "665e8b4fa5774c9fa00fa7a8d4939d19",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "668cfc40183a4b98a74bb7d504010955",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "In",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "67415e535bac44399da3e98ac622a718",
+    "m_Id": 1,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "In",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "67e93072f3b846439921b765ef398ef3",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -3493.0,
+            "y": -1429.999755859375,
+            "width": 208.0,
+            "height": 301.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "1c8331418a7c485fa1ddc84bad1c6615"
+        },
+        {
+            "m_Id": "c6a8413b222a48b2a1e2376167f45eb4"
+        },
+        {
+            "m_Id": "4e51c60876b44de2936c1c3fc116d5d8"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "68ca59cd43e548b290e592d499705c95",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "6973aec5741e4abaa273d717207edb63",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "6b1bf1f4845b4a46bc6430c6da5ef623",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.20000000298023225,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubGraphNode",
+    "m_ObjectId": "6d99f103d6d149918e1a81ffbdd77a63",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Main Light",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -4585.0,
+            "y": -709.9998779296875,
+            "width": 208.0,
+            "height": 326.9999694824219
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "43eec44d8c5d439dae0ee84e05a1b1c2"
+        },
+        {
+            "m_Id": "9bca68e57eba424dafdd7bfe4185a8e5"
+        },
+        {
+            "m_Id": "b44c8643eba64ad78bdf4a09dd13a6ca"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"970d962ef25c3084987fd10643902eed\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [],
+    "m_PropertyIds": [],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubtractNode",
+    "m_ObjectId": "6e9b6ef5097947809d95b8d773abf846",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Subtract",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -3429.0,
+            "y": -1077.9998779296875,
+            "width": 208.0,
+            "height": 301.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "aaac37d021ea47609fa810c615e641a2"
+        },
+        {
+            "m_Id": "ef47044a105f45e88f477ca97a3da493"
+        },
+        {
+            "m_Id": "8d73c40335274957ac8362330421a5df"
+        }
+    ],
+    "synonyms": [
+        "subtraction",
+        "remove",
+        "minus",
+        "take away"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.NormalMaterialSlot",
+    "m_ObjectId": "6f5fc66449de441b8869a87edcc4b67a",
+    "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.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "709bc37f413b43989e10344af564bd3b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1785.000244140625,
+            "y": -145.99996948242188,
+            "width": 130.0001220703125,
+            "height": 117.99991607666016
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "b063c9773c534ad89c575aa889e66ff5"
+        },
+        {
+            "m_Id": "cefe21f0eac04aeabfcee35b90975048"
+        },
+        {
+            "m_Id": "a9157f3aaa2347af8fd033b4c4b0befd"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "7364055d8c764168a028853afe6139e7",
+    "m_Id": 3,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "7389827cd11c45e09df335a39b70d995",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 1.0,
+        "z": 0.0,
+        "w": 0.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.SubtractNode",
+    "m_ObjectId": "752d361598f34802bdabb2006893ee8c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Subtract",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -3221.0,
+            "y": -1400.9998779296875,
+            "width": 208.0,
+            "height": 302.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "513b39a009294c129f856da96ab57ab8"
+        },
+        {
+            "m_Id": "ac00d087474443bf9d9aa37f802602e4"
+        },
+        {
+            "m_Id": "f0caaf6cae88432e9d5a88fc73b7fec4"
+        }
+    ],
+    "synonyms": [
+        "subtraction",
+        "remove",
+        "minus",
+        "take away"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "777cbe5e4a6b4165b013c4cdf4342502",
+    "m_Id": 3,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PositionMaterialSlot",
+    "m_ObjectId": "7c7517f9694240619843bbd4ec64eb7e",
+    "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.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "7ffabb68451b4b67bb6e07de1ba1da90",
+    "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.CategoryData",
+    "m_ObjectId": "80d2cc06b6264d588e67513de5b51205",
+    "m_Name": "",
+    "m_ChildObjectList": [
+        {
+            "m_Id": "38bd2f3ce3a74e5bbc895cad0262fb80"
+        },
+        {
+            "m_Id": "bca4c824a259437eb51ab73e93ab5f3b"
+        },
+        {
+            "m_Id": "592b0ef343074ff1a1287004fca7adb0"
+        }
+    ]
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "860b019439c2493e97d133b759d9fc9a",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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.Vector4MaterialSlot",
+    "m_ObjectId": "86ab455965c44a93a3f493e9b0f48756",
+    "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.SamplerStateMaterialSlot",
+    "m_ObjectId": "8c182435d4e64953849034c208cf2bb6",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "8d73c40335274957ac8362330421a5df",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "8ebb1780453b43dc98b45f6067833959",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.ClampNode",
+    "m_ObjectId": "92925db0efae4737bd2fd9e1ad019362",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Clamp",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2003.0001220703125,
+            "y": -1246.0,
+            "width": 208.0,
+            "height": 326.0
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "668cfc40183a4b98a74bb7d504010955"
+        },
+        {
+            "m_Id": "1cd7bcceeb8a475a953a5aafcc140f30"
+        },
+        {
+            "m_Id": "b0d59b7b25554666859f73a9c88ab2e5"
+        },
+        {
+            "m_Id": "7364055d8c764168a028853afe6139e7"
+        }
+    ],
+    "synonyms": [
+        "limit"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "96777b5ccb2b44b9bce9c4bd6bb3c90b",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "96ddb3644d8c43c285cbb5f21d8eb5f3",
+    "m_Id": 0,
+    "m_DisplayName": "Out",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0
+    },
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "9ade7d4255934f4f9439af7ced6618b2",
+    "m_Id": 1,
+    "m_DisplayName": "Min",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Min",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector3MaterialSlot",
+    "m_ObjectId": "9bca68e57eba424dafdd7bfe4185a8e5",
+    "m_Id": 2,
+    "m_DisplayName": "Colour",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Colour",
+    "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.SampleTexture2DNode",
+    "m_ObjectId": "9c4954c57f404d4b8cb3d3d9bfc6b538",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Sample Texture 2D",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2256.0,
+            "y": 155.9999542236328,
+            "width": 208.0,
+            "height": 435.00006103515627
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "27ad0067a1ac423699225f7bd6af03b2"
+        },
+        {
+            "m_Id": "0bf8204cf2ea4339a8dbc8c27b116f54"
+        },
+        {
+            "m_Id": "0cbb3a5439e243ada8b7cb2de572431d"
+        },
+        {
+            "m_Id": "1574f4a46a5a47aea5ea483a74ba13ab"
+        },
+        {
+            "m_Id": "05f2d914ce6f45e5925a01d8c76d2cb1"
+        },
+        {
+            "m_Id": "592872ef058c4c2499daedc804f7b8dc"
+        },
+        {
+            "m_Id": "b24289447e924ee2a7dc7b0111def457"
+        },
+        {
+            "m_Id": "8c182435d4e64953849034c208cf2bb6"
+        }
+    ],
+    "synonyms": [
+        "tex2d"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "9c573440653e491aa5c9ebc32ad0bc3a",
+    "m_Id": 0,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "In",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StepNode",
+    "m_ObjectId": "a3f7cb1f17914838af71811b64c90d4e",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Step",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2914.0,
+            "y": -1429.999755859375,
+            "width": 208.0,
+            "height": 301.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "fabb574db4ee4cbe99fb3a1d66cd070b"
+        },
+        {
+            "m_Id": "67415e535bac44399da3e98ac622a718"
+        },
+        {
+            "m_Id": "68ca59cd43e548b290e592d499705c95"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.MultiplyNode",
+    "m_ObjectId": "a46c58e738f841c0917436944b14191b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Multiply",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1172.0001220703125,
+            "y": -736.0000610351563,
+            "width": 208.0,
+            "height": 302.0000915527344
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "a76966634add403aa89fc35932daa808"
+        },
+        {
+            "m_Id": "511b158a4cc84d2b9cc2972716afda5b"
+        },
+        {
+            "m_Id": "7ffabb68451b4b67bb6e07de1ba1da90"
+        }
+    ],
+    "synonyms": [
+        "multiplication",
+        "times",
+        "x"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "a5804fe7ac2043eca221245e2f77149b",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2205.000244140625,
+            "y": -222.00003051757813,
+            "width": 129.999755859375,
+            "height": 34.00018310546875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "86ab455965c44a93a3f493e9b0f48756"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "bca4c824a259437eb51ab73e93ab5f3b"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "a76966634add403aa89fc35932daa808",
+    "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.ClampNode",
+    "m_ObjectId": "a784b9c54f424d5f8747957ee2a13fd9",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Clamp",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2973.0,
+            "y": -1018.9998779296875,
+            "width": 207.999755859375,
+            "height": 326.00006103515627
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "9c573440653e491aa5c9ebc32ad0bc3a"
+        },
+        {
+            "m_Id": "9ade7d4255934f4f9439af7ced6618b2"
+        },
+        {
+            "m_Id": "521ddca3b31c40df8b29bbe13e589afd"
+        },
+        {
+            "m_Id": "777cbe5e4a6b4165b013c4cdf4342502"
+        }
+    ],
+    "synonyms": [
+        "limit"
+    ],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.StepNode",
+    "m_ObjectId": "a8daeaf6269a45ccb85c271e8c38edad",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Step",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -3763.0,
+            "y": -1077.9998779296875,
+            "width": 208.0,
+            "height": 301.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "f7bb6a168a1240b193be10b614a22311"
+        },
+        {
+            "m_Id": "d426e910d98f464eb9d899044825b875"
+        },
+        {
+            "m_Id": "34f9686843a3465fa430f405a2b699e1"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "a9157f3aaa2347af8fd033b4c4b0befd",
+    "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.BlockNode",
+    "m_ObjectId": "a9e1e33e9ba547ae9ecfd88c3a6722fa",
+    "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": "6f5fc66449de441b8869a87edcc4b67a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "VertexDescription.Normal"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "aaac37d021ea47609fa810c615e641a2",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "ac00d087474443bf9d9aa37f802602e4",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.5,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "afc5266cc7b54b348bb39d148a19a336",
+    "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.DynamicValueMaterialSlot",
+    "m_ObjectId": "b063c9773c534ad89c575aa889e66ff5",
+    "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",
+    "m_ObjectId": "b079924139ca445cbd5803a3c20acc51",
+    "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": "63a7d9e20a7f49e4b2422928d6e7baaf"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.BaseColor"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "b0d59b7b25554666859f73a9c88ab2e5",
+    "m_Id": 2,
+    "m_DisplayName": "Max",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Max",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.UVMaterialSlot",
+    "m_ObjectId": "b24289447e924ee2a7dc7b0111def457",
+    "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.SubGraphNode",
+    "m_ObjectId": "b3a6d1995d60421b8865243f09e5d4a0",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Mix Fog",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -750.0,
+            "y": -146.00003051757813,
+            "width": 208.0,
+            "height": 279.0000305175781
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "09f9bf10b5e847b5a2e7fa8730c51446"
+        },
+        {
+            "m_Id": "31eefef0adb24104a551c7613bbf2f91"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedSubGraph": "{\n    \"subGraph\": {\n        \"fileID\": -5475051401550479605,\n        \"guid\": \"aadfc52f8da612746841c7c5af3fcea6\",\n        \"type\": 3\n    }\n}",
+    "m_PropertyGuids": [
+        "67a1ace6-abdb-45ee-b1b5-2f6803d10966"
+    ],
+    "m_PropertyIds": [
+        745104271
+    ],
+    "m_Dropdowns": [],
+    "m_DropdownSelectedEntries": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.BlockNode",
+    "m_ObjectId": "b4318b0903004fbc8bb26e70defa6bda",
+    "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": "4d34e063080648b0a3465081705618c8"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_SerializedDescriptor": "SurfaceDescription.Alpha"
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector1MaterialSlot",
+    "m_ObjectId": "b44c8643eba64ad78bdf4a09dd13a6ca",
+    "m_Id": 3,
+    "m_DisplayName": "CullingMask",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "CullingMask",
+    "m_StageCapability": 3,
+    "m_Value": 0.0,
+    "m_DefaultValue": 0.0,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.TangentMaterialSlot",
+    "m_ObjectId": "b7b27e90d2854b28bb1aec99fe59bfae",
+    "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": 3,
+    "m_Type": "UnityEditor.ShaderGraph.Internal.ColorShaderProperty",
+    "m_ObjectId": "bca4c824a259437eb51ab73e93ab5f3b",
+    "m_Guid": {
+        "m_GuidSerialized": "15d276c8-b640-4b33-ac79-19430ba4670b"
+    },
+    "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": false,
+    "hlslDeclarationOverride": 0,
+    "m_Hidden": false,
+    "m_Priority": 10,
+    "m_Value": {
+        "r": 0.0,
+        "g": 0.0,
+        "b": 0.0,
+        "a": 0.0
+    },
+    "isMainColor": false,
+    "m_ColorMode": 0
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Texture2DMaterialSlot",
+    "m_ObjectId": "bd3f5bef441544cabe0a27ca1a23fa5a",
+    "m_Id": 0,
+    "m_DisplayName": "Base map",
+    "m_SlotType": 1,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Out",
+    "m_StageCapability": 3,
+    "m_BareResource": false
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "c2c3f6c7a02a445d86e0f3549f95cfd4",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -2520.0,
+            "y": 170.0,
+            "width": 135.0,
+            "height": 33.999969482421878
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "bd3f5bef441544cabe0a27ca1a23fa5a"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "38bd2f3ce3a74e5bbc895cad0262fb80"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.PropertyNode",
+    "m_ObjectId": "c43ef0741d654db6bbc0da1a2742675c",
+    "m_Group": {
+        "m_Id": ""
+    },
+    "m_Name": "Property",
+    "m_DrawState": {
+        "m_Expanded": true,
+        "m_Position": {
+            "serializedVersion": "2",
+            "x": -1227.000244140625,
+            "y": -255.99990844726563,
+            "width": 123.0001220703125,
+            "height": 33.9998779296875
+        }
+    },
+    "m_Slots": [
+        {
+            "m_Id": "d8a09b53c5704549906a45b8b7d93c3c"
+        }
+    ],
+    "synonyms": [],
+    "m_Precision": 0,
+    "m_PreviewExpanded": true,
+    "m_NodeLOD": 0,
+    "m_DismissedVersion": 0,
+    "m_PreviewMode": 0,
+    "m_CustomColors": {
+        "m_SerializableColors": []
+    },
+    "m_Property": {
+        "m_Id": "592b0ef343074ff1a1287004fca7adb0"
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c454dc7c902c4266b5f5bd0a12641875",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c50cb113ea1b48b2a75f2b2de2d6e8db",
+    "m_Id": 0,
+    "m_DisplayName": "A",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "A",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "c63a8e6c192942a293aae14886da3249",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "c6a8413b222a48b2a1e2376167f45eb4",
+    "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.Vector1MaterialSlot",
+    "m_ObjectId": "cd7636688cc142b5abb6dcd4387f63c1",
+    "m_Id": 0,
+    "m_DisplayName": "Alpha Clip Threshold",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "AlphaClipThreshold",
+    "m_StageCapability": 2,
+    "m_Value": 1.0,
+    "m_DefaultValue": 0.5,
+    "m_Labels": []
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "cefe21f0eac04aeabfcee35b90975048",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "d426e910d98f464eb9d899044825b875",
+    "m_Id": 1,
+    "m_DisplayName": "In",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "In",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.Vector4MaterialSlot",
+    "m_ObjectId": "d8a09b53c5704549906a45b8b7d93c3c",
+    "m_Id": 0,
+    "m_DisplayName": "Emission",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "ef47044a105f45e88f477ca97a3da493",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "f0caaf6cae88432e9d5a88fc73b7fec4",
+    "m_Id": 2,
+    "m_DisplayName": "Out",
+    "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_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicVectorMaterialSlot",
+    "m_ObjectId": "f7bb6a168a1240b193be10b614a22311",
+    "m_Id": 0,
+    "m_DisplayName": "Edge",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Edge",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 1.0,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "f7fa29e55141464aae56a6ff447e75e1",
+    "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.DynamicVectorMaterialSlot",
+    "m_ObjectId": "fabb574db4ee4cbe99fb3a1d66cd070b",
+    "m_Id": 0,
+    "m_DisplayName": "Edge",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "Edge",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "x": 0.7900000214576721,
+        "y": 1.0,
+        "z": 1.0,
+        "w": 1.0
+    },
+    "m_DefaultValue": {
+        "x": 0.0,
+        "y": 0.0,
+        "z": 0.0,
+        "w": 0.0
+    }
+}
+
+{
+    "m_SGVersion": 0,
+    "m_Type": "UnityEditor.ShaderGraph.DynamicValueMaterialSlot",
+    "m_ObjectId": "fc3004f4e0fd4beabbafd246eb2a651f",
+    "m_Id": 1,
+    "m_DisplayName": "B",
+    "m_SlotType": 0,
+    "m_Hidden": false,
+    "m_ShaderOutputName": "B",
+    "m_StageCapability": 3,
+    "m_Value": {
+        "e00": 0.800000011920929,
+        "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
+    }
+}
+

+ 10 - 0
Assets/Art/shader/RenWuShader.shadergraph.meta

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

+ 111 - 62
Assets/Res/CombatHero/Nanzhu.prefab

@@ -69,6 +69,7 @@ Transform:
   - {fileID: 9044771592397656366}
   - {fileID: 4322969765057620113}
   - {fileID: 322632003636689912}
+  - {fileID: 342057885342069300}
   - {fileID: 1187838730353272687}
   - {fileID: 2994176716274470317}
   - {fileID: 6348987393351660161}
@@ -223,8 +224,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 292701434655550553}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.07727957, y: 0.4606362, z: -0.062090002, w: 0.88203573}
-  m_LocalPosition: {x: -0.1451279, y: 0, z: 0.00000015258789}
+  m_LocalRotation: {x: -0.0772795, y: 0.4606362, z: -0.062090047, w: 0.88203573}
+  m_LocalPosition: {x: -0.1451279, y: 0.0000000047683715, z: 0.00000015258789}
   m_LocalScale: {x: 0.9999998, y: 0.9999999, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -256,7 +257,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 351170292600738611}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.013632825, y: 0.04588199, z: -0.280201, w: 0.9587473}
+  m_LocalRotation: {x: 0, y: -0.0000000037252903, z: -0, w: 1}
   m_LocalPosition: {x: -0.14855865, y: 0, z: 0.00000001551068}
   m_LocalScale: {x: 0.9999996, y: 0.9999996, z: 1}
   m_ConstrainProportionsScale: 0
@@ -322,8 +323,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 502155147938813583}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.014498322, y: 0.0015882769, z: -0.09680145, w: 0.9951969}
-  m_LocalPosition: {x: -0.019027594, y: 0.000000038146972, z: 0}
+  m_LocalRotation: {x: -0.014498283, y: 0.0015881981, z: -0.096801445, w: 0.9951969}
+  m_LocalPosition: {x: -0.019027634, y: 0.000000038146972, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -354,7 +355,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 614146175909946826}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5878885, y: -0.0100866845, z: 0.78826725, w: -0.18143904}
+  m_LocalRotation: {x: -0.5878885, y: -0.010086658, z: 0.78826725, w: -0.18143901}
   m_LocalPosition: {x: 0.032911986, y: 0.021739312, z: 0.045047794}
   m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -387,7 +388,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 748393507073666803}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.05277878, y: -0.0076950756, z: -0.34573838, w: 0.93681383}
+  m_LocalRotation: {x: -0.052778747, y: -0.00769501, z: -0.3457384, w: 0.93681383}
   m_LocalPosition: {x: -0.0893898, y: 0.0094221495, z: 0.0304821}
   m_LocalScale: {x: 1, y: 0.99999994, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -420,8 +421,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 823214863236262207}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000000030947243, y: -0.0000000145762575, z: -0.20768343, w: 0.9781961}
-  m_LocalPosition: {x: -0.031238822, y: 0.000000076293944, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: -0.20768341, w: 0.9781961}
+  m_LocalPosition: {x: -0.031238804, y: -0.000000076293944, z: -0.000000076293944}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -486,7 +487,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 893157167972554376}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.031313613, y: -0.051039267, z: -0.27991262, w: 0.9581563}
+  m_LocalRotation: {x: -0.0072198664, y: 0.03508995, z: 0.1386008, w: 0.98970014}
   m_LocalPosition: {x: -0.14249496, y: 0, z: 0.0000000108454055}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -551,7 +552,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1084275330680329334}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000033278894, y: 0.0000000016548046, z: -0.40224087, w: 0.9155339}
+  m_LocalRotation: {x: 0.000000013642519, y: -0.000000005993857, z: -0.4022409, w: 0.91553384}
   m_LocalPosition: {x: -0.027586516, y: -0.000000076293944, z: 0}
   m_LocalScale: {x: 1, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
@@ -583,7 +584,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1084310150122364341}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00038513908, y: -0.000101139216, z: -0.25397143, w: 0.96721166}
+  m_LocalRotation: {x: -0.00038510992, y: -0.00010111607, z: -0.25397143, w: 0.96721166}
   m_LocalPosition: {x: -0.0910915, y: 0.006086807, z: 0.012472572}
   m_LocalScale: {x: 1, y: 1, z: 0.9999999}
   m_ConstrainProportionsScale: 0
@@ -616,8 +617,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1162330323270382447}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000001475144, y: -0.0000000021070339, z: -0.14140065, w: 0.98995245}
-  m_LocalPosition: {x: -0.029523315, y: -0.000000076293944, z: 0.000000076293944}
+  m_LocalRotation: {x: -0.0000000010546176, y: 0.000000045307846, z: -0.14140064, w: 0.98995245}
+  m_LocalPosition: {x: -0.029523352, y: -0.000000038146972, z: 0}
   m_LocalScale: {x: 0.9999999, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -729,7 +730,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1446655693840360201}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.047830276, y: -0.04156968, z: 0.08172297, w: 0.99463844}
+  m_LocalRotation: {x: 0.000000007242118, y: 0.000079870224, z: -0.000090673566, w: 1}
   m_LocalPosition: {x: -0.14249496, y: 0, z: 0.0000000108454055}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -826,8 +827,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1698250236020278380}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.059072565, y: -0.032520156, z: -0.058499508, w: 0.9960074}
-  m_LocalPosition: {x: -0.12854782, y: -0.00013383865, z: -0.000016491413}
+  m_LocalRotation: {x: 0.059072565, y: -0.032520153, z: -0.058499508, w: 0.9960074}
+  m_LocalPosition: {x: -0.12854782, y: -0.00013383865, z: -0.000016486645}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -859,8 +860,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1813561016405006274}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000028894194, y: -0.0000000073009505, z: -0.24497926, w: 0.9695283}
-  m_LocalPosition: {x: -0.02578884, y: 0.000000038146972, z: 0}
+  m_LocalRotation: {x: -0.000000010874023, y: -0.000000012621859, z: -0.24497926, w: 0.9695283}
+  m_LocalPosition: {x: -0.025788764, y: 0.000000038146972, z: -0.000000038146972}
   m_LocalScale: {x: 1.0000001, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -892,7 +893,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1823938800360400890}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0023179296, y: 0.15219587, z: -0.04552923, w: 0.9872984}
+  m_LocalRotation: {x: 0.0025507172, y: 0.0968903, z: -0.000316127, w: 0.99529177}
   m_LocalPosition: {x: -0.082405925, y: -0.0000009346008, z: 1.7400793e-10}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -958,7 +959,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1916072688224784139}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.03590034, y: -0.2263097, z: -0.03578777, w: 0.9727355}
+  m_LocalRotation: {x: -0.035900343, y: -0.22630975, z: -0.035787787, w: 0.9727355}
   m_LocalPosition: {x: -0.14083283, y: 0, z: 0.0000000065850325}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -991,7 +992,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1950557356879956695}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00027954965, y: -0.010730029, z: -0.22078961, w: 0.9752624}
+  m_LocalRotation: {x: -0.00027953705, y: -0.010729971, z: -0.22078966, w: 0.9752624}
   m_LocalPosition: {x: -0.09351272, y: 0.005344925, z: -0.0065357587}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -1024,7 +1025,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2044559369521331584}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.02465996, y: 0.1361789, z: 0.974807, w: 0.17492424}
+  m_LocalRotation: {x: -0.009147934, y: 0.13809091, z: 0.90314853, w: 0.40641108}
   m_LocalPosition: {x: -0.016713237, y: -0.13145413, z: 0.0759351}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1.0000002}
   m_ConstrainProportionsScale: 0
@@ -1089,7 +1090,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2173626256717425780}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.115643986, y: -0.32210088, z: 0.41060916, w: 0.84514946}
+  m_LocalRotation: {x: -0.0876313, y: -0.3308054, z: 0.3366795, w: 0.8772317}
   m_LocalPosition: {x: -0.14083283, y: 0, z: 0.0000000065850325}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1122,7 +1123,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2254867996496277537}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.035847068, y: 0.0060656536, z: 0.054572713, w: 0.9978477}
+  m_LocalRotation: {x: -0.035847053, y: 0.006065654, z: 0.054572713, w: 0.9978477}
   m_LocalPosition: {x: -0.094891734, y: -0.00009988308, z: 0.000007305145}
   m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -1247,7 +1248,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2520365795001117875}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.017248277, y: -0.22067834, z: -0.30484468, w: 0.92632246}
+  m_LocalRotation: {x: -0.019659188, y: -0.17958347, z: -0.2405686, w: 0.9536719}
   m_LocalPosition: {x: -0.124370955, y: 0.0000010204315, z: -4.7975843e-13}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1388,7 +1389,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2819664155657093707}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0015146579, y: 0.06108786, z: -0.021266045, w: 0.9979047}
+  m_LocalRotation: {x: 0.0027232869, y: 0.031802367, z: 0.008633602, w: 0.9994532}
   m_LocalPosition: {x: -0.104208216, y: 0, z: -0.0000000027627538}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1553,7 +1554,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3203542025181959176}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.12922335, y: 0.045149725, z: 0.04536181, w: 0.98954797}
+  m_LocalRotation: {x: 0.12922333, y: 0.045149725, z: 0.04536182, w: 0.98954797}
   m_LocalPosition: {x: -0.06189331, y: 0, z: 0.0000000017881393}
   m_LocalScale: {x: 0.99999994, y: 0.9999998, z: 0.9999999}
   m_ConstrainProportionsScale: 0
@@ -1588,7 +1589,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3300965484864890795}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.011394286, y: 0.0032104463, z: -0.048809208, w: 0.998738}
+  m_LocalRotation: {x: -0.008829243, y: 0.05539727, z: -0.049796853, w: 0.9971828}
   m_LocalPosition: {x: -0.104208216, y: 0, z: -0.0000000027627538}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1620,7 +1621,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3447817915165066041}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.026350735, y: -0.08250775, z: -0.233511, w: 0.96848893}
+  m_LocalRotation: {x: -0.027780117, y: -0.06201648, z: -0.15853113, w: 0.98501277}
   m_LocalPosition: {x: -0.14855865, y: 0, z: 0.00000001551068}
   m_LocalScale: {x: 0.9999996, y: 0.9999996, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1946,8 +1947,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3899098606503601405}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.65820014, y: 0.08870725, z: 0.019014286, w: 0.7473568}
-  m_LocalPosition: {x: -0.22286697, y: 0, z: 0}
+  m_LocalRotation: {x: -0.65820014, y: 0.0887073, z: 0.019014303, w: 0.7473568}
+  m_LocalPosition: {x: -0.22286698, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2320,7 +2321,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4820452139981491472}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.035008863, y: -0.02787163, z: -0.09593689, w: 0.99438107}
+  m_LocalRotation: {x: 0.03492384, y: -0.041869562, z: -0.1506883, w: 0.98707664}
   m_LocalPosition: {x: -0.05546936, y: 0.000000076293944, z: 2.728484e-14}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2352,8 +2353,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4850187982416425196}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000000138348994, y: -0.000000005535354, z: -0.37147135, w: 0.92844445}
-  m_LocalPosition: {x: -0.027586555, y: 0, z: 0}
+  m_LocalRotation: {x: -0.00000000691745, y: 0.0000000027676772, z: -0.37147135, w: 0.92844445}
+  m_LocalPosition: {x: -0.027586516, y: 0, z: 0}
   m_LocalScale: {x: 0.99999994, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2385,7 +2386,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4966315231788198708}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.05940343, y: 0.23116009, z: 0.032218672, w: 0.9705659}
+  m_LocalRotation: {x: -0.05362054, y: 0.20995145, z: 0.05460751, w: 0.9747119}
   m_LocalPosition: {x: -0.09138802, y: 0, z: -9.1861124e-10}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2483,8 +2484,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5081730958586872467}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.057370726, y: -0.01842435, z: 0.005344315, w: 0.99816865}
-  m_LocalPosition: {x: -0.12656227, y: -0.00010168075, z: -0.000011701583}
+  m_LocalRotation: {x: 0.057370733, y: -0.018424347, z: 0.005344313, w: 0.99816865}
+  m_LocalPosition: {x: -0.12656227, y: -0.00010166168, z: -0.000011701583}
   m_LocalScale: {x: 1, y: 0.9999999, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2706,7 +2707,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5639225187493043989}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.004288752, y: 0.0062581315, z: 0.042665154, w: 0.99906063}
+  m_LocalRotation: {x: 0.00429297, y: 0.002396835, z: 0.016472526, w: 0.99985224}
   m_LocalPosition: {x: -0.06687782, y: 0, z: -0.000000002961169}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2772,8 +2773,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5699481579251328208}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0127985515, y: -0.36358565, z: -0.011786216, w: 0.9313983}
-  m_LocalPosition: {x: -0.1451279, y: 0.000000009536743, z: 0}
+  m_LocalRotation: {x: 0.012798602, y: -0.36358565, z: -0.011786158, w: 0.93139833}
+  m_LocalPosition: {x: -0.1451279, y: 0, z: 0}
   m_LocalScale: {x: 0.9999999, y: 1, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2988,7 +2989,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6165246901505300424}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.006147047, y: 0.05068725, z: -0.009891913, w: 0.9986467}
+  m_LocalRotation: {x: -0.0053607486, y: 0.054534964, z: 0.004829934, w: 0.9984858}
   m_LocalPosition: {x: -0.104208216, y: 0, z: -0.0000000027627538}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3201,8 +3202,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6829447777175565008}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.014584943, y: 0.00005623784, z: -0.20081834, w: 0.9795199}
-  m_LocalPosition: {x: -0.028517531, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: -0.014584955, y: 0.00005628653, z: -0.20081837, w: 0.9795199}
+  m_LocalPosition: {x: -0.028517608, y: 0, z: 0.000000038146972}
   m_LocalScale: {x: 0.99999994, y: 1, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3326,8 +3327,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7066601883930390955}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000014835509, y: 0.0000000013972442, z: -0.09376747, w: 0.99559414}
-  m_LocalPosition: {x: -0.024698943, y: -0.000000038146972, z: 0}
+  m_LocalRotation: {x: -0.000000002794489, y: -0.000000029671016, z: -0.093767494, w: 0.99559414}
+  m_LocalPosition: {x: -0.024698943, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -3358,7 +3359,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7252956973441299225}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.030776523, y: -0.101121895, z: -0.15054326, w: 0.9829364}
+  m_LocalRotation: {x: -0.034864638, y: -0.09978619, z: -0.11043296, w: 0.9882468}
   m_LocalPosition: {x: -0.14083283, y: 0, z: 0.0000000065850325}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3391,7 +3392,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7374477753961859615}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0018782739, y: -0.016899088, z: -0.21413544, w: 0.976656}
+  m_LocalRotation: {x: -0.0018782712, y: -0.016899087, z: -0.21413542, w: 0.976656}
   m_LocalPosition: {x: -0.14083283, y: 0, z: 0.0000000065850325}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3505,7 +3506,7 @@ Transform:
   m_GameObject: {fileID: 7516503280657808243}
   serializedVersion: 2
   m_LocalRotation: {x: -0.001700365, y: 0.9746806, z: -0.19163002, w: -0.115207985}
-  m_LocalPosition: {x: 0.0957669, y: -0.003920059, z: -0.088667676}
+  m_LocalPosition: {x: 0.0957669, y: -0.00392004, z: -0.088667676}
   m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3683,7 +3684,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7948627602199293492}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.018670896, y: -0.044490688, z: -0.16987643, w: 0.9842835}
+  m_LocalRotation: {x: 0.020425247, y: -0.02531574, z: -0.1328173, w: 0.99060667}
   m_LocalPosition: {x: -0.09786163, y: 0.000000019073486, z: -0.0000000013172029}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3750,7 +3751,7 @@ Transform:
   m_GameObject: {fileID: 8157072182123631697}
   serializedVersion: 2
   m_LocalRotation: {x: -0.29031858, y: 0.8897333, z: 0.31742206, w: 0.1527516}
-  m_LocalPosition: {x: 0.092894286, y: -0.016632766, z: 0.090222426}
+  m_LocalPosition: {x: 0.092894286, y: -0.016632747, z: 0.090222426}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3790,6 +3791,54 @@ Transform:
   - {fileID: 4740279330888179170}
   m_Father: {fileID: 3299892940066969014}
   m_LocalEulerAnglesHint: {x: -60.52319, y: -72.47689, z: -138.11383}
+--- !u!1 &8245650438897184013
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 342057885342069300}
+  - component: {fileID: 2160324487819309018}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &342057885342069300
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8245650438897184013}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.21, z: 1.53}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7980208121730886396}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &2160324487819309018
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8245650438897184013}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &8261776332852155105
 GameObject:
   m_ObjectHideFlags: 0
@@ -3815,7 +3864,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8261776332852155105}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.07509204, y: -0.1419454, z: 0.19217604, w: 0.9681328}
+  m_LocalRotation: {x: 0.000000018614664, y: -0.000113040216, z: 0.00012803078, w: 1}
   m_LocalPosition: {x: -0.14855865, y: 0, z: 0.00000001551068}
   m_LocalScale: {x: 0.9999996, y: 0.9999996, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3848,7 +3897,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8295054865073593577}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.016776351, y: -0.23471138, z: -0.121560775, w: 0.9642884}
+  m_LocalRotation: {x: -0.015961919, y: -0.07941556, z: -0.046715874, w: 0.9956184}
   m_LocalPosition: {x: -0.14249496, y: 0, z: 0.0000000108454055}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3880,8 +3929,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8336113941855156023}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000013095588, y: 0.000000007109865, z: 0.47713497, w: 0.87883}
-  m_LocalPosition: {x: -0.2624955, y: 0.000000023841856, z: 0}
+  m_LocalRotation: {x: 0, y: 0, z: 0.47713503, w: 0.87883}
+  m_LocalPosition: {x: -0.2624955, y: 0.0000000047683715, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -3913,7 +3962,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8429302049251445418}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.04510126, y: 0.0024949638, z: -0.24530135, w: 0.968394}
+  m_LocalRotation: {x: 0.000000003725291, y: -4.6566126e-10, z: 1.7347239e-18, w: 1}
   m_LocalPosition: {x: -0.14249496, y: 0, z: 0.0000000108454055}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -3945,7 +3994,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8430788103579812248}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.01468279, y: -0.002984584, z: -0.17310542, w: 0.9847893}
+  m_LocalRotation: {x: -0.014682746, y: -0.002984531, z: -0.17310543, w: 0.9847893}
   m_LocalPosition: {x: -0.093890265, y: 0.008929901, z: -0.026670417}
   m_LocalScale: {x: 0.9999998, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -4011,8 +4060,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8655832130479669456}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000010644473, y: 0.00000000340518, z: -0.3046904, w: 0.95245147}
-  m_LocalPosition: {x: -0.031239776, y: 0.000000076293944, z: 0}
+  m_LocalRotation: {x: 0.0000000061042322, y: -0.000000017597811, z: -0.30469042, w: 0.95245147}
+  m_LocalPosition: {x: -0.031239813, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -4044,8 +4093,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9024834936801607917}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000003327057, y: -0.0000000018143983, z: -0.3978452, w: 0.9174526}
-  m_LocalPosition: {x: -0.02163269, y: 0, z: 0}
+  m_LocalRotation: {x: -0.000000021413864, y: 0.00000002552782, z: -0.39784518, w: 0.9174526}
+  m_LocalPosition: {x: -0.02163269, y: 0, z: 0.000000038146972}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -4076,7 +4125,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9052104310588149574}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.030969607, y: -0.2377478, z: -0.098635, w: 0.9658095}
+  m_LocalRotation: {x: -0.031291306, y: -0.19845155, z: -0.0823709, w: 0.97614187}
   m_LocalPosition: {x: -0.14855865, y: 0, z: 0.00000001551068}
   m_LocalScale: {x: 0.9999996, y: 0.9999996, z: 1}
   m_ConstrainProportionsScale: 0

+ 118 - 118
Assets/Res/CombatHero/fb_dao1.prefab

@@ -80,7 +80,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3562723674201918496}
-  - {fileID: 7591023246368955457}
+  - {fileID: 7513809145822459161}
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &1164658870965195
@@ -104,7 +104,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &1480977607144959593
+--- !u!1 &3368977622504917241
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -112,31 +112,33 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8093477516719730593}
+  - component: {fileID: 8565182548359739858}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: Bone001
+  m_Name: fbdao1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8093477516719730593
+--- !u!4 &8565182548359739858
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1480977607144959593}
+  m_GameObject: {fileID: 3368977622504917241}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
-  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.4986345, y: -0.50136185, z: -0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.004, y: -0, z: -0.002}
+  m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
+  m_Children:
+  - {fileID: 8509331773365200279}
+  - {fileID: 7591023246368955457}
+  m_Father: {fileID: 3562723674201918496}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3368977622504917241
+--- !u!1 &4095294900485605107
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -144,31 +146,29 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8565182548359739858}
+  - component: {fileID: 8509331773365200279}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbdao1run (1)
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8565182548359739858
+--- !u!4 &8509331773365200279
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3368977622504917241}
+  m_GameObject: {fileID: 4095294900485605107}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.4986345, y: -0.50136185, z: -0.50136185, w: 0.4986345}
-  m_LocalPosition: {x: -0.004, y: -0, z: -0.002}
-  m_LocalScale: {x: 1.0539397, y: 1.1541694, z: 1.0539397}
+  m_LocalRotation: {x: -0.4986345, y: 0.50136185, z: 0.50136185, w: 0.4986345}
+  m_LocalPosition: {x: -0.000023143375, y: 0, z: -0.0119704185}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 8093477516719730593}
-  - {fileID: 9008080792491880227}
-  m_Father: {fileID: 3562723674201918496}
+  m_Children: []
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4841319616322308277
 GameObject:
@@ -202,6 +202,98 @@ Transform:
   m_Children: []
   m_Father: {fileID: 25656997809885723}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5219199769341057833
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7513809145822459161}
+  - component: {fileID: 870535379941050216}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbdao1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7513809145822459161
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5219199769341057833}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
+  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3762066587073657769}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &870535379941050216
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5219199769341057833}
+  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_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
+  m_Bones:
+  - {fileID: 3562723674201918496}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 3562723674201918496}
+  m_AABB:
+    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
+    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &5502319039898907655
 GameObject:
   m_ObjectHideFlags: 0
@@ -400,7 +492,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3762066587073657769}
+  m_Father: {fileID: 8565182548359739858}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &6121306334062930883
 SkinnedMeshRenderer:
@@ -425,98 +517,6 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f58524814877b3e40882cfc86b50263f, 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
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
-  m_Bones:
-  - {fileID: 3562723674201918496}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 3562723674201918496}
-  m_AABB:
-    m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
-    m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &7254858178270901454
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 9008080792491880227}
-  - component: {fileID: 1710891530179478069}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbdao1
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &9008080792491880227
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7254858178270901454}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.7071068, y: -0.000000061817246, z: -0.000000061817246, w: 0.7071068}
-  m_LocalPosition: {x: 0.0017127597, y: 0.0099856565, z: -0.0027135524}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8565182548359739858}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1710891530179478069
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7254858178270901454}
-  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_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
   - {fileID: 2100000, guid: 86993dbe6487a364cbe7896811a1b5bd, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -4142033604824764238, guid: 50977777f317b104d9c8e8961e436858, type: 3}
   m_Bones:
-  - {fileID: 8093477516719730593}
+  - {fileID: 8509331773365200279}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8093477516719730593}
+  m_RootBone: {fileID: 8509331773365200279}
   m_AABB:
     m_Center: {x: -0.30525243, y: 0.0011679828, z: 0.009985656}
     m_Extent: {x: 0.684778, y: 0.46557194, z: 0.0770977}

+ 127 - 127
Assets/Res/CombatHero/fb_ding1.prefab

@@ -48,7 +48,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &2377362009792030562
+--- !u!1 &2210318522851765418
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -56,31 +56,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7681573815655635493}
+  - component: {fileID: 5827581424587949080}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_ding1
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7681573815655635493
+--- !u!4 &5827581424587949080
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2377362009792030562}
+  m_GameObject: {fileID: 2210318522851765418}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 6372163822679039326}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2538381807794004556
+--- !u!1 &2377362009792030562
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -88,33 +88,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8990132256551677773}
+  - component: {fileID: 7681573815655635493}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbding1run (1)
+  m_Name: fb_ding1
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8990132256551677773
+--- !u!4 &7681573815655635493
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2538381807794004556}
+  m_GameObject: {fileID: 2377362009792030562}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000034666066, y: 0.0000034454445, z: 0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: 0.27, y: 0.003, z: -0}
-  m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
+  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: 4132060160176276336}
-  - {fileID: 6712685394476199993}
-  m_Father: {fileID: 8679617179344489080}
+  m_Children: []
+  m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3188345402726710448
+--- !u!1 &2538381807794004556
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -122,90 +120,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6712685394476199993}
-  - component: {fileID: 6658487836053436328}
+  - component: {fileID: 8990132256551677773}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbding1
+  m_Name: fbding1run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6712685394476199993
+--- !u!4 &8990132256551677773
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3188345402726710448}
+  m_GameObject: {fileID: 2538381807794004556}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
-  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: -0.0000034666066, y: 0.0000034454445, z: 0.7092684, w: 0.7049386}
+  m_LocalPosition: {x: 0.27, y: 0.003, z: -0}
+  m_LocalScale: {x: 1.0416481, y: 1.0416481, z: 1.0416481}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8990132256551677773}
+  m_Children:
+  - {fileID: 5827581424587949080}
+  - {fileID: 2691489221677646519}
+  m_Father: {fileID: 8679617179344489080}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &6658487836053436328
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3188345402726710448}
-  m_Enabled: 1
-  m_CastShadows: 0
-  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_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, 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
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
-  m_Bones:
-  - {fileID: 4132060160176276336}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4132060160176276336}
-  m_AABB:
-    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
-    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &4033669629132829777
 GameObject:
   m_ObjectHideFlags: 0
@@ -254,38 +194,6 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4249159165507645107
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 4132060160176276336}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &4132060160176276336
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4249159165507645107}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000034666066, y: -0.0000034454445, z: -0.7092684, w: 0.7049386}
-  m_LocalPosition: {x: -0.0014843316, y: 0.255734, z: 0.0000000111784875}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8990132256551677773}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &5064081042845336680
 GameObject:
   m_ObjectHideFlags: 0
@@ -318,7 +226,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8679617179344489080}
-  - {fileID: 2691489221677646519}
+  - {fileID: 6351054710071852932}
   m_Father: {fileID: 6372163822679039326}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &748615157677977061
@@ -373,7 +281,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 1894970939113486830}
+  m_Father: {fileID: 8990132256551677773}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &2666755878192624369
 SkinnedMeshRenderer:
@@ -398,7 +306,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, type: 2}
+  - {fileID: 2100000, guid: e51f6fe61916bdc429f5c50f1883dbf0, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -425,9 +333,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
   m_Bones:
-  - {fileID: 8679617179344489080}
+  - {fileID: 5827581424587949080}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8679617179344489080}
+  m_RootBone: {fileID: 5827581424587949080}
   m_AABB:
     m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
     m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
@@ -520,6 +428,98 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.51, y: 0.78772473, z: 0.43}
   m_Center: {x: 0, y: 0.34613764, z: 0}
+--- !u!1 &8352539738498052744
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6351054710071852932}
+  - component: {fileID: 2619642310369752636}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbding1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6351054710071852932
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8352539738498052744}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: 0.00000008742278, z: -1.9106855e-15, w: 1}
+  m_LocalPosition: {x: 0.0010262298, y: 0.3607047, z: 0.0013793564}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 1894970939113486830}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &2619642310369752636
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8352539738498052744}
+  m_Enabled: 1
+  m_CastShadows: 0
+  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_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: ac736dc4828e57d49ab30b5a3414c1bf, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -5379562027548224914, guid: fae064f3f618703459edc44929cb44a0, type: 3}
+  m_Bones:
+  - {fileID: 8679617179344489080}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 8679617179344489080}
+  m_AABB:
+    m_Center: {x: -0.10428572, y: -0.025417708, z: 0.030807674}
+    m_Extent: {x: 0.35189587, y: 0.2687961, z: 0.26880518}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &8843384990569662011
 GameObject:
   m_ObjectHideFlags: 0

+ 121 - 50
Assets/Res/CombatHero/fb_huohulu.prefab

@@ -1,5 +1,75 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &80478499828904499
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3523989472925648754}
+  - component: {fileID: 6617618274994318241}
+  - component: {fileID: 7030117181369793920}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: lingyu
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3523989472925648754
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 80478499828904499}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: -0.78, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6709539860230415573}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!65 &6617618274994318241
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 80478499828904499}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 10, y: 10, z: 10}
+  m_Center: {x: 0, y: 0, z: 0}
+--- !u!114 &7030117181369793920
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 80478499828904499}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: lingyu
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &505536922449034425
 GameObject:
   m_ObjectHideFlags: 0
@@ -65,7 +135,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9160172853801646544}
-  - {fileID: 5945462629354462804}
+  - {fileID: 6347463344385914295}
   m_Father: {fileID: 6709539860230415573}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &4119005012996295677
@@ -89,7 +159,7 @@ Animator:
   m_AllowConstantClipSamplingOptimization: 1
   m_KeepAnimatorStateOnDisable: 0
   m_WriteDefaultValuesOnDisable: 0
---- !u!1 &2335015189209719553
+--- !u!1 &1853603027154521643
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -97,8 +167,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3617502521392103604}
-  - component: {fileID: 7227534524794343288}
+  - component: {fileID: 6347463344385914295}
+  - component: {fileID: 6454791388708030622}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_hulu
@@ -107,28 +177,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3617502521392103604
+--- !u!4 &6347463344385914295
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2335015189209719553}
+  m_GameObject: {fileID: 1853603027154521643}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0.0027418423, y: 0.32905304, z: -0.0005099106}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8763248839805234681}
+  m_Father: {fileID: 5315834147508480038}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &7227534524794343288
+--- !u!137 &6454791388708030622
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2335015189209719553}
+  m_GameObject: {fileID: 1853603027154521643}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -145,7 +215,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
+  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -172,15 +242,47 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 2584154640569874972}
+  - {fileID: 9160172853801646544}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2584154640569874972}
+  m_RootBone: {fileID: 9160172853801646544}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
+--- !u!1 &2354977990198708692
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8816018396853566720}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8816018396853566720
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2354977990198708692}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
+  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8763248839805234681}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &2590654586827996216
 GameObject:
   m_ObjectHideFlags: 0
@@ -243,8 +345,8 @@ Transform:
   m_LocalScale: {x: 1.0648, y: 1.0648, z: 1.0648}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 2584154640569874972}
-  - {fileID: 3617502521392103604}
+  - {fileID: 8816018396853566720}
+  - {fileID: 5945462629354462804}
   m_Father: {fileID: 9160172853801646544}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &4967031559869244623
@@ -331,6 +433,7 @@ Transform:
   - {fileID: 3146966691021036876}
   - {fileID: 1705757575181481569}
   - {fileID: 5315834147508480038}
+  - {fileID: 3523989472925648754}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!54 &2714522920527061815
@@ -429,38 +532,6 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &7141250753000517685
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2584154640569874972}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2584154640569874972
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 7141250753000517685}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.000000054321042, y: -0.000000054323817, z: -0.7071068, w: 0.7071067}
-  m_LocalPosition: {x: 0.0017814379, y: 0.089754246, z: 0.0000000039232826}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8763248839805234681}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8573372403924348341
 GameObject:
   m_ObjectHideFlags: 0
@@ -492,7 +563,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 5315834147508480038}
+  m_Father: {fileID: 8763248839805234681}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &8302346427361666624
 SkinnedMeshRenderer:
@@ -517,7 +588,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: f3d79fc4671836747af1c04171aec002, type: 2}
+  - {fileID: 2100000, guid: d5464f0ff5f42434898b4ca5e0f3a3b9, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +615,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -2712476317064992041, guid: 5305fe0d389fdab4488d1203e752bc54, type: 3}
   m_Bones:
-  - {fileID: 9160172853801646544}
+  - {fileID: 8816018396853566720}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 9160172853801646544}
+  m_RootBone: {fileID: 8816018396853566720}
   m_AABB:
     m_Center: {x: -0.23929873, y: 0.00096040964, z: -0.00050991774}
     m_Extent: {x: 0.32738915, y: 0.19700211, z: 0.19481586}

+ 70 - 70
Assets/Res/CombatHero/fb_jian1.prefab

@@ -48,7 +48,7 @@ MonoBehaviour:
   DotName: hitpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &1047511870456823630
+--- !u!1 &869398033128610953
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -56,42 +56,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 1439812933337521677}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fbjian1_run (1)
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &1439812933337521677
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1047511870456823630}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
-  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
-  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 7087496007493957674}
-  - {fileID: 5405213676776398865}
-  m_Father: {fileID: 7466859698293448862}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &1650330202808175606
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3937788777129149132}
-  - component: {fileID: 2464030059168441475}
+  - component: {fileID: 7379141555654379457}
+  - component: {fileID: 955906773190343824}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -100,28 +66,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3937788777129149132
+--- !u!4 &7379141555654379457
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1650330202808175606}
+  m_GameObject: {fileID: 869398033128610953}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, 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: 1028615347405319678}
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &2464030059168441475
+--- !u!137 &955906773190343824
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1650330202808175606}
+  m_GameObject: {fileID: 869398033128610953}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -138,7 +104,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
+  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -165,16 +131,50 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7466859698293448862}
+  - {fileID: 5670510311265768981}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7466859698293448862}
+  m_RootBone: {fileID: 5670510311265768981}
   m_AABB:
     m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
     m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &1805901791400093830
+--- !u!1 &1047511870456823630
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1439812933337521677}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbjian1_run (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1439812933337521677
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1047511870456823630}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.00269293, y: -0.70710176, z: -0.00269293, w: 0.70710164}
+  m_LocalPosition: {x: 0.005, y: -0.008, z: -0}
+  m_LocalScale: {x: 1.123393, y: 1.1856672, z: 1.07}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 5670510311265768981}
+  - {fileID: 7379141555654379457}
+  m_Father: {fileID: 7466859698293448862}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &2236328243214643423
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -182,8 +182,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 5405213676776398865}
-  - component: {fileID: 1472619206768845198}
+  - component: {fileID: 7247282449970161155}
+  - component: {fileID: 5115860580616424863}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_jian1
@@ -192,28 +192,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &5405213676776398865
+--- !u!4 &7247282449970161155
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1805901791400093830}
+  m_GameObject: {fileID: 2236328243214643423}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, 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: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &1472619206768845198
+--- !u!137 &5115860580616424863
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1805901791400093830}
+  m_GameObject: {fileID: 2236328243214643423}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -230,7 +230,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: d96695fd0f201484a981206048a40479, type: 2}
+  - {fileID: 2100000, guid: 0910ac78b3a407c4184fd63c49100eae, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -257,9 +257,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 7428165345049895633, guid: ddc4ea9c25ec52040a0b8c2361378d7c, type: 3}
   m_Bones:
-  - {fileID: 7087496007493957674}
+  - {fileID: 7466859698293448862}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7087496007493957674}
+  m_RootBone: {fileID: 7466859698293448862}
   m_AABB:
     m_Center: {x: -0.5277451, y: -0.0076348037, z: -0.000000059604645}
     m_Extent: {x: 0.639608, y: 0.08276934, z: 0.14790763}
@@ -298,7 +298,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7466859698293448862}
-  - {fileID: 3937788777129149132}
+  - {fileID: 7247282449970161155}
   m_Father: {fileID: 2850277934501199321}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &5295049769349527351
@@ -456,7 +456,7 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4341059381557959903
+--- !u!1 &5182842215280330390
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -464,7 +464,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7087496007493957674}
+  - component: {fileID: 7466859698293448862}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -473,22 +473,23 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7087496007493957674
+--- !u!4 &7466859698293448862
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4341059381557959903}
+  m_GameObject: {fileID: 5182842215280330390}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
   m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 1439812933337521677}
+  m_Children:
+  - {fileID: 1439812933337521677}
+  m_Father: {fileID: 1028615347405319678}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5182842215280330390
+--- !u!1 &6334498312191555901
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -496,7 +497,7 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 7466859698293448862}
+  - component: {fileID: 5670510311265768981}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -505,21 +506,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &7466859698293448862
+--- !u!4 &5670510311265768981
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5182842215280330390}
+  m_GameObject: {fileID: 6334498312191555901}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00269293, y: 0.70710176, z: 0.00269293, w: 0.70710164}
   m_LocalPosition: {x: -1.6448311e-10, y: 0.008153026, z: -0.0037629348}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 1439812933337521677}
-  m_Father: {fileID: 1028615347405319678}
+  m_Children: []
+  m_Father: {fileID: 1439812933337521677}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7849891338208220805
 GameObject:

+ 119 - 119
Assets/Res/CombatHero/fb_jian2.prefab

@@ -1,37 +1,5 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &1167176959741050178
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2197045431213786766}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2197045431213786766
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1167176959741050178}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6865594351597376310}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &1943758829950784143
 GameObject:
   m_ObjectHideFlags: 0
@@ -166,7 +134,7 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.34, y: 0.36, z: 1.3845047}
   m_Center: {x: 0, y: 0, z: 0.10598475}
---- !u!1 &5291855315857285515
+--- !u!1 &3242123819661209643
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -174,33 +142,31 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6865594351597376310}
+  - component: {fileID: 7636267109606019701}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbjian2run (1)
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6865594351597376310
+--- !u!4 &7636267109606019701
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5291855315857285515}
+  m_GameObject: {fileID: 3242123819661209643}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.50025254, y: -0.4997474, z: -0.4997474, w: 0.50025254}
-  m_LocalPosition: {x: -0.404, y: 0.004, z: -0}
-  m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
+  m_LocalRotation: {x: -0.50025254, y: 0.4997474, z: 0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: 0.0041293018, y: 0, z: -0.39396098}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2197045431213786766}
-  - {fileID: 6726553265601841411}
-  m_Father: {fileID: 7074505583183483981}
+  m_Children: []
+  m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &5695866277527572638
+--- !u!1 &5291855315857285515
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -208,90 +174,32 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6726553265601841411}
-  - component: {fileID: 8622739340240625013}
+  - component: {fileID: 6865594351597376310}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fbjian2
+  m_Name: fbjian2run (1)
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6726553265601841411
+--- !u!4 &6865594351597376310
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5695866277527572638}
+  m_GameObject: {fileID: 5291855315857285515}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
-  m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
+  m_LocalRotation: {x: 0.50025254, y: -0.4997474, z: -0.4997474, w: 0.50025254}
+  m_LocalPosition: {x: -0.404, y: 0.004, z: -0}
+  m_LocalScale: {x: 1.0476178, y: 1.0476178, z: 1.0476178}
   m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 6865594351597376310}
+  m_Children:
+  - {fileID: 7636267109606019701}
+  - {fileID: 5543557565221737433}
+  m_Father: {fileID: 7074505583183483981}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &8622739340240625013
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5695866277527572638}
-  m_Enabled: 1
-  m_CastShadows: 0
-  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_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, 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
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
-  m_Bones:
-  - {fileID: 2197045431213786766}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2197045431213786766}
-  m_AABB:
-    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
-    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &6360724120513573557
 GameObject:
   m_ObjectHideFlags: 0
@@ -373,6 +281,98 @@ Transform:
   - {fileID: 6865594351597376310}
   m_Father: {fileID: 3525720028267400576}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6918574621145624245
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1725576616040042811}
+  - component: {fileID: 5908764708113839489}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fbjian2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1725576616040042811
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6918574621145624245}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00000008146034, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0.001073494, y: -0.00010567544, z: -0.095695294}
+  m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3525720028267400576}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &5908764708113839489
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6918574621145624245}
+  m_Enabled: 1
+  m_CastShadows: 0
+  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_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
+  m_Bones:
+  - {fileID: 7074505583183483981}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 7074505583183483981}
+  m_AABB:
+    m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
+    m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &6968568073675785829
 GameObject:
   m_ObjectHideFlags: 0
@@ -437,7 +437,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7074505583183483981}
-  - {fileID: 5543557565221737433}
+  - {fileID: 1725576616040042811}
   m_Father: {fileID: 9057844881385621598}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &7120436569189825082
@@ -492,7 +492,7 @@ Transform:
   m_LocalScale: {x: 0.408649, y: 0.408649, z: 0.408649}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3525720028267400576}
+  m_Father: {fileID: 6865594351597376310}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &2636380103424717117
 SkinnedMeshRenderer:
@@ -517,7 +517,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 8420e942e81a291449164dc3c4f357f3, type: 2}
+  - {fileID: 2100000, guid: ec89875f45618634691f6e7faf52ae06, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -544,9 +544,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -1842949565556893370, guid: dc66c17578dedac49b0d16f9727d3779, type: 3}
   m_Bones:
-  - {fileID: 7074505583183483981}
+  - {fileID: 7636267109606019701}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 7074505583183483981}
+  m_RootBone: {fileID: 7636267109606019701}
   m_AABB:
     m_Center: {x: -0.49395144, y: 0.0027128905, z: 0.000117860734}
     m_Extent: {x: 0.747043, y: 0.22003533, z: 0.056045186}

+ 115 - 115
Assets/Res/CombatHero/fb_linglongta.prefab

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!1 &1660625026029973378
+--- !u!1 &919215717835575276
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -8,8 +8,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 8570373653050028974}
-  - component: {fileID: 3775664911318318538}
+  - component: {fileID: 5719255521721823359}
+  - component: {fileID: 6234662471547808175}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: fb_linglongta
@@ -18,28 +18,28 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &8570373653050028974
+--- !u!4 &5719255521721823359
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660625026029973378}
+  m_GameObject: {fileID: 919215717835575276}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 589998100047264782}
+  m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3775664911318318538
+--- !u!137 &6234662471547808175
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 1660625026029973378}
+  m_GameObject: {fileID: 919215717835575276}
   m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
@@ -56,7 +56,7 @@ SkinnedMeshRenderer:
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
-  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, type: 2}
+  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, type: 2}
   m_StaticBatchInfo:
     firstSubMesh: 0
     subMeshCount: 0
@@ -83,9 +83,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
   m_Bones:
-  - {fileID: 6318980446073838052}
+  - {fileID: 4887794763406024427}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6318980446073838052}
+  m_RootBone: {fileID: 4887794763406024427}
   m_AABB:
     m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
     m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
@@ -178,6 +178,98 @@ BoxCollider:
   serializedVersion: 3
   m_Size: {x: 0.5, y: 0.9786749, z: 0.51}
   m_Center: {x: 0, y: 0.09983301, z: 0}
+--- !u!1 &3569422492220170385
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4547305475808196839}
+  - component: {fileID: 3088096650968573032}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_linglongta
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4547305475808196839
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3569422492220170385}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 589998100047264782}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &3088096650968573032
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3569422492220170385}
+  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_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: 838f24e6b06702f4e9c1920dbaac2574, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
+  m_Bones:
+  - {fileID: 6181072718080781131}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6181072718080781131}
+  m_AABB:
+    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
+    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
 --- !u!1 &4020983649939190267
 GameObject:
   m_ObjectHideFlags: 0
@@ -288,8 +380,8 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 6318980446073838052}
-  - {fileID: 8570373653050028974}
+  - {fileID: 6181072718080781131}
+  - {fileID: 4547305475808196839}
   m_Father: {fileID: 4887794763406024427}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6525093672149038688
@@ -373,7 +465,7 @@ Transform:
   - {fileID: 589998100047264782}
   m_Father: {fileID: 120756530494083055}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &8117117223482470946
+--- !u!1 &7712071662744135824
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -381,90 +473,30 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6576967559216710953}
-  - component: {fileID: 4954707728321180533}
+  - component: {fileID: 6181072718080781131}
   m_Layer: 0
   m_HasEditorInfo: 1
-  m_Name: fb_linglongta
+  m_Name: Bone001
   m_TagString: Untagged
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6576967559216710953
+--- !u!4 &6181072718080781131
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8117117223482470946}
+  m_GameObject: {fileID: 7712071662744135824}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000021855694, y: -0, z: -0, w: 1}
-  m_LocalPosition: {x: -0, y: 0.48627383, z: 0.000000021255705}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
+  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
+  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 120756530494083055}
+  m_Father: {fileID: 589998100047264782}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &4954707728321180533
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8117117223482470946}
-  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_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: 531ad6417bcf6ec40bfde6322a6e3960, 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
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -76694959663356165, guid: 770b3056bf329334bbfda38cf86bdde5, type: 3}
-  m_Bones:
-  - {fileID: 4887794763406024427}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 4887794763406024427}
-  m_AABB:
-    m_Center: {x: -0.17488012, y: -0.0016542971, z: 0.00000010430813}
-    m_Extent: {x: 0.4813178, y: 0.30737725, z: 0.20882654}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
 --- !u!1 &8833322958098411812
 GameObject:
   m_ObjectHideFlags: 0
@@ -498,7 +530,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4887794763406024427}
-  - {fileID: 6576967559216710953}
+  - {fileID: 5719255521721823359}
   m_Father: {fileID: 3229702076746228403}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8112392103606109572
@@ -537,35 +569,3 @@ MonoBehaviour:
   _Animator: {fileID: 8112392103606109572}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &8854775904126252572
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 6318980446073838052}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &6318980446073838052
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 8854775904126252572}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.0000008506696, y: -0.00000077682074, z: -0.7026459, w: 0.7115397}
-  m_LocalPosition: {x: 0.003003329, y: 0.3102259, z: 0.000000013560405}
-  m_LocalScale: {x: 1.0651475, y: 1.0651475, z: 1.0651475}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 589998100047264782}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 99 - 99
Assets/Res/CombatHero/fb_wulonglun.prefab

@@ -118,7 +118,7 @@ Transform:
   m_Children: []
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &2765884690952921055
+--- !u!1 &2699077979858943839
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -126,8 +126,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 3343722168943612468}
-  - component: {fileID: 9081341001646215678}
+  - component: {fileID: 3829167642267508913}
+  - component: {fileID: 4852225642529109617}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun
@@ -136,13 +136,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &3343722168943612468
+--- !u!4 &3829167642267508913
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2765884690952921055}
+  m_GameObject: {fileID: 2699077979858943839}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
@@ -151,13 +151,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &9081341001646215678
+--- !u!137 &4852225642529109617
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 2765884690952921055}
+  m_GameObject: {fileID: 2699077979858943839}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -243,7 +243,55 @@ Transform:
   - {fileID: 8019158978286339551}
   m_Father: {fileID: 2106735808395853295}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &3304795313112564774
+--- !u!1 &3398165251034620908
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 376580140852992892}
+  - component: {fileID: 9181201862506644401}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: pengpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &376580140852992892
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398165251034620908}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.015, z: 0.45}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7320365188319078122}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &9181201862506644401
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3398165251034620908}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: pengpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4239245284798863485
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -251,8 +299,8 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 6719616111229695996}
-  - component: {fileID: 157108464823508807}
+  - component: {fileID: 2465827957040670280}
+  - component: {fileID: 8967639581292230444}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: wulonglun2
@@ -261,13 +309,13 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &6719616111229695996
+--- !u!4 &2465827957040670280
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3304795313112564774}
+  m_GameObject: {fileID: 4239245284798863485}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000015454312, y: 0.7071068, z: -0.000000015454312, w: 0.7071068}
   m_LocalPosition: {x: -0, y: 0, z: 0.00000002161662}
@@ -276,13 +324,13 @@ Transform:
   m_Children: []
   m_Father: {fileID: 8019158978286339551}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &157108464823508807
+--- !u!137 &8967639581292230444
 SkinnedMeshRenderer:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3304795313112564774}
+  m_GameObject: {fileID: 4239245284798863485}
   m_Enabled: 1
   m_CastShadows: 0
   m_ReceiveShadows: 1
@@ -326,95 +374,15 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: 1123287165921399627, guid: b56279dbd1df85a459779c47e0a6bd04, type: 3}
   m_Bones:
-  - {fileID: 8460482785759891620}
+  - {fileID: 7634146787506342690}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 8460482785759891620}
+  m_RootBone: {fileID: 7634146787506342690}
   m_AABB:
     m_Center: {x: 0.0024843812, y: 0.002859503, z: 0.00008600205}
     m_Extent: {x: 0.43250233, y: 0.4285911, z: 0.030751482}
   m_DirtyAABB: 0
   m_EnableVSSkinning: 1
   m_ReleaseMeshData: 1
---- !u!1 &3398165251034620908
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 376580140852992892}
-  - component: {fileID: 9181201862506644401}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: pengpos
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &376580140852992892
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3398165251034620908}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0.015, z: 0.45}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 7320365188319078122}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &9181201862506644401
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 3398165251034620908}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  DotName: pengpos
-  followSkeleton: 0
-  myRotation: {x: 0, y: 0, z: 0}
---- !u!1 &4875691851651969941
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 8460482785759891620}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: Bone001
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &8460482785759891620
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4875691851651969941}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
-  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 8019158978286339551}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &7141257263086483798
 GameObject:
   m_ObjectHideFlags: 0
@@ -445,8 +413,8 @@ Transform:
   m_LocalScale: {x: 1.05, y: 1.05, z: 1.05}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 8460482785759891620}
-  - {fileID: 6719616111229695996}
+  - {fileID: 7634146787506342690}
+  - {fileID: 2465827957040670280}
   m_Father: {fileID: 8985698407474411210}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!1 &7179850442623262044
@@ -530,7 +498,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8985698407474411210}
-  - {fileID: 3343722168943612468}
+  - {fileID: 3829167642267508913}
   m_Father: {fileID: 7320365188319078122}
   m_LocalEulerAnglesHint: {x: 0, y: -90, z: 0}
 --- !u!95 &852375880241615242
@@ -569,3 +537,35 @@ MonoBehaviour:
   _Animator: {fileID: 852375880241615242}
   _Transitions: {fileID: 11400000, guid: d71511a73b4564e41a1e11f3f55ec1f8, type: 2}
   _ActionOnDisable: 0
+--- !u!1 &7391135570179373518
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7634146787506342690}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Bone001
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7634146787506342690
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7391135570179373518}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00000013315736, y: -4.323337e-10, z: 0.99999475, w: -0.0032467872}
+  m_LocalPosition: {x: 0.0024026327, y: 0.002230635, z: 9.750415e-11}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8019158978286339551}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 136 - 136
Assets/Res/CombatHero/fb_yuping.prefab

@@ -31,7 +31,7 @@ Transform:
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 8974866603299107661}
+  m_Father: {fileID: 6610789380701596093}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!137 &3507355564131952769
 SkinnedMeshRenderer:
@@ -41,132 +41,6 @@ SkinnedMeshRenderer:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 249648919915554140}
   m_Enabled: 1
-  m_CastShadows: 0
-  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_ShadingRate: 0
-  m_RenderingLayerMask: 1
-  m_RendererPriority: 0
-  m_Materials:
-  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, 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
-  serializedVersion: 2
-  m_Quality: 0
-  m_UpdateWhenOffscreen: 0
-  m_SkinnedMotionVectors: 1
-  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
-  m_Bones:
-  - {fileID: 6598966518811955930}
-  m_BlendShapeWeights: []
-  m_RootBone: {fileID: 6598966518811955930}
-  m_AABB:
-    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
-    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
-  m_DirtyAABB: 0
-  m_EnableVSSkinning: 1
-  m_ReleaseMeshData: 1
---- !u!1 &325623607481822929
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 3645249824464222405}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: fb_yuping_show
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &3645249824464222405
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 325623607481822929}
-  serializedVersion: 2
-  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
-  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
-  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
-  m_ConstrainProportionsScale: 0
-  m_Children:
-  - {fileID: 2992720160335178309}
-  - {fileID: 2497305786436552913}
-  m_Father: {fileID: 6598966518811955930}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &400955788230969046
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 7
-  m_Component:
-  - component: {fileID: 2497305786436552913}
-  - component: {fileID: 3340404091903741625}
-  m_Layer: 0
-  m_HasEditorInfo: 1
-  m_Name: yuping
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 1
---- !u!4 &2497305786436552913
-Transform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400955788230969046}
-  serializedVersion: 2
-  m_LocalRotation: {x: 0.00000006657903, 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: 3645249824464222405}
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!137 &3340404091903741625
-SkinnedMeshRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 400955788230969046}
-  m_Enabled: 1
   m_CastShadows: 1
   m_ReceiveShadows: 1
   m_DynamicOccludee: 1
@@ -209,9 +83,9 @@ SkinnedMeshRenderer:
   m_SkinnedMotionVectors: 1
   m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
   m_Bones:
-  - {fileID: 2992720160335178309}
+  - {fileID: 2115942982971620793}
   m_BlendShapeWeights: []
-  m_RootBone: {fileID: 2992720160335178309}
+  m_RootBone: {fileID: 2115942982971620793}
   m_AABB:
     m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
     m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
@@ -417,7 +291,7 @@ Transform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6598966518811955930}
-  - {fileID: 6771881079622904718}
+  - {fileID: 3744286585025576509}
   m_Father: {fileID: 2307709339058834475}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!95 &8285792300048012968
@@ -456,7 +330,7 @@ MonoBehaviour:
   _Animator: {fileID: 8285792300048012968}
   _Transitions: {fileID: 11400000, guid: 7966078bfd2ccab4a92b1f0be02bcd95, type: 2}
   _ActionOnDisable: 0
---- !u!1 &5395222643259688964
+--- !u!1 &4624469588160787610
 GameObject:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -464,7 +338,99 @@ GameObject:
   m_PrefabAsset: {fileID: 0}
   serializedVersion: 7
   m_Component:
-  - component: {fileID: 2992720160335178309}
+  - component: {fileID: 3744286585025576509}
+  - component: {fileID: 3956147046321304549}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: yuping
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3744286585025576509
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4624469588160787610}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0.00000006657903, 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: 8974866603299107661}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!137 &3956147046321304549
+SkinnedMeshRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4624469588160787610}
+  m_Enabled: 1
+  m_CastShadows: 0
+  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_ShadingRate: 0
+  m_RenderingLayerMask: 1
+  m_RendererPriority: 0
+  m_Materials:
+  - {fileID: 2100000, guid: c87dc6d40fc68a445aa316c07eeee6f0, 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
+  serializedVersion: 2
+  m_Quality: 0
+  m_UpdateWhenOffscreen: 0
+  m_SkinnedMotionVectors: 1
+  m_Mesh: {fileID: -128313207864270650, guid: 6015c8db4267dd048b4be4d64cd30c4a, type: 3}
+  m_Bones:
+  - {fileID: 6598966518811955930}
+  m_BlendShapeWeights: []
+  m_RootBone: {fileID: 6598966518811955930}
+  m_AABB:
+    m_Center: {x: -0.47700614, y: -0.0041514784, z: -0.00009982288}
+    m_Extent: {x: 0.48711044, y: 0.23823026, z: 0.23135829}
+  m_DirtyAABB: 0
+  m_EnableVSSkinning: 1
+  m_ReleaseMeshData: 1
+--- !u!1 &6464370024913468573
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2115942982971620793}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Bone001
@@ -473,20 +439,20 @@ GameObject:
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
   m_IsActive: 1
---- !u!4 &2992720160335178309
+--- !u!4 &2115942982971620793
 Transform:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 5395222643259688964}
+  m_GameObject: {fileID: 6464370024913468573}
   serializedVersion: 2
   m_LocalRotation: {x: 0.0000054902584, y: -0.0000053734734, z: -0.70370746, w: 0.7104899}
   m_LocalPosition: {x: 0.0068355557, y: 0.011254414, z: 4.9194604e-10}
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children: []
-  m_Father: {fileID: 3645249824464222405}
+  m_Father: {fileID: 6610789380701596093}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &6642471949105620041
 GameObject:
@@ -536,6 +502,40 @@ MonoBehaviour:
   DotName: pengpos
   followSkeleton: 0
   myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &8099468498516160357
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6610789380701596093}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: fb_yuping_show
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6610789380701596093
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8099468498516160357}
+  serializedVersion: 2
+  m_LocalRotation: {x: -0.0000054429547, y: 0.0000054203256, z: 0.70370746, w: 0.7104899}
+  m_LocalPosition: {x: 0.079, y: -0.024, z: -0}
+  m_LocalScale: {x: 3.6666656, y: 3.6666656, z: 3.6666665}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2115942982971620793}
+  - {fileID: 6771881079622904718}
+  m_Father: {fileID: 6598966518811955930}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
 --- !u!1 &8219916005125797274
 GameObject:
   m_ObjectHideFlags: 0
@@ -566,6 +566,6 @@ Transform:
   m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
   m_ConstrainProportionsScale: 0
   m_Children:
-  - {fileID: 3645249824464222405}
+  - {fileID: 6610789380701596093}
   m_Father: {fileID: 8974866603299107661}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}

+ 30 - 4
Assets/Res/Config/DivineSenseConfig.json

@@ -3,10 +3,36 @@
     {
       "ID": 1,
       "DetectEventCount": 3,
-      "QualityBonusChance": 10,
-      "DivineSenseCount": 100,
-      "DivineSenseCost": -1,
-      "MinDivineSenseValue": 100
+      "QualityBonusChance": [
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0
+      ],
+      "exp": null
+    },
+    {
+      "ID": 2,
+      "DetectEventCount": 3,
+      "QualityBonusChance": [
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0,
+        10.0
+      ],
+      "exp": null
     }
   ]
 }

+ 0 - 30
Assets/Res/Config/DivineSenseIntervalConfig.json

@@ -1,30 +0,0 @@
-{
-  "configList": [
-    {
-      "ID": 1,
-      "MinValue": 100,
-      "MaxValue": 300,
-      "EventQualities": [
-        1
-      ]
-    },
-    {
-      "ID": 2,
-      "MinValue": 300,
-      "MaxValue": 700,
-      "EventQualities": [
-        1,
-        2
-      ]
-    },
-    {
-      "ID": 3,
-      "MinValue": 700,
-      "MaxValue": 1000,
-      "EventQualities": [
-        2,
-        3
-      ]
-    }
-  ]
-}

+ 0 - 7
Assets/Res/Config/DivineSenseIntervalConfig.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CH4Xt3utBnIKTnaQH1TVlShlVW72gEy0MgAkQSS9kA80aEC9PXdlgQL2ra9e
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 16 - 0
Assets/Res/Config/EventConditionConfig.json

@@ -7,6 +7,22 @@
     {
       "ID": 2,
       "operation": 1
+    },
+    {
+      "ID": 11,
+      "operation": null
+    },
+    {
+      "ID": 12,
+      "operation": null
+    },
+    {
+      "ID": 101,
+      "operation": null
+    },
+    {
+      "ID": 102,
+      "operation": null
     }
   ]
 }

+ 4 - 16
Assets/Res/Config/EventConfig.json

@@ -5,6 +5,7 @@
       "EventType": 1,
       "EventTriggerType": 1,
       "EventQuality": 1,
+      "EventCompleteCount": null,
       "EventConditionId": [
         2
       ],
@@ -12,20 +13,14 @@
         2
       ],
       "Description": null,
-      "DialogueID": null,
-      "RewardID": [
-        1001
-      ],
-      "RewardCount": [
-        10
-      ],
-      "TriggerEventNextId": -1
+      "DialogueID": null
     },
     {
       "ID": 2,
       "EventType": 2,
       "EventTriggerType": 1,
       "EventQuality": 1,
+      "EventCompleteCount": null,
       "EventConditionId": [
         1
       ],
@@ -36,14 +31,7 @@
       "DialogueID": 1,
       "associateVlaue": [
         1
-      ],
-      "RewardID": [
-        1001
-      ],
-      "RewardCount": [
-        10
-      ],
-      "TriggerEventNextId": -1
+      ]
     }
   ]
 }

+ 2 - 1
Assets/Res/Config/GameConstantConfig.json

@@ -27,7 +27,8 @@
         140,
         150,
         160
-      ]
+      ],
+      "DetectEventCount": 100
     }
   ]
 }

+ 21 - 21
Assets/Res/HeroAnimtion/fb_wulonglun.asset

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7185268523185464614
+--- !u!114 &-6135444481631302940
 MonoBehaviour:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -10,14 +10,14 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
-  m_Name: Take 001
+  m_Name: jihuo
   m_EditorClassIdentifier: 
   _Transition:
-    rid: 616298967125196806
+    rid: 2530115299889905666
   references:
     version: 2
     RefIds:
-    - rid: 616298967125196806
+    - rid: 2530115299889905666
       type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
       data:
         _FadeDuration: 0.25
@@ -71,36 +71,42 @@ MonoBehaviour:
   _Definition:
     _Transitions:
     - {fileID: 8413550133293145741}
-    - {fileID: -7185268523185464614}
     - {fileID: -822125633454001215}
     - {fileID: 4545472588857971225}
+    - {fileID: -6135444481631302940}
     _Modifiers:
     - _From: 0
       _To: 0
       _Fade: 0
-    - _From: 2
-      _To: 0
-      _Fade: 0
     - _From: 1
       _To: 0
       _Fade: 0
-    - _From: 3
+    - _From: 1
       _To: 1
       _Fade: 0
     - _From: 2
       _To: 1
       _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
     - _From: 1
-      _To: 1
+      _To: 2
       _Fade: 0
     - _From: 0
-      _To: 1
-      _Fade: 0
-    - _From: 1
       _To: 2
       _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
     - _From: 2
-      _To: 2
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 1
       _Fade: 0
     - _From: 3
       _To: 2
@@ -111,17 +117,11 @@ MonoBehaviour:
     - _From: 2
       _To: 3
       _Fade: 0
-    - _From: 0
-      _To: 3
-      _Fade: 0
     - _From: 1
       _To: 3
       _Fade: 0
     - _From: 0
-      _To: 2
-      _Fade: 0
-    - _From: 3
-      _To: 0
+      _To: 3
       _Fade: 0
     _Aliases: []
     _AliasAllTransitions: 0

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_linglongta_TD.txt


Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/Res/TimeLineAssets/fb_wulonglun_TD.txt


+ 1 - 1
Assets/Res/UI/CombatPanel.prefab

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

+ 62 - 0
Assets/Scenes/testCombat.scene

@@ -2960,6 +2960,67 @@ RectTransform:
   m_AnchoredPosition: {x: -5, y: 0}
   m_SizeDelta: {x: -20, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1001 &1089162872
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 3076136778433984314, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_Name
+      value: Nanzhu (3)
+      objectReference: {fileID: 0}
+    - target: {fileID: 3780976137779322548, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0.105
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 6.027
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: -0.281
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 5226940908611843665, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: a6adfd04f86f10044bca8a08a63f3b8a, type: 3}
 --- !u!1 &1185765189
 GameObject:
   m_ObjectHideFlags: 0
@@ -6923,3 +6984,4 @@ SceneRoots:
   - {fileID: 1584646302}
   - {fileID: 2622624}
   - {fileID: 144571669}
+  - {fileID: 1089162872}

+ 50 - 0
Assets/Scripts/Core/UI/UTool/UtilTools.cs

@@ -8,12 +8,14 @@ using System.Text.RegularExpressions;
 using UnityEngine;
 #endif
 using System.IO;
+using System.Linq;
 using System.Runtime.Serialization.Formatters.Binary;
 #if !COMBAT_SERVER
 using UnityEngine.Profiling;
 #endif
 using System.Security.Cryptography;
 using Fort23.UTool;
+using Random = System.Random;
 
 namespace Utility
 {
@@ -853,6 +855,54 @@ namespace Utility
                 return (T)formatter.Deserialize(memoryStream);
             }
         }
+        
+        public static T GetRandomByWeight<T>(List<T> items, int[] weights)
+        {
+            if (items.Count != weights.Length)
+            {
+                LogTool.Error("权重和数组长度不一致");
+            }
+
+
+            int totalWeight = weights.Sum();
+            Random random = new Random();
+            int randomValue = random.Next(0, totalWeight);
+
+            int currentWeight = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                currentWeight += weights[i];
+                if (randomValue < currentWeight)
+                    return items[i];
+            }
+
+            // 理论上不会到达这里,但为了安全返回最后一个元素
+            return items[items.Count - 1];
+        }
+        
+        public static T GetRandomByWeight<T>(List<T> items, float[] weights)
+        {
+            
+            if (items.Count != weights.Length)
+            {
+                LogTool.Error("权重和数组长度不一致");
+            }
+
+            float totalWeight = weights.Sum();
+            Random random = new Random();
+            float randomValue = (float)(random.NextDouble() * totalWeight);
+
+            float currentWeight = 0;
+            for (int i = 0; i < items.Count; i++)
+            {
+                currentWeight += weights[i];
+                if (randomValue < currentWeight)
+                    return items[i];
+            }
+
+            // 理论上不会到达这里,但为了安全返回最后一个元素
+            return items[items.Count - 1];
+        }
     }
 
 

+ 4 - 16
Assets/Scripts/GameData/ExcelConfig/DivineSenseConfig.cs

@@ -27,27 +27,15 @@ public int DetectEventCount;
 
 
 		/// <summary>
-		///品质加成概率(目前是线性增长)
+		///品质概率
 		/// </summary>
-public int QualityBonusChance;
+public float[] QualityBonusChance;
 
 
 		/// <summary>
-		///触发额外权重乘数的步长(例如每100神识值)
+		///经验
 		/// </summary>
-public int DivineSenseCount;
-
-
-		/// <summary>
-		///神识消耗值 -1完全消耗
-		/// </summary>
-public int DivineSenseCost;
-
-
-		/// <summary>
-		///探索所需最低神识值
-		/// </summary>
-public int MinDivineSenseValue;
+public int exp;
 
 
 	}

+ 0 - 44
Assets/Scripts/GameData/ExcelConfig/DivineSenseIntervalConfig.cs

@@ -1,44 +0,0 @@
-// Auto Generated Code By excel2json
-// Generate From Excel\DivineSenseConfig.xlsx. SheetName: DivineSenseIntervalConfig
-
-using System;
-using Fort23.GameData;
-
-namespace Excel2Json
-{
-	[Config(prefab = "DivineSenseIntervalConfig.json")]
-	public partial class DivineSenseIntervalConfigHolder : ConfigHolder<DivineSenseIntervalConfig>
	{
-	}
-
-
-	[Serializable]
-	public struct DivineSenseIntervalConfig : IConfig
	{
-		public int GetID() {return ID;} 
-		/// <summary>
-		///ID
-		/// </summary>
-public int ID;
-
-
-		/// <summary>
-		///神识值区间下界(包含
-		/// </summary>
-public int MinValue;
-
-
-		/// <summary>
-		///神识值区间上界(不包含)
-		/// </summary>
-public int MaxValue;
-
-
-		/// <summary>
-		///允许的通用事件品质
-		/// </summary>
-public int[] EventQualities;
-
-
-	}
-
-}
-// End of Auto Generated Code

+ 6 - 18
Assets/Scripts/GameData/ExcelConfig/EventConfig.cs

@@ -38,6 +38,12 @@ public int EventTriggerType;
 public int EventQuality;
 
 
+		/// <summary>
+		///事件次数 -1无限
+		/// </summary>
+public int EventCompleteCount;
+
+
 		/// <summary>
 		///触发条件类型
 		/// </summary>
@@ -68,24 +74,6 @@ public int DialogueID;
 public int[] associateVlaue;
 
 
-		/// <summary>
-		///奖励ID
-		/// </summary>
-public int[] RewardID;
-
-
-		/// <summary>
-		///奖励数量
-		/// </summary>
-public int[] RewardCount;
-
-
-		/// <summary>
-		///触发下一个事件id
-		/// </summary>
-public int TriggerEventNextId;
-
-
 	}
 
 }

+ 6 - 0
Assets/Scripts/GameData/ExcelConfig/GameConstantConfig.cs

@@ -68,6 +68,12 @@ public int maxLv;
 public int[] equipmentRarityAttributeFactor;
 
 
+		/// <summary>
+		///每多少神识探测事件数量
+		/// </summary>
+public int DetectEventCount;
+
+
 	}
 
 }

+ 1 - 1
Assets/Scripts/GameLogic/Combat/CombatTool/RandomEventController.cs

@@ -11,7 +11,7 @@ namespace GameLogic.Combat.CombatTool
         public void StartRandomEvent(Transform root)
         {
             
-            CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(root);
+            
             Debug.Log("模拟测试事件");
             int eventCount = Random.Range(3, 5);
             for (int i = 0; i < eventCount; i++)

+ 2 - 1
Assets/Scripts/GameLogic/Combat/Hero/State/MagicWeaponChuChangState.cs

@@ -30,7 +30,8 @@ namespace GameLogic.Combat.Hero.State
 
             myCombatMagicWeaponEntity.GameObject.transform.eulerAngles = Vector3.zero;
             myCombatMagicWeaponEntity.GameObject.transform.localScale = Vector3.one;
-            
+            myCombatMagicWeaponEntity.GameObject.transform.rotation = myCombatMagicWeaponEntity.MagicWeaponControl
+                .combatHeroEntity.GameObject.transform.rotation;
             myCombatMagicWeaponEntity.GameObject.SetActive(true);
             startPos = myCombatMagicWeaponEntity.MagicWeaponControl.combatHeroEntity.dotPos;
             float y = myCombatMagicWeaponEntity.IsEnemy ? 5: 5;

+ 47 - 30
Assets/Scripts/GameLogic/EventManager/EventManager.cs

@@ -13,35 +13,35 @@ using Random = UnityEngine.Random;
 public class EventSystemManager : Singleton<EventSystemManager>
 {
     List<EventConfig> eventConfigs = new List<EventConfig>();
-    private List<DivineSenseIntervalConfig> divineSenseIntervalConfigs = new List<DivineSenseIntervalConfig>();
 
     public void CustomInit()
     {
         eventConfigs = ConfigComponent.Instance.GetAll<EventConfig>().ToList();
-        divineSenseIntervalConfigs = ConfigComponent.Instance.GetAll<DivineSenseIntervalConfig>().ToList();
     }
 
 
-    public void DetectEvents(int bigMapId)
+    public List<EventConfig> DetectEvents(int bigMapId)
     {
         BigMap bigMap = ConfigComponent.Instance.Get<BigMap>(bigMapId);
-        DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(1);
+        DivineSenseConfig divineSenseConfig = ConfigComponent.Instance.Get<DivineSenseConfig>(AccountFileInfo.Instance.playerData.divineSenseLevel);
 
+        List<int> qualitys = new List<int>() { 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 };
 
         //先掉落出品质
-        List<ItemInfo> itemInfos = DropManager.Instance.DropItem(1);
+        int quality = UtilTools.GetRandomByWeight(qualitys, divineSenseConfig.QualityBonusChance);
+
 
         // 获取通用事件
-        List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 3 && CanTriggerEvent(e.ID) && e.EventQuality == itemInfos[0].dropItemConfig.itemID[0]).ToList();
+        List<EventConfig> globalEvents = eventConfigs.Where(e => e.EventTriggerType == 3 && CanTriggerEvent(e.ID) && e.EventQuality == quality).ToList();
 
 
         //神识场景事件
-        List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.DivineSenseGeneralEvent.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == itemInfos[0].dropItemConfig.itemID[0]).ToList();
+        List<EventConfig> candidateEvents = eventConfigs.Where(e => bigMap.DivineSenseGeneralEvent.Contains(e.ID) && CanTriggerEvent(e.ID) && e.EventQuality == quality).ToList();
 
         if (candidateEvents.Count == 0 && globalEvents.Count == 0)
         {
-            LogTool.Warning("没有可以刷新的任务");
-            return;
+            LogTool.Error("没有可以刷新的事件");
+            return default;
         }
 
 
@@ -66,30 +66,41 @@ public class EventSystemManager : Singleton<EventSystemManager>
             }
         }
 
-
-        // 触发事件
-        foreach (var evt in triggeredEvents)
-        {
-            TriggerEvent(evt);
-        }
-
         if (triggeredEvents.Count == 0)
         {
             Debug.Log("没有可以触发的事件");
+            return default;
         }
+
+        return triggeredEvents;
+        // // 触发事件
+        // foreach (var evt in triggeredEvents)
+        // {
+        //     TriggerEvent(evt);
+        // }
     }
 
-    /// <summary>
-    /// 根据神识值选择通用神识区间
-    /// </summary>
-    private DivineSenseIntervalConfig SelectInterval(float divineSenseValue)
+    public void DetectRandomEvents()
     {
-        var intervals = divineSenseIntervalConfigs
-            .Where(i => divineSenseValue >= i.MinValue && divineSenseValue < i.MaxValue)
-            .ToList();
-        return intervals.FirstOrDefault();
+        // 获取通用事件
+        List<EventConfig> randomEvents = eventConfigs.Where(e => e.EventTriggerType == 2 && CanTriggerEvent(e.ID)).ToList();
+
+
+        //神识场景事件
+
+
+        if (randomEvents.Count == 0)
+        {
+            LogTool.Warning("没有可以刷新的事件");
+            return;
+        }
+
+
+        int idex = Random.Range(1, randomEvents.Count);
+        TriggerEvent(randomEvents[idex]);
     }
 
+
     /// <summary>
     /// 触发单个事件,处理对话、奖励和完成逻辑。
     /// </summary>
@@ -98,12 +109,7 @@ public class EventSystemManager : Singleton<EventSystemManager>
         Debug.Log($"触发事件: {evt.Description} (ID: {evt.ID}, 品质: {evt.EventQuality})");
         if (evt.DialogueID > 0)
         {
-            DialogueManager.Instance.StartDialogue(evt.DialogueID, evt.ID);
-        }
-
-        if (evt.RewardID.Length > 0)
-        {
-            // TODO: 实现奖励逻辑
+            // DialogueManager.Instance.StartDialogue(evt.DialogueID, evt.ID);
         }
 
         CompleteEvent(evt.ID);
@@ -157,5 +163,16 @@ public class EventSystemManager : Singleton<EventSystemManager>
     public void CompleteEvent(int eventID)
     {
         LogTool.Log($"完成任务{eventID}");
+        AccountFileInfo.EventData eventData =  AccountFileInfo.Instance.playerData.events.FirstOrDefault((e) => e.eventID == eventID);
+        if (eventData == null)
+        {
+            eventData = new AccountFileInfo.EventData();
+            eventData.eventID = eventID;
+        }
+
+        eventData.completeCount++;
+        AccountFileInfo.Instance.playerData.events.Add(eventData);
+        AccountFileInfo.Instance.SavePlayerData();
+        
     }
 }

+ 11 - 0
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -27,6 +27,10 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     [System.Serializable]
     public class PlayerData
     {
+        public int divineSenseLevel = 1;
+        
+        public List<EventData> events = new List<EventData>();
+        
         public List<ItemData> ItemListData = new List<ItemData>();
 
       
@@ -54,6 +58,13 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         // /// </summary>
         // public List<HeroData> HeroListInBackDatas = new List<HeroData>();
     }
+    
+    public class EventData
+    {
+        public int eventID ;
+        //完成cishu
+        public int completeCount = 0;
+    }
 
 
     /// <summary>

+ 3 - 0
Assets/Scripts/GameUI/DialogueManager.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: c0b51378f2614ea18c9558f232462776
+timeCreated: 1745307432

+ 6 - 0
Assets/Scripts/GameLogic/EventManager/DialogueManager.cs → Assets/Scripts/GameUI/DialogueManager/DialogueManager.cs

@@ -1,7 +1,9 @@
 using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
+using Common.Utility.CombatEvent;
 using Excel2Json;
+using Fort23.Mono;
 using Fort23.UTool;
 using UnityEngine;
 using Utility;
@@ -52,6 +54,10 @@ public class DialogueManager : Singleton<DialogueManager>
 
 
         //todo 加载对话ui
+        DialoguePanel.OpenDialoguePanel(dialogueConfig.Content, null, ShowDialogueEventData.MessageShowType.Default, () =>
+        {
+
+        });
         currentNodeID++;
     }
 

+ 0 - 0
Assets/Scripts/GameLogic/EventManager/DialogueManager.cs.meta → Assets/Scripts/GameUI/DialogueManager/DialogueManager.cs.meta


+ 19 - 2
Assets/Scripts/GameUI/UI/CombatPanel/CombatPanel.cs

@@ -1,4 +1,6 @@
+using System.Collections.Generic;
 using Common.Utility.CombatEvent;
+using Excel2Json;
 using Fort23.Core;
 using GameLogic.Combat.CombatTool;
 using UnityEngine;
@@ -81,17 +83,32 @@ namespace Fort23.Mono
             CameraSelect.onValueChanged.AddListener(CameraSelect_onValueChanged);
             AutoUse.onValueChanged.AddListener((x) =>
             {
+              
                 CombatController.currActiveCombat.CombatHeroController.playerHeroEntity.MagicWeaponControl.isAutoUse =
                     x;
             });
         }
 
 
-        private void Bnt_shengShi_onClick()
+        private async void Bnt_shengShi_onClick()
         {
             UIManager.Instance.DormancyAllGComponent<ShengShiEventWidget>();
-            CombatController.currActiveCombat.RandomEventController.StartRandomEvent(CombatController.currActiveCombat
+            CombatController.currActiveCombat.CombatSenceController.StartPayShengShi(CombatController.currActiveCombat
                 .CombatHeroController.playerHeroEntity.GameObject.transform);
+            List<EventConfig> eventConfigs =  EventSystemManager.Instance.DetectEvents(1);
+            if(eventConfigs == null || eventConfigs.Count == 0)
+                return;
+            for (var i = 0; i < eventConfigs.Count; i++)
+            {
+                ShengShiEventWidget shengShiEventWidget =
+                    await UIManager.Instance.CreateGComponentForObject<ShengShiEventWidget>(ShengShiEventWidget, null,
+                        DynamicEvent,
+                        isInstance: true);
+                shengShiEventWidget.InitShengShiEventWidget(eventConfigs[i].ID);
+            }
+            //
+            // CombatController.currActiveCombat.RandomEventController.StartRandomEvent(CombatController.currActiveCombat
+            //     .CombatHeroController.playerHeroEntity.GameObject.transform);
         }
 
         private void CameraSelect_onValueChanged(float value)

+ 3 - 3
Assets/Scripts/GameUI/UI/CombatPanel/ShengShiEventWidget.cs

@@ -1,3 +1,4 @@
+using Core.Language;
 using Excel2Json;
 using Fort23.UTool;
 
@@ -25,13 +26,12 @@ namespace Fort23.Mono
 
         private void Button_onClick()
         {
-            
         }
 
         public void InitShengShiEventWidget(int id)
         {
-            RandomEventConfig randomEventConfig = ConfigComponent.Instance.Get<RandomEventConfig>(id);
-            Massge.text = randomEventConfig.eventMassge;
+            EventConfig randomEventConfig = ConfigComponent.Instance.Get<EventConfig>(id);
+            Massge.text = LanguageManager.Instance.Text(randomEventConfig.Description);
         }
     }
 }

+ 8 - 0
Assets/Scripts/GameUI/UI/DialoguePanel.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WikbvHz+AXgHp+Osu7blkenJ3QNuwBPl7GO+zVvkEx5KykJ8zz0EBxEqANfc
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 146 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs

@@ -0,0 +1,146 @@
+using System.Text;
+using Common.Utility.CombatEvent;
+using Core.Language;
+using UnityEngine;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "DialoguePanel")]
+    public partial class DialoguePanel : UIPanel
+    {
+        private int[] dialogueMessaga;
+        private ShowDialogueEventData.MessageShowType messageShowType;
+        private System.Action finish;
+        private int index;
+
+        private char[] _currShowMessage;
+
+        private float _showTime = 0.05f;
+        private float _currShowTime = 0;
+        protected StringBuilder _sb = new StringBuilder();
+        private int _currShowIndex;
+
+        private bool _isUpdate;
+        private bool _isShowNextButton;
+        private string[] showIconName;
+
+        public static async void OpenDialoguePanel(int[] dialogueMessaga, string[] icon,
+            ShowDialogueEventData.MessageShowType messageShowType,
+            System.Action finish)
+        {
+            DialoguePanel dialoguePanel = await UIManager.Instance.LoadAndOpenPanel<DialoguePanel>(null, UILayer.Top);
+            // dialoguePanel.GObjectPoolInterface.SetActive(false);
+            dialoguePanel.ShowPanel(dialogueMessaga, icon, messageShowType, finish);
+        }
+
+        private void Init()
+        {
+        }
+
+        protected override void AddEvent()
+        {
+        }
+
+        protected override void DelEvent()
+        {
+        }
+
+        public override void AddButtonEvent()
+        {
+            nextButton.onClick.AddListener(NextShow);
+        }
+
+        private void NextShow()
+        {
+            StartShowMassge();
+        }
+
+        public void ShowPanel(int[] dialogueMessaga, string[] icon,
+            ShowDialogueEventData.MessageShowType messageShowType,
+            System.Action finish)
+        {
+            showIconName = icon;
+            this.dialogueMessaga = dialogueMessaga;
+            this.messageShowType = messageShowType;
+            this.finish = finish;
+            index = 0;
+            StaticUpdater.Instance.AddRenderUpdateCallBack(Update);
+            StartShowMassge();
+        }
+
+        private void StartShowMassge()
+        {
+            if (index >= dialogueMessaga.Length)
+            {
+                UIManager.Instance.HideUIUIPanel(this);
+                finish?.Invoke();
+                return;
+            }
+
+            _isShowNextButton = false;
+            nextIcon.SetActive(false);
+            string m = LanguageManager.Instance.Text(dialogueMessaga[index]);
+
+            if (showIconName != null && index < showIconName.Length)
+            {
+                icon.icon_name = showIconName[index];
+            }
+
+            index++;
+            switch (messageShowType)
+            {
+                case ShowDialogueEventData.MessageShowType.Default:
+                    message.text = m;
+                    ShowNextIcon();
+                    break;
+                case ShowDialogueEventData.MessageShowType.Verbatim:
+                    _sb.Clear();
+                    _currShowMessage = m.ToCharArray();
+                    _sb.Append(_currShowMessage[0]);
+                    message.text = _sb.ToString();
+                    _isUpdate = true;
+                    _currShowIndex = 1;
+                    break;
+            }
+        }
+
+        private void ShowNextIcon()
+        {
+            nextIcon.SetActive(true);
+            _isShowNextButton = true;
+        }
+
+        public override void Hide()
+        {
+            base.Hide();
+            StaticUpdater.Instance.RemoveRenderUpdateCallBack(Update);
+        }
+
+        public void Update()
+        {
+            if (!_isUpdate)
+            {
+                return;
+            }
+
+            if (messageShowType == ShowDialogueEventData.MessageShowType.Verbatim)
+            {
+                if (_currShowIndex >= _currShowMessage.Length)
+                {
+                    _isUpdate = false;
+                    ShowNextIcon();
+                    return;
+                }
+
+                _currShowTime += Time.deltaTime;
+                if (_currShowTime > _showTime)
+                {
+                    _currShowTime -= _showTime;
+                    _sb.Append(_currShowMessage[_currShowIndex]);
+                    _currShowIndex++;
+                    message.text = _sb.ToString();
+                }
+            }
+        }
+    }
+}

+ 1 - 1
Assets/Scripts/GameData/ExcelConfig/DivineSenseIntervalConfig.cs.meta → Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanel.cs.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: B3hL5n6vBnOYmVXzDk1CqwQR+iPVg+YYCwmwrSxvEN6LfAAyIYqDhsU5FRNl
+guid: D39Nsy2pWn65ShEG8IKBu7Jg1maKHY8SKTcLKktroqDzEohYPMa/+dlNTkV+
 MonoImporter:
   externalObjects: {}
   serializedVersion: 2

+ 62 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs

@@ -0,0 +1,62 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class DialoguePanel 
+	{
+	  #region 自定义数据 
+	  private GameObject _nextIcon;
+	  public GameObject nextIcon
+	   {
+	   get{
+	      if (_nextIcon == null)
+	       {
+	         _nextIcon  = GetUIUnit<GameObject>("nextIcon"); 
+	       }
+	      return _nextIcon;
+	     }
+	   }
+	  private Text _message;
+	  public Text message
+	   {
+	   get{
+	      if (_message == null)
+	       {
+	         _message  = GetUIUnit<Text>("message"); 
+	       }
+	      return _message;
+	     }
+	   }
+	  private Button _nextButton;
+	  public Button nextButton
+	   {
+	   get{
+	      if (_nextButton == null)
+	       {
+	         _nextButton  = GetUIUnit<Button>("nextButton"); 
+	       }
+	      return _nextButton;
+	     }
+	   }
+	  private MyImage _icon;
+	  public MyImage icon
+	   {
+	   get{
+	      if (_icon == null)
+	       {
+	         _icon  = GetUIUnit<MyImage>("icon"); 
+	       }
+	      return _icon;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/DialoguePanel/DialoguePanelData.cs.meta

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

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


BIN
Excel2Json/Excel/DivineSenseConfig.xlsx


+ 2 - 2
UserSettings/EditorUserSettings.asset

@@ -45,10 +45,10 @@ EditorUserSettings:
       value: 50030c5e500c58580e5d5c71457a0e44124f4d78292e7434787b1e36b2b4323a
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 52570c02000d5e025a58597212725c4440161c2e797a75607f2c4467b7b3323e
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác