瀏覽代碼

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

# Conflicts:
#	Assets/StreamingAssets/assetConfig.txt   resolved by master version
DESKTOP-FB72PO8\Administrator 1 天之前
父節點
當前提交
d253415ed8
共有 61 個文件被更改,包括 4541 次插入929 次删除
  1. 632 0
      Assets/Art/ArtHero/Gw_Man.prefab
  2. 7 0
      Assets/Art/ArtHero/Gw_Man.prefab.meta
  3. 622 0
      Assets/Art/ArtHero/Gw_Woman.prefab
  4. 7 0
      Assets/Art/ArtHero/Gw_Woman.prefab.meta
  5. 348 124
      Assets/Art/Character/Guaiwu/Man/Gw_Man.playable
  6. 110 113
      Assets/Art/Character/Guaiwu/Woman/Gw_Woman.playable
  7. 30 1
      Assets/Art/Character/Guaiwu/Woman/wm gj1.fbx.meta
  8. 30 1
      Assets/Art/Character/Guaiwu/Woman/wm gj2.fbx.meta
  9. 30 1
      Assets/Art/Character/Guaiwu/Woman/wm idle.fbx.meta
  10. 30 1
      Assets/Art/Character/Guaiwu/Woman/wm idle2.fbx.meta
  11. 1 1
      Assets/Art/UIAssets/TextrueJson/bg.txt
  12. 0 0
      Assets/Art/UIAssets/TextrueJson/tongyong.txt
  13. 二進制
      Assets/Art/UIAssets/bg/bg_gf_xingchendao.png
  14. 203 0
      Assets/Art/UIAssets/bg/bg_gf_xingchendao.png.meta
  15. 二進制
      Assets/Art/UIAssets/decorate/dec_gf_di_xingchendao.png
  16. 二進制
      Assets/Art/UIAssets/decorate/dec_glow.png
  17. 203 0
      Assets/Art/UIAssets/decorate/dec_glow.png.meta
  18. 二進制
      Assets/Art/UIAssets/decorate/dec_jianbian_tiao2.png
  19. 203 0
      Assets/Art/UIAssets/decorate/dec_jianbian_tiao2.png.meta
  20. 二進制
      Assets/Art/UIAssets/decorate/dec_tiaozheng.png
  21. 二進制
      Assets/Art/UIAssets/decorate/dec_weixuanzhong.png
  22. 二進制
      Assets/Art/UIAssets/decorate/dec_xuanzhong.png
  23. 二進制
      Assets/Art/UIAssets/decorate/dec_yuanquan.png
  24. 203 0
      Assets/Art/UIAssets/decorate/dec_yuanquan.png.meta
  25. 465 523
      Assets/Art/cs3.scene
  26. 383 0
      Assets/Res/HeroAnimtion/gw_man.asset
  27. 8 0
      Assets/Res/HeroAnimtion/gw_man.asset.meta
  28. 197 0
      Assets/Res/HeroAnimtion/gw_woman.asset
  29. 8 0
      Assets/Res/HeroAnimtion/gw_woman.asset.meta
  30. 1 0
      Assets/Res/TimeLineAssets/Gw_Man_TD.txt
  31. 7 0
      Assets/Res/TimeLineAssets/Gw_Man_TD.txt.meta
  32. 1 0
      Assets/Res/TimeLineAssets/Gw_Woman_TD.txt
  33. 7 0
      Assets/Res/TimeLineAssets/Gw_Woman_TD.txt.meta
  34. 524 130
      Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab
  35. 267 23
      Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab
  36. 3 0
      Assets/Res/UIAtlas/tongyong.spriteatlasv2
  37. 3 3
      Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat
  38. 5 5
      Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs
  39. 二進制
      Excel2Json/Excel/Item.xlsx
  40. 0 0
      UGUIPack/uguiconfig.db
  41. 2 2
      UserSettings/EditorUserSettings.asset
  42. 二進制
      美术/art_use_ui/battle/dec_gf_di_xingchendao.png
  43. 二進制
      美术/art_use_ui/bg/bg_gf_xingchendao.png
  44. 二進制
      美术/art_use_ui/gongfa/dec_tiaozheng.png
  45. 二進制
      美术/art_use_ui/gongfa/dec_weixuanzhong.png
  46. 二進制
      美术/art_use_ui/gongfa/dec_xuanzhong.png
  47. 二進制
      美术/art_use_ui/tongyong/dec_glow.png
  48. 二進制
      美术/art_use_ui/tongyong/dec_jianbian_tiao2.png
  49. 二進制
      美术/art_use_ui/tongyong/dec_yuanquan.png
  50. 1 1
      美术/unity_use_ui/TextrueJson/bg.txt
  51. 0 0
      美术/unity_use_ui/TextrueJson/tongyong.txt
  52. 二進制
      美术/unity_use_ui/bg/bg_gf_xingchendao.png
  53. 二進制
      美术/unity_use_ui/decorate/dec_gf_di_xingchendao.png
  54. 二進制
      美术/unity_use_ui/decorate/dec_glow.png
  55. 二進制
      美术/unity_use_ui/decorate/dec_jianbian_tiao2.png
  56. 二進制
      美术/unity_use_ui/decorate/dec_tiaozheng.png
  57. 二進制
      美术/unity_use_ui/decorate/dec_weixuanzhong.png
  58. 二進制
      美术/unity_use_ui/decorate/dec_xuanzhong.png
  59. 二進制
      美术/unity_use_ui/decorate/dec_yuanquan.png
  60. 二進制
      美术/参考/功法界面 改.png
  61. 二進制
      美术/参考/功法界面-详情 改.png

+ 632 - 0
Assets/Art/ArtHero/Gw_Man.prefab

