ソースを参照

Merge branch 'master' of http://fort23.cn:3000/fort23/XY001

# Conflicts:
#	Assets/Res/UI/EqRecyclePanel.prefab   resolved by origin/master(远端) version
lcn 4 ヶ月 前
コミット
b20b206134
64 ファイル変更3900 行追加1842 行削除
  1. 622 175
      Assets/Art/test01.scene
  2. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta
  3. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta
  4. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta
  5. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta
  6. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta
  7. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta
  8. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta
  9. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta
  10. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta
  11. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta
  12. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta
  13. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta
  14. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta
  15. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta
  16. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta
  17. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta
  18. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta
  19. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta
  20. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta
  21. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta
  22. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta
  23. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta
  24. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta
  25. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta
  26. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta
  27. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta
  28. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta
  29. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta
  30. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta
  31. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta
  32. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta
  33. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta
  34. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta
  35. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta
  36. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta
  37. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta
  38. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta
  39. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta
  40. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta
  41. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta
  42. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta
  43. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta
  44. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta
  45. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta
  46. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta
  47. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta
  48. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta
  49. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta
  50. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta
  51. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta
  52. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta
  53. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta
  54. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta
  55. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta
  56. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta
  57. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta
  58. 7 0
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta
  59. 89 89
      Assets/Layer Lab/GUI Pro-SuperCasual/Prefabs/Prefabs_DemoScene_Panels/Collection_List.prefab
  60. 1589 317
      Assets/Res/UI/EqRecyclePanel.prefab
  61. 314 8
      Assets/Res/UI/WidgetItem.prefab
  62. 12 12
      UserSettings/EditorUserSettings.asset
  63. 315 461
      UserSettings/Layouts/CurrentMaximizeLayout.dwlt
  64. 560 780
      UserSettings/Layouts/default-2022.dwlt

ファイルの差分が大きいため隠しています
+ 622 - 175
Assets/Art/test01.scene


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

ファイルの差分が大きいため隠しています
+ 89 - 89
Assets/Layer Lab/GUI Pro-SuperCasual/Prefabs/Prefabs_DemoScene_Panels/Collection_List.prefab


ファイルの差分が大きいため隠しています
+ 1589 - 317
Assets/Res/UI/EqRecyclePanel.prefab


+ 314 - 8
Assets/Res/UI/WidgetItem.prefab

@@ -122,7 +122,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: 90, y: 90}
+  m_SizeDelta: {x: 100, y: 100}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4404666695256229840
 CanvasRenderer:
@@ -162,7 +162,7 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Round12
+  _icon_name: btn_Round09
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
@@ -330,7 +330,7 @@ MonoBehaviour:
   m_fontMaterials: []
   m_fontColor32:
     serializedVersion: 2
-    rgba: 4294967295
+    rgba: 4286611612
   m_fontColor: {r: 0.6132076, g: 0.50040054, b: 0.50040054, a: 1}
   m_enableVertexGradient: 0
   m_colorMode: 3
@@ -558,6 +558,44 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &2654032404493663270
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1230383290210271096}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: HeroShards
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1230383290210271096
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2654032404493663270}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 2731455764362398641}
+  - {fileID: 8769390152937081920}
+  m_Father: {fileID: 1515036893769208877}
+  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_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 0.5}
 --- !u!1 &3646136775730434938
 GameObject:
   m_ObjectHideFlags: 0
@@ -727,6 +765,105 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 8e0fed06f6e134745d1fa1d786d61cbc
+--- !u!1 &6068697863213743772
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8769390152937081920}
+  - component: {fileID: 6121896776075230898}
+  - component: {fileID: 2399912038442555053}
+  - component: {fileID: 7008548636899416174}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: di_mask
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8769390152937081920
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children:
+  - {fileID: 7741548700730218477}
+  m_Father: {fileID: 1230383290210271096}
+  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_SizeDelta: {x: 64.4, y: 64.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6121896776075230898
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 1
+--- !u!222 &2399912038442555053
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_CullTransparentMesh: 1
+--- !u!114 &7008548636899416174
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6068697863213743772}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0.26830178, g: 0.7945862, b: 0.89433956, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Bg
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
 --- !u!1 &6624212208645409916
 GameObject:
   m_ObjectHideFlags: 0
