Kaynağa Gözat

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

李桃 3 ay önce
ebeveyn
işleme
4d2e291e81
76 değiştirilmiş dosya ile 323 ekleme ve 818 silme
  1. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta
  2. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta
  3. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta
  4. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta
  5. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta
  6. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta
  7. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta
  8. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta
  9. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta
  10. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta
  11. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta
  12. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta
  13. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta
  14. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta
  15. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta
  16. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta
  17. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta
  18. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta
  19. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta
  20. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta
  21. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta
  22. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta
  23. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta
  24. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta
  25. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta
  26. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta
  27. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta
  28. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta
  29. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta
  30. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta
  31. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta
  32. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta
  33. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta
  34. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta
  35. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta
  36. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta
  37. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta
  38. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta
  39. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta
  40. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta
  41. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta
  42. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta
  43. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta
  44. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta
  45. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta
  46. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta
  47. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta
  48. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta
  49. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta
  50. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta
  51. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta
  52. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta
  53. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta
  54. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta
  55. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta
  56. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta
  57. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta
  58. 3 3
      Assets/Res/UI/WidgetHero.prefab
  59. 6 6
      Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs
  60. 9 7
      Assets/Scripts/Core/UI/UTool/UITween/TweenBasic.cs
  61. 3 0
      Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData.meta
  62. 10 0
      Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs
  63. 3 0
      Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs.meta
  64. 12 0
      Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs
  65. 3 0
      Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs.meta
  66. 2 2
      Assets/Scripts/Core/UI/UTool/UITween/TweenCanvasGroup.cs
  67. 50 17
      Assets/Scripts/Core/UI/UTool/UITween/TweenEntity.cs
  68. 2 2
      Assets/Scripts/Core/UI/UTool/UITween/TweenGraphic.cs
  69. 11 13
      Assets/Scripts/Core/UI/UTool/UITween/TweenPlayFx.cs
  70. 2 2
      Assets/Scripts/Core/UI/UTool/UITween/TweenTextMeshProUGUI.cs
  71. 2 2
      Assets/Scripts/Core/UI/UTool/UITween/TweenTransform.cs
  72. 25 10
      Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs
  73. 4 0
      Assets/Scripts/GameLogic/Combat/CombatEvent/CombatUseSkillEventData.cs
  74. 1 1
      Assets/Scripts/GameUI/UI/MainUIPanel.cs
  75. 1 1
      ProjectSettings/EntitiesClientSettings.asset
  76. 174 353
      UserSettings/Layouts/default-2022.dwlt

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XnNOvS2rBXlxXpr16fvCmsPHgWH8VFHvaajxnXEO0+Lb+o7fajApk9g=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wn9Osn6uWy19n3dRwPVXSi8zA/NNxMGamLi6utiwD+X5DpzMgms/FuQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3IW4HirVHp0wSS+sYuhPq4wOVtRbtACyDpCZepeaCbfGI08iv6f7nQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CHkc4CmoWyo5sfhaQFShkw8xWrnK+juSPLRnEr3llUekkRBix5ZoBfM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: By8e43v/W3qLQOMbGDHKnzQ1oVBoz5MMFUugFGg14LSYNj1Njr+MPYQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnxK5HivV33OupUJ+JP+V/9teQap+ztGB11Lq2ALmJ7bla/ddbhYa04=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WntJtHioU3NKb2nnD0dUISgC1zZQcsilS4IbgriLnCZ1wIyK9cX4J6k=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Di8X4SmvB3ge6zef2gCaXRZq3zBtFY8jFzd5o6bomPWk5L14wwtHKJ0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XHJK4S6rBi/k6hiG+4qlvyeg8D9jbTYaSpnLNdwRKj8F6vNTRi6falo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XX4etS2oB371NxuZcw05IS7s+EBX/Ogp24kPquNVxP4ZZ7thmGQ150s=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DnwbtX+qW3kUcU7gF/g5Ww8eYRAfyBUw09gomb/TK0PqVTeGcmPy6+c=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DHsZ5yisAX7UVf3pVzwzK1HoZ/JB0X6kdTqBV+yZJOe8wTWWflACQro=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XSxL5yOuUnkMucF5NjiSv6mC0MomCcuCw/OcjNahb/EEKvGYmLA88bo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XixO5yKtBSkujT/Yo+LlHZVgWWHJlfZDrxmT87bhSGjnJVND3Stiajg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CyxKsC2sWypcCjPE0h7XuANJjwfU+gi9pwWnq6SzC0jS2RgVBz+xElI=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XnkX4yr+UH2DIh54RIzV3KC0zEu/+w8JOEJAjd+8DkooXRRnVRS8gn4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DX4dtHz4Bipv7q0XRgKEar+wpEuoC5+XJQm5wBThWoKT7rD9nJ7811M=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS4WtSytUXqUcAvvuEz6MIe6wC5++VEmCknpN9DxdlxEC/9fhamMdSY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D35Nt3/7V3oeeg2tECPRN5W7PXslQjV7n/sPfo4SCFc3sJPYe5J8ky8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: D3tNsyilB3i4xmmkmAD3BN/NbtaODW6sRIh/o2RdBJE/jqqDLbidyr4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wysbt3+vVXnqMmqdutbdvYNzhJ9lOfMN3MvpbBt8w0h3jmxv5PhvZF0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CnxNsnuqBX4S8omhxPbs1mqYKa1B0YuAkaDOycWbV8KQv1GXlh5SG08=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wiwa4S+qV3NOhqCLPdnZ0OEH1LYB0bSGgD5xAnWooXHJCl1VRAiHQf8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Bi9L4Cj+AHPuGn8LZIYTb5B2HOjwV6mjAvna2Ye/9nSE+zxpNfe5LcY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CXsZvXmvVXsRGEYgSXpAoLhOATQ4iz+KOq51ccrRpyxNPfFkTWo7IJg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CitKsiOsU3nwm9PqkqRsuIBPvjM/CQqmZo6H14bJDHRhyBJooAqrf38=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CilLsCytBi7buU3Wf6Zw+6P64zzFZXQmZ66qyUp0JNKprV5dI0muOPk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DyxKty2rBXn/06ZsUtf9TF7orZHiO76HLMfFgi8hUUL4ToHtSgK4yMY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WX4Y43usUyorijdis2k62UjUG1/+PvFyLo6icQdiFk+P5zkhnYYV0tQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CSlJ5yKoVn9L6v/2bU+18WEkkeJMVwhHj2EXqitM3KO0Vpscl4EEDow=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnoY4yqtBn/wYhJMhwat1IBCtMjJ9ma1tBGHRbYCQtN9QetRU21pdxE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CSsZtSyrW3KdesuXUQEF3GG0ZG6PcjmSlhNda4HHSHWHdJJU4ZWcIWU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: W3MWvC2sU3kqwEOsO5qExfOMwKbalcywli/mlT3+gBhnH/DcEg4LIXY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DitM4CP4Wy8kasO+J7x8PL4OCgy0MqfDYl7/WUQ55A0IbTgyDRYDckQ=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XHoa536qVSo1MMzWPhQGBzsVJIL+JaetQxMdeZg5pa6ogw4scREnmvY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C3tOtyr/AHp/afz3Hg+9Q47UzuY2IqYHplEf4ui3zRoLkI/GLN6CujE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: BnhN4X6rUH0jMn3fYObWQUvXrEiasSCkPhc8JbOsINIutcWU4CgChWg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CCwetCutAi2UV5mMi3dJGtbf7TH8Pl7uWAXtnE2Q8o6LEffgYLVMPok=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Ci5M4XmtV3kTcEFfo31h77sRxXdBJug8JUP5av/cDJOmU91aMB3aWAs=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CHpOtiOlUCiLhXBdTUlThN/xOtLXptISi6yHthB8Gmz24rf6IL106tE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXMasS75BX98L9GjB44gwXorFMSrN633nseMNo6AitM4/+nv8KTFnbk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CywasCz7B3jMYlg5tDSfqsXkczUoioSG65XnqOwbGBKzKSdFXt0Df+k=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DX0ZsCz/VnOmWhUILaTbxboK/G7/GWAzv8HhlihSjNiR+Y4CLWGobrM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: By8X53yrU38bknJGUihaIUtOATknopJbDRlc+JSwkT64aIy5qDG7EEA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WX9OvC6uByoOIrVW3nIQSMNf3LM1pZD9Ka2y441hC4JSQIu9SrdoSno=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnhLti+lWyl9Kn3CNyMd2EJiT+dJT6mEOlKfEBXlesCRUFd/EeJFJS8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CX8dtSKlB3jowDuy6mzIlk6K9S+iuvY2p4nGn2PAWSpGaTQdEzIEXoo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnpNsiikVS0cPCBiY0rPqTCAaLCqpejlGuaYCE/ygObHZK+qTG5tFiE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wi8b4SqsBntipPRSKRJiQN1SMhfD4TziuhYK9TFzunh65XqXmYg+Kp8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C30W5HysAn+0f2PAjQx5oTiz0ATQjbJb5Q0VTjAlfmSRrU1sfJUP9NA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wy8ftS6uUH5y5qPwQ0yu8W/oYp7ZH6MFLPwcssmhpvfuF4Hn+HwbtXo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Dn0btXz4VX8OXiNzaUfQswmQwVhP0uonJUtbFeIgLOpvDA2SrIVx6RM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CXxNsnv/USgeazDGmL/lIDqBQZgOfxKN6zmeUKj6dMlSXl/IVr9iYTM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CH0ftij5VC97tNfIkeEuIHzHPrIDIqpQITPaUgF/jP7GWCmLbbmKub0=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CC4Y5i37USg4QBqGqWb0PcWqg+/JirlZgWVdlE7zYZSzFywN6HoiKOs=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CikWtiytBn2/7jzkHypzFxJoLGSG+NWtu4kZSOHtbfAvMTyZkCX8SD8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 7
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WnIcsyv8W3JU+JtswB+d+yeRz1OsDww2KAKE4L9ZkeMrktxzi3TrJMo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 3 - 3
Assets/Res/UI/WidgetHero.prefab