@@ -0,0 +1,632 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1016977511890789997
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3674968565133853412}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: effect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3674968565133853412
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1016977511890789997}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &3374804917397144976
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7021329712115033991}
+  - component: {fileID: 3345173113518931745}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7021329712115033991
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3374804917397144976}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0.75, z: 0.47}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3345173113518931745
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3374804917397144976}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4637964640349254871
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4178960904777794660}
+  - component: {fileID: 7607511246662823557}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4178960904777794660
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637964640349254871}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.09, z: 0.84}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &7607511246662823557
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4637964640349254871}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos3
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &5349545708233926371
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3231594957320066841}
+  - component: {fileID: 5775366195684529325}
+  - component: {fileID: 5103682720129024760}
+  - component: {fileID: 6527805921833676069}
+  - component: {fileID: 3818802069020362906}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Gw_Man
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3231594957320066841
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349545708233926371}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: 2.61, y: 19.99, z: 15}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 4908547219699994929}
+  - {fileID: 6455342491152624911}
+  - {fileID: 1950855680812183898}
+  - {fileID: 7021329712115033991}
+  - {fileID: 4178960904777794660}
+  - {fileID: 7129101432897321317}
+  - {fileID: 3674968565133853412}
+  - {fileID: 1696591732861424902}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!54 &5775366195684529325
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349545708233926371}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &5103682720129024760
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349545708233926371}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.6438279, y: 1.7375259, z: 0.5788822}
+  m_Center: {x: -0.140661, y: 0.89930344, z: 0.16387272}
+--- !u!114 &6527805921833676069
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349545708233926371}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 3818802069020362906}
+  _Transitions: {fileID: 11400000, guid: fd2a950f047f6d44d9f31b6bb3917a05, type: 2}
+  _ActionOnDisable: 0
+--- !u!95 &3818802069020362906
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5349545708233926371}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &6227900832882115170
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4908547219699994929}
+  - component: {fileID: 2932250564375112316}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Gw_Man
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4908547219699994929
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6227900832882115170}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!320 &2932250564375112316
+PlayableDirector:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6227900832882115170}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_PlayableAsset: {fileID: 11400000, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+  m_InitialState: 1
+  m_WrapMode: 2
+  m_DirectorUpdateMode: 1
+  m_InitialTime: 0
+  m_SceneBindings:
+  - key: {fileID: 2761697835773610385, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -7329466118603762448, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -4648395486292562092, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 4700053389732629173, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 0}
+    value: {fileID: 0}
+  - key: {fileID: 2866699138166918871, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -5086008065414625965, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 7542796109499174336, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -6917696670741814025, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 2373784270826516611, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -4506567727553095775, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -1916809949452115839, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 5043479744965800752, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 7209776157798999230, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -1967332769226936495, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 316636926299432361, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -5222684820533695275, guid: e8de29fa49f3d884eb8e464c916212cf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 6597947157480340169, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+    value: {fileID: 4358907625227995280}
+  - key: {fileID: -7776986790532549219, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+    value: {fileID: 4358907625227995280}
+  - key: {fileID: 2104055894217312404, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+    value: {fileID: 4358907625227995280}
+  - key: {fileID: 1875121212086222368, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+    value: {fileID: 4358907625227995280}
+  m_ExposedReferences:
+    m_References:
+    - d3d3fcbd8cb8a3d4ea62175d2ab430f7: {fileID: 0}
+    - d8f52b8140b945646bba2928f14fa847: {fileID: 0}
+    - 107c0281ab5015945b9dd6b6604a6c03: {fileID: 0}
+    - c03658669bf520a42b2a7ca850cdec70: {fileID: 0}
+    - 97957883873eead45bac806ca33a805a: {fileID: 0}
+    - da39ab302b6f3b741b5c23084cedf19f: {fileID: 0}
+    - cd41b8fc3b21efe4cbe899ed914b6600: {fileID: 0}
+    - 31c9ad88093e6ca47b20bb18ffde6e38: {fileID: 0}
+    - 3e3d16ad40b2f6d4d9ff4bb1d0530658: {fileID: 0}
+    - a27f8fc3b05620744b1d8ecb8887fb39: {fileID: 0}
+    - 4b1143ea381fa784f845770efe57aa83: {fileID: 0}
+    - 7c7b63a1a0f94964ea4c108dc4af7f42: {fileID: 0}
+    - bb35662e382e98d4b80a57b982b56ab8: {fileID: 0}
+    - 6589fc36d26872a46bfc37722f0d7bf8: {fileID: 0}
+    - 8e5d16b5462d3284d88f214e820dadd8: {fileID: 0}
+    - 0ee58640dad94eb489d6f6345bb5180f: {fileID: 0}
+    - a0779ba4dad202b4db95cb6cd4b0c896: {fileID: 0}
+    - e5893d02ff773c24d90f3a4c2a3cf23a: {fileID: 0}
+    - b190ed1255d343840a5d9183261365db: {fileID: 0}
+    - 9635ac9ca9870f44ebb1d5aa834aeb1f: {fileID: 0}
+    - b595c57d511827847877b0a39cb18ce9: {fileID: 0}
+    - 7eb1db0bf59982e4ba2ce0cb58d76bf5: {fileID: 0}
+    - d9a0fd86aae4d22458ec4598babc39d9: {fileID: 0}
+    - 4db9e7fff1b8eca43a9c546af192dc07: {fileID: 0}
+    - c0d3aed911ec10241b4881dd97d57871: {fileID: 0}
+    - 888a17ff1678a32458692c29e3b98065: {fileID: 0}
+    - d0adedccc0a2738449274d6a52066b4b: {fileID: 0}
+    - 81c219ee5fd8d1344a247672e8a7e494: {fileID: 0}
+    - d79c1d139f3d5184ab27a4d3a3be27fd: {fileID: 0}
+    - c1853077ea817324884439b3f62904ab: {fileID: 0}
+    - a73f76c883890c3409c7eadfe88a018d: {fileID: 0}
+--- !u!1 &6634093378998607135
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1950855680812183898}
+  - component: {fileID: 171009752047680071}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &1950855680812183898
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6634093378998607135}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.22, y: 1.57, z: 0.95}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &171009752047680071
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6634093378998607135}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos1
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &7396157168333250774
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7129101432897321317}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7129101432897321317
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7396157168333250774}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2.13, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &8315360860991485281
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6455342491152624911}
+  - component: {fileID: 8882146912504706554}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &6455342491152624911
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8315360860991485281}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.02, z: 0.18}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 3231594957320066841}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8882146912504706554
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8315360860991485281}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1001 &1153264880005722861
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 3231594957320066841}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 0.40000004
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 0.40000004
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 0.40000004
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 919132149155446097, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_Name
+      value: man
+      objectReference: {fileID: 0}
+    - target: {fileID: 1011397753927472187, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_Name
+      value: gwman
+      objectReference: {fileID: 0}
+    - target: {fileID: 1011397753927472187, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_IsActive
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063787381685132359, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_CastShadows
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 7063787381685132359, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 910be73c1baaebe4086a21dc0d425414, type: 2}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 4358907625227995280}
+  m_SourcePrefab: {fileID: 100100000, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+--- !u!4 &1696591732861424902 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+  m_PrefabInstance: {fileID: 1153264880005722861}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &2071745566372630460 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+  m_PrefabInstance: {fileID: 1153264880005722861}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &4358907625227995280
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2071745566372630460}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0

+ 7 - 0
Assets/Art/ArtHero/Gw_Man.prefab.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WXxJvHivVXof1qiZVN4If0wtMQAA7Enve+Q7H9Va6TonpW+sePSPDOMG0a2a
+PrefabImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 622 - 0
Assets/Art/ArtHero/Gw_Woman.prefab

