Prechádzať zdrojové kódy

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

DESKTOP-FB72PO8\Administrator 4 mesiacov pred
rodič
commit
2cfcc9168d
68 zmenil súbory, kde vykonal 2231 pridanie a 1479 odobranie
  1. 56 56
      Assets/Art/ArtHero/Guaiwu01.prefab
  2. 80 80
      Assets/Art/ArtHero/Guaiwu03.prefab
  3. 63 31
      Assets/Art/ArtHero/Guaiwu04.prefab
  4. 114 114
      Assets/Art/ArtHero/Guaiwu05.prefab
  5. 36 34
      Assets/Art/ArtHero/GuaiwuJY01.prefab
  6. 69 69
      Assets/Art/ArtHero/GuaiwuJY02.prefab
  7. 4 4
      Assets/Art/GuaiWuTimeline/Guaiwu01.playable
  8. 3 3
      Assets/Art/GuaiWuTimeline/Guaiwu02.playable
  9. 3 3
      Assets/Art/GuaiWuTimeline/Guaiwu03.playable
  10. 5 5
      Assets/Art/GuaiWuTimeline/Guaiwu04.playable
  11. 3 3
      Assets/Art/GuaiWuTimeline/Guaiwu05.playable
  12. 106 0
      Assets/Art/GuaiWuTimeline/GuaiwuBoss01.playable
  13. 3 3
      Assets/Art/GuaiWuTimeline/GuaiwuBoss02.playable
  14. 4 4
      Assets/Art/GuaiWuTimeline/GuaiwuJY01.playable
  15. 4 4
      Assets/Art/GuaiWuTimeline/GuaiwuJY02.playable
  16. 0 0
      Assets/Art/UIAssets/TextrueJson/EquipmentIcon.txt
  17. 0 0
      Assets/Art/UIAssets/TextrueJson/all.txt
  18. 1 1
      Assets/Art/UIAssets/TextrueJson/bg.txt
  19. 1 1
      Assets/Art/UIAssets/TextrueJson/box.txt
  20. 1 1
      Assets/Art/UIAssets/TextrueJson/heroIcon.txt
  21. 1 1
      Assets/Art/UIAssets/TextrueJson/itemIcon.txt
  22. 1 1
      Assets/Art/UIAssets/TextrueJson/skillIcon.txt
  23. BIN
      Assets/Art/UIAssets/decorate/dec_Divider_Left.png
  24. 147 0
      Assets/Art/UIAssets/decorate/dec_Divider_Left.png.meta
  25. BIN
      Assets/Art/UIAssets/decorate/dec_Divider_Right.png
  26. 147 0
      Assets/Art/UIAssets/decorate/dec_Divider_Right.png.meta
  27. BIN
      Assets/Art/UIAssets/decorate/dec_SkillIcon02_2.png
  28. 133 0
      Assets/Art/UIAssets/decorate/dec_SkillIcon02_2.png.meta
  29. 4 4
      Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab
  30. 214 472
      Assets/Art/test01.scene
  31. 0 0
      Assets/Res/TimeLineAssets/Guaiwu01_TD.txt
  32. 0 0
      Assets/Res/TimeLineAssets/Guaiwu02_TD.txt
  33. 0 0
      Assets/Res/TimeLineAssets/Guaiwu03_TD.txt
  34. 0 0
      Assets/Res/TimeLineAssets/Guaiwu04_TD.txt
  35. 0 0
      Assets/Res/TimeLineAssets/Guaiwu05_TD.txt
  36. 0 0
      Assets/Res/TimeLineAssets/GuaiwuBoss01_TD.txt
  37. 0 0
      Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt
  38. 0 0
      Assets/Res/TimeLineAssets/GuaiwuJY01_TD.txt
  39. 0 0
      Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt
  40. 8 0
      Assets/Res/UI/EqRecyclePanel.prefab
  41. 149 32
      Assets/Res/UI/HeroDetailPanel.prefab
  42. 76 73
      Assets/Res/UIAtlas/all.spriteatlasv2
  43. 401 172
      Assets/Scenes/UIBuild.scene
  44. 34 3
      Assets/Scripts/GameLogic/Bag/BagController.cs
  45. 5 0
      Assets/Scripts/GameLogic/Bag/ItemInfo.cs
  46. 2 16
      Assets/Scripts/GameLogic/Equipment/EquipmentController.cs
  47. 3 3
      Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs
  48. 64 6
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  49. 115 21
      Assets/Scripts/GameUI/UI/Hero/EqRecyclePanel.cs
  50. 11 0
      Assets/Scripts/GameUI/UI/Hero/EqRecyclePanelData.cs
  51. 0 0
      Assets/StreamingAssets/assetConfig.txt
  52. 1 1
      UGUIPack/uguiconfig.db
  53. 12 12
      UserSettings/EditorUserSettings.asset
  54. 137 236
      UserSettings/Layouts/CurrentMaximizeLayout.dwlt
  55. BIN
      美术/art_use_ui/all/dec_Divider_Left.png
  56. BIN
      美术/art_use_ui/all/dec_Divider_Right.png
  57. BIN
      美术/art_use_ui/all/dec_SkillIcon02_2.png
  58. 0 0
      美术/unity_use_ui/TextrueJson/EquipmentIcon.txt
  59. 0 0
      美术/unity_use_ui/TextrueJson/all.txt
  60. 1 1
      美术/unity_use_ui/TextrueJson/bg.txt
  61. 1 1
      美术/unity_use_ui/TextrueJson/box.txt
  62. 1 1
      美术/unity_use_ui/TextrueJson/heroIcon.txt
  63. 1 1
      美术/unity_use_ui/TextrueJson/itemIcon.txt
  64. 1 1
      美术/unity_use_ui/TextrueJson/skillIcon.txt
  65. BIN
      美术/unity_use_ui/decorate/dec_Divider_Left.png
  66. BIN
      美术/unity_use_ui/decorate/dec_Divider_Right.png
  67. BIN
      美术/unity_use_ui/decorate/dec_SkillIcon02_2.png
  68. 5 5
      美术/工具/imgui.ini

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

@@ -25,7 +25,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 517235012000881922}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000002996984, y: 0.0000002448863, z: -0.09774899, w: 0.9952111}
+  m_LocalRotation: {x: -0.02121608, y: 0.014041514, z: -0.1351335, w: 0.99050075}
   m_LocalPosition: {x: -0.095750615, y: 0, z: -0.0000000023841857}
   m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 1}
   m_ConstrainProportionsScale: 0
@@ -58,8 +58,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 941230739996346001}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.32882807, y: 0.70064074, z: -0.26903293, w: 0.5732329}
-  m_LocalPosition: {x: -0.41400817, y: -0.76316017, z: -0.035378598}
+  m_LocalRotation: {x: 0.42948723, y: -0.24519253, z: -0.21963286, w: 0.8409416}
+  m_LocalPosition: {x: 0.014030266, y: 0.19571723, z: -0.5347402}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -90,8 +90,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1003940308036976796}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5120222, y: 0.22478852, z: 0.75910425, w: -0.3332629}
-  m_LocalPosition: {x: 5.5581467e-10, y: -0.82683206, z: 0.012714871}
+  m_LocalRotation: {x: 0.71227074, y: -0.28133225, z: -0.6017379, w: 0.22679073}
+  m_LocalPosition: {x: 5.735663e-10, y: 0.09869116, z: 0.012714912}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -122,7 +122,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1192403183400266627}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.010145826, y: -0.015418769, z: 0.35415974, w: 0.9350028}
+  m_LocalRotation: {x: -0.002517786, y: 0.00007184428, z: 0.35900736, w: 0.9333314}
   m_LocalPosition: {x: -0.060257882, y: 0.0030225085, z: -5.8849764e-10}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -155,7 +155,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1204867660803657432}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000002322885, y: -0.00000016415335, z: -0.15261473, w: 0.9882858}
+  m_LocalRotation: {x: -0.025434138, y: -0.00062448945, z: -0.23542956, w: 0.97155833}
   m_LocalPosition: {x: -0.089385904, y: 0, z: -0.0000000023841857}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -188,7 +188,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1499950728007709512}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000024513394, y: 0.00000023528655, z: -0.09774897, w: 0.9952111}
+  m_LocalRotation: {x: 0.000000013469833, y: 0.00000023712738, z: -0.07040955, w: 0.9975182}
   m_LocalPosition: {x: -0.0957505, y: 0, z: 0.000000028610229}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -221,8 +221,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1738434606454410098}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000041267093, y: -0.00000027555276, z: -0.61795896, w: 0.78621036}
-  m_LocalPosition: {x: -0.050252378, y: -0.04316005, z: 0.0036030076}
+  m_LocalRotation: {x: -0.00000012161101, y: -0.00000019503676, z: -0.61795896, w: 0.78621036}
+  m_LocalPosition: {x: -0.06623333, y: -0.04097885, z: 0.00029753355}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -254,8 +254,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1838118653741822078}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0033412843, y: 0.03689041, z: -0.09015092, w: 0.9952391}
-  m_LocalPosition: {x: -0.18429184, y: -0.870302, z: -0.18604939}
+  m_LocalRotation: {x: 0.068795875, y: -0.7661192, z: -0.07505386, w: 0.634583}
+  m_LocalPosition: {x: 0.058384456, y: 0.07219461, z: -0.25931522}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -286,8 +286,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1866395905884919210}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.15386803, y: 0.54533416, z: -0.22375205, w: 0.7930134}
-  m_LocalPosition: {x: -0.3836625, y: -0.81514966, z: -0.11455793}
+  m_LocalRotation: {x: 0.24362192, y: -0.42998603, z: -0.21919645, w: 0.841257}
+  m_LocalPosition: {x: 0.06715706, y: 0.1381962, z: -0.4734051}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -350,8 +350,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2882851203522417164}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000012801664, y: 0.0000000030967373, z: -0.095299914, w: 0.9954486}
-  m_LocalPosition: {x: -0.08322978, y: 0, z: 0.0000000011920929}
+  m_LocalRotation: {x: -0.0000000030273706, y: -0.000000031622243, z: -0.09529975, w: 0.99544865}
+  m_LocalPosition: {x: -0.08322978, y: 0.000000038146972, z: 1.4901161e-10}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -383,8 +383,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2928249710452690994}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5120222, y: 0.22478852, z: 0.75910425, w: -0.3332629}
-  m_LocalPosition: {x: 5.5581467e-10, y: -0.82683206, z: 0.012714871}
+  m_LocalRotation: {x: 0.71227074, y: -0.28133225, z: -0.6017379, w: 0.22679073}
+  m_LocalPosition: {x: 5.735663e-10, y: 0.09869116, z: 0.012714912}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -418,7 +418,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2991163456517051738}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000074812014, y: -0.00000004039766, z: -0.19210075, w: 0.9813752}
+  m_LocalRotation: {x: -0.00000005710069, y: -0.00000003667813, z: -0.12965938, w: 0.9915586}
   m_LocalPosition: {x: -0.08642071, y: -0.000000019073486, z: 0.000000019073486}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -451,8 +451,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3394317258434069261}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.04897618, y: 0.31046844, z: -0.14792632, w: 0.9377252}
-  m_LocalPosition: {x: -0.2989809, y: -0.84929496, z: -0.17753534}
+  m_LocalRotation: {x: 0.119829886, y: -0.6464859, z: -0.15502106, w: 0.7373366}
+  m_LocalPosition: {x: 0.08002908, y: 0.09565413, z: -0.37178084}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -483,8 +483,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3434815645976056890}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6868253, y: -0.120451555, z: 0.70105547, w: 0.14927734}
-  m_LocalPosition: {x: 0.003150608, y: -0.3613866, z: 0.06016572}
+  m_LocalRotation: {x: 0.6954544, y: 0.13688514, z: -0.69234395, w: -0.1351497}
+  m_LocalPosition: {x: -0.0025802737, y: 0.55511975, z: 0.14117706}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -515,7 +515,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3493017184809338656}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000012615803, y: -0.000000012880363, z: 0.30128524, w: 0.95353407}
+  m_LocalRotation: {x: -0.013822083, y: 0.009684182, z: 0.30039674, w: 0.953665}
   m_LocalPosition: {x: -0.112616345, y: -0.0000000047683715, z: -0.0000000023841857}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -548,8 +548,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3631714024479262299}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000000042525534, y: -0.000000054980777, z: -0.16103204, w: 0.9869492}
-  m_LocalPosition: {x: -0.0765714, y: 0, z: -0.0000000011920929}
+  m_LocalRotation: {x: -0.000000008646715, y: -0.000000054440747, z: -0.16103195, w: 0.9869492}
+  m_LocalPosition: {x: -0.0765714, y: 0.000000038146972, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -580,8 +580,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3666689279924653801}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.67254806, y: -0.18416442, z: 0.6840198, w: 0.21419506}
-  m_LocalPosition: {x: 0.0013407312, y: -0.34426954, z: 0.10288717}
+  m_LocalRotation: {x: 0.6796024, y: 0.20133297, z: -0.6766679, w: -0.19931424}
+  m_LocalPosition: {x: -0.0031640513, y: 0.5866327, z: 0.19066273}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -647,7 +647,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3888803354041132558}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.1227087, y: 0.055650692, z: 0.91204435, w: 0.38732508}
+  m_LocalRotation: {x: 0.007768023, y: -0.00024367128, z: 0.9220294, w: 0.3870419}
   m_LocalPosition: {x: 0.04619926, y: 0.004480219, z: -8.7233726e-10}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -712,7 +712,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4329588176471288402}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.068141736, y: 0.27047625, z: -0.06345466, w: 0.9582134}
+  m_LocalRotation: {x: -0.044926994, y: 0.15296753, z: -0.09036217, w: 0.9830652}
   m_LocalPosition: {x: -0.116907515, y: 0, z: 0.000000019073486}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -745,8 +745,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4592999940358108592}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.18261985, y: 0.2108336, z: -0.1565997, w: 0.94745755}
-  m_LocalPosition: {x: -0.099464245, y: 0, z: -0.000000038146972}
+  m_LocalRotation: {x: 0.11574354, y: 0.1959578, z: -0.12537555, w: 0.96565264}
+  m_LocalPosition: {x: -0.09946426, y: 0, z: 0.000000038146972}
   m_LocalScale: {x: 0.99999976, y: 0.99999976, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -777,8 +777,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5130514607975545459}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.026909577, y: 0.3513976, z: -0.09737684, w: 0.9307596}
-  m_LocalPosition: {x: -0.122653745, y: 0.000000076293944, z: 0.0000000047683715}
+  m_LocalRotation: {x: -0.021866264, y: 0.029585639, z: -0.0963396, w: 0.9946684}
+  m_LocalPosition: {x: -0.1226537, y: 0, z: -5.9604643e-10}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -811,8 +811,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5246050325934176820}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5525537, y: 0.42534944, z: 0.58342546, w: -0.41638577}
-  m_LocalPosition: {x: 0.0000004899502, y: -0.38144007, z: -0.02781066}
+  m_LocalRotation: {x: 0.5705026, y: -0.42062062, z: -0.56712186, w: 0.41949722}
+  m_LocalPosition: {x: -0.0021275056, y: 0.5352935, z: 0.053094022}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -858,7 +858,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5429970840323022344}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000010279542, y: -0.0000001203298, z: -0.19210076, w: 0.9813752}
+  m_LocalRotation: {x: -0.012560319, y: -0.011272623, z: -0.2696612, w: 0.96280736}
   m_LocalPosition: {x: -0.08642063, y: -0.0000000047683715, z: -0.0000000023841857}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -891,7 +891,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5535449083642498178}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0101457955, y: -0.015418728, z: 0.3541597, w: 0.9350028}
+  m_LocalRotation: {x: -0.009483587, y: 0.013631508, z: 0.4174423, w: 0.90855175}
   m_LocalPosition: {x: -0.060257882, y: 0.0030225085, z: -5.8849536e-10}
   m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 1}
   m_ConstrainProportionsScale: 0
@@ -924,7 +924,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5860814184449199872}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0035020944, y: 0.13469304, z: 0.001800381, w: 0.99087954}
+  m_LocalRotation: {x: 0.011112847, y: -0.0292854, z: 0.023427809, w: 0.99923474}
   m_LocalPosition: {x: -0.12480169, y: 0, z: -1.1368684e-15}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -957,8 +957,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6000168006181089355}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0044150297, y: -0.31748906, z: 0.01318582, w: 0.94816}
-  m_LocalPosition: {x: -0.08640757, y: -0.8668913, z: -0.11221866}
+  m_LocalRotation: {x: 0.0062767994, y: -0.78907794, z: 0.0011984614, w: 0.61425984}
+  m_LocalPosition: {x: 0.02829863, y: 0.07116022, z: -0.14041318}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -989,8 +989,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6213701896808110380}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.69727176, y: -0.007041357, z: 0.71600455, w: 0.033166207}
-  m_LocalPosition: {x: -0.0021393697, y: -0.3206958, z: -0.054393027}
+  m_LocalRotation: {x: 0.708461, y: 0.021850966, z: -0.7051095, w: -0.02064508}
+  m_LocalPosition: {x: -0.002448515, y: 0.610651, z: 0.03341292}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1021,8 +1021,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6718140329950896978}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.005347715, y: -0.44235814, z: 0.010841295, w: 0.89675707}
-  m_LocalPosition: {x: -0.010477778, y: -0.8638742, z: -0.013218528}
+  m_LocalRotation: {x: 0.017897254, y: -0.77035147, z: -0.021778123, w: 0.6369961}
+  m_LocalPosition: {x: 0.004856965, y: 0.06425626, z: -0.018027423}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1054,7 +1054,7 @@ Transform:
   m_GameObject: {fileID: 6816297291186240009}
   serializedVersion: 2
   m_LocalRotation: {x: 3.5527133e-15, y: 0, z: -0, w: 1}
-  m_LocalPosition: {x: -0.04479332, y: -0.000000009536743, z: 0}
+  m_LocalPosition: {x: -0.04479324, y: 0.0000000047683715, z: -2.9802322e-10}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1085,8 +1085,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6922480200288438743}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000005218929, y: -0.00000030025691, z: -0.7376984, w: 0.6751304}
-  m_LocalPosition: {x: -0.044863395, y: 0.078352965, z: -0.00000005364418}
+  m_LocalRotation: {x: -0.0000001449162, y: -0.00000023251806, z: -0.73769844, w: 0.67513037}
+  m_LocalPosition: {x: -0.04486336, y: 0.07835297, z: -0.00000007495284}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1224,7 +1224,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7170508150338001568}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000049799805, y: -0.00000022790016, z: -0.15261479, w: 0.9882858}
+  m_LocalRotation: {x: -0.000000010611045, y: -0.0000002382684, z: -0.07129308, w: 0.9974554}
   m_LocalPosition: {x: -0.08938583, y: -0.000000038146972, z: -0.000000019073486}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1257,8 +1257,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7296023399206320477}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.69342715, y: -0.07345911, z: 0.709585, w: 0.10125052}
-  m_LocalPosition: {x: -0.000023323595, y: -0.325466, z: 0.028672995}
+  m_LocalRotation: {x: 0.7031541, y: 0.08926764, z: -0.6999328, w: -0.08774785}
+  m_LocalPosition: {x: -0.0028385643, y: 0.605651, z: 0.11649145}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1633,8 +1633,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7750704757169647667}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.11664848, y: 0.2533653, z: -0.11357314, w: 0.9535724}
-  m_LocalPosition: {x: -0.110919, y: 0.000000076293944, z: -0.000000038146972}
+  m_LocalRotation: {x: 0.003773215, y: 0.23831649, z: -0.13718203, w: 0.96144277}
+  m_LocalPosition: {x: -0.110919, y: 0.000000009536743, z: 0.000000009536743}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1666,7 +1666,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8482314704540553120}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000005422615, y: -0.000000035608444, z: 0.3012853, w: 0.95353407}
+  m_LocalRotation: {x: 0.00000003961899, y: -0.000000033703223, z: 0.2153332, w: 0.9765407}
   m_LocalPosition: {x: -0.11261642, y: 0.000000028610229, z: 0.000000014305114}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1699,8 +1699,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8767862982945536846}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.1659933, y: 0.050601244, z: -0.0062801014, w: 0.9848078}
-  m_LocalPosition: {x: -0.04479332, y: -0.000000009536743, z: 0}
+  m_LocalRotation: {x: 1.9759049e-10, y: -1.15439915e-11, z: 0.23784, w: 0.97130436}
+  m_LocalPosition: {x: -0.04479332, y: 0.000000038146972, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:

+ 80 - 80
Assets/Art/ArtHero/Guaiwu03.prefab

@@ -25,7 +25,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 182478607846004630}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.05123105, y: -0.07656465, z: -0.33263078, w: 0.9385468}
+  m_LocalRotation: {x: -0.051231086, y: -0.07656462, z: -0.3326309, w: 0.9385467}
   m_LocalPosition: {x: -0.15980525, y: -0.000000019073486, z: -0.0000000047683715}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -58,9 +58,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 370187340223180352}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.034959063, y: 0.017397288, z: 0.57392013, w: 0.81797975}
+  m_LocalRotation: {x: 0.0349593, y: 0.017397067, z: 0.57392067, w: 0.81797945}
   m_LocalPosition: {x: -0.17507423, y: 0, z: 0}