@@ -862,6 +999,90 @@ MonoBehaviour:
   m_hasFontAssetChanged: 0
   m_baseMaterial: {fileID: 0}
   m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &7310672583097689030
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7741548700730218477}
+  - component: {fileID: 2202988894485000509}
+  - component: {fileID: 6096866157633898550}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: hero_icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7741548700730218477
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 8769390152937081920}
+  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_SizeDelta: {x: 60, y: 75}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2202988894485000509
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_CullTransparentMesh: 1
+--- !u!114 &6096866157633898550
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7310672583097689030}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: icon_tx105
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 1a259ebae9e024f1d8fb10d831b49c24, type: 3}
+  packInfo:
+    packName: heroIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson/heroIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/heroIcon.spriteatlasv2
+    lasetJsonGUID: a54d3984b6522f413325daf005732f7d
 --- !u!1 &7543347028993922308
 GameObject:
   m_ObjectHideFlags: 0
@@ -880,7 +1101,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &6033858037849463588
 RectTransform:
   m_ObjectHideFlags: 0
@@ -897,7 +1118,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: 23.7}
+  m_AnchoredPosition: {x: 0, y: 26.6}
   m_SizeDelta: {x: 90, y: 40.4}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4164539319831174714
@@ -964,7 +1185,7 @@ GameObject:
   m_Icon: {fileID: 0}
   m_NavMeshLayer: 0
   m_StaticEditorFlags: 0
-  m_IsActive: 1
+  m_IsActive: 0
 --- !u!224 &5410523429226151182
 RectTransform:
   m_ObjectHideFlags: 0
@@ -982,7 +1203,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: 100, y: 100}
+  m_SizeDelta: {x: 95.5, y: 97.3}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &4212259591542464616
 CanvasRenderer:
@@ -1030,6 +1251,90 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &7671188777593409960
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2731455764362398641}
+  - component: {fileID: 8970128689940395250}
+  - component: {fileID: 7838204096128365874}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: border
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &2731455764362398641
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 1
+  m_Children: []
+  m_Father: {fileID: 1230383290210271096}
+  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_SizeDelta: {x: 68, y: 70}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &8970128689940395250
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  m_CullTransparentMesh: 1
+--- !u!114 &7838204096128365874
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7671188777593409960}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 0, g: 0.3590937, b: 0.5773585, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 1
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_00_04_06_Border
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
 --- !u!1 &7948008364224510343
 GameObject:
   m_ObjectHideFlags: 0
@@ -1146,16 +1451,17 @@ RectTransform:
   m_LocalScale: {x: 1.4, y: 1.4, z: 1.4}
   m_ConstrainProportionsScale: 1
   m_Children:
+  - {fileID: 5410523429226151182}
   - {fileID: 1835098571422434311}
   - {fileID: 1614591406946658395}
   - {fileID: 6033858037849463588}
-  - {fileID: 5410523429226151182}
   - {fileID: 964352678154303035}
   - {fileID: 3545244106223690488}
   - {fileID: 4688880321879378313}
   - {fileID: 4888607739940384859}
   - {fileID: 3551382341916395911}
   - {fileID: 4607032735910672874}
+  - {fileID: 1230383290210271096}
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}

+ 12 - 12
UserSettings/EditorUserSettings.asset

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

ファイルの差分が大きいため隠しています
+ 315 - 461
UserSettings/Layouts/CurrentMaximizeLayout.dwlt


ファイルの差分が大きいため隠しています
+ 560 - 780
UserSettings/Layouts/default-2022.dwlt


この差分においてかなりの量のファイルが変更されているため、一部のファイルを表示していません