@@ -0,0 +1,622 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &1182509747471790462
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8819924318033202407}
+  - component: {fileID: 3094429443097411279}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Gw_Woman
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8819924318033202407
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1182509747471790462}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!320 &3094429443097411279
+PlayableDirector:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1182509747471790462}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_PlayableAsset: {fileID: 11400000, guid: b1f1ed50e8de5ac41bf8f4ec179a100f, type: 2}
+  m_InitialState: 1
+  m_WrapMode: 2
+  m_DirectorUpdateMode: 1
+  m_InitialTime: 0
+  m_SceneBindings:
+  - key: {fileID: 2761697835773610385, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -7329466118603762448, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -4648395486292562092, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 4700053389732629173, guid: 08f691757ed46004982451085ad847bf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 0}
+    value: {fileID: 0}
+  - key: {fileID: 2866699138166918871, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -5086008065414625965, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 7542796109499174336, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -6917696670741814025, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 2373784270826516611, guid: d39ee79d0178c19439bfbd4de1723bb7, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -4506567727553095775, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -1916809949452115839, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 5043479744965800752, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 7209776157798999230, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -1967332769226936495, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 316636926299432361, guid: fb6ad4d618c47c845b34b1b6dda36c56, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: -5222684820533695275, guid: e8de29fa49f3d884eb8e464c916212cf, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 6597947157480340169, guid: f735c9e5518dc254d90f604e4c2cd66b, type: 2}
+    value: {fileID: 0}
+  - key: {fileID: 6843891709632614060, guid: b1f1ed50e8de5ac41bf8f4ec179a100f, type: 2}
+    value: {fileID: 6166064876978181509}
+  - key: {fileID: 352260394954815900, guid: b1f1ed50e8de5ac41bf8f4ec179a100f, type: 2}
+    value: {fileID: 6166064876978181509}
+  m_ExposedReferences:
+    m_References:
+    - d3d3fcbd8cb8a3d4ea62175d2ab430f7: {fileID: 0}
+    - d8f52b8140b945646bba2928f14fa847: {fileID: 0}
+    - 107c0281ab5015945b9dd6b6604a6c03: {fileID: 0}
+    - c03658669bf520a42b2a7ca850cdec70: {fileID: 0}
+    - 97957883873eead45bac806ca33a805a: {fileID: 0}
+    - da39ab302b6f3b741b5c23084cedf19f: {fileID: 0}
+    - cd41b8fc3b21efe4cbe899ed914b6600: {fileID: 0}
+    - 31c9ad88093e6ca47b20bb18ffde6e38: {fileID: 0}
+    - 3e3d16ad40b2f6d4d9ff4bb1d0530658: {fileID: 0}
+    - a27f8fc3b05620744b1d8ecb8887fb39: {fileID: 0}
+    - 4b1143ea381fa784f845770efe57aa83: {fileID: 0}
+    - 7c7b63a1a0f94964ea4c108dc4af7f42: {fileID: 0}
+    - bb35662e382e98d4b80a57b982b56ab8: {fileID: 0}
+    - 6589fc36d26872a46bfc37722f0d7bf8: {fileID: 0}
+    - 8e5d16b5462d3284d88f214e820dadd8: {fileID: 0}
+    - 0ee58640dad94eb489d6f6345bb5180f: {fileID: 0}
+    - a0779ba4dad202b4db95cb6cd4b0c896: {fileID: 0}
+    - e5893d02ff773c24d90f3a4c2a3cf23a: {fileID: 0}
+    - b190ed1255d343840a5d9183261365db: {fileID: 0}
+    - 9635ac9ca9870f44ebb1d5aa834aeb1f: {fileID: 0}
+    - b595c57d511827847877b0a39cb18ce9: {fileID: 0}
+    - 7eb1db0bf59982e4ba2ce0cb58d76bf5: {fileID: 0}
+    - d9a0fd86aae4d22458ec4598babc39d9: {fileID: 0}
+    - 4db9e7fff1b8eca43a9c546af192dc07: {fileID: 0}
+    - c0d3aed911ec10241b4881dd97d57871: {fileID: 0}
+    - 888a17ff1678a32458692c29e3b98065: {fileID: 0}
+    - d0adedccc0a2738449274d6a52066b4b: {fileID: 0}
+    - 81c219ee5fd8d1344a247672e8a7e494: {fileID: 0}
+    - d79c1d139f3d5184ab27a4d3a3be27fd: {fileID: 0}
+    - c1853077ea817324884439b3f62904ab: {fileID: 0}
+    - a73f76c883890c3409c7eadfe88a018d: {fileID: 0}
+--- !u!1 &3401219472667328913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3053632779892809561}
+  - component: {fileID: 3208727351129283150}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos2
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3053632779892809561
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3401219472667328913}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: -0.19, y: 1.17, z: 2.3}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3208727351129283150
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3401219472667328913}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos2
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &3744027093457671047
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7530674015777337475}
+  - component: {fileID: 2695229539597596796}
+  - component: {fileID: 396933856734097702}
+  - component: {fileID: 5118581101379158945}
+  - component: {fileID: 8765232971657719265}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Gw_Woman
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &7530674015777337475
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3744027093457671047}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 1, z: 0, w: 0}
+  m_LocalPosition: {x: -3.72, y: 19.99, z: 15}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 8819924318033202407}
+  - {fileID: 8624688420063307411}
+  - {fileID: 4124948821794089562}
+  - {fileID: 3053632779892809561}
+  - {fileID: 2768474473048047668}
+  - {fileID: 658966507554636087}
+  - {fileID: 3756680839182345179}
+  - {fileID: 7333132650723155194}
+  m_Father: {fileID: 0}
+  m_LocalEulerAnglesHint: {x: 0, y: 180, z: 0}
+--- !u!54 &2695229539597596796
+Rigidbody:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3744027093457671047}
+  serializedVersion: 4
+  m_Mass: 1
+  m_Drag: 0
+  m_AngularDrag: 0.05
+  m_CenterOfMass: {x: 0, y: 0, z: 0}
+  m_InertiaTensor: {x: 1, y: 1, z: 1}
+  m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ImplicitCom: 1
+  m_ImplicitTensor: 1
+  m_UseGravity: 1
+  m_IsKinematic: 1
+  m_Interpolate: 0
+  m_Constraints: 0
+  m_CollisionDetection: 0
+--- !u!65 &396933856734097702
+BoxCollider:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3744027093457671047}
+  m_Material: {fileID: 0}
+  m_IncludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_ExcludeLayers:
+    serializedVersion: 2
+    m_Bits: 0
+  m_LayerOverridePriority: 0
+  m_IsTrigger: 1
+  m_ProvidesContacts: 0
+  m_Enabled: 1
+  serializedVersion: 3
+  m_Size: {x: 0.41357732, y: 1.9090023, z: 0.4872675}
+  m_Center: {x: 0.001631856, y: 0.9836359, z: 0.07089567}
+--- !u!114 &5118581101379158945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3744027093457671047}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 0ad50f81b1d25c441943c37a89ba23f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  _Animator: {fileID: 8765232971657719265}
+  _Transitions: {fileID: 11400000, guid: a9feb706770e3f64082ea1c609b4f471, type: 2}
+  _ActionOnDisable: 0
+--- !u!95 &8765232971657719265
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3744027093457671047}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0
+--- !u!1 &3868106337659380126
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8624688420063307411}
+  - component: {fileID: 8040185533049730393}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hitpos
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &8624688420063307411
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3868106337659380126}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 1.35, z: 0.18}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &8040185533049730393
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3868106337659380126}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: hitpos
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4504817252573893329
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4124948821794089562}
+  - component: {fileID: 3148228293205605902}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos1
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &4124948821794089562
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4504817252573893329}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0.1, y: 1.48, z: 1.14}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &3148228293205605902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4504817252573893329}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos1
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1 &4932037394597179643
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 658966507554636087}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hp
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &658966507554636087
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4932037394597179643}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 2.23, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &5612904564779045913
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3756680839182345179}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: effect
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &3756680839182345179
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5612904564779045913}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1 &6241150953819016484
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2768474473048047668}
+  - component: {fileID: 4704698896392505240}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: zdpos3
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!4 &2768474473048047668
+Transform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6241150953819016484}
+  serializedVersion: 2
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 7530674015777337475}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!114 &4704698896392505240
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6241150953819016484}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cebc90e0510b492d94dbb8ad1eefcd1a, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  DotName: zdpos3
+  followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
+--- !u!1001 &7083665468398074641
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 7530674015777337475}
+    m_Modifications:
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalScale.x
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalScale.y
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalScale.z
+      value: 45
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 180
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_ConstrainProportionsScale
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: -6145838063591851594, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_Materials.Array.data[0]
+      value: 
+      objectReference: {fileID: 2100000, guid: 666bf6b2199c09d4cbede42c8ab1cb2f, type: 2}
+    - target: {fileID: -6145838063591851594, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_Materials.Array.data[1]
+      value: 
+      objectReference: {fileID: 2100000, guid: 7e015994da837064ea5f560d6028f171, type: 2}
+    - target: {fileID: 919132149155446097, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      propertyPath: m_Name
+      value: wm
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents:
+    - targetCorrespondingSourceObject: {fileID: 919132149155446097, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+      insertIndex: -1
+      addedObject: {fileID: 6166064876978181509}
+  m_SourcePrefab: {fileID: 100100000, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+--- !u!4 &7333132650723155194 stripped
+Transform:
+  m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+  m_PrefabInstance: {fileID: 7083665468398074641}
+  m_PrefabAsset: {fileID: 0}
+--- !u!1 &7966680718809777728 stripped
+GameObject:
+  m_CorrespondingSourceObject: {fileID: 919132149155446097, guid: cbbd9eb05dbc77b47ac40df290de6d80, type: 3}
+  m_PrefabInstance: {fileID: 7083665468398074641}
+  m_PrefabAsset: {fileID: 0}
+--- !u!95 &6166064876978181509
+Animator:
+  serializedVersion: 5
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7966680718809777728}
+  m_Enabled: 1
+  m_Avatar: {fileID: 0}
+  m_Controller: {fileID: 0}
+  m_CullingMode: 0
+  m_UpdateMode: 0
+  m_ApplyRootMotion: 0
+  m_LinearVelocityBlending: 0
+  m_StabilizeFeet: 0
+  m_WarningMessage: 
+  m_HasTransformHierarchy: 1
+  m_AllowConstantClipSamplingOptimization: 1
+  m_KeepAnimatorStateOnDisable: 0
+  m_WriteDefaultValuesOnDisable: 0

+ 7 - 0
Assets/Art/ArtHero/Gw_Woman.prefab.meta

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

+ 348 - 124
Assets/Art/Character/Guaiwu/Man/Gw_Man.playable

@@ -1,6 +1,140 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-6557543860948660963
+--- !u!114 &-7776986790532549219
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: 938776710680443608}
+  m_Children: []
+  m_Clips:
+  - m_Version: 1
+    m_Start: 0
+    m_ClipIn: 0
+    m_Asset: {fileID: 2804484616052386631}
+    m_Duration: 2
+    m_TimeScale: 1
+    m_ParentTrack: {fileID: -7776986790532549219}
+    m_EaseInDuration: 0
+    m_EaseOutDuration: 0
+    m_BlendInDuration: -1
+    m_BlendOutDuration: -1
+    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: 1
+    m_PreExtrapolationMode: 1
+    m_PostExtrapolationTime: Infinity
+    m_PreExtrapolationTime: 0
+    m_DisplayName: gj2
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &-5008716753946753902
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 5b415b5ca08a6b742a522aca46d89e50, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &-2181867089726457651
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -24,7 +158,7 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
---- !u!114 &-4228881269769065477
+--- !u!114 &-1996356012367849600
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -36,7 +170,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
   m_Name: TimeLinePlayEntityAnimtionAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 5b415b5ca08a6b742a522aca46d89e50, type: 3}
+  m_Clip: {fileID: 1827226128182048838, guid: a290c00836e160a45be0159ce1ea8a7e, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -62,14 +196,17 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Version: 0
   m_Tracks:
-  - {fileID: 6597947157480340169}
+  - {fileID: 129438900764371113}
+  - {fileID: 938776710680443608}
+  - {fileID: 3355690857307691886}
+  - {fileID: 4281009902932668526}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &1231737293132614342
+--- !u!114 &129438900764371113
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -78,20 +215,46 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 030f85c3f73729f4f976f66ffb23b875, type: 3}
-  m_Name: AnimationPlayableAsset
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: gj1
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 63aaff123ffa6164fbed638ccc46b8bc, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
---- !u!114 &6597947157480340169
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 6597947157480340169}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &938776710680443608
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: g2
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: -7776986790532549219}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &1875121212086222368
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -109,16 +272,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
+  m_Parent: {fileID: 4281009902932668526}
   m_Children: []
   m_Clips:
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -6557543860948660963}
+    m_Asset: {fileID: -1996356012367849600}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: 6597947157480340169}
+    m_ParentTrack: {fileID: 1875121212086222368}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -178,16 +341,57 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
+    m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
+    m_DisplayName: sk2
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &2104055894217312404
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: 3355690857307691886}
+  m_Children: []
+  m_Clips:
   - m_Version: 1