-  m_LocalScale: {x: 1.0000002, y: 0.9999994, z: 0.9999998}
+  m_LocalScale: {x: 0.9999985, y: 1.0000005, z: 0.9999994}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8976710547591467634}
@@ -91,9 +91,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 546035720456596283}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6772081, y: -0.14538887, z: 0.70667964, w: 0.14441304}
-  m_LocalPosition: {x: 0.0024216778, y: 0.6339776, z: 0.27583712}
-  m_LocalScale: {x: 0.9999998, y: 0.9999998, z: 1}
+  m_LocalRotation: {x: -0.677208, y: -0.14538878, z: 0.7066799, w: 0.14441295}
+  m_LocalPosition: {x: 0.0024217567, y: 0.6339776, z: 0.27583665}
+  m_LocalScale: {x: 1.0000007, y: 1.0000006, z: 0.9999996}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -123,8 +123,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 574792402586294878}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0711496, y: -0.71944356, z: -0.18454824, w: 0.66579324}
-  m_LocalPosition: {x: 0.002328645, y: 0.2876296, z: -0.14972264}
+  m_LocalRotation: {x: -0.071149535, y: 0.7194435, z: 0.184548, w: -0.6657934}
+  m_LocalPosition: {x: 0.002328585, y: 0.28762934, z: -0.14972273}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -235,7 +235,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1045368655250819072}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.25831324, y: 0.9637667, z: 0.014187034, w: -0.065013856}
+  m_LocalRotation: {x: -0.25831315, y: 0.96376675, z: 0.014186832, w: -0.06501311}
   m_LocalPosition: {x: -0.0007618141, y: -0.000060129165, z: -0.19442026}
   m_LocalScale: {x: 0.9999998, y: 0.99999994, z: 1.0000001}
   m_ConstrainProportionsScale: 0
@@ -268,7 +268,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1517872432562996765}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00400716, y: -0.0026841224, z: -0.1564129, w: 0.98768}
+  m_LocalRotation: {x: -0.0040070936, y: -0.0026842416, z: -0.15641282, w: 0.98768}
   m_LocalPosition: {x: -0.095284, y: 0.000000009536743, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -301,9 +301,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1568931016909550410}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.03748028, y: 0.44241875, z: -0.023548381, w: 0.8957156}
-  m_LocalPosition: {x: -0.12616658, y: 0, z: 0}
-  m_LocalScale: {x: 0.9999986, y: 0.99999577, z: 1.0000057}
+  m_LocalRotation: {x: -0.03748035, y: 0.44241834, z: -0.023548326, w: 0.8957158}
+  m_LocalPosition: {x: -0.12616657, y: 0, z: 0}
+  m_LocalScale: {x: 1.0000052, y: 0.9999959, z: 0.99999875}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4861218949430347576}
@@ -334,9 +334,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1709908193613068784}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.18025942, y: 0.7840188, z: -0.26421806, w: 0.5319868}
-  m_LocalPosition: {x: 0.41090015, y: 0.5043994, z: 0.15599892}
-  m_LocalScale: {x: 0.9999902, y: 0.9999839, z: 1.0000259}
+  m_LocalRotation: {x: -0.18025999, y: 0.7840188, z: -0.26421815, w: 0.5319865}
+  m_LocalPosition: {x: 0.41089964, y: 0.5043994, z: 0.1559989}
+  m_LocalScale: {x: 0.99999756, y: 0.9999852, z: 1.0000185}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -366,8 +366,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1712805402593329659}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0026313947, y: 0.0023266668, z: -0.03249283, w: 0.9994658}
-  m_LocalPosition: {x: -0.08656246, y: 0, z: -7.4505804e-11}
+  m_LocalRotation: {x: -0.0026314773, y: 0.002326769, z: -0.032492865, w: 0.9994658}
+  m_LocalPosition: {x: -0.0865625, y: 0, z: -7.4505804e-11}
   m_LocalScale: {x: 0.99999976, y: 0.9999997, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -433,7 +433,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1839259347114458465}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.024714278, y: -0.08350789, z: 0.66726476, w: 0.73971176}
+  m_LocalRotation: {x: -0.024714245, y: -0.08350784, z: 0.66726476, w: 0.73971176}
   m_LocalPosition: {x: 0.033012982, y: -0.16844463, z: 0.00000003332272}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -582,8 +582,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1987259152066049244}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5645554, y: -0.43366718, z: -0.5570508, w: 0.4276733}
-  m_LocalPosition: {x: 9.40704e-10, y: 0.2760562, z: 0.02152012}
+  m_LocalRotation: {x: -0.56455517, y: 0.4336672, z: 0.55705076, w: -0.42767358}
+  m_LocalPosition: {x: 9.40704e-10, y: 0.27605596, z: 0.021520115}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -614,7 +614,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1992779579491561086}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0035528673, y: 0.0004994746, z: -0.21284392, w: 0.97707963}
+  m_LocalRotation: {x: -0.0035528822, y: 0.0004993557, z: -0.21284409, w: 0.97707963}
   m_LocalPosition: {x: -0.0266885, y: 0.009341116, z: -0.0000000018212858}
   m_LocalScale: {x: 1, y: 1, z: 0.99999976}
   m_ConstrainProportionsScale: 0
@@ -648,7 +648,7 @@ Transform:
   m_GameObject: {fileID: 2081113721745570146}
   serializedVersion: 2
   m_LocalRotation: {x: 0.53366023, y: -0.53366023, z: -0.46390378, w: 0.46390378}
-  m_LocalPosition: {x: -0.23291042, y: 0.0000000011964649, z: 0.07435803}
+  m_LocalPosition: {x: -0.23290998, y: -0.0000000025777103, z: 0.07435799}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -679,9 +679,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2185159893300393901}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.9657848, y: -0.032998282, z: 0.1358171, w: -0.21845956}
-  m_LocalPosition: {x: -0.06592457, y: -0.000000019073486, z: 0}
-  m_LocalScale: {x: 1.000008, y: 1.0000161, z: 0.9999751}
+  m_LocalRotation: {x: 0.96578526, y: -0.032998357, z: 0.13581468, w: -0.2184591}
+  m_LocalPosition: {x: -0.06592457, y: 0, z: -0.000000038146972}
+  m_LocalScale: {x: 1.0000069, y: 1.0000147, z: 0.9999778}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3666843846739278804}
@@ -711,9 +711,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2268804003237099576}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.13496216, y: -0.6993704, z: -0.10356025, w: 0.6942201}
+  m_LocalRotation: {x: 0.13496242, y: -0.6993704, z: -0.103559785, w: 0.6942201}
   m_LocalPosition: {x: 0.024888381, y: 0.06675173, z: -0.25419962}
-  m_LocalScale: {x: 0.9999994, y: 1.000003, z: 0.9999986}
+  m_LocalScale: {x: 0.9999981, y: 1.0000032, z: 0.99999964}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 7850459637593319385}
@@ -744,9 +744,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2321457575700373327}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7660067, y: -0.04512973, z: -0.43614465, w: 0.47007963}
-  m_LocalPosition: {x: -0.37226203, y: 0.4679751, z: 0.11386286}
-  m_LocalScale: {x: 1.0000021, y: 1.0000062, z: 0.99999225}
+  m_LocalRotation: {x: 0.7660066, y: -0.045129653, z: -0.43614474, w: 0.47007972}
+  m_LocalPosition: {x: -0.37226227, y: 0.46797493, z: 0.11386267}
+  m_LocalScale: {x: 0.9999922, y: 1.0000069, z: 1.0000024}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -808,9 +808,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2929233157122274945}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.038165286, y: -0.4076086, z: -0.0216955, w: 0.91210085}
-  m_LocalPosition: {x: -0.12616655, y: 0.000000019073486, z: 0}
-  m_LocalScale: {x: 1.0000027, y: 1.0000046, z: 0.99999267}
+  m_LocalRotation: {x: 0.038165487, y: -0.40760764, z: -0.021695394, w: 0.91210127}
+  m_LocalPosition: {x: -0.12616657, y: 0, z: 0}
+  m_LocalScale: {x: 0.9999927, y: 1.0000045, z: 1.000003}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 6533022959257879390}
@@ -841,8 +841,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2976500602475718533}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.38709545, y: 0.6543791, z: 0.5701575, w: -0.3112324}
-  m_LocalPosition: {x: 0.060934912, y: 0.44215482, z: -0.3581391}
+  m_LocalRotation: {x: -0.38709515, y: 0.6543793, z: 0.5701574, w: -0.3112324}
+  m_LocalPosition: {x: 0.06093475, y: 0.4421545, z: -0.3581393}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -873,8 +873,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3013491433982859445}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.008742358, y: -0.0972278, z: -0.2555105, w: 0.96186525}
-  m_LocalPosition: {x: -0.122860484, y: 0, z: -0.000000009536743}
+  m_LocalRotation: {x: 0.008742373, y: -0.09722806, z: -0.25551045, w: 0.9618652}
+  m_LocalPosition: {x: -0.122860484, y: -0.000000019073486, z: 0.000000009536743}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -905,9 +905,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3145790356454020140}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.052966878, y: 0.08678934, z: -0.7094056, w: 0.69742805}
-  m_LocalPosition: {x: -0.12713142, y: -0.0000000023841857, z: -0.000000019073486}
-  m_LocalScale: {x: 0.99999994, y: 1, z: 1}
+  m_LocalRotation: {x: -0.052967485, y: 0.08678614, z: -0.70939, w: 0.69744426}
+  m_LocalPosition: {x: -0.1271314, y: -0.000000007152557, z: -0.000000019073486}
+  m_LocalScale: {x: 0.9999988, y: 1.0000011, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 69910692146296168}
@@ -938,8 +938,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3960913692848747131}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5493122, y: 0.43706787, z: 0.5555146, w: -0.44568083}
-  m_LocalPosition: {x: 0.00048735554, y: 0.61302507, z: 0.13618681}
+  m_LocalRotation: {x: -0.5493119, y: 0.43706778, z: 0.55551463, w: -0.44568118}
+  m_LocalPosition: {x: 0.0004873888, y: 0.61302483, z: 0.13618669}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -970,8 +970,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3977279469075194632}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.2578472, y: -0.6930865, z: -0.43697584, w: 0.5120529}
-  m_LocalPosition: {x: 0.018838791, y: 0.3432607, z: -0.2986196}
+  m_LocalRotation: {x: -0.257847, y: 0.69308645, z: 0.43697578, w: -0.512053}
+  m_LocalPosition: {x: 0.018838668, y: 0.3432604, z: -0.29861975}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1002,7 +1002,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4731423390282749986}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000021775145, y: -9.326166e-11, z: -0.338129, w: 0.9410998}
+  m_LocalRotation: {x: -0.0000000082403755, y: -0.00000006829132, z: -0.3381286, w: 0.94109994}
   m_LocalPosition: {x: -0.05780069, y: -0.0000000023841857, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1069,8 +1069,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5178876528776022680}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0026374224, y: -0.005255207, z: 0.39065507, w: 0.9205184}
-  m_LocalPosition: {x: -0.088849105, y: -0.000000038146972, z: 0}
+  m_LocalRotation: {x: -0.0026373563, y: -0.005255153, z: 0.3906553, w: 0.9205183}
+  m_LocalPosition: {x: -0.088849105, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1.0000004}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1102,8 +1102,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5349587271222140177}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.46390378, y: -0.46390378, z: -0.53366023, w: 0.53366023}
-  m_LocalPosition: {x: 0.23291042, y: 0.00000000398309, z: 0.0106072705}
+  m_LocalRotation: {x: -0.46390373, y: 0.46390373, z: 0.53366035, w: -0.53366035}
+  m_LocalPosition: {x: 0.23290998, y: 0.000000001848132, z: 0.0106072975}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1134,7 +1134,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5518262060512041041}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000011389197, y: -0.000031678537, z: -0.33796945, w: 0.9411571}
+  m_LocalRotation: {x: 0.000011325471, y: -0.00003168733, z: -0.33796942, w: 0.9411571}
   m_LocalPosition: {x: -0.057800718, y: 0.000000009536743, z: 0.000000019073486}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1167,9 +1167,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5812856034463566750}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.07668195, y: 0.48082238, z: 0.8606211, w: 0.14920148}
-  m_LocalPosition: {x: 0.25508732, y: 0.49293852, z: 0.078801505}
-  m_LocalScale: {x: 0.9999994, y: 1.0000029, z: 0.99999845}
+  m_LocalRotation: {x: -0.07668175, y: 0.48082262, z: 0.860621, w: 0.14920127}
+  m_LocalPosition: {x: 0.2550867, y: 0.4929382, z: 0.078801274}
+  m_LocalScale: {x: 0.9999984, y: 1.0000039, z: 0.9999997}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -1199,8 +1199,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6480596896393535486}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6254695, y: -0.3299334, z: -0.62417567, w: 0.3321694}
-  m_LocalPosition: {x: 0.0006829269, y: 0.55009156, z: 0.037514355}
+  m_LocalRotation: {x: -0.62546945, y: 0.3299335, z: 0.6241757, w: -0.3321696}
+  m_LocalPosition: {x: 0.000682913, y: 0.5500913, z: 0.037514184}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1231,9 +1231,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6667221927385425405}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.97060364, y: -0.035802346, z: -0.1012255, w: 0.21540707}
-  m_LocalPosition: {x: -0.06592457, y: 0, z: 0}
-  m_LocalScale: {x: 0.99999255, y: 0.99998426, z: 1.0000224}
+  m_LocalRotation: {x: 0.9706033, y: -0.03580196, z: -0.10122676, w: 0.21540804}
+  m_LocalPosition: {x: -0.06592457, y: -0.000000019073486, z: 0.000000019073486}
+  m_LocalScale: {x: 0.99999326, y: 0.9999859, z: 1.0000201}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 7850459637593319385}
@@ -1263,8 +1263,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6924780528401987771}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5645554, y: -0.43366718, z: -0.5570508, w: 0.4276733}
-  m_LocalPosition: {x: 9.40704e-10, y: 0.2760562, z: 0.02152012}
+  m_LocalRotation: {x: -0.56455517, y: 0.4336672, z: 0.55705076, w: -0.42767358}
+  m_LocalPosition: {x: 9.40704e-10, y: 0.27605596, z: 0.021520115}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1299,7 +1299,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7288455981017969266}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00090976973, y: -0.00061782025, z: 0.021901444, w: 0.99975955}
+  m_LocalRotation: {x: -0.0009097836, y: -0.0006177906, z: 0.021901453, w: 0.99975955}
   m_LocalPosition: {x: -0.09026897, y: -0.0742132, z: 0.000000014450042}
   m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1382,9 +1382,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7343194039152884161}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.033840504, y: -0.018422376, z: 0.60413647, w: 0.79594886}
+  m_LocalRotation: {x: -0.03384247, y: -0.018420424, z: 0.6040717, w: 0.79599804}
   m_LocalPosition: {x: -0.17507423, y: 0.000000009536743, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 0.99999994}
+  m_LocalScale: {x: 0.999999, y: 1.0000012, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 1427254861907001360}
@@ -1415,9 +1415,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7395730190844866710}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.059752513, y: -0.09511768, z: -0.7854824, w: 0.60860467}
+  m_LocalRotation: {x: 0.059751835, y: -0.09511684, z: -0.785483, w: 0.6086042}
   m_LocalPosition: {x: -0.12713142, y: 0.00000000834465, z: -0.000000019073486}
-  m_LocalScale: {x: 1.0000006, y: 0.9999993, z: 0.99999994}
+  m_LocalScale: {x: 0.99999934, y: 1.0000008, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4233431111312252034}
@@ -1448,9 +1448,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7753378045966506651}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.266134, y: 0.53091127, z: -0.17743173, w: 0.78474456}
-  m_LocalPosition: {x: -0.4128375, y: 0.4995652, z: 0.15511526}
-  m_LocalScale: {x: 1.0000098, y: 1.0000198, z: 0.9999706}
+  m_LocalRotation: {x: -0.266134, y: 0.5309113, z: -0.17743175, w: 0.78474444}
+  m_LocalPosition: {x: -0.41283733, y: 0.49956474, z: 0.15511468}
+  m_LocalScale: {x: 1, y: 1.0000206, z: 0.9999801}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -1480,8 +1480,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7894824324878320261}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00848605, y: -0.010310054, z: -0.77102697, w: 0.63666254}
-  m_LocalPosition: {x: -0.051257513, y: 0.13159649, z: -0.000000028312206}
+  m_LocalRotation: {x: -0.008486136, y: -0.010310025, z: -0.771027, w: 0.6366624}
+  m_LocalPosition: {x: -0.051257513, y: 0.131596, z: -0.000000028461217}
   m_LocalScale: {x: 0.9999999, y: 0.9999999, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1512,9 +1512,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8805583928493354787}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.8575319, y: 0.15047191, z: -0.077101156, w: 0.48585257}
-  m_LocalPosition: {x: -0.25330868, y: 0.49108246, z: 0.07873204}
-  m_LocalScale: {x: 1.0000006, y: 1.0000015, z: 0.99999857}
+  m_LocalRotation: {x: 0.8575317, y: 0.15047209, z: -0.0771012, w: 0.48585275}
+  m_LocalPosition: {x: -0.25330922, y: 0.49108222, z: 0.07873191}
+  m_LocalScale: {x: 0.9999983, y: 1.0000023, z: 1.0000005}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -1544,7 +1544,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8883467113405325687}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.4049878, y: 0.91149646, z: -0.026326647, w: 0.0668279}
+  m_LocalRotation: {x: -0.40493393, y: 0.91152054, z: -0.02632252, w: 0.066828124}
   m_LocalPosition: {x: -0.00076183316, y: -0.000060133934, z: 0.19442023}
   m_LocalScale: {x: 0.9999999, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1577,9 +1577,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8912986415466581560}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.46635467, y: 0.46262795, z: 0.75145406, w: -0.06169006}
-  m_LocalPosition: {x: 0.37415287, y: 0.46984106, z: 0.1135562}
-  m_LocalScale: {x: 0.9999975, y: 0.9999986, z: 1.0000049}
+  m_LocalRotation: {x: -0.4663547, y: 0.46262804, z: 0.75145394, w: -0.061690442}
+  m_LocalPosition: {x: 0.37415212, y: 0.4698408, z: 0.11355591}
+  m_LocalScale: {x: 1.0000046, y: 0.9999998, z: 0.9999976}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 1008223850534215283}
@@ -1609,9 +1609,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9071692098115085432}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.13839956, y: 0.6973073, z: -0.09939719, w: 0.69622433}
+  m_LocalRotation: {x: -0.13839914, y: 0.69730735, z: -0.09939743, w: 0.69622433}
   m_LocalPosition: {x: 0.024888344, y: 0.06675173, z: 0.25419965}
-  m_LocalScale: {x: 1.0000005, y: 1.0000018, z: 0.9999987}
+  m_LocalScale: {x: 0.99999803, y: 1.0000015, z: 1.0000004}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3666843846739278804}

+ 63 - 31
Assets/Art/ArtHero/Guaiwu04.prefab

@@ -67,8 +67,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 458447495748752918}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.06549731, y: -0.4948796, z: 0.062654115, w: 0.86422145}
-  m_LocalPosition: {x: 0.019871749, y: 0.000000028610229, z: -0.21845798}
+  m_LocalRotation: {x: 0.0294452, y: -0.46636912, z: 0.017799716, w: 0.8839208}
+  m_LocalPosition: {x: 0.019871673, y: 0.000000014980523, z: -0.218458}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -99,8 +99,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 917675889835125490}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.006661246, y: -0.000010355316, z: 0.0077025783, w: 0.9999482}
-  m_LocalPosition: {x: -0.16385497, y: -0.000000009536743, z: -2.9802322e-10}
+  m_LocalRotation: {x: -7.722453e-21, y: 3.7611292e-14, z: 2.9045143e-34, w: 1}
+  m_LocalPosition: {x: -0.16385497, y: 0, z: 2.6752043e-14}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -135,7 +135,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 943111160658351977}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0066612316, y: -0.000010345331, z: 0.0077025797, w: 0.9999482}
+  m_LocalRotation: {x: -7.1054193e-15, y: 3.146121e-14, z: 2.235451e-28, w: 1}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -168,8 +168,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1988635212433803530}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.48703533, y: -0.5323058, z: -0.46545738, w: 0.5126369}
-  m_LocalPosition: {x: -0.0000000013299429, y: 0.48083314, z: 0.023907987}
+  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
+  m_LocalPosition: {x: 2.4454832e-14, y: 0.50076115, z: -0.000000076914475}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -202,8 +202,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2011751739839523450}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6338223, y: -0.21712656, z: -0.024126869, w: 0.741986}
-  m_LocalPosition: {x: -0.24216358, y: 0.77234393, z: -0.0018120193}
+  m_LocalRotation: {x: 0.6660582, y: -0.14845243, z: -0.15615647, w: 0.71410334}
+  m_LocalPosition: {x: -0.24260175, y: 0.79257554, z: 0.000000064633596}
   m_LocalScale: {x: 1, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -234,8 +234,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2101574658773121506}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.44569698, y: -0.5856808, z: -0.3962047, w: 0.5489572}
-  m_LocalPosition: {x: 0.00010025285, y: 1.0058302, z: -0.06461784}
+  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
+  m_LocalPosition: {x: 2.080139e-15, y: 1.0341041, z: 0.00000009051068}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -267,7 +267,7 @@ Transform:
   m_GameObject: {fileID: 2275733123919210882}
   serializedVersion: 2
   m_LocalRotation: {x: -0.0018154522, y: -0.0005112481, z: -0.69590807, w: 0.7181285}
-  m_LocalPosition: {x: 0.18722808, y: 0.25477698, z: -0.000000048279762}
+  m_LocalPosition: {x: 0.18722801, y: 0.25477698, z: -0.000000049606925}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -298,8 +298,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2492597523981753839}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.03269039, y: 0.00023239768, z: 0.05465955, w: 0.99796975}
-  m_LocalPosition: {x: -0.104772106, y: 0.000000019073486, z: 0}
+  m_LocalRotation: {x: -7.105423e-15, y: 4.402201e-14, z: -2.842171e-14, w: 1}
+  m_LocalPosition: {x: -0.104772106, y: 0, z: 5.35841e-15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -430,8 +430,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3646131970783870166}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.48703533, y: -0.5323058, z: -0.46545738, w: 0.5126369}
-  m_LocalPosition: {x: -0.0000000013299429, y: 0.48083314, z: 0.023907987}
+  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
+  m_LocalPosition: {x: 2.4454832e-14, y: 0.50076115, z: -0.000000076914475}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -462,8 +462,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3663587340385535238}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.07997534, y: 0.73460245, z: 0.61621875, w: -0.27246577}
-  m_LocalPosition: {x: 0.21845034, y: 0.82324016, z: -0.032300543}
+  m_LocalRotation: {x: -0.2145986, y: 0.6987673, z: 0.65152264, w: -0.20295314}
+  m_LocalPosition: {x: 0.218458, y: 0.8483342, z: 0.0000000020345488}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -528,8 +528,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4072968442861826619}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.40370262, y: 0.91472083, z: -0.014202686, w: 0.01040539}
-  m_LocalPosition: {x: 0.17269611, y: -0.0000000333786, z: -0.000000028312206}
+  m_LocalRotation: {x: -0.00009896915, y: 0.9999868, z: 0.0051348163, w: -0.000019816367}
+  m_LocalPosition: {x: 0.17269611, y: -0.000000033903923, z: -0.00000004409509}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -560,7 +560,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4099553831640667671}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.029271418, y: -0.000045482506, z: 0.033847403, w: 0.9989983}
+  m_LocalRotation: {x: 2.1316274e-14, y: 8.16333e-14, z: -1.7401178e-27, w: 1}
   m_LocalPosition: {x: -0.20358978, y: 0.0000000047683715, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -593,8 +593,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4145871724136783471}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5162482, y: -0.4832057, z: -0.5162482, w: 0.4832057}
