瀏覽代碼

ICON图集重新打了一下

lcn 4 月之前
父節點
當前提交
8d81b588c1
共有 100 個文件被更改,包括 1340 次插入3782 次删除
  1. 0 0
      Assets/Art/UIAssets/TextrueJson/allIcon.txt
  2. 2 2
      Assets/Art/UIAssets/TextrueJson/allIcon.txt.meta
  3. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta
  4. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta
  5. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta
  6. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta
  7. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta
  8. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta
  9. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta
  10. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta
  11. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta
  12. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta
  13. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta
  14. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta
  15. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta
  16. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta
  17. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta
  18. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta
  19. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta
  20. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta
  21. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta
  22. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta
  23. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta
  24. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta
  25. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta
  26. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta
  27. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta
  28. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta
  29. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta
  30. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta
  31. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta
  32. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta
  33. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta
  34. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta
  35. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta
  36. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta
  37. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta
  38. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta
  39. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta
  40. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta
  41. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta
  42. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta
  43. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta
  44. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta
  45. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta
  46. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta
  47. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta
  48. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta
  49. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta
  50. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta
  51. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta
  52. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta
  53. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta
  54. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta
  55. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta
  56. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta
  57. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta
  58. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta
  59. 4 4
      Assets/Res/Config/ItemConfig.json
  60. 7 6
      Assets/Res/UI/DialoguePanel.prefab
  61. 344 1255
      Assets/Res/UI/EqRecyclePanel.prefab
  62. 6 6
      Assets/Res/UI/HeroDetailPanel.prefab
  63. 246 1439
      Assets/Res/UI/RewardsPanel.prefab
  64. 5 5
      Assets/Res/UI/WidgetHero.prefab
  65. 30 20
      Assets/Res/UI/WidgetItem.prefab
  66. 0 31
      Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2.meta
  67. 51 46
      Assets/Res/UIAtlas/allIcon.spriteatlasv2
  68. 2 2
      Assets/Res/UIAtlas/allIcon.spriteatlasv2.meta
  69. 0 19
      Assets/Res/UIAtlas/heroIcon.spriteatlasv2
  70. 0 31
      Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta
  71. 0 23
      Assets/Res/UIAtlas/itemIcon.spriteatlasv2
  72. 7 7
      Assets/Res/UIAtlas/skillIcon.spriteatlasv2
  73. 7 7
      Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs
  74. 2 2
      Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPre.cs
  75. 27 20
      Assets/Scripts/GameUI/UI/Items/WidgetItem.cs
  76. 22 0
      Assets/Scripts/GameUI/UI/Items/WidgetItemData.cs
  77. 0 0
      Assets/StreamingAssets/assetConfig.txt
  78. 二進制
      Excel2Json/Excel/Item.xlsx
  79. 1 1
      UGUIPack/uguiconfig.db
  80. 577 464
      UserSettings/Layouts/CurrentMaximizeLayout.dwlt
  81. 0 0
      美术/art_use_ui/allIcon/icon_Coins_s.png
  82. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_1_1.png
  83. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_1_2.png
  84. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_1_3.png
  85. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_2_1.png
  86. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_2_2.png
  87. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_2_3.png
  88. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_3_1.png
  89. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_3_2.png
  90. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_3_3.png
  91. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_4_1.png
  92. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_4_2.png
  93. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_4_3.png
  94. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_5_1.png
  95. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_5_2.png
  96. 0 0
      美术/art_use_ui/allIcon/icon_eq_1_5_3.png
  97. 0 0
      美术/art_use_ui/allIcon/icon_eq_2_1_1.png
  98. 0 0
      美术/art_use_ui/allIcon/icon_eq_2_1_2.png
  99. 0 0
      美术/art_use_ui/allIcon/icon_eq_2_1_3.png
  100. 0 0
      美术/art_use_ui/allIcon/icon_eq_2_2_1.png

文件差異過大導致無法顯示
+ 0 - 0
Assets/Art/UIAssets/TextrueJson/allIcon.txt


+ 2 - 2
Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta → Assets/Art/UIAssets/TextrueJson/allIcon.txt.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: XnNOvS2rBXlxXpr16fvCmsPHgWH8VFHvaajxnXEO0+Lb+o7fajApk9g=
-DefaultImporter:
+guid: DHxN4yuvVnNo7qCktGZTRoMXuyTOt56oM/gJq4Wfupc93gD+0VJzvJ0=
+TextScriptImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

+ 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: 

+ 4 - 4
Assets/Res/Config/ItemConfig.json

@@ -67,7 +67,7 @@
       "ID": 1004,
       "itemName": 5,
       "itemDesc": 10041,