-    m_Start: 1
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: 8781406740715436181}
+    m_Asset: {fileID: -2181867089726457651}
     m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: 6597947157480340169}
+    m_ParentTrack: {fileID: 2104055894217312404}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -247,13 +451,126 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
+    m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
+    m_DisplayName: sk1
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &2804484616052386631
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 63aaff123ffa6164fbed638ccc46b8bc, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &3355690857307691886
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: sk1
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 2104055894217312404}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &4281009902932668526
+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: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: sk2
+  m_EditorClassIdentifier: 
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 1875121212086222368}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &6597947157480340169
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: 129438900764371113}
+  m_Children: []
+  m_Clips:
   - m_Version: 1
-    m_Start: 2
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -4228881269769065477}
+    m_Asset: {fileID: -5008716753946753902}
     m_Duration: 1.6666666666666667
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6597947157480340169}
@@ -316,78 +633,9 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
-  - m_Version: 1
-    m_Start: 3.666666666666667
-    m_ClipIn: 0
-    m_Asset: {fileID: 1231737293132614342}
-    m_Duration: 2
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 6597947157480340169}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
-    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: 1
-    m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
+    m_DisplayName: gj1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0
@@ -408,27 +656,3 @@ MonoBehaviour:
   m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   m_ApplyOffsets: 0
---- !u!114 &8781406740715436181
-MonoBehaviour:
-  m_ObjectHideFlags: 1
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
-  m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: a290c00836e160a45be0159ce1ea8a7e, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0

+ 110 - 113
Assets/Art/Character/Guaiwu/Woman/Gw_Woman.playable

@@ -1,6 +1,6 @@
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
---- !u!114 &-7919371373223315717
+--- !u!114 &-8476718651388137411
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -12,7 +12,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
   m_Name: TimeLinePlayEntityAnimtionAsset
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: 8fbfd261dc233ca4dba91c9f145ea0b5, type: 3}
+  m_Clip: {fileID: 1827226128182048838, guid: f79afe64a38427d4d890507fc6f1f912, type: 3}
   m_Position: {x: 0, y: 0, z: 0}
   m_EulerAngles: {x: 0, y: 0, z: 0}
   m_UseTrackMatchFields: 1
@@ -24,7 +24,7 @@ MonoBehaviour:
   m_Rotation: {x: 0, y: 0, z: 0, w: 1}
   isRunPlay: 0
   layerId: 0
---- !u!114 &-5254884444725307471
+--- !u!114 &-8453479768499936504
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -33,21 +33,21 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: gj1
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: fda24d6e16851794695baaeab1817a07, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 6843891709632614060}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -62,14 +62,15 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_Version: 0
   m_Tracks:
-  - {fileID: 6843891709632614060}
+  - {fileID: -8453479768499936504}
+  - {fileID: 341670984781823175}
   m_FixedDuration: 0
   m_EditorSettings:
     m_Framerate: 60
     m_ScenePreview: 1
   m_DurationMode: 0
   m_MarkerTrack: {fileID: 0}
---- !u!114 &1633515617600557908
+--- !u!114 &341670984781823175
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -78,22 +79,22 @@ MonoBehaviour:
   m_GameObject: {fileID: 0}
   m_Enabled: 1
   m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
-  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_Script: {fileID: 11500000, guid: d0fc6f5187a81dc47999eefade6f0935, type: 3}
+  m_Name: gj2
   m_EditorClassIdentifier: 
-  m_Clip: {fileID: 1827226128182048838, guid: f79afe64a38427d4d890507fc6f1f912, type: 3}
-  m_Position: {x: 0, y: 0, z: 0}
-  m_EulerAngles: {x: 0, y: 0, z: 0}
-  m_UseTrackMatchFields: 1
-  m_MatchTargetFields: 63
-  m_RemoveStartOffset: 1
-  m_ApplyFootIK: 1
-  m_Loop: 0
-  m_Version: 1
-  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
-  isRunPlay: 0
-  layerId: 0
---- !u!114 &6843891709632614060
+  m_Version: 3
+  m_AnimClip: {fileID: 0}
+  m_Locked: 0
+  m_Muted: 1
+  m_CustomPlayableFullTypename: 
+  m_Curves: {fileID: 0}
+  m_Parent: {fileID: 11400000}
+  m_Children:
+  - {fileID: 352260394954815900}
+  m_Clips: []
+  m_Markers:
+    m_Objects: []
+--- !u!114 &352260394954815900
 MonoBehaviour:
   m_ObjectHideFlags: 1
   m_CorrespondingSourceObject: {fileID: 0}
@@ -111,85 +112,16 @@ MonoBehaviour:
   m_Muted: 0
   m_CustomPlayableFullTypename: 
   m_Curves: {fileID: 0}
-  m_Parent: {fileID: 11400000}
+  m_Parent: {fileID: 341670984781823175}
   m_Children: []
   m_Clips:
-  - m_Version: 1
-    m_Start: 4.4
-    m_ClipIn: 0
-    m_Asset: {fileID: 1633515617600557908}
-    m_Duration: 1.2
-    m_TimeScale: 1
-    m_ParentTrack: {fileID: 6843891709632614060}
-    m_EaseInDuration: 0
-    m_EaseOutDuration: 0
-    m_BlendInDuration: -1
-    m_BlendOutDuration: -1
-    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: 1
-    m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
-    m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
   - m_Version: 1
     m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -5254884444725307471}