-  m_LocalPosition: {x: 0.00000003603927, y: 0.0031581766, z: -0.23867734}
+  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
+  m_LocalPosition: {x: 0, y: 0, z: -0.000000009770192}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -625,8 +625,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4309461991386805866}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.032788094, y: -0.0010151463, z: -0.003094183, w: 0.99945706}
-  m_LocalPosition: {x: -0.061126098, y: -0.000000019073486, z: 0}
+  m_LocalRotation: {x: -7.722455e-21, y: 3.76113e-14, z: 2.9045157e-34, w: 1}
+  m_LocalPosition: {x: -0.061126098, y: 1.8189894e-14, z: 9.979851e-15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -721,8 +721,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5449474419157797779}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.1143083, y: 0.55891144, z: 0.08510827, w: 0.8168894}
-  m_LocalPosition: {x: 0.07563034, y: 0.000000009536743, z: 0.24260177}
+  m_LocalRotation: {x: -0.027874583, y: 0.5377763, z: 0.020170722, w: 0.8423852}
+  m_LocalPosition: {x: 0.07563034, y: -1.8661012e-10, z: 0.24260175}
   m_LocalScale: {x: 1, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1057,8 +1057,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6022975336854096154}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6858239, y: 0.07914314, z: 0.7192624, w: -0.07774083}
-  m_LocalPosition: {x: 0.011405673, y: 0.70907134, z: 0.25880307}
+  m_LocalRotation: {x: -0.70585483, y: 0.010458036, z: 0.70818174, w: -0.01176223}
+  m_LocalPosition: {x: 0.00000010225203, y: 0.68097776, z: 0.25477695}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1089,8 +1089,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6073098555890524430}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.43794224, y: -0.5353714, z: -0.46192798, w: 0.55516356}
-  m_LocalPosition: {x: 0.00020359423, y: 0.844574, z: -0.026642555}
+  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
+  m_LocalPosition: {x: 6.3762993e-15, y: 0.86820585, z: 0.0000000384325}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1231,10 +1231,34 @@ PrefabInstance:
     serializedVersion: 3
     m_TransformParent: {fileID: 1057264528682173702}
     m_Modifications:
+    - target: {fileID: 1279377126997367540, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: randomSeed
+      value: 1992
+      objectReference: {fileID: 0}
+    - target: {fileID: 1279377126997367540, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 1330244039121282677, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
       propertyPath: m_Layer
       value: 8
       objectReference: {fileID: 0}
+    - target: {fileID: 3148656968151344518, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: randomSeed
+      value: 1992
+      objectReference: {fileID: 0}
+    - target: {fileID: 3148656968151344518, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 3807536485563796039, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: randomSeed
+      value: 1992
+      objectReference: {fileID: 0}
+    - target: {fileID: 3807536485563796039, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 4861960103676641762, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
       propertyPath: m_LocalPosition.x
       value: 0.04
@@ -1283,6 +1307,14 @@ PrefabInstance:
       propertyPath: m_Layer
       value: 8
       objectReference: {fileID: 0}
+    - target: {fileID: 8919304941831900800, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: randomSeed
+      value: 1992
+      objectReference: {fileID: 0}
+    - target: {fileID: 8919304941831900800, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
+      propertyPath: autoRandomSeed
+      value: 0
+      objectReference: {fileID: 0}
     - target: {fileID: 9136639372104575588, guid: 76616db5cebd04d4f8be1312eb0807ce, type: 3}
       propertyPath: m_Name
       value: fx_guaiwu04_die

+ 114 - 114
Assets/Art/ArtHero/Guaiwu05.prefab

@@ -25,8 +25,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 268475401323914727}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6056055, y: 0.0035449315, z: -0.5969854, w: 0.52615386}
-  m_LocalPosition: {x: -0.32039446, y: 0.7330009, z: -0.3452247}
+  m_LocalRotation: {x: -0.4158697, y: -0.49970666, z: 0.62824786, w: -0.42737603}
+  m_LocalPosition: {x: -0.214519, y: 0.22872497, z: 1.0807279}
   m_LocalScale: {x: 0.99999964, y: 1.0000006, z: 1.0000024}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -57,8 +57,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 324804210034474948}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.01510224, y: -0.047058783, z: -0.03930165, w: 0.9980044}
-  m_LocalPosition: {x: -0.1420314, y: 0.000000019073486, z: 0}
+  m_LocalRotation: {x: -0.18233278, y: -0.07829614, z: -0.03516709, w: 0.9794834}
+  m_LocalPosition: {x: -0.14203133, y: 0, z: -0.000000038146972}
   m_LocalScale: {x: 1.0000005, y: 0.99999917, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -90,8 +90,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 406663071219605316}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7404474, y: -0.000012671636, z: -0.6721142, w: -0.00043852683}
-  m_LocalPosition: {x: -0.37173164, y: 0.79776466, z: 0.21806297}
+  m_LocalRotation: {x: -0.31639725, y: -0.27964702, z: 0.8478263, w: -0.32075053}
+  m_LocalPosition: {x: 0.18450443, y: 0.32385403, z: 1.4830986}
   m_LocalScale: {x: 1.0000002, y: 1.0000013, z: 0.9999974}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -122,8 +122,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 505174835134722821}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.39034766, y: -0.32016855, z: -0.09047631, w: 0.85844916}
-  m_LocalPosition: {x: -0.034543633, y: 0.5442525, z: -0.3088957}
+  m_LocalRotation: {x: 0.8329811, y: 0.0064646625, z: -0.3427589, w: 0.43430072}
+  m_LocalPosition: {x: 0.0029230237, y: 0.22361612, z: 0.8114269}
   m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -154,7 +154,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 862944201032697012}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.127371, y: 0.8712345, z: 0.038286116, w: -0.4725053}
+  m_LocalRotation: {x: 0.19770487, y: -0.8143878, z: -0.08379607, w: 0.53913224}
   m_LocalPosition: {x: 0.04548109, y: 0.00981606, z: -0.14403026}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1.0000001}
   m_ConstrainProportionsScale: 0
@@ -187,8 +187,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1091756707086425879}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0006387201, y: 0.048316386, z: -0.006902654, w: 0.998808}
-  m_LocalPosition: {x: -0.26590177, y: 0.0019801331, z: 0.0000003814697}
+  m_LocalRotation: {x: -0.037134375, y: -0.039427824, z: 0.11828964, w: 0.9915009}
+  m_LocalPosition: {x: -0.2659019, y: 0.0019800568, z: 0.0000003814697}
   m_LocalScale: {x: 1.0000023, y: 0.99999905, z: 0.9999979}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -220,8 +220,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1428729320331175472}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.74044746, y: -0.000012382243, z: -0.67211413, w: -0.0004385598}
-  m_LocalPosition: {x: -0.3502078, y: 0.79930466, z: -0.0038707065}
+  m_LocalRotation: {x: -0.28236908, y: -0.2953454, z: 0.87327576, w: -0.26538333}
+  m_LocalPosition: {x: 0.027602673, y: 0.25866166, z: 1.3386962}
   m_LocalScale: {x: 1.0000002, y: 1.0000024, z: 0.9999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -252,8 +252,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1447741088467164989}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.2558702, y: 0.47224477, z: 0.76372355, w: -0.35810843}
-  m_LocalPosition: {x: 0.14982757, y: 0.64153713, z: -0.35270706}
+  m_LocalRotation: {x: -0.33531755, y: -0.39995039, z: 0.8284887, w: -0.20299833}
+  m_LocalPosition: {x: 0.19002934, y: 0.2676534, z: 0.8868246}
   m_LocalScale: {x: 1.000001, y: 1.0000006, z: 0.9999982}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -284,8 +284,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1594395441740904861}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000012335688, y: -0.000000036449336, z: -0.099415004, w: 0.9950461}
-  m_LocalPosition: {x: -0.1002993, y: 0, z: 0}
+  m_LocalRotation: {x: -0.0044047777, y: -0.033673935, z: 0.1794137, w: 0.9831874}
+  m_LocalPosition: {x: -0.100299336, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 0.99999994, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -318,8 +318,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1889110348860605608}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.40655115, y: -0.57854664, z: -0.406551, w: 0.57854664}
-  m_LocalPosition: {x: -0.0000000036709493, y: 0.29167894, z: -0.08398238}
+  m_LocalRotation: {x: -0.66041577, y: -0.020367324, z: 0.7493778, w: -0.043232586}
+  m_LocalPosition: {x: -0.00058613875, y: 0.17456694, z: 0.46047628}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -386,8 +386,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1992709880757026120}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6125124, y: -0.011438851, z: 0.790304, w: 0.0108325975}
-  m_LocalPosition: {x: 0.32872298, y: 1.0244544, z: -0.047031973}
+  m_LocalRotation: {x: -0.016727226, y: -0.64178693, z: 0.72991276, w: -0.2346425}
+  m_LocalPosition: {x: 0.6113398, y: 0.2172866, z: 1.3275388}
   m_LocalScale: {x: 1.0000019, y: 1.0000021, z: 0.99999726}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -418,9 +418,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2023723961677135146}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.024044152, y: -0.35228965, z: 0.22361839, w: 0.908465}
-  m_LocalPosition: {x: -0.16139393, y: 0.000000023841856, z: 0.000000057220458}
-  m_LocalScale: {x: 1.0000012, y: 0.9999982, z: 1.0000023}
+  m_LocalRotation: {x: -0.019837203, y: -0.5586465, z: 0.3546044, w: 0.7495174}
+  m_LocalPosition: {x: -0.16139388, y: 0.000000023841856, z: 0.000000038146972}
+  m_LocalScale: {x: 1.0000012, y: 0.99999815, z: 1.0000023}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 115787745589989787}
@@ -451,8 +451,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2187167550678521981}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000523426, y: -0.0045643277, z: -0.12380664, w: 0.99229574}
-  m_LocalPosition: {x: -0.12539522, y: -0.0000000017881393, z: 0}
+  m_LocalRotation: {x: 0.00052031863, y: -0.0045331204, z: -0.123638235, w: 0.9923169}
+  m_LocalPosition: {x: -0.12539522, y: -2.9802322e-10, z: -0.000000019073486}
   m_LocalScale: {x: 1.0000001, y: 0.9999998, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -484,8 +484,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2363176614742350319}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.30220163, y: 0.12270587, z: -0.07946272, w: 0.9419677}
-  m_LocalPosition: {x: -0.12633923, y: 0, z: 0}
+  m_LocalRotation: {x: 0.20646851, y: 0.15658274, z: 0.108387, w: 0.95974207}
+  m_LocalPosition: {x: -0.12633911, y: 0, z: -0.000000019073486}
   m_LocalScale: {x: 1.0000012, y: 1.0000023, z: 0.9999972}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -517,8 +517,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2751688359354675432}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
-  m_LocalPosition: {x: -0.30468893, y: -0.000000016927595, z: -0.009741448}
+  m_LocalRotation: {x: 0.7583408, y: 0.1327997, z: -0.6286217, w: -0.110083416}
+  m_LocalPosition: {x: -0.21447825, y: 0.1436314, z: 0.19492121}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -549,8 +549,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2760925370033715946}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5465551, y: -0.14294013, z: -0.24337138, w: 0.7884263}
-  m_LocalPosition: {x: -0.116774336, y: 0.5870563, z: -0.3594904}
+  m_LocalRotation: {x: 0.79652953, y: 0.27625242, z: -0.36159548, w: 0.39808792}
+  m_LocalPosition: {x: -0.077864714, y: 0.25392154, z: 0.8723268}
   m_LocalScale: {x: 0.99999976, y: 0.9999999, z: 1.0000014}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -581,8 +581,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3058462817538630595}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.61251235, y: -0.011439057, z: 0.790304, w: 0.010832617}
-  m_LocalPosition: {x: 0.40943125, y: 1.0143747, z: 0.2626404}
+  m_LocalRotation: {x: -0.1951695, y: -0.63359433, z: 0.73899204, w: -0.11982443}
+  m_LocalPosition: {x: 0.9248295, y: 0.24400786, z: 1.4551431}
   m_LocalScale: {x: 1.0000018, y: 1.0000021, z: 0.99999326}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -613,7 +613,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3061222210203834370}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.009232748, y: 0.88109535, z: -0.054190595, w: 0.469733}
+  m_LocalRotation: {x: -0.14922653, y: 0.9030573, z: -0.01954581, w: 0.40228963}
   m_LocalPosition: {x: 0.04548109, y: 0.0098160505, z: 0.1440302}
   m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 1.0000001}
   m_ConstrainProportionsScale: 0
@@ -771,8 +771,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3281265065583204967}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000010058157, y: 0.0000000016147279, z: 0.25916648, w: 0.96583265}
-  m_LocalPosition: {x: -0.09147121, y: -0.000000019073486, z: -9.094947e-15}
+  m_LocalRotation: {x: 0.25027052, y: -0.14396703, z: 0.02868012, w: 0.9569826}
+  m_LocalPosition: {x: -0.0914712, y: 0.000000038146972, z: 0.000000038146972}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -803,8 +803,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3766638481451959730}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000012058121, y: -0.000000017896157, z: -0.029289082, w: 0.999571}
-  m_LocalPosition: {x: -0.093844526, y: 0.000000009536743, z: 0}
+  m_LocalRotation: {x: 0.0006583734, y: -0.24470018, z: -0.3011935, w: 0.9216311}
+  m_LocalPosition: {x: -0.09384455, y: -0.000000019073486, z: 0}
   m_LocalScale: {x: 1.0000001, y: 0.99999994, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -836,8 +836,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3869302755936261590}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.74044734, y: -0.000012744874, z: -0.6721143, w: -0.0004382971}
-  m_LocalPosition: {x: -0.38080946, y: 0.79771096, z: 0.3116703}
+  m_LocalRotation: {x: -0.3488063, y: -0.26251748, z: 0.81803805, w: -0.37447634}
+  m_LocalPosition: {x: 0.24037029, y: 0.3583618, z: 1.5504259}
   m_LocalScale: {x: 1.0000002, y: 1.0000004, z: 0.9999953}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -901,7 +901,7 @@ Transform:
   m_GameObject: {fileID: 4129493265655392475}
   serializedVersion: 2
   m_LocalRotation: {x: -0.000000014901103, y: -1.2435768e-15, z: -0.000000014901197, w: 1}
-  m_LocalPosition: {x: -0.039698724, y: 0, z: 0}
+  m_LocalPosition: {x: -0.03969872, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -932,8 +932,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4333393806100014236}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.30211958, y: -0.6393152, z: -0.3021193, w: 0.63931507}
-  m_LocalPosition: {x: -0.000000013866226, y: 0.2835087, z: -0.4186336}
+  m_LocalRotation: {x: 0.16542105, y: 0.67175967, z: 0.7181586, w: 0.074986815}
+  m_LocalPosition: {x: 0.095386066, y: 0.45899886, z: 0.32940498}
   m_LocalScale: {x: 0.99999887, y: 0.99999875, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -964,7 +964,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4362766446919505049}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.009439628, y: -0.30922356, z: -0.010576199, w: 0.9508837}
+  m_LocalRotation: {x: -0.047579013, y: -0.2521705, z: -0.049998038, w: 0.96521837}
   m_LocalPosition: {x: 0.0010251617, y: -0.0004964065, z: -0.07153666}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 0.9999999}
   m_ConstrainProportionsScale: 0
@@ -997,8 +997,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4432954956719140474}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.084946714, y: -0.10672521, z: -0.28845942, w: 0.94772625}
-  m_LocalPosition: {x: -0.21895082, y: 0.06624008, z: 0.0000001335144}
+  m_LocalRotation: {x: -0.13478117, y: -0.21557778, z: -0.22850929, w: 0.9397573}
+  m_LocalPosition: {x: -0.23728324, y: 0.07986751, z: 0.025859812}
   m_LocalScale: {x: 1.0000014, y: 1.0000012, z: 0.9999982}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1383,8 +1383,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4515971243099383874}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.6672187, y: 0.23413387, z: 0.68771785, w: -0.16445278}
-  m_LocalPosition: {x: 0.3222733, y: 0.9619155, z: -0.26697406}
+  m_LocalRotation: {x: -0.35135186, y: -0.55150694, z: 0.7152176, w: -0.24668959}
+  m_LocalPosition: {x: 0.4083455, y: 0.27195904, z: 1.1891361}
   m_LocalScale: {x: 1.0000004, y: 1.0000013, z: 0.999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1415,8 +1415,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4868986044531159354}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.023694823, y: 0.37555826, z: 0.23838519, w: 0.8953028}
-  m_LocalPosition: {x: -0.16139393, y: 0.000000028610229, z: -0.000000038146972}
+  m_LocalRotation: {x: 0.018484542, y: 0.6040163, z: 0.38339892, w: 0.69844675}
+  m_LocalPosition: {x: -0.16139394, y: 0.0000000047683715, z: 0}
   m_LocalScale: {x: 1.0000005, y: 1.0000023, z: 0.9999978}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1530,8 +1530,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5338828017726562971}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.09644225, y: 0.08417327, z: -0.2567814, w: 0.95795465}
-  m_LocalPosition: {x: -0.105611876, y: -0.000000019073486, z: 0}
+  m_LocalRotation: {x: -0.07801666, y: 0.0892185, z: -0.2455567, w: 0.96210986}
+  m_LocalPosition: {x: -0.105611876, y: -0.000000038146972, z: 0}
   m_LocalScale: {x: 0.9999997, y: 0.9999996, z: 1.000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1563,8 +1563,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5592686917974457561}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000019075312, y: -0.000000011187383, z: -0.290048, w: 0.9570121}
-  m_LocalPosition: {x: -0.09842155, y: 0, z: 0}
+  m_LocalRotation: {x: -0.019306747, y: -0.025538072, z: -0.2508355, w: 0.9675002}
+  m_LocalPosition: {x: -0.098421626, y: 0, z: 0.0000000011920929}
   m_LocalScale: {x: 0.9999999, y: 0.9999998, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1596,8 +1596,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5618468149431444327}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.01679239, y: 0.1056795, z: -0.6591892, w: 0.74432486}
-  m_LocalPosition: {x: -0.14393313, y: -8.9406965e-10, z: -0.000000019073486}
+  m_LocalRotation: {x: 0.0656447, y: -0.07384875, z: -0.67517155, w: 0.73101336}
+  m_LocalPosition: {x: -0.1439331, y: -0.000000019073486, z: 0}
   m_LocalScale: {x: 0.9999971, y: 1.0000027, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1677,8 +1677,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5774205927706415100}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.4804813, y: 0.6113637, z: 0.5737495, w: -0.2572619}
-  m_LocalPosition: {x: 0.22722022, y: 0.7411758, z: -0.34606177}
+  m_LocalRotation: {x: -0.5368073, y: -0.20823453, z: 0.8032054, w: -0.15276594}
+  m_LocalPosition: {x: 0.27754557, y: 0.27626252, z: 0.9775353}
   m_LocalScale: {x: 1.0000019, y: 1.000002, z: 0.99999636}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1709,7 +1709,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5877274092433434748}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000000066267565, y: 0.00000006388046, z: 0.4317594, w: 0.90198886}
+  m_LocalRotation: {x: -0.0002594588, y: 0.021641357, z: 0.1826717, w: 0.9829357}
   m_LocalPosition: {x: -0.15642819, y: -0.019303836, z: 0.0000000037586094}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1742,8 +1742,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6014831000866223618}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5277224, y: -0.15460137, z: -0.30175114, w: 0.7788156}
-  m_LocalPosition: {x: -0.23617686, y: 0.66375464, z: -0.35371876}
+  m_LocalRotation: {x: 0.6695763, y: 0.3333583, z: -0.3801717, w: 0.5440674}
+  m_LocalPosition: {x: -0.16107616, y: 0.2323054, z: 0.98538214}
   m_LocalScale: {x: 1.0000001, y: 0.9999994, z: 1.0000018}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1774,8 +1774,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6068951326750871408}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000024301741, y: -0.00000008941173, z: 0.00000020870355, w: 1}
-  m_LocalPosition: {x: -0.09404651, y: 0.000000076293944, z: 0}
+  m_LocalRotation: {x: -0.00041067848, y: 0.016383654, z: 0.06958754, w: 0.99744123}
+  m_LocalPosition: {x: -0.094046324, y: 0, z: -0.000000076293944}
   m_LocalScale: {x: 1.0000001, y: 0.999999, z: 0.9999979}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1806,8 +1806,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6118918825809460657}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000003062992, y: -0.00000008725334, z: -0.30716807, w: 0.95165527}
-  m_LocalPosition: {x: -0.06308205, y: 0.000000009536743, z: 0}
+  m_LocalRotation: {x: -0.0126301525, y: -0.24328914, z: -0.04619028, w: 0.96877104}
+  m_LocalPosition: {x: -0.06308205, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1839,8 +1839,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6182201621641406580}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.31429473, y: 0.09174246, z: 0.80938685, w: -0.4875398}
-  m_LocalPosition: {x: 0.28844574, y: 0.87431943, z: -0.31034523}
+  m_LocalRotation: {x: 0.23251249, y: 0.78546906, z: -0.4903469, w: 0.29755035}
+  m_LocalPosition: {x: 0.33441097, y: 0.27955696, z: 1.1172028}
   m_LocalScale: {x: 1.0000027, y: 1.0000001, z: 0.9999979}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1871,8 +1871,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6308168603192064329}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.07055965, y: -0.7035776, z: -0.07055937, w: 0.7035775}