@@ -1559,12 +1559,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Script: {fileID: 11500000, guid: 6a23dadfaa104ddf929b8c98dd02623c, type: 3}
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
-  maxDuration: 0.8
+  maxDuration: 0
   isUpdate: 0
   isUpdate: 0
-  currTime: 0.80217147
+  currTime: 0.8180616
   GrpupInfos:
   GrpupInfos:
   - Foldout: 1
   - Foldout: 1
-    isActive: 1
+    isActive: 0
     animName: skillShow
     animName: skillShow
     isLoop: 0
     isLoop: 0
     allTargets:
     allTargets:

+ 6 - 6
Assets/Scripts/Core/UI/UTool/UITween/TweenAssetGrpupInfo.cs

@@ -21,7 +21,7 @@ namespace Core.UI.UTool.UITween
         // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
         // public List<TweenEntity> allTweenInfo = new List<TweenEntity>();
 
 
 
 
-        public void StartPlay()
+        public void StartPlay(UITweenController uiTweenController)
         {
         {
             if (TweenAssetInfo == null)
             if (TweenAssetInfo == null)
             {
             {
@@ -38,7 +38,7 @@ namespace Core.UI.UTool.UITween
                 }
                 }
 
 
                 tweenEntity.Prepare();
                 tweenEntity.Prepare();
-                tweenEntity.Rest(allTargets[i]);
+                tweenEntity.Rest(uiTweenController,allTargets[i]);
             }
             }
 
 
             isUpdate = true;
             isUpdate = true;
@@ -63,7 +63,7 @@ namespace Core.UI.UTool.UITween
             }
             }
         }
         }
 
 
-        public void JumpToTime(float t)
+        public void JumpToTime(UITweenController UITweenController,float t)
         {
         {
             if (TweenAssetInfo == null)
             if (TweenAssetInfo == null)
             {
             {
@@ -76,10 +76,10 @@ namespace Core.UI.UTool.UITween
                 // allTweenInfo[i].Rest();
                 // allTweenInfo[i].Rest();
             }
             }
 
 
-            PlayTween(t, true);
+            PlayTween(UITweenController,t, true);
         }
         }
 
 
-        public void PlayTween(float t, bool isFallBack)
+        public void PlayTween(UITweenController UITweenController,float t, bool isFallBack)
         {
         {
             if (TweenAssetInfo == null)
             if (TweenAssetInfo == null)
             {
             {
@@ -93,7 +93,7 @@ namespace Core.UI.UTool.UITween
 
 
             for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
             for (int i = 0; i < TweenAssetInfo.allTweenInfo.Count; i++)
             {
             {
-                TweenAssetInfo.allTweenInfo[i].Play(allTargets[i], t, isFallBack);
+                TweenAssetInfo.allTweenInfo[i].Play(UITweenController,allTargets[i], t, isFallBack);
             }
             }
         }
         }
     }
     }

+ 9 - 7
Assets/Scripts/Core/UI/UTool/UITween/TweenBasic.cs

@@ -16,31 +16,33 @@ namespace Core.UI.UTool.UITween
         protected float _addTime;
         protected float _addTime;
 
 
 
 
-        public void Play(Object RectTransform,float allTime,bool isFallBack)
+
+        public void Play(UITweenController uiTweenController,Object RectTransform,float allTime,bool isFallBack)
         {
         {
+          
             if (allTime < delay)
             if (allTime < delay)
             {
             {
                 if (isFallBack)
                 if (isFallBack)
                 {
                 {
-                    Rest(RectTransform);
+                    Rest(uiTweenController,RectTransform);
                 }
                 }
 
 
                 return;
                 return;
             }
             }
 
 
-            ProPlay(RectTransform,allTime - delay);
+            ProPlay(uiTweenController,RectTransform,allTime - delay);
         }
         }
 
 
-        protected virtual void ProPlay(Object RectTransform,float allTime)
+        protected virtual void ProPlay(UITweenController uiTweenController,Object RectTransform,float allTime)
         {
         {
         }
         }
 
 
-        public void Rest(Object RectTransform)
+        public void Rest(UITweenController uiTweenController,Object RectTransform)
         {
         {
-            ProRest(RectTransform);
+            ProRest(uiTweenController,RectTransform);
         }
         }
 
 
-        protected virtual void ProRest(Object RectTransform)
+        protected virtual void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
         {
         }
         }
         public void Prepare(float delay,float duration)
         public void Prepare(float delay,float duration)

+ 3 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 1911c1540d244ece9bdefea69b01686d
+timeCreated: 1736157269

+ 10 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs

@@ -0,0 +1,10 @@
+namespace Core.UI.UTool.UITween
+{
+    public class TweenCacheDataBasic
+    {
+        public TweenCacheDataBasic()
+        {
+            
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenCacheDataBasic.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: ea6dd11e07384220b2336d173c6e9f00
+timeCreated: 1736157256

+ 12 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs

@@ -0,0 +1,12 @@
+namespace Core.UI.UTool.UITween
+{
+    public class TweenPlayFxCacheData : TweenCacheDataBasic
+    {
+        public bool isPalyFx;
+
+        public TweenPlayFxCacheData()
+        {
+            
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/Core/UI/UTool/UITween/TweenCacheData/TweenPlayFxCacheData.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 33d6e8df3db8450c9090dc3423092877
+timeCreated: 1736157288

+ 2 - 2
Assets/Scripts/Core/UI/UTool/UITween/TweenCanvasGroup.cs

@@ -25,7 +25,7 @@ namespace Core.UI.UTool.UITween
             return canvasGroup;
             return canvasGroup;
         }
         }
 
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object CanvasGroup, float allTime)
         {
         {
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             if (canvasGroup == null)
             if (canvasGroup == null)
@@ -53,7 +53,7 @@ namespace Core.UI.UTool.UITween
             canvasGroup.alpha = v;
             canvasGroup.alpha = v;
         }
         }
 
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController,Object CanvasGroup)
         {
         {
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             CanvasGroup canvasGroup = GetCanvasGroup(CanvasGroup);
             if (canvasGroup == null)
             if (canvasGroup == null)

+ 50 - 17
Assets/Scripts/Core/UI/UTool/UITween/TweenEntity.cs

@@ -13,9 +13,9 @@ namespace Core.UI.UTool.UITween
         public float delay;
         public float delay;
         [CanBeNull] public TweenTransform TweenBasic = null;
         [CanBeNull] public TweenTransform TweenBasic = null;
         [CanBeNull] public TweenCanvasGroup TweenCanvasGroup = null;
         [CanBeNull] public TweenCanvasGroup TweenCanvasGroup = null;
-        [CanBeNull]  public TweenGraphic TweenGraphic = null;
-        [CanBeNull]  public TweenPlayFx TweenPlayFx = null;
-        
+        [CanBeNull] public TweenGraphic TweenGraphic = null;
+        [CanBeNull] public TweenPlayFx TweenPlayFx = null;
+
         [HideInInspector] public Map<TweenType, TweenBasic> Map = new Map<TweenType, TweenBasic>();
         [HideInInspector] public Map<TweenType, TweenBasic> Map = new Map<TweenType, TweenBasic>();
 
 
         public void Claer()
         public void Claer()
@@ -26,29 +26,62 @@ namespace Core.UI.UTool.UITween
             TweenPlayFx = null;
             TweenPlayFx = null;
         }
         }
 
 
-        public void Play(Object RectTransform,float allTime, bool isFallBack)
+        public void Play(UITweenController UITweenController,Object RectTransform, float allTime, bool isFallBack)
         {
         {
-            TweenBasic?.Play(RectTransform,allTime, isFallBack);
-            TweenCanvasGroup?.Play(RectTransform,allTime, isFallBack);
-            TweenGraphic?.Play(RectTransform,allTime, isFallBack);
-            TweenPlayFx?.Play(RectTransform,allTime, isFallBack);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Play(UITweenController,RectTransform, allTime, isFallBack);
+                    break;
+            }
         }
         }
 
 
 
 
-        public void Rest(Object RectTransform)
+        public void Rest(UITweenController uiTweenController,Object RectTransform)
         {
         {
-            TweenBasic?.Rest(RectTransform);
-            TweenCanvasGroup?.Rest(RectTransform);
-            TweenGraphic?.Rest(RectTransform);
-            TweenPlayFx?.Rest(RectTransform);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Rest(uiTweenController,RectTransform);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Rest(uiTweenController,RectTransform);
+                    break;
+            }
         }
         }
 
 
         public void Prepare()
         public void Prepare()
         {
         {
-            TweenBasic?.Prepare(delay, duration);
-            TweenCanvasGroup?.Prepare(delay, duration);
-            TweenGraphic?.Prepare(delay, duration);
-            TweenPlayFx?.Prepare(delay, duration);
+            switch (TweenType)
+            {
+                case TweenType.RectTransform:
+                    TweenBasic?.Prepare(delay, duration);
+                    break;
+                case TweenType.CanvasGroup:
+                    TweenCanvasGroup?.Prepare(delay, duration);
+                    break;
+                case TweenType.Graphic:
+                    TweenGraphic?.Prepare(delay, duration);
+                    break;
+                case TweenType.PlayFx:
+                    TweenPlayFx?.Prepare(delay, duration);
+                    break;
+            }
         }
         }
     }
     }
 }
 }

+ 2 - 2
Assets/Scripts/Core/UI/UTool/UITween/TweenGraphic.cs

@@ -29,7 +29,7 @@ namespace Core.UI.UTool.UITween
             return graphic;
             return graphic;
         }
         }
 
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object CanvasGroup, float allTime)
         {
         {
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)
             if (graphic == null)
@@ -49,7 +49,7 @@ namespace Core.UI.UTool.UITween
             graphic.color = color;
             graphic.color = color;
         }
         }
 
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController,Object CanvasGroup)
         {
         {
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             Graphic graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)
             if (graphic == null)

+ 11 - 13
Assets/Scripts/Core/UI/UTool/UITween/TweenPlayFx.cs

@@ -6,10 +6,6 @@ namespace Core.UI.UTool.UITween
     [System.Serializable]
     [System.Serializable]
     public class TweenPlayFx : TweenBasic
     public class TweenPlayFx : TweenBasic
     {
     {
-        protected bool isPalyFx;
-
-        protected ParticleSystem[] particleSystems;
-
         public GameObject GetCanvasGroup(Object CanvasGroup)
         public GameObject GetCanvasGroup(Object CanvasGroup)
         {
         {
             GameObject graphic = CanvasGroup as GameObject;
             GameObject graphic = CanvasGroup as GameObject;
@@ -26,7 +22,7 @@ namespace Core.UI.UTool.UITween
         }
         }
 
 
 
 
-        protected override void ProPlay(Object CanvasGroup, float allTime)
+        protected override void ProPlay(UITweenController uiTweenController, Object CanvasGroup, float allTime)
         {
         {
             GameObject graphic = GetCanvasGroup(CanvasGroup);
             GameObject graphic = GetCanvasGroup(CanvasGroup);
             if (graphic == null)
             if (graphic == null)
@@ -34,23 +30,25 @@ namespace Core.UI.UTool.UITween
                 return;
                 return;
             }
             }
 
 
-            if (!isPalyFx)
+            TweenPlayFxCacheData tweenPlayFxCacheData = uiTweenController.GetCacheData<TweenPlayFxCacheData>(this);
+            if (!tweenPlayFxCacheData.isPalyFx)
             {
             {
-                particleSystems = graphic.transform.GetComponentsInChildren<ParticleSystem>();
-                
-                isPalyFx = true;
+                ParticleSystem[] particleSystems = graphic.transform.GetComponentsInChildren<ParticleSystem>();
+
+                tweenPlayFxCacheData.isPalyFx = true;
                 for (int i = 0; i < particleSystems.Length; i++)
                 for (int i = 0; i < particleSystems.Length; i++)
                 {
                 {
                     particleSystems[i].Stop();
                     particleSystems[i].Stop();
-                    particleSystems[i].Clear(true);
-                    particleSystems[i].Play(true);
+                    particleSystems[i].Clear(false);
+                    particleSystems[i].Play(false);
                 }
                 }
             }
             }
         }
         }
 
 
-        protected override void ProRest(Object CanvasGroup)
+        protected override void ProRest(UITweenController uiTweenController, Object CanvasGroup)
         {
         {
-            isPalyFx = false;
+            TweenPlayFxCacheData tweenPlayFxCacheData = uiTweenController.GetCacheData<TweenPlayFxCacheData>(this);
+            tweenPlayFxCacheData.isPalyFx = false;
         }
         }
     }
     }
 }
 }

+ 2 - 2
Assets/Scripts/Core/UI/UTool/UITween/TweenTextMeshProUGUI.cs

@@ -40,7 +40,7 @@ namespace Core.UI.UTool.UITween
             return rectTransform;
             return rectTransform;
         }
         }
 
 
-        protected override void ProPlay(Object RectTransform, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object RectTransform, float allTime)
         {
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
             if (rectTransform == null)
@@ -60,7 +60,7 @@ namespace Core.UI.UTool.UITween
             }
             }
         }
         }
 
 
-        protected override void ProRest(Object RectTransform)
+        protected override void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
             if (rectTransform == null)

+ 2 - 2
Assets/Scripts/Core/UI/UTool/UITween/TweenTransform.cs

@@ -25,7 +25,7 @@ namespace Core.UI.UTool.UITween
             return rectTransform;
             return rectTransform;
         }
         }
 
 
-        protected override void ProPlay(Object RectTransform, float allTime)
+        protected override void ProPlay(UITweenController UITweenController,Object RectTransform, float allTime)
         {
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
             if (rectTransform == null)
@@ -45,7 +45,7 @@ namespace Core.UI.UTool.UITween
             }
             }
         }
         }
 
 