-    m_Duration: 4.4
+    m_Asset: {fileID: 1896836807139918614}
+    m_Duration: 1
     m_TimeScale: 1
-    m_ParentTrack: {fileID: 6843891709632614060}
+    m_ParentTrack: {fileID: 352260394954815900}
     m_EaseInDuration: 0
     m_EaseOutDuration: 0
     m_BlendInDuration: -1
@@ -249,14 +181,79 @@ MonoBehaviour:
     m_Recordable: 0
     m_PostExtrapolationMode: 1
     m_PreExtrapolationMode: 1
-    m_PostExtrapolationTime: 0
+    m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
+    m_DisplayName: gj2
+  m_Markers:
+    m_Objects: []
+  m_InfiniteClipPreExtrapolation: 0
+  m_InfiniteClipPostExtrapolation: 0
+  m_InfiniteClipOffsetPosition: {x: 0, y: 0, z: 0}
+  m_InfiniteClipOffsetEulerAngles: {x: 0, y: 0, z: 0}
+  m_InfiniteClipTimeOffset: 0
+  m_InfiniteClipRemoveOffset: 0
+  m_InfiniteClipApplyFootIK: 1
+  mInfiniteClipLoop: 0
+  m_MatchTargetFields: 63
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_AvatarMask: {fileID: 0}
+  m_ApplyAvatarMask: 1
+  m_TrackOffset: 0
+  m_InfiniteClip: {fileID: 0}
+  m_OpenClipOffsetRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  m_ApplyOffsets: 0
+--- !u!114 &1896836807139918614
+MonoBehaviour:
+  m_ObjectHideFlags: 1
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 09e4fb4d0e1c4ef796502c9420b2361c, type: 3}
+  m_Name: TimeLinePlayEntityAnimtionAsset
+  m_EditorClassIdentifier: 
+  m_Clip: {fileID: 1827226128182048838, guid: 8fbfd261dc233ca4dba91c9f145ea0b5, type: 3}
+  m_Position: {x: 0, y: 0, z: 0}
+  m_EulerAngles: {x: 0, y: 0, z: 0}
+  m_UseTrackMatchFields: 1
+  m_MatchTargetFields: 63
+  m_RemoveStartOffset: 1
+  m_ApplyFootIK: 1
+  m_Loop: 0
+  m_Version: 1
+  m_Rotation: {x: 0, y: 0, z: 0, w: 1}
+  isRunPlay: 0
+  layerId: 0
+--- !u!114 &6843891709632614060
+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: d21dcc2386d650c4597f3633c75a1f98, type: 3}
+  m_Name: Animation 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: -8453479768499936504}
+  m_Children: []
+  m_Clips:
   - m_Version: 1
-    m_Start: 5.6000000000000005
+    m_Start: 0
     m_ClipIn: 0
-    m_Asset: {fileID: -7919371373223315717}
-    m_Duration: 1
+    m_Asset: {fileID: -8476718651388137411}
+    m_Duration: 1.2
     m_TimeScale: 1
     m_ParentTrack: {fileID: 6843891709632614060}
     m_EaseInDuration: 0
@@ -320,7 +317,7 @@ MonoBehaviour:
     m_PreExtrapolationMode: 1
     m_PostExtrapolationTime: Infinity
     m_PreExtrapolationTime: 0
-    m_DisplayName: Take 001
+    m_DisplayName: gj1
   m_Markers:
     m_Objects: []
   m_InfiniteClipPreExtrapolation: 0

+ 30 - 1
Assets/Art/Character/Guaiwu/Woman/wm gj1.fbx.meta

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

+ 30 - 1
Assets/Art/Character/Guaiwu/Woman/wm gj2.fbx.meta

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

+ 30 - 1
Assets/Art/Character/Guaiwu/Woman/wm idle.fbx.meta

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

+ 30 - 1
Assets/Art/Character/Guaiwu/Woman/wm idle2.fbx.meta

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

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

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gf_xingchendao","filePath":"/bg/bg_gf_xingchendao.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}

File diff suppressed because it is too large
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/tongyong.txt


二進制
Assets/Art/UIAssets/bg/bg_gf_xingchendao.png


+ 203 - 0
Assets/Art/UIAssets/bg/bg_gf_xingchendao.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: XX0f4Cj/UXySKgccgrRFmx+zQqxG/7gE5uNSylEE9RwYKa05n7IauTkR6vVe
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    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: OpenHarmony
+    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: 

二進制
Assets/Art/UIAssets/decorate/dec_gf_di_xingchendao.png


二進制
Assets/Art/UIAssets/decorate/dec_glow.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_glow.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: C30evSykAikqu/WF65a/hVNYflAY9S4d4QAfpWZDlmF1pL4/65pNZZ/IGF70
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    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: OpenHarmony
+    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: 

二進制
Assets/Art/UIAssets/decorate/dec_jianbian_tiao2.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_jianbian_tiao2.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: Wi4ZsC6uVHq8sc1ZQO5buVQbw5jObUxyYay3lIOWrEFUIieM6jWTNsXKg73/
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    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: OpenHarmony
+    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: 

二進制
Assets/Art/UIAssets/decorate/dec_tiaozheng.png


二進制
Assets/Art/UIAssets/decorate/dec_weixuanzhong.png


二進制
Assets/Art/UIAssets/decorate/dec_xuanzhong.png


二進制
Assets/Art/UIAssets/decorate/dec_yuanquan.png


+ 203 - 0
Assets/Art/UIAssets/decorate/dec_yuanquan.png.meta

@@ -0,0 +1,203 @@
+fileFormatVersion: 2
+guid: WnJNsyz4AS7IE/Ap8/mGBaZh4GMf9gIkNLwcXmQ/FW+Zjg1N3NajczQVl8Tp
+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
+  - serializedVersion: 3
+    buildTarget: iPhone
+    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: Android
+    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
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    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: OpenHarmony
+    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: 

File diff suppressed because it is too large
+ 465 - 523
Assets/Art/cs3.scene


+ 383 - 0
Assets/Res/HeroAnimtion/gw_man.asset