-  m_LocalPosition: {x: -0.000000011449441, y: 0.20209108, z: -0.2930833}
+  m_LocalRotation: {x: 0.020123363, y: 0.49394804, z: 0.72447777, w: -0.48035648}
+  m_LocalPosition: {x: -0.008156147, y: 0.393669, z: 0.41987517}
   m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1903,8 +1903,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6435138796751446664}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.40655115, y: -0.57854664, z: -0.406551, w: 0.57854664}
-  m_LocalPosition: {x: -0.0000000036709493, y: 0.29167894, z: -0.08398238}
+  m_LocalRotation: {x: -0.66041577, y: -0.020367324, z: 0.7493778, w: -0.043232586}
+  m_LocalPosition: {x: -0.00058613875, y: 0.17456694, z: 0.46047628}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1935,8 +1935,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6547147202541923866}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000001699667, y: -0.0000000634636, z: 0.00000023646865, w: 1}
-  m_LocalPosition: {x: -0.22297575, y: 0.0014126586, z: 0.0000002670288}
+  m_LocalRotation: {x: -0.0004107897, y: 0.016383566, z: 0.06958741, w: 0.99744123}
+  m_LocalPosition: {x: -0.22297584, y: 0.0014126586, z: 0.00000030517577}
   m_LocalScale: {x: 0.99999994, y: 0.99999887, z: 0.99999785}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1968,8 +1968,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6660741991687516044}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.37450418, y: -0.008571343, z: -0.36391217, w: 0.85278434}
-  m_LocalPosition: {x: -0.10381025, y: 0, z: 0}
+  m_LocalRotation: {x: 0.32350245, y: -0.13007413, z: -0.2788451, w: 0.8948029}
+  m_LocalPosition: {x: -0.10381035, y: 0, z: 0.000000019073486}
   m_LocalScale: {x: 0.9999976, y: 1.0000024, z: 1.0000002}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2001,7 +2001,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6944420085307491038}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000001977722, y: -0.000000046139498, z: -0.30325487, w: 0.95290947}
+  m_LocalRotation: {x: -0.17375425, y: -0.20539728, z: -0.093521036, w: 0.95857984}
   m_LocalPosition: {x: -0.06144737, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2034,8 +2034,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6985892750688880917}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7070908, y: 0.004672976, z: 0.7070919, w: -0.004673635}
-  m_LocalPosition: {x: -0.3502079, y: 0.79776996, z: -0.26977488}
+  m_LocalRotation: {x: -0.28931904, y: -0.30427185, z: 0.89708006, w: -0.13769746}
+  m_LocalPosition: {x: -0.18453817, y: 0.24132445, z: 1.1793128}
   m_LocalScale: {x: 0.999998, y: 1.0000033, z: 1.0000015}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2066,8 +2066,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7003754766017405638}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.14612637, y: -0.6918433, z: 0.14612657, w: 0.6918432}
-  m_LocalPosition: {x: -0.00000001953135, y: 0.22693956, z: -0.23688427}
+  m_LocalRotation: {x: 0.16678534, y: -0.4988238, z: -0.56785405, w: 0.6331661}
+  m_LocalPosition: {x: -0.016916502, y: 0.3392583, z: 0.4470507}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2098,8 +2098,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7049940502250373838}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00053274597, y: 0.0046419627, z: -0.12390586, w: 0.992283}
-  m_LocalPosition: {x: -0.1253953, y: -0.0000000023841857, z: 0}
+  m_LocalRotation: {x: -0.00054177217, y: 0.0047081267, z: -0.123747885, w: 0.9923024}
+  m_LocalPosition: {x: -0.12539525, y: 0.0000000023841857, z: 0.000000019073486}
   m_LocalScale: {x: 0.99999976, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2131,7 +2131,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7069944630715721123}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.5955898, y: 0.06589348, z: -0.076566584, w: 0.79691184}
+  m_LocalRotation: {x: -0.6529928, y: -0.018434633, z: -0.20914331, w: 0.72768104}
   m_LocalPosition: {x: -0.15083565, y: 0, z: -0.000000019073486}
   m_LocalScale: {x: 1.0000007, y: 1.0000033, z: 0.99999636}
   m_ConstrainProportionsScale: 0
@@ -2164,8 +2164,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7116765008170405458}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.10062734, y: -0.048195466, z: -0.4016723, w: 0.90896136}
-  m_LocalPosition: {x: -0.109360844, y: 0.000000019073486, z: 0}
+  m_LocalRotation: {x: -0.040442243, y: -0.13315305, z: -0.3752912, w: 0.91640127}
+  m_LocalPosition: {x: -0.10936073, y: 0, z: 0}
   m_LocalScale: {x: 0.99999976, y: 1.0000006, z: 1.0000006}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2245,8 +2245,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7322506242214894762}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.25298655, y: 0.7545234, z: 0.47395167, w: -0.3769113}
-  m_LocalPosition: {x: 0.07153661, y: 0.5431135, z: -0.3088958}
+  m_LocalRotation: {x: -0.4091606, y: 0.0018675431, z: 0.90405625, w: -0.12355714}
+  m_LocalPosition: {x: 0.10550949, y: 0.23769742, z: 0.7883606}
   m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2277,8 +2277,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7372147859866795302}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.000000028405337, y: -0.000000010615618, z: -0.00000009592621, w: 1}
-  m_LocalPosition: {x: -0.23270322, y: 0.00011528015, z: -0.00087764737}
+  m_LocalRotation: {x: 0.023910642, y: 0.10244036, z: 0.015702754, w: 0.9943278}
+  m_LocalPosition: {x: -0.24387611, y: -0.00074760435, z: 0.031755656}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 0.9999981}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2310,8 +2310,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7488105004409774673}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.49999994, y: -0.49999994, z: -0.50000006, w: 0.50000006}
-  m_LocalPosition: {x: 0.30468893, y: -0.000000013772698, z: -0.081918985}
+  m_LocalRotation: {x: -0.6083277, y: -0.034387343, z: 0.7916769, w: 0.04475161}
+  m_LocalPosition: {x: 0.23696372, y: 0.14459138, z: 0.16203134}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2342,9 +2342,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7517755894682730602}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.020344974, y: -0.15435237, z: -0.7319629, w: 0.66331875}
-  m_LocalPosition: {x: -0.14393312, y: -0.000000007152557, z: 0}
-  m_LocalScale: {x: 1.0000025, y: 0.99999744, z: 1}
+  m_LocalRotation: {x: -0.020274064, y: -0.061819077, z: -0.70272875, w: 0.708477}
+  m_LocalPosition: {x: -0.14393295, y: -0.000000038146972, z: 0.000000019073486}
+  m_LocalScale: {x: 1.0000025, y: 0.9999974, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4744215106833065960}
@@ -2375,8 +2375,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7562519084387988241}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.34658232, y: 0.020265145, z: -0.19171855, w: 0.9179946}
-  m_LocalPosition: {x: -0.13317695, y: -0.000000019073486, z: 0}
+  m_LocalRotation: {x: -0.40475294, y: 0.013956911, z: -0.08311395, w: 0.91053414}
+  m_LocalPosition: {x: -0.13317688, y: 0, z: 0}
   m_LocalScale: {x: 1.0000006, y: 1.0000007, z: 0.9999985}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2408,8 +2408,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7644374064506194525}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.3755798, y: -0.59911585, z: -0.3755797, w: 0.5991159}
-  m_LocalPosition: {x: -0.000000050821807, y: 0.5442525, z: -0.3088957}
+  m_LocalRotation: {x: -0.62869084, y: 0.034116447, z: 0.76316714, w: -0.14546415}
+  m_LocalPosition: {x: 0.03641369, y: 0.22813548, z: 0.8042707}
   m_LocalScale: {x: 1, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2440,8 +2440,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8316876540483110579}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.283265, y: -0.64788973, z: -0.28326476, w: 0.6478896}
-  m_LocalPosition: {x: -0.000000010442467, y: 0.21461768, z: -0.3549091}
+  m_LocalRotation: {x: 0.17900386, y: 0.5871673, z: 0.7253837, w: -0.31146532}
+  m_LocalPosition: {x: 0.025763415, y: 0.43632102, z: 0.38810074}
   m_LocalScale: {x: 0.99999917, y: 0.99999917, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2472,8 +2472,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8321902878973878896}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.022509761, y: 0.4351181, z: 0.15459566, w: 0.88671625}
-  m_LocalPosition: {x: 0, y: 0, z: 0.034543585}
+  m_LocalRotation: {x: -0.1684994, y: 0.43597168, z: 0.2491023, w: 0.84822446}
+  m_LocalPosition: {x: 0.00000015258789, y: -0.000000038146972, z: 0.03454362}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2505,8 +2505,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8397830720424371460}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.40002108, y: 0.22483051, z: -0.18980972, w: 0.86799}
-  m_LocalPosition: {x: -0.103433, y: 0, z: -0.000000038146972}
+  m_LocalRotation: {x: 0.33853808, y: -0.023678843, z: 0.055894326, w: 0.9389926}
+  m_LocalPosition: {x: -0.10343292, y: 0.000000076293944, z: 0.000000076293944}
   m_LocalScale: {x: 0.9999991, y: 1.0000014, z: 0.9999995}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2538,8 +2538,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8557000633642423551}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000008589387, y: 0.00000007876724, z: 0.7316212, w: 0.68171144}
-  m_LocalPosition: {x: 0.009095973, y: -0.16579336, z: 0.000000034401367}
+  m_LocalRotation: {x: -0.025569111, y: -0.28449595, z: 0.78275883, w: 0.55289865}
+  m_LocalPosition: {x: 0.009095993, y: -0.16579334, z: 0.000000034401364}
   m_LocalScale: {x: 0.99999994, y: 1, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -2571,8 +2571,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8577514120051854703}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000001466833, y: 0.0000000055442797, z: -0.000000044703476, w: 1}
-  m_LocalPosition: {x: -0.08747051, y: 0, z: -0.000000038146972}
+  m_LocalRotation: {x: 0.032139592, y: 0.1004052, z: 0.014079098, w: 0.9943277}
+  m_LocalPosition: {x: -0.09400482, y: -0.0005593872, z: 0.033874817}
   m_LocalScale: {x: 1.0000001, y: 1, z: 0.99999803}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2603,8 +2603,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8671715060756879796}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.12610786, y: -0.69577074, z: -0.12610768, w: 0.6957706}
-  m_LocalPosition: {x: -0.00000001610089, y: 0.35417905, z: -0.47670817}
+  m_LocalRotation: {x: 0.2997295, y: 0.8070563, z: 0.49747896, w: 0.10647536}
+  m_LocalPosition: {x: 0.18082245, y: 0.42881787, z: 0.31688708}
   m_LocalScale: {x: 0.9999992, y: 0.99999917, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2635,8 +2635,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8718442482296192410}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.61251235, y: -0.011439004, z: 0.790304, w: 0.010832616}
-  m_LocalPosition: {x: 0.3876141, y: 1.0170982, z: 0.17797801}
+  m_LocalRotation: {x: -0.1070928, y: -0.644468, z: 0.73572004, w: -0.17862865}
+  m_LocalPosition: {x: 0.8367425, y: 0.2656357, z: 1.4132179}
   m_LocalScale: {x: 1.0000018, y: 1.0000023, z: 0.9999953}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -2668,7 +2668,7 @@ Transform:
   m_GameObject: {fileID: 8766705660005479952}
   serializedVersion: 2
   m_LocalRotation: {x: -0.000000014901222, y: -1.2435586e-15, z: -0.0000000149011115, w: 1}
-  m_LocalPosition: {x: -0.039698724, y: 0, z: 0}
+  m_LocalPosition: {x: -0.039698713, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 36 - 34
Assets/Art/ArtHero/GuaiwuJY01.prefab

@@ -123,7 +123,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 479815330662904561}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000013420751, y: 0.00000017585918, z: 0.9823551, w: 0.18702546}
+  m_LocalRotation: {x: 0.00000005210658, y: 0.00000017987075, z: 0.982355, w: 0.18702571}
   m_LocalPosition: {x: 0.030326098, y: 0.007928905, z: -0.0000000011920929}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -156,7 +156,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 512932683961910105}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.004702083, y: 0.085259184, z: -0.030530449, w: 0.9958798}
+  m_LocalRotation: {x: 0.004702124, y: 0.085259445, z: -0.030530399, w: 0.9958798}
   m_LocalPosition: {x: -0.18385002, y: 0.000000009536743, z: 0.0000000023841857}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -255,9 +255,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 968773932203601087}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.16649187, y: -0.5927221, z: 0.21310017, w: 0.75864965}
+  m_LocalRotation: {x: -0.16649182, y: -0.592722, z: 0.21310003, w: 0.75864977}
   m_LocalPosition: {x: -0.0028909147, y: 0.13328296, z: 0.054916576}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.99999994, y: 0.9999997, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -289,7 +289,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0.40405098, y: 0.6108741, z: -0.37434402, w: 0.56871974}
   m_LocalPosition: {x: 0.30651248, y: 0.18495311, z: -0.3332121}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.9999996, y: 0.99999976, z: 0.99999976}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -351,7 +351,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1228503647108450307}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.71566385, y: 0.094798476, z: -0.6869109, w: -0.08361732}
+  m_LocalRotation: {x: -0.71566385, y: -0.094798476, z: 0.6869109, w: 0.08361732}
   m_LocalPosition: {x: -0.047284115, y: 0.86044097, z: -0.017446151}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -416,7 +416,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1804404643565129084}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.026948145, y: -0.6281937, z: 0.033326395, w: 0.7768757}
+  m_LocalRotation: {x: -0.026948165, y: -0.6281935, z: 0.03332644, w: 0.77687585}
   m_LocalPosition: {x: -0.02618853, y: 0.0745473, z: -0.038524956}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -448,7 +448,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1898944187554871974}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.55112535, y: 0.27440843, z: 0.7054081, w: -0.3512268}
+  m_LocalRotation: {x: -0.55112517, y: 0.27440834, z: 0.7054083, w: -0.35122687}
   m_LocalPosition: {x: 0.0000000029073441, y: 0.16226128, z: 0.06651141}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -611,7 +611,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3085396873214434428}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5897807, y: -0.41709515, z: -0.5645923, w: 0.39928174}
+  m_LocalRotation: {x: -0.5897807, y: 0.41709515, z: 0.5645923, w: -0.39928174}
   m_LocalPosition: {x: -0.04335733, y: 0.8355676, z: -0.107385404}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -643,9 +643,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3291670715589091450}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.720272, y: 0.054081354, z: -0.6898418, w: -0.049007185}
+  m_LocalRotation: {x: -0.720272, y: -0.054081354, z: 0.6898418, w: 0.049007185}
   m_LocalPosition: {x: -0.04742041, y: 0.9120394, z: -0.10461458}
-  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
+  m_LocalScale: {x: 1.0000004, y: 1.0000004, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -772,9 +772,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3834145111622835388}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.714655, y: 0.097193465, z: -0.68782514, w: -0.08196571}
+  m_LocalRotation: {x: -0.714655, y: -0.097193465, z: 0.68782514, w: 0.08196571}
   m_LocalPosition: {x: -0.053709295, y: 0.8635589, z: 0.039767273}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0000007, y: 1.0000007, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -836,7 +836,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4003602691601620862}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.002829415, y: 0.0003619712, z: -0.17537713, w: 0.98449725}
+  m_LocalRotation: {x: 0.0028293466, y: 0.00036197298, z: -0.17537726, w: 0.9844972}
   m_LocalPosition: {x: -0.08152436, y: -0.000000076293944, z: -0.0000000047683715}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -869,7 +869,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4040879933808119402}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0052156043, y: -0.015913477, z: -0.22888544, w: 0.97330934}
+  m_LocalRotation: {x: -0.005215661, y: -0.015913414, z: -0.22888553, w: 0.97330934}
   m_LocalPosition: {x: -0.11280061, y: 0, z: 0.0000000011920929}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -937,7 +937,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.07618736, y: -0.2253292, z: -0.14575104, w: 0.96030146}
   m_LocalPosition: {x: -0.11194416, y: 0, z: -0.000000038146972}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.9999997, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 2399182965420433348}
@@ -1002,7 +1002,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4542225426082745541}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.002567956, y: 0.0010194093, z: -0.20167504, w: 0.9794486}
+  m_LocalRotation: {x: 0.0025678934, y: 0.0010193471, z: -0.20167531, w: 0.97944856}
   m_LocalPosition: {x: -0.087405145, y: 0, z: 0.0000000047683715}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1103,7 +1103,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.0015045264, y: -0.45221618, z: 0.0029673134, w: 0.89190215}
   m_LocalPosition: {x: -0.16398361, y: 0, z: 0}
-  m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
+  m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4467213277177166683}
@@ -1167,7 +1167,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5606693821697683562}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.55112535, y: 0.27440843, z: 0.7054081, w: -0.3512268}
+  m_LocalRotation: {x: -0.55112517, y: 0.27440834, z: 0.7054083, w: -0.35122687}
   m_LocalPosition: {x: 0.0000000029073441, y: 0.16226128, z: 0.06651141}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1203,9 +1203,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5666499278425026455}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.006846506, y: -0.56003565, z: 0.010126913, w: 0.8283783}
+  m_LocalRotation: {x: -0.006846582, y: -0.5600353, z: 0.010127034, w: 0.82837856}
   m_LocalPosition: {x: -0.06452577, y: 0.058802698, z: -0.21764275}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.9999999, y: 0.99999964, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1237,7 +1237,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.019963324, y: 0.9996919, z: -0.0006128974, w: 0.014737022}
   m_LocalPosition: {x: -0.027667636, y: 0.05466661, z: -0.643606}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.99999964, y: 0.9999997, z: 0.99999976}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1267,9 +1267,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5971628257206467539}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.6951398, y: 0.1964095, z: -0.6651857, w: -0.18902886}
+  m_LocalRotation: {x: -0.6951398, y: -0.1964095, z: 0.6651857, w: 0.18902886}
   m_LocalPosition: {x: -0.051125247, y: 0.8993201, z: -0.018219203}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0000006, y: 1.0000006, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1300,7 +1300,7 @@ Transform:
   m_GameObject: {fileID: 6023274411550631949}
   serializedVersion: 2
   m_LocalRotation: {x: 0.00000006896954, y: -0.00000008802949, z: 0.3787432, w: 0.9255018}
-  m_LocalPosition: {x: -0.032699354, y: 0.0034779357, z: 0}
+  m_LocalPosition: {x: -0.032699354, y: 0.0034779785, z: -0.0000000011920929}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1367,7 +1367,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.00047775096, y: -0.6595024, z: -0.00094340724, w: 0.7517018}
   m_LocalPosition: {x: -0.12481258, y: 0.054846324, z: -0.36777946}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.99999994, y: 0.9999997, z: 0.9999999}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1399,7 +1399,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: 0.00082648016, y: 0.9281462, z: -0.0021652977, w: -0.37220883}
   m_LocalPosition: {x: -0.14614871, y: 0.05518224, z: -0.5303687}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.99999976, y: 0.99999964, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1561,7 +1561,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0.17431276, y: 0.71136457, z: -0.16056609, w: 0.6616602}
   m_LocalPosition: {x: 0.29647356, y: 0.08328363, z: -0.4737617}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.9999994, y: 0.9999997, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -1598,7 +1598,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7469872459023783236}
   serializedVersion: 2
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1669,6 +1669,8 @@ PlayableDirector:
     value: {fileID: 5210595181227069645}
   - key: {fileID: 2587263141743081538, guid: 00edeff798fe1f346b4e98d995106ce0, type: 2}
     value: {fileID: 5210595181227069645}
+  - key: {fileID: 3504051212001476799, guid: 00edeff798fe1f346b4e98d995106ce0, type: 2}
+    value: {fileID: 5210595181227069645}
   m_ExposedReferences:
     m_References:
     - 224dde0ffa6213944b6455972ee01691: {fileID: 2729801500386972047}
@@ -1951,7 +1953,7 @@ Transform:
   serializedVersion: 2
   m_LocalRotation: {x: -0.29735288, y: 0.66933227, z: -0.27503395, w: 0.62284184}
   m_LocalPosition: {x: 0.3030659, y: 0.13098225, z: -0.38204947}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 0.99999964, y: 0.99999976, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}
@@ -2079,7 +2081,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8392009577748766350}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.003987876, y: 0.0027712951, z: -0.49015525, w: 0.87162167}
+  m_LocalRotation: {x: -0.0039878925, y: 0.0027712886, z: -0.49015528, w: 0.8716216}
   m_LocalPosition: {x: -0.030732727, y: -0.092365265, z: 0.0038632154}
   m_LocalScale: {x: 1.0000002, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2182,7 +2184,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8657321575113844017}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.71847934, y: -0.07110691, z: -0.68784976, w: 0.07479265}
+  m_LocalRotation: {x: -0.71847934, y: 0.07110691, z: 0.68784976, w: -0.07479265}
   m_LocalPosition: {x: -0.043864895, y: 0.8953212, z: -0.18432708}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
@@ -2384,9 +2386,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9042142912914978749}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.707486, y: 0.13182716, z: -0.68552965, w: -0.11015586}
+  m_LocalRotation: {x: -0.707486, y: -0.13182716, z: 0.68552965, w: 0.11015586}
   m_LocalPosition: {x: -0.05575554, y: 0.8488028, z: 0.09647454}
-  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_LocalScale: {x: 1.0000007, y: 1.0000008, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 6809604219669241579}

+ 69 - 69
Assets/Art/ArtHero/GuaiwuJY02.prefab