-        protected override void ProRest(Object RectTransform)
+        protected override void ProRest(UITweenController uiTweenController,Object RectTransform)
         {
         {
             RectTransform rectTransform = GetRectTransform(RectTransform);
             RectTransform rectTransform = GetRectTransform(RectTransform);
             if (rectTransform == null)
             if (rectTransform == null)

+ 25 - 10
Assets/Scripts/Core/UI/UTool/UITween/UITweenController.cs

@@ -2,6 +2,7 @@ using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using OfficeOpenXml.FormulaParsing.Excel.Functions.Logical;
 using UnityEngine;
 using UnityEngine;
+using Utility;
 using Object = UnityEngine.Object;
 using Object = UnityEngine.Object;
 
 
 namespace Core.UI.UTool.UITween
 namespace Core.UI.UTool.UITween
@@ -23,6 +24,8 @@ namespace Core.UI.UTool.UITween
         public bool isLoop;
         public bool isLoop;
         private List<UITweenController> _uiTweenControllers = new List<UITweenController>();
         private List<UITweenController> _uiTweenControllers = new List<UITweenController>();
 
 
+        private Map<TweenBasic, TweenCacheDataBasic> _currPayCacheData = new Map<TweenBasic, TweenCacheDataBasic>();
+
         private void OnEnable()
         private void OnEnable()
         {
         {
             if (Application.isPlaying)
             if (Application.isPlaying)
@@ -30,12 +33,11 @@ namespace Core.UI.UTool.UITween
                 StartPlay(false);
                 StartPlay(false);
             }
             }
         }
         }
+
         void OnDrawGizmos()
         void OnDrawGizmos()
         {
         {
-        
- 
 #if UNITY_EDITOR
 #if UNITY_EDITOR
-    
+
             if (!Application.isPlaying)
             if (!Application.isPlaying)
             {
             {
                 UnityEditor.EditorApplication.QueuePlayerLoopUpdate();
                 UnityEditor.EditorApplication.QueuePlayerLoopUpdate();
@@ -44,6 +46,18 @@ namespace Core.UI.UTool.UITween
 #endif
 #endif
         }
         }
 
 
+        public T GetCacheData<T>(TweenBasic tweenBasic) where T : TweenCacheDataBasic, new()
+        {
+            if (_currPayCacheData.TryGetValue(tweenBasic, out TweenCacheDataBasic tweenPlayFxCacheData))
+            {
+                return tweenPlayFxCacheData as T;
+            }
+
+            T t = new T();
+            _currPayCacheData.Add(tweenBasic, t as TweenCacheDataBasic);
+            return t;
+        }
+
         public void Play(string animName, bool isChildren)
         public void Play(string animName, bool isChildren)
         {
         {
             _uiTweenControllers.Clear();
             _uiTweenControllers.Clear();
@@ -66,7 +80,7 @@ namespace Core.UI.UTool.UITween
                         isLoop = true;
                         isLoop = true;
                     }
                     }
 
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
                 }
             }
             }
@@ -126,7 +140,7 @@ namespace Core.UI.UTool.UITween
                         isLoop = true;
                         isLoop = true;
                     }
                     }
 
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
                 }
             }
             }
@@ -204,20 +218,20 @@ namespace Core.UI.UTool.UITween
                     //     isLoop = true;
                     //     isLoop = true;
                     // }
                     // }
 
 
-                    tweenAssetGrpupInfo.StartPlay();
+                    tweenAssetGrpupInfo.StartPlay(this);
                     _currPlay.Add(tweenAssetGrpupInfo);
                     _currPlay.Add(tweenAssetGrpupInfo);
                 }
                 }
             }
             }
 
 
             for (int i = 0; i < _currPlay.Count; i++)
             for (int i = 0; i < _currPlay.Count; i++)
             {
             {
-                _currPlay[i].JumpToTime(t);
+                _currPlay[i].JumpToTime(this, t);
                 // allTweenInfo[i].Rest();
                 // allTweenInfo[i].Rest();
             }
             }
 
 
             for (int i = 0; i < _currPlay.Count; i++)
             for (int i = 0; i < _currPlay.Count; i++)
             {
             {
-                _currPlay[i].PlayTween(t, true);
+                _currPlay[i].PlayTween(this, t, true);
             }
             }
 
 
             UITweenController[] uiTweenControllers =
             UITweenController[] uiTweenControllers =
@@ -242,7 +256,7 @@ namespace Core.UI.UTool.UITween
         {
         {
             for (int i = 0; i < GrpupInfos.Count; i++)
             for (int i = 0; i < GrpupInfos.Count; i++)
             {
             {
-                GrpupInfos[i].PlayTween(t, isFallBack);
+                GrpupInfos[i].PlayTween(this, t, isFallBack);
             }
             }
         }
         }
 
 
@@ -257,7 +271,7 @@ namespace Core.UI.UTool.UITween
 
 
             for (int i = 0; i < _currPlay.Count; i++)
             for (int i = 0; i < _currPlay.Count; i++)
             {
             {
-                _currPlay[i].PlayTween(currTime, false);
+                _currPlay[i].PlayTween(this, currTime, false);
             }
             }
 
 
             for (int i = 0; i < _uiTweenControllers.Count; i++)
             for (int i = 0; i < _uiTweenControllers.Count; i++)
@@ -268,6 +282,7 @@ namespace Core.UI.UTool.UITween
             if (!isLoop && currTime >= maxDuration)
             if (!isLoop && currTime >= maxDuration)
             {
             {
                 isUpdate = false;
                 isUpdate = false;
+                _currPlay.Clear();
             }
             }
         }
         }
     }
     }

+ 4 - 0
Assets/Scripts/GameLogic/Combat/CombatEvent/CombatUseSkillEventData.cs

@@ -6,5 +6,9 @@ namespace Common.Utility.CombatEvent
     public class CombatUseSkillEventData: EventDataBasic<CombatUseSkillEventData>
     public class CombatUseSkillEventData: EventDataBasic<CombatUseSkillEventData>
     {
     {
         public SkillBasic useSkill;
         public SkillBasic useSkill;
+        protected override void ProDispose()
+        {
+            useSkill = null;
+        }
     }
     }
 }
 }

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

@@ -292,7 +292,7 @@ namespace Fort23.Mono
                 WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                 WidgetHero itemHero = await UIManager.Instance.CreateGComponent<WidgetHero>(null,
                     poolName: "WidgetHero", root: rectTransform);
                     poolName: "WidgetHero", root: rectTransform);
                 itemHero.InitHero(keyValuePair.Value);
                 itemHero.InitHero(keyValuePair.Value);
-
+                itemHero.own.gameObject.name= "hero_battle"+i;
                 widgetHeroes.Add(itemHero);
                 widgetHeroes.Add(itemHero);
                 i++;
                 i++;
             }
             }

+ 1 - 1
ProjectSettings/EntitiesClientSettings.asset

@@ -2,7 +2,7 @@
 %TAG !u! tag:yousandi.cn,2023:
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 --- !u!114 &1
 MonoBehaviour:
 MonoBehaviour:
-  m_ObjectHideFlags: 53
+  m_ObjectHideFlags: 61
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_PrefabAsset: {fileID: 0}

+ 174 - 353
UserSettings/Layouts/default-2022.dwlt

@@ -1,54 +1,6 @@
 %YAML 1.1
 %YAML 1.1
 %TAG !u! tag:yousandi.cn,2023:
 %TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &1
 --- !u!114 &1
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 2360.8
-    y: 145.6
-    width: 1432
-    height: 756
-  m_ShowMode: 0
-  m_Title: "\u6E38\u620F"
-  m_RootView: {fileID: 5}
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &2
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12004, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_PixelRect:
-    serializedVersion: 2
-    x: 2189.6
-    y: 810.4
-    width: 1329.6
-    height: 784
-  m_ShowMode: 0
-  m_Title: "\u65F6\u95F4\u8F74"
-  m_RootView: {fileID: 7}
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_Maximized: 0
---- !u!114 &3
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -63,16 +15,16 @@ MonoBehaviour:
   m_PixelRect:
   m_PixelRect:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 34.4
-    width: 2048
-    height: 1079.2001
+    y: 43
+    width: 2560
+    height: 1349
   m_ShowMode: 4
   m_ShowMode: 4