-      "icon": "",
+      "icon": "icon_tx105",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -84,7 +84,7 @@
       "ID": 1005,
       "itemName": 6,
       "itemDesc": 10051,
-      "icon": "",
+      "icon": "icon_tx107",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -101,7 +101,7 @@
       "ID": 1006,
       "itemName": 13,
       "itemDesc": 10061,
-      "icon": "",
+      "icon": "icon_tx113",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,
@@ -118,7 +118,7 @@
       "ID": 1007,
       "itemName": 16,
       "itemDesc": 10071,
-      "icon": "",
+      "icon": "icon_tx116",
       "itemTyp": 5,
       "quality": 8,
       "stack": null,

+ 7 - 6
Assets/Res/UI/DialoguePanel.prefab

@@ -413,6 +413,7 @@ MonoBehaviour:
       m_NumAlphaKeys: 2
     m_ColorMin: {r: 0, g: 0, b: 0, a: 0}
     m_ColorMax: {r: 0, g: 0, b: 0, a: 0}
+  isLoop: 0
 --- !u!1 &6329833342161083256
 GameObject:
   m_ObjectHideFlags: 0
@@ -658,11 +659,11 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tx105
+  _icon_name: icon_tx116
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3

文件差異過大導致無法顯示
+ 344 - 1255
Assets/Res/UI/EqRecyclePanel.prefab


+ 6 - 6
Assets/Res/UI/HeroDetailPanel.prefab

@@ -17332,14 +17332,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_item_Gear_Sword
+  _icon_name: 
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 84f272205829b834da33f44ad74be676, type: 3}
+  CurrSpriteAtlas: {fileID: 0}
   packInfo:
-    packName: itemIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\itemIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/itemIcon.spriteatlasv2
-    lasetJsonGUID: 8f9c5969449e5a0e15746046d5a75c9d
+    packName: 
+    packgJsonPath: 
+    packgSpritePath: 
+    lasetJsonGUID: 
 --- !u!1 &8119578585630561182
 GameObject:
   m_ObjectHideFlags: 0

文件差異過大導致無法顯示
+ 246 - 1439
Assets/Res/UI/RewardsPanel.prefab


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

@@ -2319,12 +2319,12 @@ MonoBehaviour:
   m_PixelsPerUnitMultiplier: 1
   _icon_name: icon_tx105
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &7991572580298050915
 GameObject:
   m_ObjectHideFlags: 0

+ 30 - 20
Assets/Res/UI/WidgetItem.prefab

@@ -224,7 +224,7 @@ MonoBehaviour:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_GameObject: {fileID: 1916043416167554874}
-  m_Enabled: 1
+  m_Enabled: 0
   m_EditorHideFlags: 0
   m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
   m_Name: 
@@ -466,14 +466,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_eq_4_3_2
+  _icon_name: icon_eq_1_3_3
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: EquipmentIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
-    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &2142678362332709341
 GameObject:
   m_ObjectHideFlags: 0
@@ -574,7 +574,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 0
+  m_IsActive: 1
 --- !u!224 &1230383290210271096
 RectTransform:
   m_ObjectHideFlags: 0
@@ -614,7 +614,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &4688880321879378313
 RectTransform:
   m_ObjectHideFlags: 0
@@ -803,7 +803,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 64.4, y: 64.4}
+  m_SizeDelta: {x: 72, y: 72}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!114 &6121896776075230898
 MonoBehaviour:
@@ -899,7 +899,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 0, y: 0}
+  m_AnchoredPosition: {x: -34.7, y: 0}
   m_SizeDelta: {x: 72, y: 87}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3511437002229949790
@@ -964,7 +964,7 @@ MonoBehaviour:
   m_fontSizeMin: 18
   m_fontSizeMax: 42
   m_fontStyle: 0
-  m_HorizontalAlignment: 2
+  m_HorizontalAlignment: 4
   m_VerticalAlignment: 512
   m_textAlignment: 65535
   m_characterSpacing: 0
@@ -1035,7 +1035,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 0}
-  m_SizeDelta: {x: 60, y: 75}
+  m_SizeDelta: {x: 53.0884, y: 70.785}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &2202988894485000509
 CanvasRenderer:
@@ -1075,14 +1075,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: icon_tx105
+  _icon_name: icon_tx116
   isNotLoadDeftIcon: 0
-  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  CurrSpriteAtlas: {fileID: 100100200, guid: 3855e71da36cb4dfeb0ce0972ed08272, type: 3}
   packInfo:
-    packName: heroIcon
-    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
-    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
-    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
+    packName: allIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/allIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/allIcon.spriteatlasv2
+    lasetJsonGUID: 083ae4b3a7b2beffb51fed7b1b7800d3
 --- !u!1 &7543347028993922308
 GameObject:
   m_ObjectHideFlags: 0
@@ -1448,7 +1448,7 @@ RectTransform:
   m_GameObject: {fileID: 8408847998961895963}
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
   m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