@@ -25,8 +25,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 163343310268103973}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000032489673, y: -0.000000041903245, z: -0.3867523, w: 0.92218363}
-  m_LocalPosition: {x: -0.1880111, y: -0.000000038146972, z: 0}
+  m_LocalRotation: {x: 0.00000003176928, y: -0.00000004362094, z: -0.3867523, w: 0.92218363}
+  m_LocalPosition: {x: -0.18801112, y: 0, z: -0.000000019073486}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -59,7 +59,7 @@ Transform:
   m_GameObject: {fileID: 314904273135821684}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -1.926751e-15, z: -0, w: 1}
-  m_LocalPosition: {x: -0.09806076, y: -4.6566128e-12, z: -0.000000019073486}
+  m_LocalPosition: {x: -0.098060794, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -90,8 +90,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 349192388079350670}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.031192051, y: -0.0143730035, z: -0.18551856, w: 0.9820404}
-  m_LocalPosition: {x: -0.3531494, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: 0.124400504, y: -0.13258833, z: -0.20512404, w: 0.9617011}
+  m_LocalPosition: {x: -0.3531494, y: 0, z: 0.000000019073486}
   m_LocalScale: {x: 0.9999998, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -123,8 +123,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 686812055685329732}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.02277698, y: 0.01263718, z: -0.25117698, w: 0.9675907}
-  m_LocalPosition: {x: -0.35314944, y: 0.000000038146972, z: 0}
+  m_LocalRotation: {x: 0.023394063, y: 0.13981843, z: -0.027699469, w: 0.98951316}
+  m_LocalPosition: {x: -0.3531494, y: 0.000000019073486, z: 0}
   m_LocalScale: {x: 0.9999999, y: 1, z: 1.0000002}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -156,8 +156,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1752030138536150689}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0017940993, y: -0.016376056, z: -0.13669434, w: 0.9904763}
-  m_LocalPosition: {x: -0.15750289, y: 0, z: 0}
+  m_LocalRotation: {x: -0.0401454, y: 0.053952653, z: -0.1932344, w: 0.97884524}
+  m_LocalPosition: {x: -0.15750289, y: 0, z: 0.000000009536743}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -188,8 +188,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1821463567040139266}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.00000004208295, y: -0.0000000913099, z: -0.23209895, w: 0.9726922}
-  m_LocalPosition: {x: -0.47190273, y: 0.000000076293944, z: 9.094947e-15}
+  m_LocalRotation: {x: 0.0030127964, y: 0.009114204, z: -0.11198097, w: 0.99366397}
+  m_LocalPosition: {x: -0.47190276, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -542,8 +542,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2420968417963900337}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.752016, y: -0.65600437, z: 0.036088195, w: -0.05317867}
-  m_LocalPosition: {x: 0.000000114440915, y: -0.00000045776366, z: 0.23893452}
+  m_LocalRotation: {x: 0.82236123, y: -0.5654613, z: 0.058113903, w: 0.024460217}
+  m_LocalPosition: {x: 0.00000015258789, y: -0.00000061035155, z: 0.23893456}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -575,8 +575,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2476268477206409034}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0844902, y: 0.021007124, z: -0.24241138, w: 0.9662592}
-  m_LocalPosition: {x: -0.42780867, y: 0.000000019073486, z: 0.000000019073486}
+  m_LocalRotation: {x: 0.07497196, y: 0.043961793, z: -0.5072609, w: 0.8573989}
+  m_LocalPosition: {x: -0.42780864, y: 0.000000019073486, z: 0}
   m_LocalScale: {x: 1.0000002, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -608,8 +608,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2651671226074744763}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0000022965892, y: -0.000009056358, z: -0.2432094, w: 0.9699738}
-  m_LocalPosition: {x: -0.29748154, y: -0.0051201247, z: 0.00000036239624}
+  m_LocalRotation: {x: 0.0000022934053, y: -0.000009058717, z: -0.24320951, w: 0.9699738}
+  m_LocalPosition: {x: -0.29748085, y: -0.005120163, z: 0.0000003528595}
   m_LocalScale: {x: 0.9999997, y: 1.0000002, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -641,9 +641,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 2663632455756074971}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0056185885, y: -0.038343236, z: -0.64756536, w: 0.76102394}
-  m_LocalPosition: {x: -0.27586335, y: 0.000000038146972, z: 0}
-  m_LocalScale: {x: 0.9999985, y: 1.0000015, z: 1}
+  m_LocalRotation: {x: 0.1318732, y: 0.17390898, z: -0.5943972, w: 0.77398777}
+  m_LocalPosition: {x: -0.2758634, y: 0, z: 0.000000019073486}
+  m_LocalScale: {x: 0.9999991, y: 1.0000012, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 9123159996383544183}
@@ -674,8 +674,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3030495451085087704}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.00000496434, y: 0.00001262497, z: -0.38652775, w: 0.9222778}
-  m_LocalPosition: {x: -0.188011, y: 0, z: -0.000000019073486}
+  m_LocalRotation: {x: 0.00000005487059, y: -0.00000010784453, z: -0.38675255, w: 0.9221836}
+  m_LocalPosition: {x: -0.18801105, y: 0, z: -0.000000019073486}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -707,9 +707,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3042387011665423284}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000022548672, y: 0.00000903625, z: -0.24321021, w: 0.9699736}
-  m_LocalPosition: {x: -0.2974816, y: -0.005120201, z: -0.00000034332274}
-  m_LocalScale: {x: 1.0000005, y: 0.9999994, z: 1}
+  m_LocalRotation: {x: -0.000002253975, y: 0.000009037329, z: -0.24321014, w: 0.9699736}
+  m_LocalPosition: {x: -0.29748207, y: -0.005120163, z: -0.00000032424927}
+  m_LocalScale: {x: 1.0000004, y: 0.9999996, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 855955497457861551}
@@ -740,9 +740,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3155056942861722543}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.066353545, y: 0.03698865, z: 0.559749, w: 0.82517284}
-  m_LocalPosition: {x: -0.43866178, y: -0.000000114440915, z: 0.000000019073486}
-  m_LocalScale: {x: 1.0000001, y: 0.9999982, z: 1.0000018}
+  m_LocalRotation: {x: -0.051261157, y: 0.050695263, z: 0.767126, w: 0.6374324}
+  m_LocalPosition: {x: -0.43866187, y: -0.000000085830685, z: 0.000000038146972}
+  m_LocalScale: {x: 0.99999976, y: 0.9999982, z: 1.0000017}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8930552165600323008}
@@ -773,8 +773,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3384899799717766264}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0000000011761605, y: 0.000000029104436, z: 0.08370113, w: 0.9964909}
-  m_LocalPosition: {x: -0.2982574, y: -0.000000076293944, z: -9.094947e-15}
+  m_LocalRotation: {x: 0.0069667203, y: 0.015129357, z: 0.12646742, w: 0.99183095}
+  m_LocalPosition: {x: -0.2982574, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -806,8 +806,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3693914184750804769}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0044586826, y: -0.016334804, z: 0.0043842774, w: 0.99984705}
-  m_LocalPosition: {x: -0.12971888, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: 0.080663, y: -0.036090896, z: 0.28713113, w: 0.9538064}
+  m_LocalPosition: {x: -0.12971886, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -839,8 +839,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 3793366223954107035}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.08378473, y: -0.02362352, z: -0.27258646, w: 0.9581851}
-  m_LocalPosition: {x: -0.42780864, y: -0.000000009536743, z: -0.000000019073486}
+  m_LocalRotation: {x: -0.06869971, y: -0.05308398, z: -0.61252683, w: 0.7856675}
+  m_LocalPosition: {x: -0.42780864, y: -0.000000019073486, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000002, z: 0.9999998}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -942,8 +942,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4239863894914132935}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000010245994, y: 3.038355e-10, z: -0.004432304, w: 0.99999017}
-  m_LocalPosition: {x: -0.23687233, y: 0.1457508, z: -0.000000002980232}
+  m_LocalRotation: {x: 0.035474136, y: -0.0023767618, z: -0.07795012, w: 0.9963231}
+  m_LocalPosition: {x: -0.23687224, y: 0.14575076, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -975,8 +975,8 @@ Transform:
   m_GameObject: {fileID: 4257990832488347911}
   serializedVersion: 2
   m_LocalRotation: {x: 0.000000016743307, y: -0.000000047242196, z: -0.38776782, w: 0.9217571}
-  m_LocalPosition: {x: -0.17154911, y: 0.000000057220458, z: 0}
-  m_LocalScale: {x: 1.0000012, y: 0.99999905, z: 1}
+  m_LocalPosition: {x: -0.17154907, y: 0.000000038146972, z: 0.000000019073486}
+  m_LocalScale: {x: 1.000001, y: 0.99999917, z: 0.99999994}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 3274890537879392796}
@@ -1006,8 +1006,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4923395487431385170}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0018476073, y: 0.0010457382, z: 0.12119269, w: 0.9926267}
-  m_LocalPosition: {x: -0.21745574, y: 0.000000076293944, z: -2.9802322e-10}
+  m_LocalRotation: {x: 0.019209262, y: -0.10362068, z: 0.14153303, w: 0.984308}
+  m_LocalPosition: {x: -0.21745573, y: 0, z: 0.000000019073486}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1039,8 +1039,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4925260109009033474}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0021182324, y: -0.016355425, z: -0.09733979, w: 0.99511456}
-  m_LocalPosition: {x: -0.20572013, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: -0.023259388, y: 0.06277416, z: -0.1499589, w: 0.9864232}
+  m_LocalPosition: {x: -0.2057199, y: 0, z: 0.000000009536743}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1072,7 +1072,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 4973996809921671071}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.000000018557484, y: 0.0000000134428255, z: 0.058452815, w: 0.9982902}
+  m_LocalRotation: {x: 0.0029399998, y: -0.0032961864, z: -0.04405901, w: 0.9990192}
   m_LocalPosition: {x: -0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1105,8 +1105,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5351357043576277986}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.51503605, y: -0.51503605, z: -0.48449755, w: 0.48449755}
-  m_LocalPosition: {x: -0.26857367, y: 0.000000055624472, z: 0.5503166}
+  m_LocalRotation: {x: 0.041557126, y: 0.72703016, z: 0.6839216, w: -0.044176534}
+  m_LocalPosition: {x: -0.1330572, y: 0.3025254, z: 0.3418326}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1259,7 +1259,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5436012447452950441}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.7702603, y: -0.6321252, z: -0.05766888, w: 0.06157222}
+  m_LocalRotation: {x: -0.49309137, y: 0.86077833, z: -0.08374575, w: -0.094383754}
   m_LocalPosition: {x: 0.01802843, y: 0.17856444, z: 0.25325185}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1292,7 +1292,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 5534374379624289312}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.7043748, y: 0.7049441, z: -0.059783693, w: 0.057757337}
+  m_LocalRotation: {x: -0.40767148, y: 0.910656, z: 0.026230015, w: 0.06181939}
   m_LocalPosition: {x: 0.01802845, y: 0.17856437, z: -0.25325182}
   m_LocalScale: {x: 0.99999994, y: 0.9999999, z: 0.99999994}
   m_ConstrainProportionsScale: 0
@@ -1357,9 +1357,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6578562262357458034}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.063977204, y: -0.039728425, z: 0.60117906, w: 0.79555786}
-  m_LocalPosition: {x: -0.4386619, y: -0.000000114440915, z: -0.000000019073486}
-  m_LocalScale: {x: 1.0000004, y: 1.0000018, z: 0.99999857}
+  m_LocalRotation: {x: 0.04764057, y: -0.053030945, z: 0.8024753, w: 0.5924117}
+  m_LocalPosition: {x: -0.43866184, y: -0.00000012397766, z: 0}
+  m_LocalScale: {x: 1.0000005, y: 1.0000015, z: 0.9999986}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3157240156123790265}
@@ -1390,8 +1390,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6581529567856755521}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.5107885, y: -0.5107885, z: -0.4889736, w: 0.4889736}
-  m_LocalPosition: {x: -0.24825855, y: -0.00000005672027, z: -0.48224697}
+  m_LocalRotation: {x: -0.09379074, y: 0.6895462, z: 0.71577895, w: 0.058222592}
+  m_LocalPosition: {x: -0.11595951, y: 0.32103327, z: -0.5431491}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1422,7 +1422,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6696123211850836887}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.0020103669, y: 0.0004962181, z: -0.104433596, w: 0.9945297}
+  m_LocalRotation: {x: -0.007317135, y: -0.10263475, z: -0.08004487, w: 0.9914663}
   m_LocalPosition: {x: -0.17187536, y: 0.012483673, z: -0.0000000024359723}
   m_LocalScale: {x: 0.99999994, y: 0.99999994, z: 1}
   m_ConstrainProportionsScale: 0
@@ -1456,8 +1456,8 @@ Transform:
   m_GameObject: {fileID: 6698220328670149980}
   serializedVersion: 2
   m_LocalRotation: {x: -0.00000001674329, y: 0.000000047242178, z: -0.38776782, w: 0.9217571}
-  m_LocalPosition: {x: -0.17154907, y: 0.000000038146972, z: 0.000000019073486}
-  m_LocalScale: {x: 0.99999946, y: 1.0000011, z: 1.0000001}
+  m_LocalPosition: {x: -0.17154905, y: 0.000000038146972, z: 0}
+  m_LocalScale: {x: 0.9999999, y: 1.0000007, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children: []
   m_Father: {fileID: 9123159996383544183}
@@ -1525,9 +1525,9 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7198410597164370372}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.002644865, y: 0.016569065, z: -0.65800196, w: 0.75282925}
-  m_LocalPosition: {x: -0.27586344, y: 0, z: 0.000000019073486}
-  m_LocalScale: {x: 1.0000023, y: 0.9999981, z: 1}
+  m_LocalRotation: {x: 0.026938474, y: -0.12074685, z: -0.6715088, w: 0.730596}
+  m_LocalPosition: {x: -0.27586338, y: -0.000000038146972, z: 0}
+  m_LocalScale: {x: 1.0000021, y: 0.99999845, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 3274890537879392796}
@@ -1558,8 +1558,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7610936352857575433}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.4889736, y: -0.4889736, z: -0.5107885, w: 0.5107885}
-  m_LocalPosition: {x: 0.2596813, y: 0.00000006117182, z: 0.42340788}
+  m_LocalRotation: {x: -0.09220884, y: 0.6885403, z: 0.7164454, w: 0.064155735}
+  m_LocalPosition: {x: -0.124773785, y: 0.114964016, z: 0.26576975}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1590,8 +1590,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 7634451539619075905}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.79053134, y: -0.607237, z: -0.024828285, w: 0.075545795}
-  m_LocalPosition: {x: 0.00000019073485, y: -0.0000005340576, z: -0.23893455}
+  m_LocalRotation: {x: 0.8841907, y: -0.42850944, z: -0.0941571, w: -0.1603778}
+  m_LocalPosition: {x: 0.0000002670288, y: -0.0000005340576, z: -0.23893446}
   m_LocalScale: {x: 0.99999994, y: 1.0000001, z: 1.0000001}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1703,8 +1703,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8044732618571328323}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.0053008646, y: -0.015631167, z: -0.098025456, w: 0.99504703}
-  m_LocalPosition: {x: -0.18786076, y: -0.000000076293944, z: 0}
+  m_LocalRotation: {x: 0.05894394, y: 0.13401867, z: 0.16419162, w: 0.97550285}
+  m_LocalPosition: {x: -0.18786083, y: 0, z: 0}
   m_LocalScale: {x: 1.0000001, y: 1.0000001, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1736,8 +1736,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8368756488842909508}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.4867402, y: -0.4867402, z: -0.51291716, w: 0.51291716}
-  m_LocalPosition: {x: 0.2738491, y: -0.000000059270537, z: -0.42390388}
+  m_LocalRotation: {x: -0.110215545, y: 0.68479615, z: 0.71692914, w: 0.07013875}
+  m_LocalPosition: {x: -0.054021664, y: 0.13363278, z: -0.41322166}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -1768,8 +1768,8 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 8483035979073990665}
   serializedVersion: 2
-  m_LocalRotation: {x: -0.70621854, y: -0.03543003, z: 0.70621866, w: 0.035429936}
-  m_LocalPosition: {x: -0.000000016457939, y: 0.959954, z: -0.3765145}
+  m_LocalRotation: {x: 0.54584455, y: -0.4955492, z: -0.48642728, w: -0.4689064}
+  m_LocalPosition: {x: 0.7692431, y: 0.22873664, z: -0.44009528}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children:
@@ -1897,7 +1897,7 @@ Transform:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 9220956577294335855}
   serializedVersion: 2
-  m_LocalRotation: {x: 0.015205872, y: -0.0064542107, z: 0.98422146, w: -0.17616816}
+  m_LocalRotation: {x: 0.06581198, y: -0.055563018, z: 0.9654182, w: 0.24606754}
   m_LocalPosition: {x: 0.15103935, y: -0.041630708, z: -0.000000022179556}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0

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

@@ -223,7 +223,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -890,7 +890,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}
@@ -949,7 +949,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 650611058227117653}
-    m_Duration: 1
+    m_Duration: 0.7
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2069995017928919523}
     m_EaseInDuration: 0
@@ -1406,7 +1406,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0.9333333333333333
+    m_Start: 0.6
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1

+ 3 - 3
Assets/Art/GuaiWuTimeline/Guaiwu02.playable

@@ -248,7 +248,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -1135,7 +1135,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 650611058227117653}
-    m_Duration: 1.7333333333333334
+    m_Duration: 0.6475736961451247
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2069995017928919523}
     m_EaseInDuration: 0
@@ -1422,7 +1422,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.6666666666666667
+    m_Start: 0.5666666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1

+ 3 - 3
Assets/Art/GuaiWuTimeline/Guaiwu03.playable

@@ -253,7 +253,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -933,7 +933,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 650611058227117653}
-    m_Duration: 1.6666666666666667
+    m_Duration: 0.7666666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2069995017928919523}
     m_EaseInDuration: 0
@@ -1195,7 +1195,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.6
+    m_Start: 0.6475736961451247
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1

+ 5 - 5
Assets/Art/GuaiWuTimeline/Guaiwu04.playable

@@ -1029,7 +1029,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 650611058227117653}
-    m_Duration: 1.6666666666666667
+    m_Duration: 0.6666666666666666
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2069995017928919523}
     m_EaseInDuration: 0
@@ -1146,8 +1146,8 @@ MonoBehaviour:
   active: 1
   postPlayback: 2
   targetType: 1
-  LocationType: 5
-  targetSpecialDotName: hitpos
+  LocationType: 0
+  targetSpecialDotName: 
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0
@@ -1303,7 +1303,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.5333333333333334
+    m_Start: 0.6475736961451247
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1
@@ -1640,7 +1640,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}

+ 3 - 3
Assets/Art/GuaiWuTimeline/Guaiwu05.playable

@@ -137,7 +137,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -1058,7 +1058,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 650611058227117653}
-    m_Duration: 1.3
+    m_Duration: 0.6666666666666666
     m_TimeScale: 1
     m_ParentTrack: {fileID: 2069995017928919523}
     m_EaseInDuration: 0
@@ -1478,7 +1478,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 0
+    m_Start: 0.6
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1

+ 106 - 0
Assets/Art/GuaiWuTimeline/GuaiwuBoss01.playable

@@ -475,6 +475,7 @@ MonoBehaviour:
   - {fileID: 3504051212001476799}
   - {fileID: 4296197759840759107}
   - {fileID: 2786158496142874662}
+  - {fileID: 3901619323262513260}
   m_Clips: []
   m_Markers:
     m_Objects: []
@@ -778,6 +779,18 @@ MonoBehaviour:
   angle: 0
   manualClose: 0
   isNew: 0
+--- !u!114 &-5242606591834256131
+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: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
+  m_Name: ActivationPlayableAsset
+  m_EditorClassIdentifier: 
 --- !u!114 &-4381110610845372254
 MonoBehaviour:
   m_ObjectHideFlags: 1
@@ -2909,6 +2922,99 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: fde0d25a170598d46a0b9dc16b4527a5, type: 3}
   m_Name: ActivationPlayableAsset(Clone)(Clone)
   m_EditorClassIdentifier: 
+--- !u!114 &3901619323262513260
+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: -6594532635478953273}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: -5242606591834256131}
+    m_Duration: 1.1333333333333333
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: 3901619323262513260}
+    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 &4103037231751989377
 MonoBehaviour:
   m_ObjectHideFlags: 1

+ 3 - 3
Assets/Art/GuaiWuTimeline/GuaiwuBoss02.playable

@@ -25,7 +25,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 8141656557503723776}
-    m_Duration: 1.6666666666666667
+    m_Duration: 1.1666666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: -8941193553590232690}
     m_EaseInDuration: 0
@@ -616,7 +616,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -3398,7 +3398,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}

+ 4 - 4
Assets/Art/GuaiWuTimeline/GuaiwuJY01.playable

@@ -270,7 +270,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: 1794590155919804100}
-    m_Duration: 1.3333333333333333
+    m_Duration: 0.6666666666666666
     m_TimeScale: 1
     m_ParentTrack: {fileID: -7168837734803975687}
     m_EaseInDuration: 0
@@ -561,7 +561,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -2111,7 +2111,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.25
+    m_Start: 0.6666666666666666
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1
@@ -2393,7 +2393,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}

+ 4 - 4
Assets/Art/GuaiWuTimeline/GuaiwuJY02.playable

@@ -456,7 +456,7 @@ MonoBehaviour:
   m_Version: 3
   m_AnimClip: {fileID: 0}
   m_Locked: 0
-  m_Muted: 1
+  m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
   m_Parent: {fileID: 11400000}
@@ -492,7 +492,7 @@ MonoBehaviour:
     m_Start: 0
     m_ClipIn: 0
     m_Asset: {fileID: -1880562594711830593}
-    m_Duration: 1.6666666666666667
+    m_Duration: 0.6333333333333333
     m_TimeScale: 1
     m_ParentTrack: {fileID: -6365343517182506959}
     m_EaseInDuration: 0
@@ -1053,7 +1053,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}
@@ -1915,7 +1915,7 @@ MonoBehaviour:
   m_Children: []
   m_Clips:
   - m_Version: 1