@@ -0,0 +1,383 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-7423539111962818359
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: sk2
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356743
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356743
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: a290c00836e160a45be0159ce1ea8a7e, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &-7074638496955154251
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: gj2
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356740
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356740
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 63aaff123ffa6164fbed638ccc46b8bc, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &-5131667064088292951
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: xiuxian
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356744
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356744
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 6669c25f526232d4cbc7ed3260399f5d, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f08fdd50e79d0c4bb235a5c2696516d, type: 3}
+  m_Name: gw_man
+  m_EditorClassIdentifier: 
+  _Definition:
+    _Transitions:
+    - {fileID: 7796047374707987158}
+    - {fileID: 940026105586131154}
+    - {fileID: -7074638496955154251}
+    - {fileID: 2806995758234566110}
+    - {fileID: 4020065618120489619}
+    - {fileID: -7423539111962818359}
+    - {fileID: -5131667064088292951}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 4
+      _To: 0
+      _Fade: 0
+    - _From: 5
+      _To: 0
+      _Fade: 0
+    - _From: 6
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 4
+      _To: 1
+      _Fade: 0
+    - _From: 5
+      _To: 1
+      _Fade: 0
+    - _From: 6
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 4
+      _To: 2
+      _Fade: 0
+    - _From: 5
+      _To: 2
+      _Fade: 0
+    - _From: 6
+      _To: 2
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    - _From: 4
+      _To: 3
+      _Fade: 0
+    - _From: 5
+      _To: 3
+      _Fade: 0
+    - _From: 6
+      _To: 3
+      _Fade: 0
+    - _From: 0
+      _To: 4
+      _Fade: 0
+    - _From: 1
+      _To: 4
+      _Fade: 0
+    - _From: 2
+      _To: 4
+      _Fade: 0
+    - _From: 3
+      _To: 4
+      _Fade: 0
+    - _From: 4
+      _To: 4
+      _Fade: 0
+    - _From: 5
+      _To: 4
+      _Fade: 0
+    - _From: 6
+      _To: 4
+      _Fade: 0
+    - _From: 0
+      _To: 5
+      _Fade: 0
+    - _From: 1
+      _To: 5
+      _Fade: 0
+    - _From: 3
+      _To: 5
+      _Fade: 0
+    - _From: 2
+      _To: 5
+      _Fade: 0
+    - _From: 4
+      _To: 5
+      _Fade: 0
+    - _From: 5
+      _To: 5
+      _Fade: 0
+    - _From: 6
+      _To: 5
+      _Fade: 0
+    - _From: 0
+      _To: 6
+      _Fade: 0
+    - _From: 1
+      _To: 6
+      _Fade: 0
+    - _From: 2
+      _To: 6
+      _Fade: 0
+    - _From: 3
+      _To: 6
+      _Fade: 0
+    - _From: 4
+      _To: 6
+      _Fade: 0
+    - _From: 5
+      _To: 6
+      _Fade: 0
+    - _From: 6
+      _To: 6
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+--- !u!114 &940026105586131154
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: gj1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356739
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356739
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 5b415b5ca08a6b742a522aca46d89e50, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &2806995758234566110
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: idle
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356741
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356741
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 61660e7f2528ef94ca8cba6149bb3052, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &4020065618120489619
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: sk1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356742
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356742
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: af21fd16025fe13499a361b6d3981614, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &6039137609317899203
+MonoBehaviour:
+  m_ObjectHideFlags: 17
+  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: f04d4a67566152e40aaa01b8b745ff6b, type: 3}
+  m_Name: Editor Data
+  m_EditorClassIdentifier: 
+  _Library: {fileID: 11400000}
+  _TransitionSortMode: 0
+--- !u!114 &7796047374707987158
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: die
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356738
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356738
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: afe99e93e98a6e64593dcba6f7bfb74e, type: 3}
+        _NormalizedStartTime: NaN

+ 8 - 0
Assets/Res/HeroAnimtion/gw_man.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: WS4d5COoUy1Vyb2p7xQCaq6aka6dQS87XU8+nuGH5RGBLxgse20lstJtEVO4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 197 - 0
Assets/Res/HeroAnimtion/gw_woman.asset

@@ -0,0 +1,197 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &-5353558639798307437
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: gj2
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356746
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356746
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: 8fbfd261dc233ca4dba91c9f145ea0b5, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &-528145787277073543
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: idle
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356748
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356748
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: fda24d6e16851794695baaeab1817a07, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 6f08fdd50e79d0c4bb235a5c2696516d, type: 3}
+  m_Name: gw_woman
+  m_EditorClassIdentifier: 
+  _Definition:
+    _Transitions:
+    - {fileID: 1511746068948986417}
+    - {fileID: -5353558639798307437}
+    - {fileID: 4720617061133694731}
+    - {fileID: -528145787277073543}
+    _Modifiers:
+    - _From: 0
+      _To: 0
+      _Fade: 0
+    - _From: 1
+      _To: 0
+      _Fade: 0
+    - _From: 2
+      _To: 0
+      _Fade: 0
+    - _From: 3
+      _To: 0
+      _Fade: 0
+    - _From: 0
+      _To: 1
+      _Fade: 0
+    - _From: 1
+      _To: 1
+      _Fade: 0
+    - _From: 2
+      _To: 1
+      _Fade: 0
+    - _From: 3
+      _To: 1
+      _Fade: 0
+    - _From: 0
+      _To: 2
+      _Fade: 0
+    - _From: 0
+      _To: 3
+      _Fade: 0
+    - _From: 1
+      _To: 2
+      _Fade: 0
+    - _From: 1
+      _To: 3
+      _Fade: 0
+    - _From: 2
+      _To: 2
+      _Fade: 0
+    - _From: 2
+      _To: 3
+      _Fade: 0
+    - _From: 3
+      _To: 2
+      _Fade: 0
+    - _From: 3
+      _To: 3
+      _Fade: 0
+    _Aliases: []
+    _AliasAllTransitions: 0
+--- !u!114 &1511746068948986417
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: gj1
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356745
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356745
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: f79afe64a38427d4d890507fc6f1f912, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &4720617061133694731
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: c5a8877f26e7a6a43aaf06fade1a064a, type: 3}
+  m_Name: idle3
+  m_EditorClassIdentifier: 
+  _Transition:
+    rid: 3276232487146356747
+  references:
+    version: 2
+    RefIds:
+    - rid: 3276232487146356747
+      type: {class: ClipTransition, ns: Animancer, asm: Kybernetik.Animancer}
+      data:
+        _FadeDuration: 0.25
+        _Speed: 1
+        _Events:
+          _NormalizedTimes: []
+          _Callbacks: []
+          _Names: []
+        _Clip: {fileID: 1827226128182048838, guid: df8e71f1e89913d4d816cd5dc061974d, type: 3}
+        _NormalizedStartTime: NaN
+--- !u!114 &6039137609317899203
+MonoBehaviour:
+  m_ObjectHideFlags: 17
+  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: f04d4a67566152e40aaa01b8b745ff6b, type: 3}
+  m_Name: Editor Data
+  m_EditorClassIdentifier: 
+  _Library: {fileID: 11400000}
+  _TransitionSortMode: 0

+ 8 - 0
Assets/Res/HeroAnimtion/gw_woman.asset.meta

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

+ 1 - 0
Assets/Res/TimeLineAssets/Gw_Man_TD.txt

@@ -0,0 +1 @@
+{"timeLineName":"Gw_Man","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.666667,\"continuedTime\":1.666667,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"g2\",\"isActivity\":true,\"startTime\":0,\"endTime\":2,\"continuedTime\":2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"sk2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"sk2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Man","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 7 - 0
Assets/Res/TimeLineAssets/Gw_Man_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: XnlNsHmqBS2nwuL/zvz6bMHUvIwWpDwtNHoiJ4rhClFfcju/PjDfQFV8W6h/
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 0
Assets/Res/TimeLineAssets/Gw_Woman_TD.txt

@@ -0,0 +1 @@
+{"timeLineName":"Gw_Woman","key":["TineLineAnimationPlayableSerialization","TineLineAnimationPlayableSerialization"],"value":["{\"animName\":\"gj1\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj1\",\"isActivity\":true,\"startTime\":0,\"endTime\":1.2,\"continuedTime\":1.2,\"targetEntityType\":0,\"totalTime\":0}","{\"animName\":\"gj2\",\"loopMode\":0,\"isRunPlay\":false,\"layerId\":0,\"isEquip\":false,\"equipId\":0,\"groupName\":\"gj2\",\"isActivity\":true,\"startTime\":0,\"endTime\":1,\"continuedTime\":1,\"targetEntityType\":0,\"totalTime\":0}"],"heroName":"Gw_Woman","allAssetSerializations":{},"allAssetSerializationsKeys":{"Count":0,"tranId":0,"buffer":null,"isNotPool":true,"size":0}}

+ 7 - 0
Assets/Res/TimeLineAssets/Gw_Woman_TD.txt.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DH9O4yOpVC9+yek83zuqSY0m4iR189t4pwUm+LhwJ0/pmLcDFUopHrZle/h1
+TextScriptImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

File diff suppressed because it is too large
+ 524 - 130
Assets/Res/UI/SkillSelectPanel/GongFaUpgradePanel.prefab


+ 267 - 23
Assets/Res/UI/SkillSelectPanel/SkillSelectPanel.prefab

@@ -306,6 +306,95 @@ RectTransform:
   m_AnchoredPosition: {x: 0, y: 0}
   m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &220275034093796698
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 50435170631078031}
+  - component: {fileID: 5388579598620886646}
+  - component: {fileID: 5398071594155269881}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (1)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &50435170631078031
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 1}
+  m_AnchorMax: {x: 0.5, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 750, y: 741}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &5388579598620886646
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  m_CullTransparentMesh: 1
+--- !u!114 &5398071594155269881
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 220275034093796698}
+  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: 0.82745105, g: 0.82745105, b: 0.7490196, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 21300000, guid: b70e2b27a4af6b6488a5ef29c0b8e8a6, type: 3}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: bg_gf_xingchendao
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 0}
+  packInfo:
+    packName: bg
+    packgJsonPath: /Art/UIAssets/TextrueJson/bg.txt
+    packgSpritePath: Assets/Res/UIAtlas/bg.spriteatlasv2
+    lasetJsonGUID: a8c60c0bafc6a50970ede1f51833bf09
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
+  bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
+  direction: 0
 --- !u!1 &507132182724022166
 GameObject:
   m_ObjectHideFlags: 0