+  m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 1
   m_Children:
   - {fileID: 5410523429226151182}
@@ -1542,6 +1542,16 @@ MonoBehaviour:
     isAssetBundle: 0
     isList: 0
     ListCollectorDatas: []
+  - key: heroShards
+    gameObject: {fileID: 2654032404493663270}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: heroShardsIcon
+    gameObject: {fileID: 6096866157633898550}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
   isAssetBundle: 1
 --- !u!114 &1991110530740727775
 MonoBehaviour:

+ 0 - 31
Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2.meta

@@ -1,31 +0,0 @@
-fileFormatVersion: 2
-guid: DHhNsS2rUH4EytYpUHkvIRfWRH+46qVxv+dhvZl9+PQORcYBKo5DtsU=
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 3
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    webStreaming: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 1
-    enableTightPacking: 1
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: equipmenticon
-  assetBundleVariant: 

+ 51 - 46
Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2 → Assets/Res/UIAtlas/allIcon.spriteatlasv2

@@ -11,65 +11,70 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
-    - {fileID: 2800000, guid: 56e48d33460398d4da7ba0faafd0357f, type: 3}
+    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
+    - {fileID: 2800000, guid: a4f6d78a36655554e89a5c8fb7b9b66f, type: 3}
+    - {fileID: 2800000, guid: ad3e276b2c4977b4ca8c556f0705577c, type: 3}
+    - {fileID: 2800000, guid: 3be19fb50648f6541aca133c33f43ea2, type: 3}
+    - {fileID: 2800000, guid: 84f0f4450b0e3644eb1e97be34b42463, type: 3}
+    - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
+    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
+    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
+    - {fileID: 2800000, guid: 2dd1f5812874a7a4e879b5442c5a626e, type: 3}
+    - {fileID: 2800000, guid: 2be57e96e307a0b40bde03fdf7062255, type: 3}
+    - {fileID: 2800000, guid: bca5684a740353f4ca56daeb1e3e01e0, type: 3}
+    - {fileID: 2800000, guid: 07ebcf2547298f74bbf96ce766dd0f1c, type: 3}
+    - {fileID: 2800000, guid: 8f888901a271ee24ebafaaf1d5323c2e, type: 3}
+    - {fileID: 2800000, guid: 5e34a8f97c6846f45b3be0b2e29e62a9, type: 3}
+    - {fileID: 2800000, guid: 6c69b5e0c5f1808449f3cb328d104105, type: 3}
+    - {fileID: 2800000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
+    - {fileID: 2800000, guid: a68f300e9414b724b9ec189e3c9c061d, type: 3}
+    - {fileID: 2800000, guid: e8e109ce4146fa84d97c912786b7686b, type: 3}
+    - {fileID: 2800000, guid: 2ce3304b383ea0340b452a3f9740720b, type: 3}
     - {fileID: 2800000, guid: 3c6a10c5b63d5784c8176b5883fdddfb, type: 3}
+    - {fileID: 2800000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
+    - {fileID: 2800000, guid: d84b79a30f6baa04aad2377702a6fff8, type: 3}
+    - {fileID: 2800000, guid: d900d9dbc91df1e4e982b19a93fe6129, type: 3}
     - {fileID: 2800000, guid: 0de81f9e73c92c143b567089238db6bc, type: 3}
-    - {fileID: 2800000, guid: 4c410bd35ddeaa14e9c08fab39106384, type: 3}
-    - {fileID: 2800000, guid: 800f0cd5cf2a4da4a9b9279e96c92058, type: 3}
-    - {fileID: 2800000, guid: fd304205ac1a3a54097142a16e2d02b7, type: 3}
+    - {fileID: 2800000, guid: ab0f19aa367e5594ab23e9ba0270758b, type: 3}
     - {fileID: 2800000, guid: 19fdc1ed0ba407a428405934273e9783, type: 3}
-    - {fileID: 2800000, guid: 529b8d6840900144997f8b215e7781fb, type: 3}
     - {fileID: 2800000, guid: 455398dd98c0e0a4a830340673d3a652, type: 3}
-    - {fileID: 2800000, guid: 63278b50eee97884ca777f2239a76395, type: 3}
-    - {fileID: 2800000, guid: 9edcab6923da7cc4fb216a757a563dcd, type: 3}
-    - {fileID: 2800000, guid: 124a7b77303cf3e438c311aa4813efe4, type: 3}
+    - {fileID: 2800000, guid: f6252dadc46c09047a7e871760b009e5, type: 3}
+    - {fileID: 2800000, guid: 56e48d33460398d4da7ba0faafd0357f, type: 3}
+    - {fileID: 2800000, guid: c3ab828aa5cca194dbd8039138e66ab9, type: 3}
+    - {fileID: 2800000, guid: 149caaeb89afb654c8aaefe596ec7a31, type: 3}
+    - {fileID: 2800000, guid: 529b8d6840900144997f8b215e7781fb, type: 3}
+    - {fileID: 2800000, guid: 810ca615fc5791b438d8c4a06be05d44, type: 3}
+    - {fileID: 2800000, guid: 6454f35e79665984b80b290d89b4b866, type: 3}
     - {fileID: 2800000, guid: f44f09796a3b9d24b8842753f6c0376a, type: 3}
-    - {fileID: 2800000, guid: b332aa81d67cde04dbc9aa081dd30465, type: 3}
+    - {fileID: 2800000, guid: 5aae54de2b5a59148badb51b0ce0bc50, type: 3}
     - {fileID: 2800000, guid: 509cdc5238ea76a45bd9d3c1e2092bb4, type: 3}
+    - {fileID: 2800000, guid: 27fe6e7753734e644b2e7c2a9c19311c, type: 3}
+    - {fileID: 2800000, guid: 915ae050bd2bd9640b9859a14484c9fa, type: 3}
+    - {fileID: 2800000, guid: b332aa81d67cde04dbc9aa081dd30465, type: 3}
+    - {fileID: 2800000, guid: d55a4612f02d1ac4b8202346a0af938b, type: 3}
     - {fileID: 2800000, guid: 39ec33eac844d7946a825367eba97c32, type: 3}
+    - {fileID: 2800000, guid: fd304205ac1a3a54097142a16e2d02b7, type: 3}
+    - {fileID: 2800000, guid: 1c10bacdf9416ba499add4b765665727, type: 3}
+    - {fileID: 2800000, guid: 374135817649a76498d5b0403ed26342, type: 3}
+    - {fileID: 2800000, guid: 800f0cd5cf2a4da4a9b9279e96c92058, type: 3}
+    - {fileID: 2800000, guid: b42a9d725050c7c4da305cc35c0c745c, type: 3}
+    - {fileID: 2800000, guid: 042be304ac7dec4419b8b1242dc93af5, type: 3}
     - {fileID: 2800000, guid: 2b097d2a6dc97f2479266354c07def3c, type: 3}
-    - {fileID: 2800000, guid: afbdef33193d38a4a97261a4db82d6f6, type: 3}
-    - {fileID: 2800000, guid: ab0f19aa367e5594ab23e9ba0270758b, type: 3}
-    - {fileID: 2800000, guid: 149caaeb89afb654c8aaefe596ec7a31, type: 3}
-    - {fileID: 2800000, guid: f6252dadc46c09047a7e871760b009e5, type: 3}
     - {fileID: 2800000, guid: 04a8795bf75dd9a4f9063ec46f0380ee, type: 3}
-    - {fileID: 2800000, guid: 374135817649a76498d5b0403ed26342, type: 3}
-    - {fileID: 2800000, guid: 1c10bacdf9416ba499add4b765665727, type: 3}
-    - {fileID: 2800000, guid: 6454f35e79665984b80b290d89b4b866, type: 3}
-    - {fileID: 2800000, guid: 915ae050bd2bd9640b9859a14484c9fa, type: 3}
-    - {fileID: 2800000, guid: 27fe6e7753734e644b2e7c2a9c19311c, type: 3}
-    - {fileID: 2800000, guid: 56c7f4ee6e4310b4f85e27fa852e82f7, type: 3}
-    - {fileID: 2800000, guid: ae6754e419e63974198aaa037725d52a, type: 3}
+    - {fileID: 2800000, guid: 4c410bd35ddeaa14e9c08fab39106384, type: 3}
+    - {fileID: 2800000, guid: afbdef33193d38a4a97261a4db82d6f6, type: 3}
+    - {fileID: 2800000, guid: e4ca514f0a198e346be6b65849c3f24c, type: 3}
+    - {fileID: 2800000, guid: 124a7b77303cf3e438c311aa4813efe4, type: 3}
     - {fileID: 2800000, guid: b66ea5da704032342b737b452fd7a57a, type: 3}
-    - {fileID: 2800000, guid: c471c9bbeed2cac429f5a6c5f788a945, type: 3}
     - {fileID: 2800000, guid: 4a19e711e1db604489d67606a5cbef56, type: 3}
     - {fileID: 2800000, guid: d95ac881cad818844937dbd19089a3d3, type: 3}
-    - {fileID: 2800000, guid: d55a4612f02d1ac4b8202346a0af938b, type: 3}
-    - {fileID: 2800000, guid: 5aae54de2b5a59148badb51b0ce0bc50, type: 3}
-    - {fileID: 2800000, guid: 810ca615fc5791b438d8c4a06be05d44, type: 3}
     - {fileID: 2800000, guid: 0bceabacbce118347b978b68355806ec, type: 3}
-    - {fileID: 2800000, guid: 8cf848f98413c1b4291bd86090ab5983, type: 3}
+    - {fileID: 2800000, guid: ae6754e419e63974198aaa037725d52a, type: 3}
+    - {fileID: 2800000, guid: 9edcab6923da7cc4fb216a757a563dcd, type: 3}
     - {fileID: 2800000, guid: f9f06d5ece2bb144a9e00add498e5e25, type: 3}
-    - {fileID: 2800000, guid: c3ab828aa5cca194dbd8039138e66ab9, type: 3}
-    - {fileID: 2800000, guid: d900d9dbc91df1e4e982b19a93fe6129, type: 3}
-    - {fileID: 2800000, guid: 1562359088a3ea94db0c2d98547494c3, type: 3}
-    - {fileID: 2800000, guid: b42a9d725050c7c4da305cc35c0c745c, type: 3}
-    - {fileID: 2800000, guid: e4ca514f0a198e346be6b65849c3f24c, type: 3}
-    - {fileID: 2800000, guid: 042be304ac7dec4419b8b1242dc93af5, type: 3}
-    - {fileID: 2800000, guid: aede80725d7ea9847aba7ca1664aa3c8, type: 3}
-    - {fileID: 2800000, guid: 2ce3304b383ea0340b452a3f9740720b, type: 3}
-    - {fileID: 2800000, guid: a68f300e9414b724b9ec189e3c9c061d, type: 3}
-    - {fileID: 2800000, guid: 84f0f4450b0e3644eb1e97be34b42463, type: 3}
-    - {fileID: 2800000, guid: 2dd1f5812874a7a4e879b5442c5a626e, type: 3}
-    - {fileID: 2800000, guid: 2be57e96e307a0b40bde03fdf7062255, type: 3}
-    - {fileID: 2800000, guid: e8e109ce4146fa84d97c912786b7686b, type: 3}
-    - {fileID: 2800000, guid: 5e34a8f97c6846f45b3be0b2e29e62a9, type: 3}
-    - {fileID: 2800000, guid: 6c69b5e0c5f1808449f3cb328d104105, type: 3}
-    - {fileID: 2800000, guid: a4f6d78a36655554e89a5c8fb7b9b66f, type: 3}
-    - {fileID: 2800000, guid: ad3e276b2c4977b4ca8c556f0705577c, type: 3}
-    - {fileID: 2800000, guid: 3be19fb50648f6541aca133c33f43ea2, type: 3}
-    - {fileID: 2800000, guid: 8f888901a271ee24ebafaaf1d5323c2e, type: 3}
-    - {fileID: 2800000, guid: bca5684a740353f4ca56daeb1e3e01e0, type: 3}
-    - {fileID: 2800000, guid: 07ebcf2547298f74bbf96ce766dd0f1c, type: 3}
+    - {fileID: 2800000, guid: c471c9bbeed2cac429f5a6c5f788a945, type: 3}
+    - {fileID: 2800000, guid: 8cf848f98413c1b4291bd86090ab5983, type: 3}
+    - {fileID: 2800000, guid: 56c7f4ee6e4310b4f85e27fa852e82f7, type: 3}
+    - {fileID: 2800000, guid: 63278b50eee97884ca777f2239a76395, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

+ 2 - 2
Assets/Res/UIAtlas/itemIcon.spriteatlasv2.meta → Assets/Res/UIAtlas/allIcon.spriteatlasv2.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: B35Jty2vUXt2gtCwCGc8Cx+oMrfts7maenYW66/ONtNWrCgau1A2jLw=
+guid: DHIasH+qUi9DTkdDwWjXnUPqJ09SCKN+sgN7nwN/uBmAk/NBmE0EaM0=
 SpriteAtlasImporter:
   externalObjects: {}
   textureSettings:
@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: itemicon
+  assetBundleName: moban
   assetBundleVariant: 

+ 0 - 19
Assets/Res/UIAtlas/heroIcon.spriteatlasv2

@@ -1,19 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 3
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 2800000, guid: ff7f553a76e6f4322a64fbb61d20f9ba, type: 3}
-    - {fileID: 2800000, guid: 40bc652a2f80c4500b10133dd8ca5e43, type: 3}
-    - {fileID: 2800000, guid: 3077f31e475de4831b14989f053d238f, type: 3}
-    - {fileID: 2800000, guid: 686bc6c27b77549b0a4309b808e6620b, type: 3}
-  m_IsVariant: 0
-  m_IsPlaceholder: 0

+ 0 - 31
Assets/Res/UIAtlas/heroIcon.spriteatlasv2.meta

@@ -1,31 +0,0 @@
-fileFormatVersion: 2
-guid: DisdsCP4ASpJWW+yv3WvThwzL8/T0WZJOugmuodBPeyqpmMFuc7HiE0=
-SpriteAtlasImporter:
-  externalObjects: {}
-  textureSettings:
-    serializedVersion: 3
-    anisoLevel: 1
-    compressionQuality: 50
-    maxTextureSize: 2048
-    textureCompression: 0
-    filterMode: 1
-    generateMipMaps: 0
-    readable: 0
-    crunchedCompression: 0
-    webStreaming: 0
-    sRGB: 1
-  platformSettings: []
-  packingSettings:
-    serializedVersion: 2
-    padding: 4
-    blockOffset: 1
-    allowAlphaSplitting: 0
-    enableRotation: 0
-    enableTightPacking: 0
-    enableAlphaDilation: 0
-  secondaryTextureSettings: {}
-  variantMultiplier: 1
-  bindAsDefault: 1
-  userData: 
-  assetBundleName: heroicon
-  assetBundleVariant: 

+ 0 - 23
Assets/Res/UIAtlas/itemIcon.spriteatlasv2

@@ -1,23 +0,0 @@
-%YAML 1.1
-%TAG !u! tag:yousandi.cn,2023:
---- !u!612988286 &1
-SpriteAtlasAsset:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: 
-  serializedVersion: 3
-  m_MasterAtlas: {fileID: 0}
-  m_ImporterData:
-    packables:
-    - {fileID: 2800000, guid: d84b79a30f6baa04aad2377702a6fff8, type: 3}
-    - {fileID: 2800000, guid: 3dbad1a5a76c126439669e6a3fd22f96, type: 3}
-    - {fileID: 2800000, guid: e6614d7880f624bebb9eb042438465e7, type: 3}
-    - {fileID: 2800000, guid: fac2f1f21015b4387ba948c68d69b20a, type: 3}
-    - {fileID: 2800000, guid: 082c2d0dec6374c548992e3de4c3cc17, type: 3}
-    - {fileID: 2800000, guid: 12f59c252111d4ddaa1efdbe970c9338, type: 3}
-    - {fileID: 2800000, guid: 11f8939ed19d74afd9f1ec5c2cd1ed40, type: 3}
-    - {fileID: 2800000, guid: 137d66878d81240e08b1f9e634dd03e5, type: 3}
-  m_IsVariant: 0
-  m_IsPlaceholder: 0

+ 7 - 7
Assets/Res/UIAtlas/skillIcon.spriteatlasv2

@@ -11,22 +11,22 @@ SpriteAtlasAsset:
   m_MasterAtlas: {fileID: 0}
   m_ImporterData:
     packables:
+    - {fileID: 2800000, guid: cd17866a0bfb911429fe498a0431277c, type: 3}
+    - {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
     - {fileID: 2800000, guid: 26e0f7c71e95f4b67b429f478069bc93, type: 3}
     - {fileID: 2800000, guid: 9a8da91ac8b0b3042b18b5f66a65c614, type: 3}
     - {fileID: 2800000, guid: 49a56cefdb25e1d4781964df6ef99cee, type: 3}
-    - {fileID: 2800000, guid: cd17866a0bfb911429fe498a0431277c, type: 3}
-    - {fileID: 2800000, guid: 3b5496225424c894180fe06fe939122a, type: 3}
-    - {fileID: 2800000, guid: a878d3156a1104bb5a021cc9db275ec9, type: 3}
-    - {fileID: 2800000, guid: 4805970872efad343a8559b5ddf6160a, type: 3}
+    - {fileID: 2800000, guid: 2d02827d80f314b27ad033444533c025, type: 3}
     - {fileID: 2800000, guid: 9e6ea24bb7a75d649a177f0c404c14ce, type: 3}
     - {fileID: 2800000, guid: 377bbbee9636d8749b06a6ff1eff1b68, type: 3}
-    - {fileID: 2800000, guid: 2d02827d80f314b27ad033444533c025, type: 3}
     - {fileID: 2800000, guid: 44e771c4fac834747917264ec667b36d, type: 3}
+    - {fileID: 2800000, guid: 4805970872efad343a8559b5ddf6160a, type: 3}
     - {fileID: 2800000, guid: 420e401ffc649de45b6789ff546e7b69, type: 3}
+    - {fileID: 2800000, guid: a878d3156a1104bb5a021cc9db275ec9, type: 3}
     - {fileID: 2800000, guid: 91b32d7475b6ca44e932bb93a5b5b040, type: 3}
-    - {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     - {fileID: 2800000, guid: bd02d94a9e7e5b2488e9bf34e210e4e9, type: 3}
-    - {fileID: 2800000, guid: 28e6a1e003583174188048aadd974b70, type: 3}
+    - {fileID: 2800000, guid: 3fb1e3f2ace104b39a8b5a61d145264f, type: 3}
     - {fileID: 2800000, guid: 400a70f93890a604fb5dba2d1d0de503, type: 3}
+    - {fileID: 2800000, guid: 28e6a1e003583174188048aadd974b70, type: 3}
   m_IsVariant: 0
   m_IsPlaceholder: 0

+ 7 - 7
Assets/Scripts/GameUI/UI/Hero/HeroDetailPanel.cs

@@ -80,6 +80,11 @@ namespace Fort23.Mono
                 return;
             }
             
+            if (isOpenPre)
+            {
+                ExitPowerUpPre(curPreTyp, upPre.Stars1);
+            }
+            
             GObjectPool.Instance.Recycle(modelObj);
             
             if (sourcePanel == UIPanelName.BagPanel)
@@ -351,12 +356,6 @@ namespace Fort23.Mono
         }
         
         private void OnClickClose()
-        {
-            CloseLogic();
-            UIManager.Instance.HideUIUIPanel(this);
-        }
-
-        private void CloseLogic()
         {
             if (isOpenPre)
             {
@@ -365,9 +364,10 @@ namespace Fort23.Mono
             else
             {
                 GObjectPool.Instance.Recycle(modelObj);
-                
+                UIManager.Instance.HideUIUIPanel(this);
             }
         }
+        
 
         public WidgetHero heroWidget;
         public UIPanelName sourcePanel;

+ 2 - 2
Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPre.cs

@@ -11,11 +11,11 @@ namespace Fort23.Mono
     [UIBinding(prefab = "HeroPowerUpPre"  )]
     public partial class HeroPowerUpPre : UIComponent
     {
-        private HeroDetailPanel heroDetailPanel;
+        // private HeroDetailPanel heroDetailPanel;
         private HeroInfo heroInfo;
         private async void Init()
         {
-            heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(null);
+            // heroDetailPanel = await UIManager.Instance.LoadAndOpenPanel<HeroDetailPanel>(null);
         }
         public override void AddEvent()
         {

+ 27 - 20
Assets/Scripts/GameUI/UI/Items/WidgetItem.cs

@@ -51,6 +51,17 @@ namespace Fort23.Mono
             
             this.action = action;
             
+            bg.color = colorConfig.bgColors[3];
+            corner.color = colorConfig.cornerColors[3];
+            // light.color = colorConfig.lightColors[itemInfo.eqInfo.quality];
+            // border.color = colorConfig.borderColors[itemInfo.eqInfo.quality];
+            glow.color = colorConfig.glowColors[3];
+            
+            border.gameObject.SetActive(false);
+            light.gameObject.SetActive(false);
+            
+            heroShards.SetActive(false);
+            
             numObj.SetActive(true);
             alertRed.SetActive(false);
             icon.gameObject.SetActive(true);
@@ -67,46 +78,42 @@ namespace Fort23.Mono
                 
                 bg.color = colorConfig.bgColors[itemInfo.eqInfo.quality];
                 corner.color = colorConfig.cornerColors[itemInfo.eqInfo.quality];
-                light.color = colorConfig.lightColors[itemInfo.eqInfo.quality];
-                border.color = colorConfig.borderColors[itemInfo.eqInfo.quality];
+                // light.color = colorConfig.lightColors[itemInfo.eqInfo.quality];
+                // border.color = colorConfig.borderColors[itemInfo.eqInfo.quality];
                 glow.color = colorConfig.glowColors[itemInfo.eqInfo.quality];
             }
+
+            if (itemInfo.config.itemTyp == 5)
+            {
+                heroShards.SetActive(true);
+                icon.gameObject.SetActive(false);
+                heroShardsIcon.icon_name = itemInfo.config.icon;
+            }
             else
             {
                 icon.icon_name = itemInfo.config.icon;
                 lvObj.SetActive(false);
-
-                // switch (itemInfo.eqInfo.quality)
-                // {
-                //     case 1:
-                //     case 2:
-                //         bg.color = colorConfig.bgColors[1];
-                //         break;
-                // }
-                
-                // bg.color = Color.blue;
             }
-            // if (itemInfo.config.itemTyp == 4)
-            // {
-            //     itemInfo.eqInfo = PlayerManager.Instance.eqController
-            //         .BuildEquipment(itemInfo.config, 1, 1);
-            //     //itemInfo.eqInfo.InitEquipment(itemInfo.config,1,1);
-            // }
         }
 
         public void SetEmpty(Action action = null)
         {
             itemInfo = null;
             this.action = action;
+            
+            border.gameObject.SetActive(false);
+            light.gameObject.SetActive(false);
+            
             numObj.SetActive(false);
             icon.gameObject.SetActive(false);
             alertRed.SetActive(false);
             corner.gameObject.SetActive(false);
             glow.gameObject.SetActive(false);
             lvObj.SetActive(false);
+            heroShards.SetActive(false);
             bg.color = colorConfig.bgColors[0];
-            light.color = colorConfig.lightColors[0];
-            border.color = colorConfig.borderColors[0];
+            // light.color = colorConfig.lightColors[0];
+            // border.color = colorConfig.borderColors[0];
         }
 
     }

+ 22 - 0
Assets/Scripts/GameUI/UI/Items/WidgetItemData.cs

@@ -142,6 +142,28 @@ namespace Fort23.Mono
 	      return _txtLv;
 	     }
 	   }