-    m_Start: 1.3
+    m_Start: 0.5666666666666667
     m_ClipIn: 0
     m_Asset: {fileID: 2411068713565190326}
     m_Duration: 1

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/EquipmentIcon.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/all.txt


+ 1 - 1
Assets/Art/UIAssets/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/box.txt

@@ -1 +1 @@
-{"packName":"box","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Chest05","filePath":"/bg/bg_Chest05.png"},{"textrueName":"icon_Chest03","filePath":"/icon/icon_Chest03.png"}],"keyToValue":{}}
+{"packName":"box","isTyPack":false,"newTextureJson":[{"textrueName":"icon_Chest03","filePath":"/icon/icon_Chest03.png"},{"textrueName":"bg_Chest05","filePath":"/bg/bg_Chest05.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/itemIcon.txt

@@ -1 +1 @@
-{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_Coins_s","filePath":"/icon/icon_Coins_s.png"},{"textrueName":"icon_Gem_Star_Blue","filePath":"/icon/icon_Gem_Star_Blue.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"}],"keyToValue":{}}
+{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_Coins_s","filePath":"/icon/icon_Coins_s.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_Gem_Star_Blue","filePath":"/icon/icon_Gem_Star_Blue.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"}],"keyToValue":{}}

+ 1 - 1
Assets/Art/UIAssets/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_10002","filePath":"/icon/icon_skill_10002.png"},{"textrueName":"icon_skill_10003","filePath":"/icon/icon_skill_10003.png"},{"textrueName":"icon_skill_10004","filePath":"/icon/icon_skill_10004.png"},{"textrueName":"icon_skill_10005","filePath":"/icon/icon_skill_10005.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_20002","filePath":"/icon/icon_skill_20002.png"},{"textrueName":"icon_skill_20004","filePath":"/icon/icon_skill_20004.png"},{"textrueName":"icon_skill_20005","filePath":"/icon/icon_skill_20005.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_30002","filePath":"/icon/icon_skill_30002.png"},{"textrueName":"icon_skill_30004","filePath":"/icon/icon_skill_30004.png"},{"textrueName":"icon_skill_30005","filePath":"/icon/icon_skill_30005.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"},{"textrueName":"icon_skill_40002","filePath":"/icon/icon_skill_40002.png"},{"textrueName":"icon_skill_40004","filePath":"/icon/icon_skill_40004.png"},{"textrueName":"icon_skill_40005","filePath":"/icon/icon_skill_40005.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10004","filePath":"/icon/icon_skill_10004.png"},{"textrueName":"icon_skill_10005","filePath":"/icon/icon_skill_10005.png"},{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_10002","filePath":"/icon/icon_skill_10002.png"},{"textrueName":"icon_skill_10003","filePath":"/icon/icon_skill_10003.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20004","filePath":"/icon/icon_skill_20004.png"},{"textrueName":"icon_skill_20005","filePath":"/icon/icon_skill_20005.png"},{"textrueName":"icon_skill_30002","filePath":"/icon/icon_skill_30002.png"},{"textrueName":"icon_skill_20002","filePath":"/icon/icon_skill_20002.png"},{"textrueName":"icon_skill_30004","filePath":"/icon/icon_skill_30004.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30005","filePath":"/icon/icon_skill_30005.png"},{"textrueName":"icon_skill_40002","filePath":"/icon/icon_skill_40002.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"},{"textrueName":"icon_skill_40005","filePath":"/icon/icon_skill_40005.png"},{"textrueName":"icon_skill_40004","filePath":"/icon/icon_skill_40004.png"}],"keyToValue":{}}

BIN
Assets/Art/UIAssets/decorate/dec_Divider_Left.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_Divider_Left.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: XH5OtyitUXK0AmzxcnBjHyGKd7Q1y9Fe+lbYdkbnhFvnyhU09cVIYkQ=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 10, y: 0, z: 55, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Art/UIAssets/decorate/dec_Divider_Right.png


+ 147 - 0
Assets/Art/UIAssets/decorate/dec_Divider_Right.png.meta

@@ -0,0 +1,147 @@
+fileFormatVersion: 2
+guid: Cn5JtyirAilbU1R/zUK6aPz9L8UOmvV6vp0wU7fX1oyViR9aIRHAMiE=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 51, y: 0, z: 14, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 1537655665
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

BIN
Assets/Art/UIAssets/decorate/dec_SkillIcon02_2.png


+ 133 - 0
Assets/Art/UIAssets/decorate/dec_SkillIcon02_2.png.meta

@@ -0,0 +1,133 @@
+fileFormatVersion: 2
+guid: CXMb4CquAXLZ308xNT7Kd7vV91wsySZ3FGM7lmxNIE6/Sx6U9lNMlhs=
+TextureImporter:
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
+  mipmaps:
+    mipMapMode: 0
+    enableMipMap: 0
+    sRGBTexture: 1
+    linearTexture: 0
+    fadeOut: 0
+    borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
+    mipMapFadeDistanceStart: 1
+    mipMapFadeDistanceEnd: 3
+  bumpmap:
+    convertToNormalMap: 0
+    externalNormalMap: 0
+    heightScale: 0.25
+    normalMapFilter: 0
+    flipGreenChannel: 0
+  isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
+  grayScaleToAlpha: 0
+  generateCubemap: 6
+  cubemapConvolution: 0
+  seamlessCubemap: 0
+  textureFormat: 1
+  maxTextureSize: 2048
+  textureSettings:
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 1
+    wrapV: 1
+    wrapW: 1
+  nPOTScale: 0
+  lightmap: 0
+  compressionQuality: 50
+  spriteMode: 1
+  spriteExtrude: 1
+  spriteMeshType: 1
+  alignment: 0
+  spritePivot: {x: 0.5, y: 0.5}
+  spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
+  alphaIsTransparency: 1
+  spriteTessellationDetail: -1
+  textureType: 8
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 0
+  swizzle: 50462976
+  cookieLightType: 0
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  spriteSheet:
+    serializedVersion: 2
+    sprites: []
+    outline: []
+    physicsShape: []
+    bones: []
+    spriteID: 5e97eb03825dee720800000000000000
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 4 - 4
Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab

@@ -227,7 +227,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.99215686, g: 0.62694573, b: 0.2668902, a: 1}
+      maxColor: {r: 0.99215686, g: 0.3428503, b: 0.12997253, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -5118,7 +5118,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.97735846, g: 0.7104184, b: 0.26370233, a: 1}
+      maxColor: {r: 1, g: 0.5310368, b: 0.118867874, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -10009,7 +10009,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.94716984, g: 0.5756725, b: 0.11258806, a: 1}
+      maxColor: {r: 0.9490196, g: 0.523652, b: 0.1137255, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14900,7 +14900,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.94716984, g: 0.5756725, b: 0.11258806, a: 1}
+      maxColor: {r: 1, g: 0.50838786, b: 0.066037595, a: 1}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 214 - 472
Assets/Art/test01.scene


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu01_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu02_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu03_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu04_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/Guaiwu05_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuBoss01_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuJY01_TD.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt


+ 8 - 0
Assets/Res/UI/EqRecyclePanel.prefab

@@ -126,6 +126,14 @@ MonoBehaviour:
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
     - gameObject: {fileID: 0}
+  - key: rewardRoot
+    gameObject: {fileID: 1377245231049526165}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
   isAssetBundle: 1
 --- !u!1 &597804199663922683
 GameObject:

+ 149 - 32
Assets/Res/UI/HeroDetailPanel.prefab

@@ -1163,7 +1163,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &8778996195175564478
 RectTransform:
   m_ObjectHideFlags: 0
@@ -1183,8 +1183,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 25, y: 27}
-  m_SizeDelta: {x: 20, y: 21}
+  m_AnchoredPosition: {x: 31.3, y: 33}
+  m_SizeDelta: {x: 23.6, y: 24.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &700370959848519613
 GameObject:
@@ -1328,13 +1328,14 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 8778996195175564478}
+  - {fileID: 2139028617726136268}
   - {fileID: 5780263360241271809}
   m_Father: {fileID: 7666796405045906089}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 290, y: -383}
-  m_SizeDelta: {x: 80, y: 80}
+  m_AnchoredPosition: {x: 290, y: -361}
+  m_SizeDelta: {x: 85, y: 85}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3984027647546827249
 CanvasRenderer:
@@ -1401,7 +1402,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.11372549, g: 0.30980393, b: 0.7607843, a: 1}
+  m_Color: {r: 0.20426483, g: 0.53988004, b: 0.82641506, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2312,9 +2313,9 @@ RectTransform:
   - {fileID: 7381803730339431127}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 336.49994, y: -28}
   m_SizeDelta: {x: 227, y: 56}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5254878090505631399
@@ -5077,9 +5078,9 @@ RectTransform:
   - {fileID: 1714301204429487981}
   m_Father: {fileID: 7705411688387883887}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 0, y: 0}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 549.99994, y: 0}
   m_SizeDelta: {x: 175.2, y: 56}
   m_Pivot: {x: 0, y: 1}
 --- !u!222 &8592391560479041805
@@ -7396,7 +7397,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &7666796405045906089
 RectTransform:
   m_ObjectHideFlags: 0
@@ -8735,9 +8736,9 @@ RectTransform:
   - {fileID: 3875893009412036452}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -96.6}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4515796977380946822
@@ -8838,7 +8839,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.35220122, g: 0.35220122, b: 0.35220122, a: 1}
+  m_Color: {r: 0.2, g: 0.20392157, b: 0.28235295, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -8855,7 +8856,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Round12
+  _icon_name: dec_00_04_06_Bg
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -9329,9 +9330,9 @@ RectTransform:
   - {fileID: 2714858469072854325}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -143.2}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &4970468942560128240
@@ -9543,6 +9544,8 @@ GameObject:
   - component: {fileID: 5780263360241271809}
   - component: {fileID: 8841696187582654226}
   - component: {fileID: 3775778195469110210}
+  - component: {fileID: 6541850966166253640}
+  - component: {fileID: 3497477194425018052}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: TextSkill
@@ -9567,7 +9570,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: -4.9}
+  m_AnchoredPosition: {x: 0, y: -42.8}
   m_SizeDelta: {x: 120, y: 35}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8841696187582654226
@@ -9600,7 +9603,7 @@ MonoBehaviour:
       m_Calls: []
   m_FontData:
     m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
-    m_FontSize: 24
+    m_FontSize: 25
     m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 0
@@ -9612,6 +9615,36 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u6280\u80FD"
+--- !u!114 &6541850966166253640
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4990842854640410597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1.5, y: -2}
+  m_UseGraphicAlpha: 1
+--- !u!114 &3497477194425018052
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4990842854640410597}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
+  m_EffectDistance: {x: 1.83, y: -1.61}
+  m_UseGraphicAlpha: 1
 --- !u!1 &5008413077809334098
 GameObject:
   m_ObjectHideFlags: 0
@@ -10011,9 +10044,9 @@ RectTransform:
   - {fileID: 6378568511483276108}
   m_Father: {fileID: 2920983210776913852}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 1}
-  m_AnchorMax: {x: 0, y: 1}
-  m_AnchoredPosition: {x: 50, y: -50}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &5188900526901306069
@@ -12727,7 +12760,7 @@ CanvasGroup:
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 6213300356282155384}
   m_Enabled: 1
-  m_Alpha: 0.924375
+  m_Alpha: 1
   m_Interactable: 1
   m_BlocksRaycasts: 1
   m_IgnoreParentGroups: 0
@@ -12745,7 +12778,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   maxDuration: 1
   isUpdate: 0
-  currTime: 0.145
+  currTime: 1
   GrpupInfos:
   - Foldout: 1
     isActive: 1
@@ -13127,7 +13160,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_att_shanbi
+  _icon_name: icon_equip_Boots
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -15841,7 +15874,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.35220122, g: 0.35220122, b: 0.35220122, a: 1}
+  m_Color: {r: 0.2, g: 0.20392157, b: 0.28235295, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -15858,7 +15891,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Round12
+  _icon_name: dec_00_04_06_Bg
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -16510,6 +16543,90 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: -145}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &7822350228067285488
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2139028617726136268}
+  - component: {fileID: 4895457353438962673}
+  - component: {fileID: 8348570394730425682}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Image_skill
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2139028617726136268
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7822350228067285488}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 5291764182513315455}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 3}
+  m_SizeDelta: {x: 91, y: 93}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4895457353438962673
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7822350228067285488}
+  m_CullTransparentMesh: 1
+--- !u!114 &8348570394730425682
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7822350228067285488}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_SkillIcon02_2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: 6454551997e36ff920b4ff5b0ad47aae
 --- !u!1 &7885022950032364291
 GameObject:
   m_ObjectHideFlags: 0
@@ -17302,7 +17419,7 @@ RectTransform:
   m_Father: {fileID: 2804013640962594419}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
+  m_AnchorMax: {x: 0, y: 0}
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 0, y: 0}
   m_Pivot: {x: 0.5, y: 0.5}

+ 76 - 73
Assets/Res/UIAtlas/all.spriteatlasv2

@@ -11,91 +11,94 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
-    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
-    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
-    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
-    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
-    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
-    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
-    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
-    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
-    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
-    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
-    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
-    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
-    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
-    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
-    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
-    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
-    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
-    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
-    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
-    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
-    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
-    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
+    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
     - {fileID: 2800000, guid: 1e57f4f2deb7646f38356896a394b27c, type: 3}
-    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
-    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
-    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
-    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
-    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
-    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
-    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
-    - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
-    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
-    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
     - {fileID: 2800000, guid: d05f208cad7f39c488a07bc21a1938e9, type: 3}
+    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: 05f27d75986d94b2a876e7c5984f42b6, type: 3}
+    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
+    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
+    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
+    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
+    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
     - {fileID: 2800000, guid: 99451d3c99bda4547aea27878c0936fa, type: 3}
-    - {fileID: 2800000, guid: f135276cb2d8f43339f0cbe999537c48, type: 3}
-    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 8beb887d62a704827986ead27b5a4935, type: 3}
+    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
+    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
+    - {fileID: 2800000, guid: a30bf5a5fe0484028b110056f3f4bfb7, type: 3}
+    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
     - {fileID: 2800000, guid: 9cc56dbf2574943bfac47268b7bbc584, type: 3}
-    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
-    - {fileID: 2800000, guid: 5fc69a4cdcb513349b62aadcb6ea64ae, type: 3}
-    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
-    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
-    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
-    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
-    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
-    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
-    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
-    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
-    - {fileID: 2800000, guid: 81855acce71634bc8aa205d1313e2dd8, type: 3}
-    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
-    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
+    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
+    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: 066cdce1ecfa6a14dbec09075860d79a, type: 3}
+    - {fileID: 2800000, guid: c9076402f3d8e4f14b590c121f9c99d0, type: 3}
+    - {fileID: 2800000, guid: 620836cccebfa47d69f3604400cda9d1, type: 3}
+    - {fileID: 2800000, guid: 7c8926e9485cb44518cbd710f654f4c3, type: 3}
+    - {fileID: 2800000, guid: dd5f2c8c6196c4f2da80fb80e8d302c1, type: 3}
+    - {fileID: 2800000, guid: 5c40ba2427908a24d9352a4296d00504, type: 3}
+    - {fileID: 2800000, guid: 036dc8ba1666442588bd4900d7967f74, type: 3}
+    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
     - {fileID: 2800000, guid: 82fb7f520a3d042f68f126f07425081c, type: 3}
+    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
+    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
+    - {fileID: 2800000, guid: ce32dcb975473404e93ec07abe82cf10, type: 3}
     - {fileID: 2800000, guid: 458074caa850a4ebe9902dadcebd5519, type: 3}
-    - {fileID: 2800000, guid: 0b7cc907f403f4a67ad658df2c8b8bd6, type: 3}
-    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
-    - {fileID: 2800000, guid: 104a340bfa7bdc842a914e4855a3f023, type: 3}
-    - {fileID: 2800000, guid: 9c4fd4838fb139248bd31b4595d3d3e0, type: 3}
-    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
-    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 7dcf2d1065fa80640890e6fc7a8b1d8e, type: 3}
+    - {fileID: 2800000, guid: 92753e7463d6c4451bcfaa1be32e5834, type: 3}
     - {fileID: 2800000, guid: 084d642e01f7849d0a49230ab9cc18b9, type: 3}
-    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
-    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
-    - {fileID: 2800000, guid: 4f5b4c2303ae14f8aa8d2daf5803f417, type: 3}
+    - {fileID: 2800000, guid: ce1ea5fcdbd674590ac8eae01e003bad, type: 3}
+    - {fileID: 2800000, guid: 014bfa77b5b6abb468599df19cab8b08, type: 3}
+    - {fileID: 2800000, guid: 7298f85c9be3e480ca29a540b881acc7, type: 3}
+    - {fileID: 2800000, guid: e939c98a051bd9340aa91d8314666dab, type: 3}
     - {fileID: 2800000, guid: acf622f4b8b10451f864e6bbe0f2d18c, type: 3}
-    - {fileID: 2800000, guid: a87149123ae00504d802648411192f19, type: 3}
-    - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
-    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
-    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
-    - {fileID: 2800000, guid: b585079c6bd658f4e937b4f0468e8091, type: 3}
+    - {fileID: 2800000, guid: 92cd22df52f4e473a89701d0395c71ac, type: 3}
+    - {fileID: 2800000, guid: 69c249842084043e0b2152a611527273, type: 3}
+    - {fileID: 2800000, guid: c4a220291754e4cdcb56015d594b6049, type: 3}
     - {fileID: 2800000, guid: 9369285ebc9f1452cb96bdd4c71dc580, type: 3}
-    - {fileID: 2800000, guid: e701ef601bf944f31a3d97f606f78430, type: 3}
-    - {fileID: 2800000, guid: df1cd931072aa4a118088d9e27a0a603, type: 3}
-    - {fileID: 2800000, guid: fb9317113944240948cfe4a213422ff8, type: 3}
-    - {fileID: 2800000, guid: e66ca3a4c42e3764c9dd960f3e696fea, type: 3}
-    - {fileID: 2800000, guid: 6db8a26aaf376472cb3da4b0174c3640, type: 3}
-    - {fileID: 2800000, guid: 4e7efc4278c98434aa518be230a9a6e2, type: 3}
-    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
-    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
-    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: 18bdd168063b3419c93ff0ad3d928768, type: 3}
+    - {fileID: 2800000, guid: 8433511397436d04bb18893929b38c14, type: 3}
+    - {fileID: 2800000, guid: 2b82d333ed81d430a84d2124a819c288, type: 3}
+    - {fileID: 2800000, guid: a909a2534241641bfa4fd6d3aa0997fa, type: 3}
+    - {fileID: 2800000, guid: 1cedae3cd8e1c4e8b8351163cb83d3c3, type: 3}
+    - {fileID: 2800000, guid: 54f226abc196547a9b4749d64512ffcb, type: 3}
+    - {fileID: 2800000, guid: 40b46970b24114095ae4592b09cd788b, type: 3}
+    - {fileID: 2800000, guid: 5d0910d5da5bc9a43a3cdad4e94e053d, type: 3}
+    - {fileID: 2800000, guid: 88f8d005a66c74c8e8516498671a5363, type: 3}
+    - {fileID: 2800000, guid: e1b6b9fd78e034d5da9c741d07ed1146, type: 3}
+    - {fileID: 2800000, guid: 7802bfdd398ef4cf8a545b3d8362f081, type: 3}
+    - {fileID: 2800000, guid: 644d6a9935ab8468f91bccdf0e81217e, type: 3}
+    - {fileID: 2800000, guid: 0107877e5f4474feeb6c3a48ddbd0181, type: 3}
+    - {fileID: 2800000, guid: 513aeb74bd03e47a89e20193a6ed1b19, type: 3}
+    - {fileID: 2800000, guid: 694e03b969504324081225f1921465de, type: 3}
     - {fileID: 2800000, guid: 58233a1daedbb4a24b2ddca6bcb864fd, type: 3}
+    - {fileID: 2800000, guid: 03108c847a5054b63971245729018c27, type: 3}
+    - {fileID: 2800000, guid: eb5a004d027914b13abea711a54675e5, type: 3}
+    - {fileID: 2800000, guid: e4a00da9d5759447c948b8fa241afc3e, type: 3}
+    - {fileID: 2800000, guid: 793dd477683f1b743acb6e68d204d465, type: 3}
     - {fileID: 2800000, guid: dd87b4353a45646fbbeaafe8c13a4632, type: 3}
-    - {fileID: 2800000, guid: 1944ddda93ef84249abc2c330ccc1671, type: 3}
     - {fileID: 2800000, guid: 7c661cddbbc49467d8441a35766809e1, type: 3}
-    - {fileID: 2800000, guid: 7a8716b2f7dea49e2a0a4b04902a7b29, type: 3}
+    - {fileID: 2800000, guid: 0e2733676e1be451a8519a89c49798c1, type: 3}
+    - {fileID: 2800000, guid: b2e467ec8826146c494188b3c7fbdef7, type: 3}
     - {fileID: 2800000, guid: 7529bbf4240db4e31a7b6f4df456a36a, type: 3}