@@ -618,7 +707,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.9921569, g: 0.9803922, b: 0.9607844, a: 1}
+  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
@@ -635,7 +724,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_xuanzhong
+  _icon_name: dec_weixuanzhong
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
   packInfo:
@@ -672,7 +761,7 @@ MonoBehaviour:
     - Target: {fileID: 8374476484755925391}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.9411765, y: 0.9490196, z: 0.8784314, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -686,14 +775,14 @@ MonoBehaviour:
     - Target: {fileID: 8374476484755925391}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8784314, y: 0.95686275, z: 0.89411765, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
   - {fileID: 857437492319237345}
   - {fileID: 8374476484755925391}
   AllComsStateTypes: 4002000080000000
-  CurrIndex: 1
+  CurrIndex: 0
 --- !u!114 &1911700382173267592
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -2039,6 +2128,95 @@ MonoBehaviour:
   topOrLeftColor: {r: 1, g: 1, b: 1, a: 1}
   bottomOrRightColor: {r: 0, g: 0, b: 0, a: 1}
   direction: 0
+--- !u!1 &2792882705726486909
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3272393574512112453}
+  - component: {fileID: 749452282353296769}
+  - component: {fileID: 3155142313046984080}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: Image (4)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3272393574512112453
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6694772361877173011}
+  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: 6, y: 481}
+  m_SizeDelta: {x: 470.3329, y: 470.3329}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &749452282353296769
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  m_CullTransparentMesh: 1
+--- !u!114 &3155142313046984080
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2792882705726486909}
+  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: 0.227451, g: 0.69411767, b: 0.86666673, 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_glow
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  packInfo:
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
+  imageH: 1624
+  useGradient: 0
+  topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
+  bottomOrRightColor: {r: 0.5568628, g: 0.76470596, b: 0.74509805, a: 1}
+  direction: 0
 --- !u!1 &2852344175065108756
 GameObject:
   m_ObjectHideFlags: 0
@@ -2070,6 +2248,8 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 5473342035507285947}
+  - {fileID: 50435170631078031}
+  - {fileID: 3272393574512112453}
   - {fileID: 6870355629153732168}
   - {fileID: 6565763541845300463}
   - {fileID: 4487645842108660236}
@@ -2885,6 +3065,7 @@ GameObject:
   - component: {fileID: 8770117552995916788}
   - component: {fileID: 8438237142757567239}
   - component: {fileID: 1461499720874115526}
+  - component: {fileID: 7136091248352913582}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -2933,7 +3114,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6431373, g: 0.70980394, b: 0.654902, a: 1}
+  m_Color: {r: 0.9411765, g: 0.9490196, b: 0.8784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -2954,6 +3135,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8F85\u52A9"
+--- !u!114 &7136091248352913582
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3891518416558775222}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &3898641425973088963
 GameObject:
   m_ObjectHideFlags: 0
@@ -3880,7 +4076,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Color: {r: 0.82745105, g: 0.82745105, b: 0.7490196, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -3897,14 +4093,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_diban
+  _icon_name: dec_juxing_fang
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: ec7ecef974a85f145b7ba1bd986de220, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
   packInfo:
-    packName: gongfa
-    packgJsonPath: /Art/UIAssets/TextrueJson\gongfa.txt
-    packgSpritePath: Assets/Res/UIAtlas/gongfa.spriteatlasv2
-    lasetJsonGUID: d888d6e73899265a3799225e04fd014b
+    packName: tongyong
+    packgJsonPath: /Art/UIAssets/TextrueJson\tongyong.txt
+    packgSpritePath: Assets/Res/UIAtlas/tongyong.spriteatlasv2
+    lasetJsonGUID: 6472d9ebc06e87fe8abb79924cdc3be1
   imageH: 1624
   useGradient: 0
   topOrLeftColor: {r: 0.098039225, g: 0.16862746, b: 0.18431373, a: 1}
@@ -4080,7 +4276,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: -3.7, y: 55.425095}
+  m_AnchoredPosition: {x: 0.000012159, y: 55.425095}
   m_SizeDelta: {x: 750, y: 110.8501}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3493563560025743580
@@ -4104,7 +4300,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.19215688, g: 0.3647059, b: 0.38431376, a: 1}
+  m_Color: {r: 0.8941177, g: 0.8431373, b: 0.7254902, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4145,6 +4341,7 @@ GameObject:
   - component: {fileID: 2509165199344505155}
   - component: {fileID: 4727156979047918535}
   - component: {fileID: 2704694145830204549}
+  - component: {fileID: 5048207027985940991}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4193,7 +4390,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.87843144, g: 0.9568628, b: 0.8941177, a: 1}
+  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
@@ -4214,6 +4411,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u5168\u90E8"
+--- !u!114 &5048207027985940991
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5885840101328355703}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &6601605642981940278
 GameObject:
   m_ObjectHideFlags: 0
@@ -4448,6 +4660,7 @@ GameObject:
   - component: {fileID: 4070278992186964066}
   - component: {fileID: 1896888060464675892}
   - component: {fileID: 5928119389132673519}
+  - component: {fileID: 7075714363060638667}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -4496,7 +4709,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.57254905, g: 0.43529415, b: 0.19607845, a: 1}
+  m_Color: {r: 0.94117653, g: 0.9568628, b: 0.909804, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -4504,7 +4717,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
     m_FontSize: 40
     m_FontStyle: 1
     m_BestFit: 0
@@ -4517,6 +4730,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u8C03\u6574"
+--- !u!114 &7075714363060638667
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6835285763623382150}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.36078432, g: 0.53333336, b: 0.454902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &7181239539594388838
 GameObject:
   m_ObjectHideFlags: 0
@@ -4800,7 +5028,7 @@ MonoBehaviour:
     - Target: {fileID: 3891518416558775222}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.9411765, y: 0.9490196, z: 0.8784314, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -4814,7 +5042,7 @@ MonoBehaviour:
     - Target: {fileID: 3891518416558775222}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.8784314, y: 0.95686275, z: 0.89411765, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:
@@ -4981,6 +5209,7 @@ GameObject:
   - component: {fileID: 1357601294388932923}
   - component: {fileID: 489359079058652538}
   - component: {fileID: 8197373045940010032}
+  - component: {fileID: 566360598316617976}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -5029,7 +5258,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.8784314, g: 0.95686275, b: 0.89411765, a: 1}
+  m_Color: {r: 0.9411765, g: 0.9490196, b: 0.8784314, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -5050,6 +5279,21 @@ MonoBehaviour:
     m_VerticalOverflow: 0
     m_LineSpacing: 1
   m_Text: "\u4E3B\u52A8"
+--- !u!114 &566360598316617976
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8374476484755925391}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0.7803922, g: 0.67058825, b: 0.5254902, a: 1}
+  m_EffectDistance: {x: 1, y: -1}
+  m_UseGraphicAlpha: 1
 --- !u!1 &8428897132685908306
 GameObject:
   m_ObjectHideFlags: 0
@@ -5381,7 +5625,7 @@ MonoBehaviour:
     - Target: {fileID: 5885840101328355703}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.6431373, y: 0.70980394, z: 0.654902, w: 1}
+      - {x: 0.94117653, y: 0.9490197, z: 0.87843144, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   - StateInfos:
@@ -5395,7 +5639,7 @@ MonoBehaviour:
     - Target: {fileID: 5885840101328355703}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 0.87843144, y: 0.9568628, z: 0.8941177, w: 1}