+	  private GameObject _heroShards;
+	  public GameObject heroShards
+	   {
+	   get{
+	      if (_heroShards == null)
+	       {
+	         _heroShards  = GetUIUnit<GameObject>("heroShards"); 
+	       }
+	      return _heroShards;
+	     }
+	   }
+	  private MyImage _heroShardsIcon;
+	  public MyImage heroShardsIcon
+	   {
+	   get{
+	      if (_heroShardsIcon == null)
+	       {
+	         _heroShardsIcon  = GetUIUnit<MyImage>("heroShardsIcon"); 
+	       }
+	      return _heroShardsIcon;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

文件差異過大導致無法顯示
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


二進制
Excel2Json/Excel/Item.xlsx


+ 1 - 1
UGUIPack/uguiconfig.db

@@ -1 +1 @@
-{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"a6fab45fc6a5f0b09679bb4eedcdd188"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":"a54d3984b6522f413325daf005732f7d"},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"151dde130cdc5228de9614f608886409"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":"dc3cb1520cfd8b3b6ac7d02c7fccd2df"},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""}],"isJiaoYan":true}
+{"allPackgInfos":[{"packName":"all","packgJsonPath":"/Art/UIAssets/TextrueJson/all.txt","packgSpritePath":"Assets/Res/UIAtlas/all.spriteatlasv2","lasetJsonGUID":"a6fab45fc6a5f0b09679bb4eedcdd188"},{"packName":"heroIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/heroIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/heroIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"skillIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/skillIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/skillIcon.spriteatlasv2","lasetJsonGUID":"ba8dbdc12cfea95132d75e229eac99b8"},{"packName":"itemIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/itemIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/itemIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"EquipmentIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/EquipmentIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2","lasetJsonGUID":""},{"packName":"bg","packgJsonPath":"/Art/UIAssets/TextrueJson/bg.txt","packgSpritePath":"Assets/Res/UIAtlas/bg.spriteatlasv2","lasetJsonGUID":""},{"packName":"box","packgJsonPath":"/Art/UIAssets/TextrueJson/box.txt","packgSpritePath":"Assets/Res/UIAtlas/box.spriteatlasv2","lasetJsonGUID":""},{"packName":"allIcon","packgJsonPath":"/Art/UIAssets/TextrueJson/allIcon.txt","packgSpritePath":"Assets/Res/UIAtlas/allIcon.spriteatlasv2","lasetJsonGUID":"083ae4b3a7b2beffb51fed7b1b7800d3"}],"isJiaoYan":true}