+    - {fileID: 2800000, guid: ab7ed8048d1084deca39266a82de2fbc, type: 3}
+    - {fileID: 2800000, guid: c9543603422a7467da7d308507e9b575, type: 3}
+    - {fileID: 2800000, guid: 7a1aa398466652b4aae1bf35dd9f03e8, type: 3}
+    - {fileID: 2800000, guid: 20a0259ff08564d3193d072c03463665, type: 3}
+    - {fileID: 2800000, guid: 044267119b30c460785747c947493225, type: 3}
+    - {fileID: 2800000, guid: ebc537e5817db4407935a71d199232e9, type: 3}
+    - {fileID: 2800000, guid: 50db720a997df0f4bb76d75ca3128dc6, type: 3}
+    - {fileID: 2800000, guid: cb6357c4501c7f940be9613426020ba9, type: 3}
+    - {fileID: 2800000, guid: 687226eea50e240aeb387bc0204de028, type: 3}
+    - {fileID: 2800000, guid: 143cd712a8bc04e1c9218c3c504b7abf, type: 3}
+    - {fileID: 2800000, guid: d320d0b7f786e44768dbf452a215d9f4, type: 3}
+    - {fileID: 2800000, guid: 265dc7048cc994225bb9669326ab9ed6, type: 3}
+    - {fileID: 2800000, guid: 11b26917032164d598602af49f7fe468, type: 3}
+    - {fileID: 2800000, guid: 5c287376e64d24bc1a85b53628621857, type: 3}
+    - {fileID: 2800000, guid: f4492d7c6449e4ea7bcfb41d86964417, type: 3}
+    - {fileID: 2800000, guid: c5d88737534914e22a2b08bf691052c3, type: 3}
+    - {fileID: 2800000, guid: 7f40c4693834f4b79813864b3b216f22, type: 3}
+    - {fileID: 2800000, guid: 9e984408ac7ba4153bace3927806efeb, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 401 - 172
Assets/Scenes/UIBuild.scene


+ 34 - 3
Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -21,7 +21,7 @@ namespace GameLogic.Bag
         /// <summary>
         /// 外部访问用
         /// </summary>
-        // public List<ItemInfo> BagList => m_bagList;
+        public Dictionary<string, ItemInfo>  allBagDic => m_allBagDic;
 
 
         public void Init()
@@ -129,9 +129,11 @@ namespace GameLogic.Bag
 
         #endregion
 
-        public bool AddItem(int itemId, long count)
+        public bool AddItem(int itemId, long count, string guid = "")
         {
-            ItemInfo item = GetItemInfo(itemId);
+            string guidStr = string.IsNullOrEmpty(guid) ? itemId.ToString() : guid;
+            
+            ItemInfo item = GetItemInfo(itemId, guidStr);
             return AddItem(item, count);
         }
 
@@ -202,6 +204,35 @@ namespace GameLogic.Bag
             AddItem(eqItemInfo, count);
         }
 
+        /// <summary>
+        /// 重新加载一次所有装备
+        /// 一般用于,分解装备之后
+        /// </summary>
+        public void ReInitAllEqItem()
+        {
+            PlayerManager.Instance.eqController.allZyEqDic.Clear();
+            foreach (KeyValuePair<string,ItemInfo> keyValuePair in m_allBagDic)
+            {
+                PlayerManager.Instance.eqController.AddEquipment(keyValuePair.Value);
+            }
+        }
+
+        public void RemoveItem(ItemInfo itemInfo, bool saveNow, bool zeroDel)
+        {
+            itemInfo.count.Value = 0;
+            if (zeroDel)
+            {
+                m_allBagDic.Remove(itemInfo.guid);
+            }
+            AccountFileInfo.Instance.SaveItemData(itemInfo, saveNow);
+        }
+
+        public void ModifyItem(ItemInfo itemInfo, bool saveNow)
+        {
+            itemInfo.count.Value -= itemInfo.count.Value;
+            AccountFileInfo.Instance.SaveItemData(itemInfo, saveNow);
+        }
+
         /// <summary>
         /// 一般是掉了(随机)一个东西(ItemInfo),然后来背包找,是否之前掉过一样的
         /// 一般用于有guid的item

+ 5 - 0
Assets/Scripts/GameLogic/Bag/ItemInfo.cs

@@ -45,6 +45,11 @@ namespace GameLogic.Bag
             if (itemData.eqData != null && itemData.eqData.zyEqId != 0)
             {
                 eqInfo = new EquipmentInfo(itemData.eqData, this);
+                //TODO 如果数量=0,且是穿了的装备,设置数量=1(仅初始化生效),感觉不是很好,看后面有新思路没
+                if (count.Value == 0 && eqInfo.isWear)
+                {
+                    count.Value = 1;
+                }
             }
             
         }

+ 2 - 16
Assets/Scripts/GameLogic/Equipment/EquipmentController.cs

@@ -71,7 +71,7 @@ namespace GameLogic.Equipment
         public void Init(ItemInfo itemInfo)
         {
             AddEquipment(itemInfo);
-            if (itemInfo.eqInfo != null && itemInfo.eqInfo.isEquip)
+            if (itemInfo.eqInfo != null && itemInfo.eqInfo.isWear)
             {
                 AddToCurEquip(itemInfo, true);
             }
@@ -99,18 +99,6 @@ namespace GameLogic.Equipment
             zyEqAddAttributeDic[zy].hp = 0;
         }
 
-        /// <summary>
-        /// 生成装备的GUID
-        /// </summary>
-        /// <returns></returns>
-        // public long GenerateGUID()
-        // {
-        //     curGUID++;
-        //     AccountFileInfo.Instance.playerData.eqGUID = curGUID;
-        //     AccountFileInfo.Instance.SavePlayerData();
-        //     return curGUID;
-        // }
-
         /// <summary>
         /// 通过品质获取装备的额外参数,装备属性会叠加这个值
         /// </summary>
@@ -254,9 +242,7 @@ namespace GameLogic.Equipment
                             {
                                 AccountFileInfo.Instance.SaveItemData(itemInfo);
                             }
-                                
                         }
-                                    
                         break;
                     }
                 }
@@ -296,7 +282,7 @@ namespace GameLogic.Equipment
         /// <param name="eqItemInfo">装备item</param>
         public void EquipLogic(bool equip, ItemInfo eqItemInfo)
         {
-            eqItemInfo.eqInfo.isEquip = equip;
+            eqItemInfo.eqInfo.isWear = equip;
             if (equip)
             {
                 eqItemInfo.count.Value--;

+ 3 - 3
Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -26,7 +26,7 @@ namespace GameLogic.Equipment
 
         public int dropLv;
         
-        public bool isEquip;
+        public bool isWear;
         
         public int Attack => m_Attack;
         public int Defense => m_Defense;
@@ -42,7 +42,7 @@ namespace GameLogic.Equipment
         public EquipmentInfo(AccountFileInfo.EqData eqData, ItemInfo itemInfo)
         {
             myItemInfo = itemInfo;
-            isEquip = eqData.isEquip;
+            isWear = eqData.isEquip;
             
             basicEquipConfig = ConfigComponent.Instance.Get<HeroBasicEquipConfig>(eqData.zyEqId);
             level = basicEquipConfig.lv;
@@ -145,7 +145,7 @@ namespace GameLogic.Equipment
                 zyEqId = basicEquipConfig.ID,
                 quality = quality,
                 // zy = zy,
-                isEquip = isEquip,
+                isEquip = isWear,
             };
             return eqData;
         }

+ 64 - 6
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -59,10 +59,10 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 
     
     /// <summary>
-    /// 初始化索引表
+    /// 重建索引表
     /// 主要给道具用,比较多,调用频繁
     /// </summary>
-    private void InitializeIndexMap()
+    private void RestoreIndexMap()
     {
         itemIndexMap.Clear();
         for (int i = 0; i < playerData.ItemListData.Count; i++)
@@ -108,7 +108,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         JsonUtility.FromJsonOverwrite(data, playerData);
 #endif
         //初始化索引
-        InitializeIndexMap();
+        RestoreIndexMap();
     }
 
 
@@ -149,11 +149,25 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// 保存item数据
     /// </summary>
     /// <param name="itemInfo"></param>
-    public void SaveItemData(ItemInfo itemInfo)
+    /// <param name="now">是否立即保存</param>
+    /// <param name="zeroDel">count为0时,是否删除</param>
+    public void SaveItemData(ItemInfo itemInfo, bool now = true)
     {
         
         if (itemIndexMap.TryGetValue(itemInfo.guid, out int index))
         {
+            // //count为零且需要立即删除时,移除Data并移除索引(也有count为0,不删除的情况,就走else的逻辑)
+            // if (itemInfo.count.Value == 0 && zeroDel)
+            // {
+            //     playerData.ItemListData.RemoveAt(index);
+            //     itemIndexMap.Remove(itemInfo.guid);
+            // }
+            // else
+            // {
+            //     // 快速找到索引,直接修改
+            //     playerData.ItemListData[index] = itemInfo.ToItemData();
+            // }
+            
             // 快速找到索引,直接修改
             playerData.ItemListData[index] = itemInfo.ToItemData();
         }
@@ -163,8 +177,12 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             playerData.ItemListData.Add(itemInfo.ToItemData());
             itemIndexMap[itemInfo.guid] = playerData.ItemListData.Count - 1;
         }
+
+        if (now)
+        {
+            SavePlayerData();    
+        }
         
-        SavePlayerData();
         
         // if (itemInfo.guid == playerData.ItemListData[lastItemIdx].guid)
         // {
@@ -195,8 +213,45 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     //     SavePlayerData();
     // }
 
-    public void SavePlayerData()
+
+
+
+    /// <summary>
+    /// 清除空数据,重建索引
+    /// </summary>
+    private void CleanEmptyData()
+    {
+        // 从后往前遍历,这样删除元素,可以一般循环,一遍删除
+        for (int i = playerData.ItemListData.Count - 1; i >= 0; i--)
+        {
+            ItemData itemData = playerData.ItemListData[i];
+            if (itemData.itemCount == 0)
+            {
+                //不是装备,删除
+                if (itemData.eqData == null || itemData.eqData.zyEqId == 0)
+                {
+                    playerData.ItemListData.RemoveAt(i);
+                    return;
+                }
+
+                //是装备,但是没有穿,删除
+                if (itemData.eqData != null && itemData.eqData.zyEqId != 0 && !itemData.eqData.isEquip)
+                {
+                    playerData.ItemListData.RemoveAt(i);
+                }
+            }
+        }
+        
+        RestoreIndexMap();
+    }
+    
+    public void SavePlayerData(bool clean = false)
     {
+        if (clean)
+        {
+            CleanEmptyData();
+        }
+        
         if (!string.IsNullOrEmpty(persistentDataPath))
         {
             string playerSettingJson = JsonManager.ToJson(playerData);
@@ -317,6 +372,9 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     {
         // public string guid;
         // public int count;
+        /// <summary>
+        /// HeroBasicEquipConfig ID
+        /// </summary>
         public int zyEqId;
         // public int dropLv;
         public int quality;

+ 115 - 21
Assets/Scripts/GameUI/UI/Hero/EqRecyclePanel.cs

@@ -8,7 +8,10 @@ namespace Fort23.Mono
     public partial class EqRecyclePanel : UIPanel
     {
         
-        private string poolName = "eqItem";
+        private string eqItemPolPoolName = "eqItem";
+        private string awardItemPoolName = "awardItem";
+
+        private List<WidgetItem> pendingEqs = new List<WidgetItem>();
         private void Init()
         {
         }
@@ -21,17 +24,66 @@ namespace Fort23.Mono
         public override void AddButtonEvent()
         {
             btnBack.onClick.AddListener(OnclickClose);
+            btnRec.onClick.AddListener(OnClickRecycle);
+        }
+
+        private void OnClickRecycle()
+        {
+            foreach (WidgetItem widgetItem in pendingEqs)
+            {
+                ItemInfo itemInfo = BagController.Instance.allBagDic[widgetItem.itemInfo.guid];
+                if(itemInfo.count.Value - widgetItem.itemInfo.count.Value <= 0)
+                {
+                    //删除到0后,如果装备被穿了,不移除背包。
+                    if (itemInfo.eqInfo.isWear)
+                    {
+                        itemInfo.count.Value = 0;
+                        BagController.Instance.RemoveItem(itemInfo, false, false);
+                    }
+                    else{
+                        // BagController.Instance.allBagDic.Remove(widgetItem.itemInfo.guid);
+                        BagController.Instance.RemoveItem(itemInfo, false, true);
+                    }
+                }
+                else {
+                    // itemInfo.count.Value -= widgetItem.itemInfo.count.Value;
+                    BagController.Instance.ModifyItem(itemInfo, false);
+                }
+            }
+            
+            BagController.Instance.ReInitAllEqItem();
+
+            foreach (KeyValuePair<string,ItemInfo> keyValuePair in awardDic)
+            {
+                BagController.Instance.AddItem(keyValuePair.Value.itemID, keyValuePair.Value.count.Value, keyValuePair.Value.guid);
+            }
+            
+            AccountFileInfo.Instance.SavePlayerData(true);
+            
+            pendingEqs.Clear();
+            awardDic.Clear();
+            
         }
 
         private void OnclickClose()
         {
             UIManager.Instance.HideUIUIPanel(this);
-            UIManager.Instance.DormancyAllGComponent<WidgetItem>(poolName);
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(eqItemPolPoolName);
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(awardItemPoolName);
         }
 
+
+
+        /// <summary>
+        /// 回收奖励
+        /// </summary>
+        private Dictionary<string, ItemInfo> awardDic = new Dictionary<string, ItemInfo>();
+
         public async void InitEqRecyclePanel()
         {
             // GameObject eqGo = eqsUIObj[0] as GameObject;
+            pendingEqs.Clear();
+            awardDic.Clear();
 
             foreach (KeyValuePair<int,Dictionary<int,List<ItemInfo>>> keyValuePair in PlayerManager.Instance.eqController.allZyEqDic)
             {
@@ -39,35 +91,77 @@ namespace Fort23.Mono
                 {
                     foreach (ItemInfo itemInfo in valuePair.Value)
                     {
-                        if (itemInfo.eqInfo == null)
+                        if (!ValidityCheck(itemInfo))
                         {
                             continue;
                         }
-                        if (itemInfo.count.Value == 0)
-                        {
-                            LogTool.Log("装备只有1个,而且被穿了:" + itemInfo.eqInfo.isEquip);
-
-                            if (!itemInfo.eqInfo.isEquip)
-                            {
-                                LogTool.Log("不应该出现,数量为0的装备还未穿戴?需要检查:eqConfigID" 
-                                            + itemInfo.eqInfo.basicEquipConfig.ID
-                                            + "| itemID:" + itemInfo.itemID 
-                                            + "| guid:" + itemInfo.guid);
-                            }
-                            
-                            continue;     
-                        }
                         WidgetItem widgetItem = await UIManager.Instance.
                             CreateGComponentForObject<WidgetItem>(eqItem, null, isInstance : true, 
-                                poolName:poolName, root:itemRoot);
+                                poolName:eqItemPolPoolName, root:itemRoot);
                         widgetItem.InitWidget(itemInfo);
+                        
+                        pendingEqs.Add(widgetItem);
+
+                        for (int i = 0; i < itemInfo.eqInfo.basicEquipConfig.disItems.Length; i++)
+                        {
+                            AddToRecycleDic(itemInfo.eqInfo.basicEquipConfig.disItems[i], itemInfo.eqInfo.basicEquipConfig.disItems[i]);
+                        }
+                        
                     }
                 }
             }
+
+
+            foreach (KeyValuePair<string,ItemInfo> keyValuePair in awardDic)
+            {
+                WidgetItem awardItem = await UIManager.Instance.
+                    CreateGComponentForObject<WidgetItem>(recItem, null, isInstance : true, 
+                        poolName:awardItemPoolName, root:rewardRoot);
+                awardItem.InitWidget(keyValuePair.Value);
+            }
             
-            
-            
-            
+        }
+
+
+        private void AddToRecycleDic(int itemID, int count)
+        {
+            ItemInfo itemInfo = new ItemInfo(itemID, count);
+            if (awardDic.ContainsKey(itemInfo.guid))
+            {
+                awardDic[itemInfo.guid].count += count;
+            }
+            else {
+                awardDic.Add(itemInfo.guid, itemInfo);
+            }
+        }
+
+        /// <summary>
+        /// 装备有效性检查
+        /// </summary>
+        /// <param name="itemInfo"></param>
+        /// <returns></returns>
+        private bool ValidityCheck(ItemInfo itemInfo)
+        {
+            if (itemInfo.eqInfo == null)
+            {
+                return false;
+            }
+            if (itemInfo.count.Value <= 0)
+            {
+                LogTool.Log(itemInfo.count.Value +"装备只有1个,而且被穿了:" + itemInfo.eqInfo.isWear);
+
+                if (!itemInfo.eqInfo.isWear)
+                {
+                    LogTool.Log("不应该出现,数量为0的装备还未穿戴?需要检查:eqConfigID" 
+                                + itemInfo.eqInfo.basicEquipConfig.ID
+                                + "| itemID:" + itemInfo.itemID 
+                                + "| guid:" + itemInfo.guid);
+                }
+                            
+                return false;
+            }
+
+            return true;
         }
     }
 }

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

@@ -96,6 +96,17 @@ namespace Fort23.Mono
 	      return _btnRec;
 	     }
 	   }
+	  private RectTransform _rewardRoot;
+	  public RectTransform rewardRoot
+	   {
+	   get{
+	      if (_rewardRoot == null)
+	       {
+	         _rewardRoot  = GetUIUnit<RectTransform>("rewardRoot"); 
+	       }
+	      return _rewardRoot;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"fdc09952e21a713f23682168cce500b3"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson\\box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":"400626ea8d256573f3183ae708817184"}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"7f6af24b7e68d556cab4cc7ac439f1bb"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"","lasetJsonGUID":""}],"isJiaoYan":true}

+ 12 - 12
UserSettings/EditorUserSettings.asset

@@ -21,34 +21,34 @@ EditorUserSettings:
       value: 184c
       flags: 0
     RecentlyUsedSceneGuid-0:
-      value: 5007050006035d0254085b7647700e44174e197c7c2c7668752f4436e1b3676c
+      value: 0009555e5400515f590b097412770f1140161d2b7d2977642e2b4a63b1e5636d
       flags: 0
     RecentlyUsedSceneGuid-1:
-      value: 5452000707020a0a0c0f092143220844144e402c2f2c71662e711836e0b2306a
+      value: 0509560200060a0c5908552040750b44444f1a7a2a7827327c2a1e63b3b4603c
       flags: 0
     RecentlyUsedSceneGuid-2:
-      value: 5a05505551515d03555a0d2316745d44444e412e2f712235292d1960b6b3663c
+      value: 020600005157590b5e595b7313215b44424e4b7f7b2b70337479486be6b46d39
       flags: 0
     RecentlyUsedSceneGuid-3:
-      value: 5701025003000c090c0c0d2643225b444015407c7d7074627b7c1c66e3b4613a
+      value: 5455050750515e025d5f5b2342770f4212164878792d2462282a4a62b1e5603d
       flags: 0
     RecentlyUsedSceneGuid-4:
-      value: 530404525401510d5f0b097b45200f4444154f297b2b7134787c4432b5b16d60
+      value: 0600055050050c595f0c097146200b44464f4c2f7c2c24627b2a4d35e6e4366c
       flags: 0
     RecentlyUsedSceneGuid-5:
-      value: 5b520d0503545b0d0c0c0a2715770748154f4d2c7d7d7e627a7d4a35b4e1646a
+      value: 0052555e0156080d0b0c097b4726594443154b287c7f76617b2b1830e1b5613b
       flags: 0
     RecentlyUsedSceneGuid-6:
-      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
+      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
       flags: 0
     RecentlyUsedSceneGuid-7:
-      value: 055303045d535e5d54080e721672094412154e7b757c71342e794b65b2e4616f
+      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
       flags: 0
     RecentlyUsedSceneGuid-8:
-      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
+      value: 5a50500553530b595d0f597343770941474e4c722e2a20367e794861e1b86c68
       flags: 0
     RecentlyUsedSceneGuid-9:
-      value: 5753045f5d005b5f0b0a082315715d44464e4b7b797125622e284430bbe66d68
+      value: 5a500c0357030b0f0858097a44770f40154f4f2e2a2c743229794b64e0b56c6a
       flags: 0
     Systems Window:
       value: 183b144645154b7802000a2b17364d11021e17246e72662b47695d73a2a07478a2a505e1e82d6f2f100cca3210371526d1051c05e22a040f2507f00b32f01c061ccb5a9f5ace1e10d81c50a48d5d91a3959694aa9ad8efd7c9f2afe0f1c0fcfdf6f8b6f2a5a6dacfb89debbfa1cbc9c3f5c3bac18e9c89c1bbdec2d6f2b992939996c59699c79ae8d182b7baad82aba0b0aea88398abdbf1dd8a8ea765ffc520262728fafcf8f6c28eb162945c71898d6167877a72a980809c9f71cecece859d579fd5f106dbdadb21de0dde237c686c76706641634c764f547c624a7e622d6628286620686f653d2b635a0204003e0805017509093043470e3643041c5d5b415c54450e1c424b420f6e4b634e636263696655641a1f273c0f083c1102ec362de62318e9ea25ab61ade8ed0ee30655b0b6b7b8176615
@@ -57,10 +57,10 @@ EditorUserSettings:
       value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba75e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1bf968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
       flags: 0
     UnityEditor.ShaderGraph.FloatingWindowsLayout2:
-      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b982988db381b2b4808789f4aaa0a3b9adb9b3a8c482a7eec9b0a0f0a5aecee8c2c7d9b2d08e9c9189ea9e93de81e0dbc9dc94dfcd9b9f9a8188dff4c3fac0f7f4c2f9f7c7c5f0cdfdc5c6d0f079f1f531343226ecece8e6d3ebef3fd22229d7df276a9b64
+      value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8d97ddbd90bf
       flags: 0
     UnityEditor.ShaderGraph.InspectorWindow:
-      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908ff0a2a4a1bbaaa0a9f2a3f3f8aa93e6edf38e9ccbddc18390ac86d4849394ea829f83f291cb918384d28397d5888b89dcf2dff2c7f7f7c2f3f38b88
+      value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd81908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed9195908797a7cf
       flags: 0
     vcSharedLogLevel:
       value: 0d5e400f0650

+ 137 - 236
UserSettings/Layouts/CurrentMaximizeLayout.dwlt

@@ -14,174 +14,21 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Children:
   - {fileID: 3}
-  - {fileID: 10}
-  - {fileID: 12}
-  - {fileID: 14}
+  - {fileID: 9}
+  - {fileID: 11}
+  - {fileID: 13}
   m_Position:
     serializedVersion: 2
     x: 0
     y: 30
-    width: 1527
+    width: 1503
     height: 929
   m_MinSize: {x: 400, y: 100}
   m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
-  controlID: 102929
+  controlID: 19
   draggingID: 0
 --- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12015, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 200, y: 200}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: Game
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 118
-    y: 96
-    width: 428
-    height: 527.5
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_SerializedViewNames: []
-  m_SerializedViewValues: []
-  m_PlayModeViewName: GameView
-  m_ShowGizmos: 0
-  m_TargetDisplay: 0
-  m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
-  m_TargetSize: {x: 750, y: 1334}
-  m_TextureFilterMode: 0
-  m_TextureHideFlags: 61
-  m_RenderIMGUI: 1
-  m_EnterPlayModeBehavior: 0
-  m_UseMipMap: 0
-  m_VSyncEnabled: 0
-  m_Gizmos: 0
-  m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
-  m_ZoomArea:
-    m_HRangeLocked: 0
-    m_VRangeLocked: 0
-    hZoomLockedByDefault: 0
-    vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -187.5
-    m_HBaseRangeMax: 187.5
-    m_VBaseRangeMin: -333.5
-    m_VBaseRangeMax: 333.5
-    m_HAllowExceedBaseRangeMin: 1
-    m_HAllowExceedBaseRangeMax: 1
-    m_VAllowExceedBaseRangeMin: 1
-    m_VAllowExceedBaseRangeMax: 1
-    m_ScaleWithWindow: 0
-    m_HSlider: 0
-    m_VSlider: 0
-    m_IgnoreScrollWheelUntilClicked: 0
-    m_EnableMouseInput: 1
-    m_EnableSliderZoomHorizontal: 0
-    m_EnableSliderZoomVertical: 0
-    m_UniformScale: 1
-    m_UpDirection: 1
-    m_DrawArea:
-      serializedVersion: 2
-      x: 0
-      y: 21
-      width: 428
-      height: 506.5
-    m_Scale: {x: 0.7593703, y: 0.7593703}
-    m_Translation: {x: 214, y: 253.25}
-    m_MarginLeft: 0
-    m_MarginRight: 0
-    m_MarginTop: 0
-    m_MarginBottom: 0
-    m_LastShownAreaInsideMargins:
-      serializedVersion: 2
-      x: -281.81244
-      y: -333.5
-      width: 563.6249
-      height: 667
-    m_MinimalGUI: 1
-  m_defaultScale: 0.7593703
-  m_LastWindowPixelSize: {x: 856, y: 1055}
-  m_ClearInEditMode: 1
-  m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
-  m_XRRenderMode: 0
-  m_RenderTexture: {fileID: 0}
---- !u!114 &3
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  - {fileID: 8}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 429
-    height: 929
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 8096, y: 16192}
-  vertical: 1
-  controlID: 102930
-  draggingID: 0
---- !u!114 &4
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 1
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: GameView
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 429
-    height: 548.5
-  m_MinSize: {x: 201, y: 221}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 2}
-  m_Panes:
-  - {fileID: 5}
-  - {fileID: 2}
-  - {fileID: 6}
-  - {fileID: 7}
-  m_Selected: 1
-  m_LastSelected: 0
---- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -201,10 +48,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 118
+    x: 143
     y: 96