-  m_Title: "\u68C0\u67E5\u5668"
-  m_RootView: {fileID: 8}
+  m_Title: Hierarchy
+  m_RootView: {fileID: 3}
   m_MinSize: {x: 875, y: 300}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_MaxSize: {x: 10000, y: 10000}
   m_Maximized: 1
   m_Maximized: 1
---- !u!114 &4
+--- !u!114 &2
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -87,94 +39,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1432
-    height: 756
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 19}
-  m_Panes:
-  - {fileID: 19}
-  m_Selected: 0
-  m_LastSelected: 0
---- !u!114 &5
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 4}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1432
-    height: 756
-  m_MinSize: {x: 200, y: 221}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 19
-  draggingID: 0
---- !u!114 &6
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12006, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: TimelineWindow
-  m_EditorClassIdentifier: 
-  m_Children: []
-  m_Position:
-    serializedVersion: 2
-    x: 0
+    x: 584
     y: 0
     y: 0
-    width: 1329.6
-    height: 784
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  m_ActualView: {fileID: 18}
+    width: 858
+    height: 970
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 13}
   m_Panes:
   m_Panes:
-  - {fileID: 18}
+  - {fileID: 13}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &7
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 12010, guid: 0000000000000000e000000000000000, type: 0}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Children:
-  - {fileID: 6}
-  m_Position:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 1329.6
-    height: 784
-  m_MinSize: {x: 100, y: 121}
-  m_MaxSize: {x: 4000, y: 4021}
-  vertical: 0
-  controlID: 45
-  draggingID: 0
---- !u!114 &8
+--- !u!114 &3
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -187,22 +63,22 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
-  - {fileID: 9}
-  - {fileID: 11}
-  - {fileID: 10}
+  - {fileID: 4}
+  - {fileID: 6}
+  - {fileID: 5}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 2048
-    height: 1079.2
+    width: 2560
+    height: 1349
   m_MinSize: {x: 875, y: 300}
   m_MinSize: {x: 875, y: 300}
   m_MaxSize: {x: 10000, y: 10000}
   m_MaxSize: {x: 10000, y: 10000}
   m_UseTopView: 1
   m_UseTopView: 1
   m_TopViewHeight: 30
   m_TopViewHeight: 30
   m_UseBottomView: 1
   m_UseBottomView: 1
   m_BottomViewHeight: 20
   m_BottomViewHeight: 20
---- !u!114 &9
+--- !u!114 &4
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -219,12 +95,12 @@ MonoBehaviour:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 2048
+    width: 2560
     height: 30
     height: 30
   m_MinSize: {x: 0, y: 0}
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_LastLoadedLayoutName: 
   m_LastLoadedLayoutName: 
---- !u!114 &10
+--- !u!114 &5
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -240,12 +116,12 @@ MonoBehaviour:
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 1059.2
-    width: 2048
+    y: 1329
+    width: 2560
     height: 20
     height: 20
   m_MinSize: {x: 0, y: 0}
   m_MinSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
   m_MaxSize: {x: 0, y: 0}
---- !u!114 &11
+--- !u!114 &6
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -258,20 +134,20 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
+  - {fileID: 7}
   - {fileID: 12}
   - {fileID: 12}
-  - {fileID: 17}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 30
     y: 30
-    width: 2048
-    height: 1029.2
-  m_MinSize: {x: 300, y: 100}
-  m_MaxSize: {x: 24288, y: 16192}
+    width: 2560
+    height: 1299
+  m_MinSize: {x: 400, y: 100}
+  m_MaxSize: {x: 32384, y: 16192}
   vertical: 0
   vertical: 0
-  controlID: 65
+  controlID: 181
   draggingID: 0
   draggingID: 0
---- !u!114 &12
+--- !u!114 &7
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -284,20 +160,20 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
-  - {fileID: 13}
-  - {fileID: 16}
+  - {fileID: 8}
+  - {fileID: 11}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 1238.4
-    height: 1029.2
-  m_MinSize: {x: 200, y: 100}
-  m_MaxSize: {x: 16192, y: 16192}
+    width: 1892
+    height: 1299
+  m_MinSize: {x: 300, y: 100}
+  m_MaxSize: {x: 24288, y: 16192}
   vertical: 1
   vertical: 1
-  controlID: 66
+  controlID: 182
   draggingID: 0
   draggingID: 0
---- !u!114 &13
+--- !u!114 &8
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -310,20 +186,21 @@ MonoBehaviour:
   m_Name: 
   m_Name: 
   m_EditorClassIdentifier: 
   m_EditorClassIdentifier: 
   m_Children:
   m_Children:
-  - {fileID: 14}
-  - {fileID: 15}
+  - {fileID: 9}
+  - {fileID: 2}
+  - {fileID: 10}
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 1238.4
-    height: 636.8
-  m_MinSize: {x: 200, y: 50}
-  m_MaxSize: {x: 16192, y: 8096}
+    width: 1892
+    height: 970
+  m_MinSize: {x: 300, y: 50}
+  m_MaxSize: {x: 24288, y: 8096}
   vertical: 0
   vertical: 0
-  controlID: 67
+  controlID: 183
   draggingID: 0
   draggingID: 0
---- !u!114 &14
+--- !u!114 &9
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -340,16 +217,16 @@ MonoBehaviour:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
     y: 0
     y: 0
-    width: 826.4
-    height: 636.8
+    width: 584
+    height: 970
   m_MinSize: {x: 201, y: 221}
   m_MinSize: {x: 201, y: 221}
   m_MaxSize: {x: 4001, y: 4021}
   m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 20}
+  m_ActualView: {fileID: 14}
   m_Panes:
   m_Panes:
-  - {fileID: 20}
+  - {fileID: 14}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &15
+--- !u!114 &10
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -364,18 +241,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 826.4
+    x: 1442
     y: 0
     y: 0
-    width: 412
-    height: 636.8
-  m_MinSize: {x: 202, y: 221}
-  m_MaxSize: {x: 4002, y: 4021}
-  m_ActualView: {fileID: 21}
+    width: 450
+    height: 970
+  m_MinSize: {x: 200, y: 200}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 15}
   m_Panes:
   m_Panes:
-  - {fileID: 21}
+  - {fileID: 15}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &16
+--- !u!114 &11
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -391,18 +268,18 @@ MonoBehaviour:
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 636.8
-    width: 1238.4
-    height: 392.39996
+    y: 970
+    width: 1892
+    height: 329
   m_MinSize: {x: 231, y: 271}
   m_MinSize: {x: 231, y: 271}
   m_MaxSize: {x: 10001, y: 10021}
   m_MaxSize: {x: 10001, y: 10021}
-  m_ActualView: {fileID: 22}
+  m_ActualView: {fileID: 16}
   m_Panes:
   m_Panes:
-  - {fileID: 22}
-  - {fileID: 23}
+  - {fileID: 16}
+  - {fileID: 17}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 1
   m_LastSelected: 1
---- !u!114 &17
+--- !u!114 &12
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -417,61 +294,18 @@ MonoBehaviour:
   m_Children: []
   m_Children: []
   m_Position:
   m_Position:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1238.4
+    x: 1892
     y: 0
     y: 0
-    width: 809.6
-    height: 1029.2
-  m_MinSize: {x: 276, y: 71}
-  m_MaxSize: {x: 4001, y: 4021}
-  m_ActualView: {fileID: 24}
+    width: 668
+    height: 1299
+  m_MinSize: {x: 275, y: 50}
+  m_MaxSize: {x: 4000, y: 4000}
+  m_ActualView: {fileID: 18}
   m_Panes:
   m_Panes:
-  - {fileID: 24}
+  - {fileID: 18}
   m_Selected: 0
   m_Selected: 0
   m_LastSelected: 0
   m_LastSelected: 0