文件差異過大導致無法顯示
+ 577 - 464
UserSettings/Layouts/CurrentMaximizeLayout.dwlt


+ 0 - 0
美术/art_use_ui/itemIcon/icon_Coins_s.png → 美术/art_use_ui/allIcon/icon_Coins_s.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_1_1.png → 美术/art_use_ui/allIcon/icon_eq_1_1_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_1_2.png → 美术/art_use_ui/allIcon/icon_eq_1_1_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_1_3.png → 美术/art_use_ui/allIcon/icon_eq_1_1_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_2_1.png → 美术/art_use_ui/allIcon/icon_eq_1_2_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_2_2.png → 美术/art_use_ui/allIcon/icon_eq_1_2_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_2_3.png → 美术/art_use_ui/allIcon/icon_eq_1_2_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_3_1.png → 美术/art_use_ui/allIcon/icon_eq_1_3_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_3_2.png → 美术/art_use_ui/allIcon/icon_eq_1_3_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_3_3.png → 美术/art_use_ui/allIcon/icon_eq_1_3_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_4_1.png → 美术/art_use_ui/allIcon/icon_eq_1_4_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_4_2.png → 美术/art_use_ui/allIcon/icon_eq_1_4_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_4_3.png → 美术/art_use_ui/allIcon/icon_eq_1_4_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_5_1.png → 美术/art_use_ui/allIcon/icon_eq_1_5_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_5_2.png → 美术/art_use_ui/allIcon/icon_eq_1_5_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_1_5_3.png → 美术/art_use_ui/allIcon/icon_eq_1_5_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_2_1_1.png → 美术/art_use_ui/allIcon/icon_eq_2_1_1.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_2_1_2.png → 美术/art_use_ui/allIcon/icon_eq_2_1_2.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_2_1_3.png → 美术/art_use_ui/allIcon/icon_eq_2_1_3.png


+ 0 - 0
美术/art_use_ui/EquipmentIcon/icon_eq_2_2_1.png → 美术/art_use_ui/allIcon/icon_eq_2_2_1.png


部分文件因文件數量過多而無法顯示