+      - {x: 1, y: 1, z: 1, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:

+ 3 - 0
Assets/Res/UIAtlas/tongyong.spriteatlasv2

@@ -47,6 +47,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 0ca05684ec26a624a9be95c43eaa0897, type: 3}
     - {fileID: 2800000, guid: 7a4d82b8d51add842a86c03efe809031, type: 3}
     - {fileID: 2800000, guid: 17b5819cad711404c975f429ddaacb35, type: 3}
+    - {fileID: 2800000, guid: 471869ab4e95d7148ae33f596ff58701, type: 3}
     - {fileID: 2800000, guid: ed5c755d642c4154ebee5e36e03b7842, type: 3}
     - {fileID: 2800000, guid: 6c45afd6bc7e1db429d58030b64f1609, type: 3}
     - {fileID: 2800000, guid: a3178eda8f1ba914b82935602d128450, type: 3}
@@ -54,6 +55,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: eb44227a93f162245ab5ca2598da46f6, type: 3}
     - {fileID: 2800000, guid: c72ebc5d8ce36804996ee703ace7b435, type: 3}
     - {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    - {fileID: 2800000, guid: ed654371779a62345955e43f0eacacc2, type: 3}
     - {fileID: 2800000, guid: 28ecf9571bb84a34baf741a7755478ab, type: 3}
     - {fileID: 2800000, guid: 961a8424bce54524f84abe77130c7754, type: 3}
     - {fileID: 2800000, guid: b845f98d3db279d41b8e0cddd75b1e66, type: 3}
@@ -109,6 +111,7 @@ SpriteAtlasAsset:
     - {fileID: 2800000, guid: 43ee7ca9b6e77b041a5a5c40598a7267, type: 3}
     - {fileID: 2800000, guid: 2d2e9b702b9dc20418741c36f06c90b5, type: 3}
     - {fileID: 2800000, guid: 939cf700d9f1e0344914a17bda374b4a, type: 3}
+    - {fileID: 2800000, guid: e8b66ebe511cc1d4e85937a30bccd4a3, type: 3}
     - {fileID: 2800000, guid: 7e5ce0d678f92704a9674a80dc521664, type: 3}
     - {fileID: 2800000, guid: 9c0b0fd4eb2445f4cabe4b5febe52f66, type: 3}
     - {fileID: 2800000, guid: 416044e3ca43d5d47adb73e0b3c82e5e, type: 3}

+ 3 - 3
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -61,10 +61,10 @@ Material:
     - _QueueControl: 0
     - _QueueOffset: 0
     - _depthoff: 1.18
-    - _qiangdu: 4
+    - _qiangdu: 5
     - _ran: 0.1
     m_Colors:
-    - _mainColor: {r: 0.1196062, g: 1.0562625, b: 2.3051374, a: 0}
+    - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: -2.643743, g: -5.5874977, b: -30, a: 0}
   m_BuildTextureStacks: []

+ 5 - 5
Assets/Scripts/GameUI/UI/GongFaUpgradePanel/GongFaUpgradePanel.cs

@@ -183,19 +183,19 @@ namespace Fort23.Mono
             switch (skillConfig.attribute)
             {
                 case 1:
-                    Icon_Attribute.icon_name = "dec_jin";
+                    Icon_Attribute.icon_name = "dec_jin2";
                     break;
                 case 2:
-                    Icon_Attribute.icon_name = "dec_mu";
+                    Icon_Attribute.icon_name = "dec_mu2";
                     break;
                 case 4:
-                    Icon_Attribute.icon_name = "dec_shui";
+                    Icon_Attribute.icon_name = "dec_shui2";
                     break;
                 case 8:
-                    Icon_Attribute.icon_name = "dec_huo";
+                    Icon_Attribute.icon_name = "dec_huo2";
                     break;
                 case 16:
-                    Icon_Attribute.icon_name = "dec_tu";
+                    Icon_Attribute.icon_name = "dec_tu2";
                     break;
             }
 

二進制
Excel2Json/Excel/Item.xlsx


File diff suppressed because it is too large
+ 0 - 0
UGUIPack/uguiconfig.db


+ 2 - 2
UserSettings/EditorUserSettings.asset

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

二進制
美术/art_use_ui/battle/dec_gf_di_xingchendao.png


二進制
美术/art_use_ui/bg/bg_gf_xingchendao.png


二進制
美术/art_use_ui/gongfa/dec_tiaozheng.png


二進制
美术/art_use_ui/gongfa/dec_weixuanzhong.png


二進制
美术/art_use_ui/gongfa/dec_xuanzhong.png


二進制
美术/art_use_ui/tongyong/dec_glow.png


二進制
美术/art_use_ui/tongyong/dec_jianbian_tiao2.png


二進制
美术/art_use_ui/tongyong/dec_yuanquan.png


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

@@ -1 +1 @@
-{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}
+{"packName":"bg","isTyPack":false,"newTextureJson":[{"textrueName":"bg_daoyou_lihui1","filePath":"/bg/bg_daoyou_lihui1.png"},{"textrueName":"bg_daoyou_lihui2","filePath":"/bg/bg_daoyou_lihui2.png"},{"textrueName":"bg_daoyou_lihui3","filePath":"/bg/bg_daoyou_lihui3.png"},{"textrueName":"bg_dongfu","filePath":"/bg/bg_dongfu.png"},{"textrueName":"bg_gf_xingchendao","filePath":"/bg/bg_gf_xingchendao.png"},{"textrueName":"bg_gushi_di","filePath":"/bg/bg_gushi_di.png"},{"textrueName":"bg_map_di","filePath":"/bg/bg_map_di.png"},{"textrueName":"bg_map_dikuai","filePath":"/bg/bg_map_dikuai.png"},{"textrueName":"bg_pata","filePath":"/bg/bg_pata.png"},{"textrueName":"bg_shan_di","filePath":"/bg/bg_shan_di.png"},{"textrueName":"bg_shengli","filePath":"/bg/bg_shengli.png"},{"textrueName":"bg_shengli_di","filePath":"/bg/bg_shengli_di.png"},{"textrueName":"bg_shibai","filePath":"/bg/bg_shibai.png"},{"textrueName":"bg_shibai_di","filePath":"/bg/bg_shibai_di.png"},{"textrueName":"bg_tianfu","filePath":"/bg/bg_tianfu.png"},{"textrueName":"bg_xianturiji","filePath":"/bg/bg_xianturiji.png"},{"textrueName":"bg_xinjing","filePath":"/bg/bg_xinjing.png"},{"textrueName":"bg_xiulian","filePath":"/bg/bg_xiulian.png"},{"textrueName":"bg_zairu","filePath":"/bg/bg_zairu.png"},{"textrueName":"bg_zhangjie","filePath":"/bg/bg_zhangjie.png"},{"textrueName":"bg_zs_01","filePath":"/bg/bg_zs_01.png"},{"textrueName":"bg_zs_02","filePath":"/bg/bg_zs_02.png"}],"keyToValue":{}}

File diff suppressed because it is too large
+ 0 - 0
美术/unity_use_ui/TextrueJson/tongyong.txt


二進制
美术/unity_use_ui/bg/bg_gf_xingchendao.png


二進制
美术/unity_use_ui/decorate/dec_gf_di_xingchendao.png


二進制
美术/unity_use_ui/decorate/dec_glow.png


二進制
美术/unity_use_ui/decorate/dec_jianbian_tiao2.png


二進制
美术/unity_use_ui/decorate/dec_tiaozheng.png


二進制
美术/unity_use_ui/decorate/dec_weixuanzhong.png


二進制
美术/unity_use_ui/decorate/dec_xuanzhong.png


二進制
美术/unity_use_ui/decorate/dec_yuanquan.png


二進制
美术/参考/功法界面 改.png


二進制
美术/参考/功法界面-详情 改.png


Some files were not shown because too many files changed in this diff