---- !u!114 &18
-MonoBehaviour:
-  m_ObjectHideFlags: 52
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 0}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f817a38900380be47942905e17e7d39b, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_MinSize: {x: 100, y: 100}
-  m_MaxSize: {x: 4000, y: 4000}
-  m_TitleContent:
-    m_Text: "\u65F6\u95F4\u8F74"
-    m_Image: {fileID: -5401195905404635996, guid: 0000000000000000d000000000000000, type: 0}
-    m_Tooltip: 
-  m_Pos:
-    serializedVersion: 2
-    x: 2189.6
-    y: 810.4
-    width: 1329.6
-    height: 763
-  m_SerializedDataModeController:
-    m_DataMode: 0
-    m_PreferredDataMode: 0
-    m_SupportedDataModes: 
-    isAutomatic: 1
-  m_ViewDataDictionary: {fileID: 0}
-  m_OverlayCanvas:
-    m_LastAppliedPresetName: Default
-    m_SaveData: []
-    m_OverlaysVisible: 1
-  m_Preferences:
-    editType: 0
-    timeReferenceMode: 0
-  m_LockTracker:
-    m_IsLocked: 0
-  m_SequenceHierarchy: {fileID: 0}
-  m_SequencePath:
-    m_SelectionRoot: 0
-    m_SubElements: []
---- !u!114 &19
+--- !u!114 &13
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -486,15 +320,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u6E38\u620F"
-    m_Image: {fileID: 4621777727084837110, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Game
+    m_Image: {fileID: -6423792434712278376, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 2360.8
-    y: 145.6
-    width: 1432
-    height: 735
+    x: 584
+    y: 73
+    width: 856
+    height: 949
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -520,23 +354,23 @@ MonoBehaviour:
   m_VSyncEnabled: 0
   m_VSyncEnabled: 0
   m_Gizmos: 0
   m_Gizmos: 0
   m_Stats: 0
   m_Stats: 0
-  m_SelectedSizes: 07000000000000000000000000000000000000000000000000000000000000000000000000000000
+  m_SelectedSizes: 07000000000000000000000012000000000000000000000000000000000000000000000000000000
   m_ZoomArea:
   m_ZoomArea:
     m_HRangeLocked: 0
     m_HRangeLocked: 0
     m_VRangeLocked: 0
     m_VRangeLocked: 0
     hZoomLockedByDefault: 0
     hZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
     vZoomLockedByDefault: 0
-    m_HBaseRangeMin: -300
-    m_HBaseRangeMax: 300
-    m_VBaseRangeMin: -649.60004
-    m_VBaseRangeMax: 649.60004
+    m_HBaseRangeMin: -375
+    m_HBaseRangeMax: 375
+    m_VBaseRangeMin: -812
+    m_VBaseRangeMax: 812
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMin: 1
     m_HAllowExceedBaseRangeMax: 1
     m_HAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMin: 1
     m_VAllowExceedBaseRangeMax: 1
     m_VAllowExceedBaseRangeMax: 1
     m_ScaleWithWindow: 0
     m_ScaleWithWindow: 0
     m_HSlider: 0
     m_HSlider: 0
-    m_VSlider: 0
+    m_VSlider: 1
     m_IgnoreScrollWheelUntilClicked: 0
     m_IgnoreScrollWheelUntilClicked: 0
     m_EnableMouseInput: 1
     m_EnableMouseInput: 1
     m_EnableSliderZoomHorizontal: 0
     m_EnableSliderZoomHorizontal: 0
@@ -547,29 +381,29 @@ MonoBehaviour:
       serializedVersion: 2
       serializedVersion: 2
       x: 0
       x: 0
       y: 21
       y: 21
-      width: 1432
-      height: 714
-    m_Scale: {x: 0.54956895, y: 0.54956895}
-    m_Translation: {x: 716, y: 357}
+      width: 856
+      height: 928
+    m_Scale: {x: 0.5714286, y: 0.5714286}
+    m_Translation: {x: 427.99997, y: 463.99994}
     m_MarginLeft: 0
     m_MarginLeft: 0
     m_MarginRight: 0
     m_MarginRight: 0
     m_MarginTop: 0
     m_MarginTop: 0
     m_MarginBottom: 0
     m_MarginBottom: 0
     m_LastShownAreaInsideMargins:
     m_LastShownAreaInsideMargins:
       serializedVersion: 2
       serializedVersion: 2
-      x: -1302.8392
-      y: -649.60004
-      width: 2605.6785
-      height: 1299.2001
+      x: -748.99994
+      y: -811.9999
+      width: 1497.9999
+      height: 1623.9999
     m_MinimalGUI: 1
     m_MinimalGUI: 1
-  m_defaultScale: 0.54956895
-  m_LastWindowPixelSize: {x: 1790, y: 918.75}
+  m_defaultScale: 0.5714286
+  m_LastWindowPixelSize: {x: 856, y: 949}
   m_ClearInEditMode: 1
   m_ClearInEditMode: 1
   m_NoCameraWarning: 1
   m_NoCameraWarning: 1
-  m_LowResolutionForAspectRatios: 01000000000000000000
+  m_LowResolutionForAspectRatios: 01000001000000000000
   m_XRRenderMode: 0
   m_XRRenderMode: 0
   m_RenderTexture: {fileID: 0}
   m_RenderTexture: {fileID: 0}
---- !u!114 &20
+--- !u!114 &14
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -584,15 +418,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u573A\u666F"
-    m_Image: {fileID: 8634526014445323508, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Scene
+    m_Image: {fileID: 2593428753322112591, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 64.8
-    width: 825.4
-    height: 615.8
+    y: 73
+    width: 583
+    height: 949
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -608,7 +442,7 @@ MonoBehaviour:
       collapsed: 0
       collapsed: 0
       displayed: 1
       displayed: 1
       snapOffset: {x: -154.40002, y: -26.400024}
       snapOffset: {x: -154.40002, y: -26.400024}
-      snapOffsetDelta: {x: 0, y: 0}
+      snapOffsetDelta: {x: -9.599976, y: 0}
       snapCorner: 3
       snapCorner: 3
       id: Tool Settings
       id: Tool Settings
       index: 0
       index: 0
@@ -659,7 +493,7 @@ MonoBehaviour:
       floating: 0
       floating: 0
       collapsed: 0
       collapsed: 0
       displayed: 1
       displayed: 1
-      snapOffset: {x: 0, y: -193.6}
+      snapOffset: {x: 0, y: -196}
       snapOffsetDelta: {x: 0, y: 0}
       snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 2
       snapCorner: 2
       id: unity-transform-toolbar
       id: unity-transform-toolbar
@@ -894,7 +728,7 @@ MonoBehaviour:
       collapsed: 0
       collapsed: 0
       displayed: 0
       displayed: 0
       snapOffset: {x: -209.6, y: -195.20001}
       snapOffset: {x: -209.6, y: -195.20001}
-      snapOffsetDelta: {x: 0.000030517578, y: 0}
+      snapOffsetDelta: {x: 0, y: 0}
       snapCorner: 3
       snapCorner: 3
       id: AINavigationOverlay
       id: AINavigationOverlay
       index: 9
       index: 9
@@ -940,33 +774,20 @@ MonoBehaviour:
       layout: 4
       layout: 4
       size: {x: 0, y: 0}
       size: {x: 0, y: 0}
       sizeOverriden: 0
       sizeOverriden: 0
-    - dockPosition: 1
-      containerId: overlay-container--right
-      floating: 0
-      collapsed: 0
-      displayed: 1
-      snapOffset: {x: 48, y: 48}
-      snapOffsetDelta: {x: 0, y: 0}
-      snapCorner: 0
-      id: UnityEditor.SceneViewCameraOverlay
-      index: 13
-      layout: 4
-      size: {x: 0, y: 0}
-      sizeOverriden: 0
     m_OverlaysVisible: 1
     m_OverlaysVisible: 1
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
   m_WindowGUID: cc27987af1a868c49b0894db9c0f5429
-  m_Gizmos: 1
+  m_Gizmos: 0
   m_OverrideSceneCullingMask: 6917529027641081856
   m_OverrideSceneCullingMask: 6917529027641081856
   m_SceneIsLit: 1
   m_SceneIsLit: 1
   m_SceneLighting: 1
   m_SceneLighting: 1
-  m_2DMode: 1
+  m_2DMode: 0
   m_isRotationLocked: 0
   m_isRotationLocked: 0
   m_PlayAudio: 0
   m_PlayAudio: 0
   m_AudioPlay: 0
   m_AudioPlay: 0
   m_Position:
   m_Position:
-    m_Target: {x: -441.13892, y: 237.15135, z: 22050.408}
+    m_Target: {x: 2.2843015, y: 0.3424857, z: 23.714994}
     speed: 2
     speed: 2
-    m_Value: {x: -441.13892, y: 237.15135, z: 22050.408}
+    m_Value: {x: 2.2843015, y: 0.3424857, z: 23.714994}
   m_RenderMode: 0
   m_RenderMode: 0
   m_CameraMode:
   m_CameraMode:
     drawMode: 0
     drawMode: 0
@@ -975,7 +796,7 @@ MonoBehaviour:
   m_ValidateTrueMetals: 0
   m_ValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_DoValidateTrueMetals: 0
   m_SceneViewState:
   m_SceneViewState:
-    m_AlwaysRefresh: 1
+    m_AlwaysRefresh: 0
     showFog: 1
     showFog: 1
     showSkybox: 1
     showSkybox: 1
     showFlares: 1
     showFlares: 1
@@ -994,17 +815,17 @@ MonoBehaviour:
       m_Size: {x: 0, y: 0}
       m_Size: {x: 0, y: 0}
     yGrid:
     yGrid:
       m_Fade:
       m_Fade:
-        m_Target: 0
+        m_Target: 1
         speed: 2
         speed: 2
-        m_Value: 0
+        m_Value: 1
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
       m_Size: {x: 1, y: 1}
     zGrid:
     zGrid:
       m_Fade:
       m_Fade:
-        m_Target: 1
+        m_Target: 0
         speed: 2
         speed: 2
-        m_Value: 1
+        m_Value: 0
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Pivot: {x: 0, y: 0, z: 0}
       m_Size: {x: 1, y: 1}
       m_Size: {x: 1, y: 1}
@@ -1012,17 +833,17 @@ MonoBehaviour:
     m_GridAxis: 1
     m_GridAxis: 1
     m_gridOpacity: 0.5
     m_gridOpacity: 0.5
   m_Rotation:
   m_Rotation:
-    m_Target: {x: 0, y: 0, z: 0, w: 1}
+    m_Target: {x: -0.28058064, y: -0.5403683, z: 0.19731596, w: -0.768388}
     speed: 2
     speed: 2
-    m_Value: {x: 0, y: 0, z: 0, w: 1}
+    m_Value: {x: -0.28056985, y: -0.5403475, z: 0.19730836, w: -0.7683584}
   m_Size:
   m_Size:
-    m_Target: 480.39127
+    m_Target: 4.6487536
     speed: 2
     speed: 2
-    m_Value: 480.39127
+    m_Value: 4.6487536
   m_Ortho:
   m_Ortho:
-    m_Target: 1
+    m_Target: 0
     speed: 2
     speed: 2
-    m_Value: 1
+    m_Value: 0
   m_CameraSettings:
   m_CameraSettings:
     m_Speed: 1
     m_Speed: 1
     m_SpeedNormalized: 0.5
     m_SpeedNormalized: 0.5
@@ -1038,14 +859,14 @@ MonoBehaviour:
     m_OcclusionCulling: 0
     m_OcclusionCulling: 0
     m_EnableGDRP: 1
     m_EnableGDRP: 1
     m_BackfaceCulling: 0
     m_BackfaceCulling: 0
-  m_LastSceneViewRotation: {x: 0.1829034, y: 0.028218752, z: -0.0039814366, w: 0.98275405}
+  m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
   m_LastSceneViewOrtho: 0
   m_LastSceneViewOrtho: 0
   m_ReplacementShader: {fileID: 0}
   m_ReplacementShader: {fileID: 0}
   m_ReplacementString: 
   m_ReplacementString: 
   m_SceneVisActive: 1
   m_SceneVisActive: 1
   m_LastLockedObject: {fileID: 0}
   m_LastLockedObject: {fileID: 0}
   m_ViewIsLockedToObject: 0
   m_ViewIsLockedToObject: 0
---- !u!114 &21
+--- !u!114 &15
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1060,15 +881,15 @@ MonoBehaviour:
   m_MinSize: {x: 200, y: 200}
   m_MinSize: {x: 200, y: 200}
   m_MaxSize: {x: 4000, y: 4000}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u5C42\u7EA7"
-    m_Image: {fileID: -3734745235275155857, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Hierarchy
+    m_Image: {fileID: 7966133145522015247, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 826.4
-    y: 64.8
-    width: 410
-    height: 615.8
+    x: 1442
+    y: 73
+    width: 448
+    height: 949
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -1084,7 +905,7 @@ MonoBehaviour:
       scrollPos: {x: 0, y: 0}
       scrollPos: {x: 0, y: 0}
       m_SelectedIDs: 
       m_SelectedIDs: 
       m_LastClickedID: 0
       m_LastClickedID: 0
-      m_ExpandedIDs: 6cc0f9ffb617faffe449faffec49faff90c6faff506bfbff5a6bfbffc072fbffc472fbffcc72fbfffa73fbff0074fbffe030fcff9e39fcffa888fcffac88fcffb488fcffe289fcffe889fcff088afcff168afcff50ccfdff5cccfdff62ccfdffa64cfeffb24cfeffb84cfeffb052feff2027ffffc0c6ffffc8c6ffff2ec7ffff32c8ffff18caffff8acaffffb8cbffff74f8ffff86faffff40a500009e1002005a280200
+      m_ExpandedIDs: 02b3ffff32b3ffff7eb4ffffecbaffffbaf0ffffc6f0ffff3cf1ffff42f1ffff62f1ffff70f1ffff80faffff
       m_RenameOverlay:
       m_RenameOverlay:
         m_UserAcceptedRename: 0
         m_UserAcceptedRename: 0
         m_Name: 
         m_Name: 
@@ -1100,7 +921,7 @@ MonoBehaviour:
         m_IsRenaming: 0
         m_IsRenaming: 0
         m_OriginalEventType: 11
         m_OriginalEventType: 11
         m_IsRenamingFilename: 0
         m_IsRenamingFilename: 0
-        m_ClientGUIView: {fileID: 15}
+        m_ClientGUIView: {fileID: 0}
       m_SearchString: 
       m_SearchString: 
     m_ExpandedScenes: []
     m_ExpandedScenes: []
     m_CurrenRootInstanceID: 0
     m_CurrenRootInstanceID: 0
@@ -1108,7 +929,7 @@ MonoBehaviour:
       m_IsLocked: 0
       m_IsLocked: 0
     m_CurrentSortingName: TransformSorting
     m_CurrentSortingName: TransformSorting
   m_WindowGUID: 4c969a2b90040154d917609493e03593
   m_WindowGUID: 4c969a2b90040154d917609493e03593
---- !u!114 &22
+--- !u!114 &16
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1123,15 +944,15 @@ MonoBehaviour:
   m_MinSize: {x: 230, y: 250}
   m_MinSize: {x: 230, y: 250}
   m_MaxSize: {x: 10000, y: 10000}
   m_MaxSize: {x: 10000, y: 10000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u9879\u76EE"
-    m_Image: {fileID: -5179483145760003458, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Project
+    m_Image: {fileID: -5467254957812901981, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 701.60004
-    width: 1237.4
-    height: 371.39996
+    y: 1043
+    width: 1891
+    height: 308
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -1153,7 +974,7 @@ MonoBehaviour:
     m_SkipHidden: 0
     m_SkipHidden: 0
     m_SearchArea: 1
     m_SearchArea: 1
     m_Folders:
     m_Folders:
-    - Assets/Res/UI
+    - Assets
     m_Globs: []
     m_Globs: []
     m_OriginalText: 
     m_OriginalText: 
     m_ImportLogFlags: 0
     m_ImportLogFlags: 0
@@ -1161,32 +982,32 @@ MonoBehaviour:
   m_ViewMode: 1
   m_ViewMode: 1
   m_StartGridSize: 16
   m_StartGridSize: 16
   m_LastFolders:
   m_LastFolders:
-  - Assets/Res/UI
+  - Assets
   m_LastFoldersGridSize: 16
   m_LastFoldersGridSize: 16
-  m_LastProjectPath: H:\XY001\XY001
+  m_LastProjectPath: D:\unityProject\XY001
   m_LockTracker:
   m_LockTracker:
     m_IsLocked: 0
     m_IsLocked: 0
   m_FolderTreeState:
   m_FolderTreeState:
-    scrollPos: {x: 0, y: 5808.6}
-    m_SelectedIDs: 5aa60000
-    m_LastClickedID: 42586
-    m_ExpandedIDs: 00000000eea50000f0a50000f2a50000f4a50000f6a50000f8a50000faa50000fca50000fea5000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a600008aa600008ca600008ea6000090a6000092a6000094a6000096a6000098a600009aa600009ca6000000ca9a3bffffff7f
+    scrollPos: {x: 0, y: 79}
+    m_SelectedIDs: 4ea80000
+    m_LastClickedID: 43086
+    m_ExpandedIDs: 000000004ea8000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a8000000ca9a3bffffff7f
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
-      m_Name: Materials
-      m_OriginalName: Materials
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
       m_EditFieldRect:
         serializedVersion: 2
         serializedVersion: 2
         x: 0
         x: 0
         y: 0
         y: 0
         width: 0
         width: 0
         height: 0
         height: 0
-      m_UserData: 43944
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 16}
+      m_ClientGUIView: {fileID: 11}
     m_SearchString: 
     m_SearchString: 
     m_CreateAssetUtility:
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_EndAction: {fileID: 0}
@@ -1198,7 +1019,7 @@ MonoBehaviour:
     scrollPos: {x: 0, y: 0}
     scrollPos: {x: 0, y: 0}
     m_SelectedIDs: 
     m_SelectedIDs: 
     m_LastClickedID: 0
     m_LastClickedID: 0
-    m_ExpandedIDs: 00000000eea50000f0a50000f2a50000f4a50000f6a50000f8a50000faa50000fca50000fea5000000a6000002a6000004a6000006a6000008a600000aa600000ca600000ea6000010a6000012a6000014a6000016a6000018a600001aa600001ca600001ea6000020a6000022a6000024a6000026a6000028a600002aa600002ca600002ea6000030a6000032a6000034a6000036a6000038a600003aa600003ca600003ea6000040a6000042a6000044a6000046a6000048a600004aa600004ca600004ea6000050a6000052a6000054a6000056a6000058a600005aa600005ca600005ea6000060a6000062a6000064a6000066a6000068a600006aa600006ca600006ea6000070a6000072a6000074a6000076a6000078a600007aa600007ca600007ea6000080a6000082a6000084a6000086a6000088a600008aa600008ca600008ea6000090a6000092a6000094a6000096a6000098a600009aa600009ca60000
+    m_ExpandedIDs: 000000004ea8000050a8000052a8000054a8000056a8000058a800005aa800005ca800005ea8000060a8000062a8000064a80000
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
       m_Name: 
       m_Name: 
@@ -1226,23 +1047,23 @@ MonoBehaviour:
     m_SelectedInstanceIDs: 
     m_SelectedInstanceIDs: 
     m_LastClickedInstanceID: 0
     m_LastClickedInstanceID: 0
     m_HadKeyboardFocusLastEvent: 1
     m_HadKeyboardFocusLastEvent: 1
-    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100988c010096820100
+    m_ExpandedInstanceIDs: c6230000c4a50000688a020070700100988c0100
     m_RenameOverlay:
     m_RenameOverlay:
       m_UserAcceptedRename: 0
       m_UserAcceptedRename: 0
-      m_Name: WidgetHero
-      m_OriginalName: WidgetHero
+      m_Name: 
+      m_OriginalName: 
       m_EditFieldRect:
       m_EditFieldRect:
         serializedVersion: 2
         serializedVersion: 2
         x: 0
         x: 0
         y: 0
         y: 0
         width: 0
         width: 0
         height: 0
         height: 0
-      m_UserData: 52588
+      m_UserData: 0
       m_IsWaitingForDelay: 0
       m_IsWaitingForDelay: 0
       m_IsRenaming: 0
       m_IsRenaming: 0
-      m_OriginalEventType: 0
+      m_OriginalEventType: 11
       m_IsRenamingFilename: 1
       m_IsRenamingFilename: 1
-      m_ClientGUIView: {fileID: 16}
+      m_ClientGUIView: {fileID: 11}
     m_CreateAssetUtility:
     m_CreateAssetUtility:
       m_EndAction: {fileID: 0}
       m_EndAction: {fileID: 0}
       m_InstanceID: 0
       m_InstanceID: 0
@@ -1250,11 +1071,11 @@ MonoBehaviour:
       m_Icon: {fileID: 0}
       m_Icon: {fileID: 0}
       m_ResourceFile: 
       m_ResourceFile: 
     m_NewAssetIndexInList: -1
     m_NewAssetIndexInList: -1
-    m_ScrollPosition: {x: 0, y: 155.60004}
+    m_ScrollPosition: {x: 0, y: 0}
     m_GridSize: 16
     m_GridSize: 16
   m_SkipHiddenPackages: 0
   m_SkipHiddenPackages: 0
   m_DirectoriesAreaWidth: 363.8
   m_DirectoriesAreaWidth: 363.8
---- !u!114 &23
+--- !u!114 &17
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1269,15 +1090,15 @@ MonoBehaviour:
   m_MinSize: {x: 100, y: 100}
   m_MinSize: {x: 100, y: 100}
   m_MaxSize: {x: 4000, y: 4000}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u63A7\u5236\u53F0"
-    m_Image: {fileID: -4950941429401207979, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Console
+    m_Image: {fileID: -4327648978806127646, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
     x: 0
     x: 0
-    y: 683.2
-    width: 1512.6
-    height: 389.79993
+    y: 957
+    width: 1891
+    height: 394
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -1288,7 +1109,7 @@ MonoBehaviour:
     m_LastAppliedPresetName: Default
     m_LastAppliedPresetName: Default
     m_SaveData: []
     m_SaveData: []
     m_OverlaysVisible: 1
     m_OverlaysVisible: 1
---- !u!114 &24
+--- !u!114 &18
 MonoBehaviour:
 MonoBehaviour:
   m_ObjectHideFlags: 52
   m_ObjectHideFlags: 52
   m_CorrespondingSourceObject: {fileID: 0}
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1303,15 +1124,15 @@ MonoBehaviour:
   m_MinSize: {x: 275, y: 50}
   m_MinSize: {x: 275, y: 50}
   m_MaxSize: {x: 4000, y: 4000}
   m_MaxSize: {x: 4000, y: 4000}
   m_TitleContent:
   m_TitleContent:
-    m_Text: "\u68C0\u67E5\u5668"
-    m_Image: {fileID: -440750813802333266, guid: 0000000000000000d000000000000000, type: 0}
+    m_Text: Inspector
+    m_Image: {fileID: -2667387946076563598, guid: 0000000000000000d000000000000000, type: 0}
     m_Tooltip: 
     m_Tooltip: 
   m_Pos:
   m_Pos:
     serializedVersion: 2
     serializedVersion: 2
-    x: 1238.4
-    y: 64.8
-    width: 808.6
-    height: 1008.19995
+    x: 1892
+    y: 73
+    width: 667
+    height: 1278
   m_SerializedDataModeController:
   m_SerializedDataModeController:
     m_DataMode: 0
     m_DataMode: 0
     m_PreferredDataMode: 0
     m_PreferredDataMode: 0
@@ -1325,7 +1146,7 @@ MonoBehaviour:
   m_ObjectsLockedBeforeSerialization: []
   m_ObjectsLockedBeforeSerialization: []
   m_InstanceIDsLockedBeforeSerialization: 
   m_InstanceIDsLockedBeforeSerialization: 
   m_PreviewResizer:
   m_PreviewResizer:
-    m_CachedPref: 253.40002
+    m_CachedPref: 246.99994
     m_ControlHash: -371814159
     m_ControlHash: -371814159
     m_PrefName: Preview_InspectorPreview
     m_PrefName: Preview_InspectorPreview
   m_LastInspectedObjectInstanceID: -1
   m_LastInspectedObjectInstanceID: -1