-    width: 428
-    height: 527.5
+    width: 469
+    height: 361.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -259,7 +106,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 1
       id: unity-search-toolbar
       index: 1
@@ -311,7 +158,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Light Settings
       index: 2
@@ -337,7 +184,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Constraints
       index: 3
@@ -350,7 +197,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Cloth Collisions
       index: 4
@@ -402,7 +249,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Occlusion Culling
       index: 5
@@ -415,7 +262,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Physics Debugger
       index: 6
@@ -428,7 +275,7 @@ MonoBehaviour:
       collapsed: 0
       displayed: 0
       snapOffset: {x: 0, y: 0}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: 0, y: 25}
       snapCorner: 0
       id: Scene View/Scene Visibility
       index: 7
@@ -568,17 +415,17 @@ MonoBehaviour:
     m_OverlaysVisible: 1
   m_WindowGUID: 6ec4b650245f86f4b853159290a53aa0
   m_Gizmos: 1
-  m_OverrideSceneCullingMask: 6917529027641081856
-  m_SceneIsLit: 1
+  m_OverrideSceneCullingMask: 0
+  m_SceneIsLit: 0
   m_SceneLighting: 1
   m_2DMode: 1
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_Position:
-    m_Target: {x: -0.20259318, y: 0.32272974, z: 0.040965054}
+    m_Target: {x: 843.2695, y: 9.29941, z: -1.8970643}
     speed: 2
-    m_Value: {x: -0.20259318, y: 0.32272974, z: 0.040965054}
+    m_Value: {x: 843.2695, y: 9.29941, z: -1.8970643}
   m_RenderMode: 0
   m_CameraMode:
     drawMode: 0
@@ -589,7 +436,7 @@ MonoBehaviour:
   m_SceneViewState:
     m_AlwaysRefresh: 0
     showFog: 1
-    showSkybox: 1
+    showSkybox: 0
     showFlares: 1
     showImageEffects: 1
     showParticleSystems: 1
@@ -628,9 +475,9 @@ MonoBehaviour:
     speed: 2
     m_Value: {x: 0, y: 0, z: 0, w: 1}
   m_Size:
-    m_Target: 1.387346
+    m_Target: 954.8977
     speed: 2
-    m_Value: 1.387346
+    m_Value: 954.8977
   m_Ortho:
     m_Target: 1
     speed: 2
@@ -657,7 +504,61 @@ MonoBehaviour:
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
---- !u!114 &6
+--- !u!114 &3
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Children:
+  - {fileID: 4}
+  - {fileID: 7}
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 470
+    height: 929
+  m_MinSize: {x: 100, y: 100}
+  m_MaxSize: {x: 8096, y: 16192}
+  vertical: 1
+  controlID: 20
+  draggingID: 0
+--- !u!114 &4
+MonoBehaviour:
+  m_ObjectHideFlags: 52
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 1
+  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
+  m_Name: SceneView
+  m_EditorClassIdentifier: 
+  m_Children: []
+  m_Position:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 470
+    height: 382.5
+  m_MinSize: {x: 201, y: 221}
+  m_MaxSize: {x: 4001, y: 4021}
+  m_ActualView: {fileID: 2}
+  m_Panes:
+  - {fileID: 2}
+  - {fileID: 5}
+  - {fileID: 6}
+  m_Selected: 0
+  m_LastSelected: 1
+--- !u!114 &5
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -677,10 +578,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 0
-    y: 73
-    width: 1209
-    height: 436
+    x: 144
+    y: 96
+    width: 469
+    height: 361.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -795,7 +696,7 @@ MonoBehaviour:
   m_CurrentEditor: 0
   m_LayerEditor:
     m_SelectedLayerIndex: 0
---- !u!114 &7
+--- !u!114 &6
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -925,7 +826,7 @@ MonoBehaviour:
       type: {class: TransitionLibraryAliasesPage, ns: Animancer.Editor.TransitionLibraries, asm: Kybernetik.Animancer.Editor}
       data:
         _ScrollPosition: {x: 0, y: 0}
---- !u!114 &8
+--- !u!114 &7
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -941,17 +842,17 @@ MonoBehaviour:
   m_Position:
     serializedVersion: 2
     x: 0
-    y: 548.5
-    width: 429
-    height: 380.5
+    y: 382.5
+    width: 470
+    height: 546.5
   m_MinSize: {x: 101, y: 121}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 9}
+  m_ActualView: {fileID: 8}
   m_Panes:
-  - {fileID: 9}
+  - {fileID: 8}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &9
+--- !u!114 &8
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -971,10 +872,10 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 118
-    y: 644.5
-    width: 428
-    height: 359.5
+    x: 143
+    y: 478.5
+    width: 469
+    height: 525.5
   m_SerializedDataModeController:
     m_DataMode: 0
     m_PreferredDataMode: 0
@@ -985,7 +886,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_OverlaysVisible: 1
---- !u!114 &10
+--- !u!114 &9
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -995,23 +896,23 @@ MonoBehaviour:
   m_Enabled: 1
   m_EditorHideFlags: 1
   m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: SceneHierarchyWindow
+  m_Name: 
   m_EditorClassIdentifier: 
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 429
+    x: 470
     y: 0
-    width: 294.5
+    width: 255
     height: 929
   m_MinSize: {x: 202, y: 221}
   m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 11}
+  m_ActualView: {fileID: 10}
   m_Panes:
-  - {fileID: 11}
+  - {fileID: 10}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &11
+--- !u!114 &10
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1031,9 +932,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 547
+    x: 613
     y: 96
-    width: 292.5
+    width: 253
     height: 908
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1048,9 +949,9 @@ MonoBehaviour:
   m_SceneHierarchy:
     m_TreeViewState:
       scrollPos: {x: 0, y: 0}
-      m_SelectedIDs: 
-      m_LastClickedID: 0
-      m_ExpandedIDs: 32b9efff36b9efffd2b9effff667f0ff0468f0ff2ef8f3ff38f8f3ff40f8f3ff82f8f3ff94f8f3ff7a42f4ff7e42f4ff8842f4ff5c45f4ff8890f4ff9690f4ffe09af4ff88f2f4ffae88f5ffb69ef5ffb0b9f5ff2a03f6ff2c03f6ff2e03f6ff5831f6fffc31f6ff0632f6ff9e32f6ff5435f6ffee41f6ffa242f6ffe244f6ff1847f6ffbe47f6ffb04bf6ff624ff6ff704ff6ff705bf6ff005cf6ffae5cf6ff5e6bf6ff606bf6ff626bf6ff6c6bf6ffaa6cf6ffbc6cf6ff4c8af6ff22c3f6ffe2c3f6ff2e8ff9ff3c8ff9ffb0a9f9ffb6a9f9ffecabf9ff48f4f9ff56f4f9ff08b0fdffdee8fdff02eafdff06eafdff12eafdffb0eafdff36ebfdff08eefdffcc0afeffce0afeffd00afeffda0afeff7216feffacbbffffbeccffffccccffff0ef8ffff4efaffffd28101009e900100f4b80100f0d801004cea0100d8150200f815020002160200
+      m_SelectedIDs: 52df0100
+      m_LastClickedID: 122706
+      m_ExpandedIDs: 12b4f8ff34b4f8ff62dd010084dd0100a0dd0100d4dd0100e0dd01000ede010022de01007ade010092de0100a6de0100c2de0100cede010020df010052df0100
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_Name: 
@@ -1066,7 +967,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 0}
+        m_ClientGUIView: {fileID: 9}
       m_SearchString: 
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
@@ -1074,7 +975,7 @@ MonoBehaviour:
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 9cd1477dbcc46d642bdb31d35b82cd83
---- !u!114 &12
+--- !u!114 &11
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1089,18 +990,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 723.5
+    x: 725
     y: 0
-    width: 381
+    width: 338.5
     height: 929
   m_MinSize: {x: 232, y: 271}
   m_MaxSize: {x: 10002, y: 10021}
-  m_ActualView: {fileID: 13}
+  m_ActualView: {fileID: 12}
   m_Panes:
-  - {fileID: 13}
+  - {fileID: 12}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &13
+--- !u!114 &12
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1120,9 +1021,9 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 841.5
+    x: 868
     y: 96
-    width: 379
+    width: 336.5
     height: 908
   m_SerializedDataModeController:
     m_DataMode: 0
@@ -1135,7 +1036,7 @@ MonoBehaviour:
     m_SaveData: []
     m_OverlaysVisible: 1
   m_SearchFilter:
-    m_NameFilter: 
+    m_NameFilter: PopupDim_RewardItems
     m_ClassNames: []
     m_AssetLabels: []
     m_AssetBundleNames: []
@@ -1147,7 +1048,7 @@ MonoBehaviour:
     m_Folders:
     - Assets/Editor
     m_Globs: []
-    m_OriginalText: 
+    m_OriginalText: PopupDim_RewardItems
     m_ImportLogFlags: 0
     m_FilterByTypeIntersection: 0
   m_ViewMode: 1
@@ -1160,9 +1061,9 @@ MonoBehaviour:
     m_IsLocked: 0
   m_FolderTreeState:
     scrollPos: {x: 0, y: 0}
-    m_SelectedIDs: 82a80000
-    m_LastClickedID: 43138
-    m_ExpandedIDs: 000000006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a6000000ca9a3b
+    m_SelectedIDs: 74a80000
+    m_LastClickedID: 43124
+    m_ExpandedIDs: 000000005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000078a600007ca8000000ca9a3b
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1178,7 +1079,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 11}
     m_SearchString: 
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
@@ -1190,7 +1091,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_LastClickedID: 0
-    m_ExpandedIDs: 000000006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a6000000ca9a3b
+    m_ExpandedIDs: 000000005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a60000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1215,10 +1116,10 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_ResourceFile: 
   m_ListAreaState:
-    m_SelectedInstanceIDs: 
-    m_LastClickedInstanceID: 0
-    m_HadKeyboardFocusLastEvent: 0
-    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010088960000069a00008c8b0000728b000000000000
+    m_SelectedInstanceIDs: 52df0100
+    m_LastClickedInstanceID: 122706
+    m_HadKeyboardFocusLastEvent: 1
+    m_ExpandedInstanceIDs: d02e01001ef900002afc000092f80000f0f70000d8fa000046fa0000f0f80000dc5b0100d05b0100c85b0100cc5b01004a0b0100de0b0100de0a01009e0b0100220b01002a4201007a490100aa4401008a4301006a4e010088960000069a00008c8b0000728b0000
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_Name: 
@@ -1234,7 +1135,7 @@ MonoBehaviour:
       m_IsRenaming: 0
       m_OriginalEventType: 11
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 12}
+      m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
@@ -1246,7 +1147,7 @@ MonoBehaviour:
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 180.5
---- !u!114 &14
+--- !u!114 &13
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1261,18 +1162,18 @@ MonoBehaviour:
   m_Children: []
   m_Position:
     serializedVersion: 2
-    x: 1104.5
+    x: 1063.5
     y: 0
-    width: 422.5
+    width: 439.5
     height: 929
   m_MinSize: {x: 276, y: 71}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 15}
+  m_ActualView: {fileID: 14}
   m_Panes:
-  - {fileID: 15}
+  - {fileID: 14}
   m_Selected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &14
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1292,14 +1193,14 @@ MonoBehaviour:
     m_Tooltip: 
   m_Pos:
     serializedVersion: 2
-    x: 1222.5
+    x: 1206.5
     y: 96
-    width: 421.5
+    width: 438.5
     height: 908
   m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
+    m_DataMode: 1
+    m_PreferredDataMode: 1
+    m_SupportedDataModes: 010000000200000003000000
     isAutomatic: 1
   m_ViewDataDictionary: {fileID: 0}
   m_OverlayCanvas:

BIN
美术/art_use_ui/all/dec_Divider_Left.png


BIN
美术/art_use_ui/all/dec_Divider_Right.png


BIN
美术/art_use_ui/all/dec_SkillIcon02_2.png


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
美术/unity_use_ui/TextrueJson/EquipmentIcon.txt


Rozdielové dáta súboru neboli zobrazené, pretože súbor je príliš veľký
+ 0 - 0
美术/unity_use_ui/TextrueJson/all.txt


+ 1 - 1
美术/unity_use_ui/TextrueJson/bg.txt

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Archer","filePath":"/bg/bg_Archer.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_herozbtop","filePath":"/bg/bg_herozbtop.png"},{"textrueName":"bg_warrior","filePath":"/bg/bg_warrior.png"},{"textrueName":"bg_Mage","filePath":"/bg/bg_Mage.png"},{"textrueName":"bg_priest","filePath":"/bg/bg_priest.png"},{"textrueName":"bg_herobagtop","filePath":"/bg/bg_herobagtop.png"}],"keyToValue":{}}

+ 1 - 1
美术/unity_use_ui/TextrueJson/box.txt

@@ -1 +1 @@
-{"packName":"box","isTyPack":false,"newTextureJson":[{"textrueName":"bg_Chest05","filePath":"/bg/bg_Chest05.png"},{"textrueName":"icon_Chest03","filePath":"/icon/icon_Chest03.png"}],"keyToValue":{}}
+{"packName":"box","isTyPack":false,"newTextureJson":[{"textrueName":"icon_Chest03","filePath":"/icon/icon_Chest03.png"},{"textrueName":"bg_Chest05","filePath":"/bg/bg_Chest05.png"}],"keyToValue":{}}

+ 1 - 1
美术/unity_use_ui/TextrueJson/heroIcon.txt

@@ -1 +1 @@
-{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"},{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"}],"keyToValue":{}}
+{"packName":"heroIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_tx116","filePath":"/icon/icon_tx116.png"},{"textrueName":"icon_tx105","filePath":"/icon/icon_tx105.png"},{"textrueName":"icon_tx107","filePath":"/icon/icon_tx107.png"},{"textrueName":"icon_tx113","filePath":"/icon/icon_tx113.png"}],"keyToValue":{}}

+ 1 - 1
美术/unity_use_ui/TextrueJson/itemIcon.txt

@@ -1 +1 @@
-{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_Coins_s","filePath":"/icon/icon_Coins_s.png"},{"textrueName":"icon_Gem_Star_Blue","filePath":"/icon/icon_Gem_Star_Blue.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"}],"keyToValue":{}}
+{"packName":"itemIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_item_Gear_Armor_Top","filePath":"/icon/icon_item_Gear_Armor_Top.png"},{"textrueName":"icon_item_Gear_Sword","filePath":"/icon/icon_item_Gear_Sword.png"},{"textrueName":"icon_item_Gear_Hat_Witch","filePath":"/icon/icon_item_Gear_Hat_Witch.png"},{"textrueName":"icon_Coins_s","filePath":"/icon/icon_Coins_s.png"},{"textrueName":"icon_item_Gear_Armor_Bottom","filePath":"/icon/icon_item_Gear_Armor_Bottom.png"},{"textrueName":"icon_item_Gear_Ring","filePath":"/icon/icon_item_Gear_Ring.png"},{"textrueName":"icon_Gem_Star_Blue","filePath":"/icon/icon_Gem_Star_Blue.png"},{"textrueName":"icon_item_Gear_Boots","filePath":"/icon/icon_item_Gear_Boots.png"}],"keyToValue":{}}

+ 1 - 1
美术/unity_use_ui/TextrueJson/skillIcon.txt

@@ -1 +1 @@
-{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_10002","filePath":"/icon/icon_skill_10002.png"},{"textrueName":"icon_skill_10003","filePath":"/icon/icon_skill_10003.png"},{"textrueName":"icon_skill_10004","filePath":"/icon/icon_skill_10004.png"},{"textrueName":"icon_skill_10005","filePath":"/icon/icon_skill_10005.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_20002","filePath":"/icon/icon_skill_20002.png"},{"textrueName":"icon_skill_20004","filePath":"/icon/icon_skill_20004.png"},{"textrueName":"icon_skill_20005","filePath":"/icon/icon_skill_20005.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_30002","filePath":"/icon/icon_skill_30002.png"},{"textrueName":"icon_skill_30004","filePath":"/icon/icon_skill_30004.png"},{"textrueName":"icon_skill_30005","filePath":"/icon/icon_skill_30005.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"},{"textrueName":"icon_skill_40002","filePath":"/icon/icon_skill_40002.png"},{"textrueName":"icon_skill_40004","filePath":"/icon/icon_skill_40004.png"},{"textrueName":"icon_skill_40005","filePath":"/icon/icon_skill_40005.png"}],"keyToValue":{}}
+{"packName":"skillIcon","isTyPack":false,"newTextureJson":[{"textrueName":"icon_skill_10004","filePath":"/icon/icon_skill_10004.png"},{"textrueName":"icon_skill_10005","filePath":"/icon/icon_skill_10005.png"},{"textrueName":"icon_skill_10001","filePath":"/icon/icon_skill_10001.png"},{"textrueName":"icon_skill_10002","filePath":"/icon/icon_skill_10002.png"},{"textrueName":"icon_skill_10003","filePath":"/icon/icon_skill_10003.png"},{"textrueName":"icon_skill_30001","filePath":"/icon/icon_skill_30001.png"},{"textrueName":"icon_skill_20004","filePath":"/icon/icon_skill_20004.png"},{"textrueName":"icon_skill_20005","filePath":"/icon/icon_skill_20005.png"},{"textrueName":"icon_skill_30002","filePath":"/icon/icon_skill_30002.png"},{"textrueName":"icon_skill_20002","filePath":"/icon/icon_skill_20002.png"},{"textrueName":"icon_skill_30004","filePath":"/icon/icon_skill_30004.png"},{"textrueName":"icon_skill_20001","filePath":"/icon/icon_skill_20001.png"},{"textrueName":"icon_skill_30005","filePath":"/icon/icon_skill_30005.png"},{"textrueName":"icon_skill_40002","filePath":"/icon/icon_skill_40002.png"},{"textrueName":"icon_skill_40001","filePath":"/icon/icon_skill_40001.png"},{"textrueName":"icon_skill_40005","filePath":"/icon/icon_skill_40005.png"},{"textrueName":"icon_skill_40004","filePath":"/icon/icon_skill_40004.png"}],"keyToValue":{}}

BIN
美术/unity_use_ui/decorate/dec_Divider_Left.png


BIN
美术/unity_use_ui/decorate/dec_Divider_Right.png


BIN
美术/unity_use_ui/decorate/dec_SkillIcon02_2.png


+ 5 - 5
美术/工具/imgui.ini

@@ -10,27 +10,27 @@ Collapsed=0
 
 [Window][Tool]
 Pos=400,0
-Size=900,100
+Size=715,100
 Collapsed=0
 
 [Window][unity_art]
-Pos=1300,0
+Pos=1115,0
 Size=400,720
 Collapsed=0
 
 [Window][console]
 Pos=400,520
-Size=900,70
+Size=715,70
 Collapsed=0
 
 [Window][控制台]
 Pos=400,590
-Size=900,130
+Size=715,130
 Collapsed=0
 
 [Window][scence]
 Pos=400,100
-Size=900,420
+Size=715,420
 Collapsed=0
 
 [Docking][Data]

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