Browse Source

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

李桃 4 months ago
parent
commit
3858a82cd6
100 changed files with 5042 additions and 1279 deletions
  1. 451 381
      Assets/Art/Chapter/Chapter01.prefab
  2. 1279 98
      Assets/Art/Chapter/Chapter02.prefab
  3. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Boing_Bounce/desktop.ini.meta
  4. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Designed/desktop.ini.meta
  5. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/Natural/desktop.ini.meta
  6. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Bubble/desktop.ini.meta
  7. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Cash_Register/desktop.ini.meta
  8. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chest_Open/desktop.ini.meta
  9. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Chimes/desktop.ini.meta
  10. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Boxy/desktop.ini.meta
  11. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Bright/desktop.ini.meta
  12. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Coin/desktop.ini.meta
  13. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/Pop/desktop.ini.meta
  14. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Collect/desktop.ini.meta
  15. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Confetti/desktop.ini.meta
  16. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Eat_Bite/desktop.ini.meta
  17. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Firework/desktop.ini.meta
  18. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Generic/desktop.ini.meta
  19. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Huge/desktop.ini.meta
  20. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Squeaky/desktop.ini.meta
  21. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/Water/desktop.ini.meta
  22. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Footstep/desktop.ini.meta
  23. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Boxy/desktop.ini.meta
  24. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Bright/desktop.ini.meta
  25. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/Pop/desktop.ini.meta
  26. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Match/desktop.ini.meta
  27. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Bottle/desktop.ini.meta
  28. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Liquid/desktop.ini.meta
  29. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/Mouth/desktop.ini.meta
  30. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Pop/desktop.ini.meta
  31. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Powerup/desktop.ini.meta
  32. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Glass/desktop.ini.meta
  33. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Metal/desktop.ini.meta
  34. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Plastic/desktop.ini.meta
  35. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Watery/desktop.ini.meta
  36. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/Wood/desktop.ini.meta
  37. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Rattle/desktop.ini.meta
  38. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Spin_Wheel/desktop.ini.meta
  39. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/Swoosh/desktop.ini.meta
  40. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Appear/desktop.ini.meta
  41. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Bonus/desktop.ini.meta
  42. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Generic/desktop.ini.meta
  43. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Negative/desktop.ini.meta
  44. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Open_Close/desktop.ini.meta
  45. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Select/desktop.ini.meta
  46. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/Settings/desktop.ini.meta
  47. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Click/desktop.ini.meta
  48. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Countdown/desktop.ini.meta
  49. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Error/desktop.ini.meta
  50. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Coin/desktop.ini.meta
  51. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Gem/desktop.ini.meta
  52. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Generic_Soft/desktop.ini.meta
  53. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/Star/desktop.ini.meta
  54. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Fillup/desktop.ini.meta
  55. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Notification/desktop.ini.meta
  56. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Success/desktop.ini.meta
  57. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/Swipe_Swoosh/desktop.ini.meta
  58. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/UI/desktop.ini.meta
  59. 0 7
      Assets/Cute UI _ Interact Sound Effects Pack/AUDIO/desktop.ini.meta
  60. 7 7
      Assets/Plugins/Android/AndroidManifest.xml
  61. 1 1
      Assets/Plugins/Android/AndroidManifest.xml.meta
  62. 0 16
      Assets/Plugins/Android/LauncherManifest.xml
  63. 5 27
      Assets/Plugins/Android/baseProjectTemplate.gradle
  64. 1 1
      Assets/Plugins/Android/baseProjectTemplate.gradle.meta
  65. 0 1
      Assets/Plugins/Android/build.gradle
  66. 0 7
      Assets/Plugins/Android/build.gradle.meta
  67. 3 3
      Assets/Plugins/Android/gradleTemplate.properties
  68. 1 1
      Assets/Plugins/Android/gradleTemplate.properties.meta
  69. 23 13
      Assets/Plugins/Android/launcherTemplate.gradle
  70. 1 1
      Assets/Plugins/Android/launcherTemplate.gradle.meta
  71. 88 6
      Assets/Plugins/Android/mainTemplate.gradle
  72. 15 15
      Assets/Plugins/Android/settingsTemplate.gradle
  73. 1 1
      Assets/Plugins/Android/settingsTemplate.gradle.meta
  74. 11 11
      Assets/PottingMobileSDK/Resources/AdManagerSettings.asset
  75. 8 26
      Assets/PottingMobileSDK/google-services.json
  76. 1 1
      Assets/PottingMobileSDK/google-services.json.meta
  77. 1 1
      Assets/Res/CombatScenes/NavMeshTarget.prefab
  78. 2 2
      Assets/Res/UI/EqRecyclePanel.prefab
  79. 210 0
      Assets/Res/UI/MainUIPanel.prefab
  80. 2370 0
      Assets/Res/UI/RewardsPanel.prefab
  81. 2 2
      Assets/Res/UI/RewardsPanel.prefab.meta
  82. 231 238
      Assets/Scenes/UIBuild.scene
  83. 38 1
      Assets/Scripts/Core/DownloadFile/WXDownload.cs
  84. 1 1
      Assets/Scripts/GameLogic/Bag/BagController.cs
  85. 14 0
      Assets/Scripts/GameLogic/Bag/ItemInfo.cs
  86. 2 2
      Assets/Scripts/GameLogic/Combat/CombatTool/CombatSenceController.cs
  87. 4 4
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  88. 8 3
      Assets/Scripts/GameLogic/Combat/Skill/S900001.cs
  89. 16 1
      Assets/Scripts/GameLogic/Equipment/EquipmentController.cs
  90. 1 0
      Assets/Scripts/GameLogic/Player/DropManager.cs
  91. 54 3
      Assets/Scripts/GameUI/SDK/YouLoftSDK.cs
  92. 10 0
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  93. 23 2
      Assets/Scripts/GameUI/UI/Hero/EqRecyclePanel.cs
  94. 1 1
      Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs
  95. 1 1
      Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs
  96. 61 0
      Assets/Scripts/GameUI/UI/Items/RewardsPanel.cs
  97. 11 0
      Assets/Scripts/GameUI/UI/Items/RewardsPanel.cs.meta
  98. 73 0
      Assets/Scripts/GameUI/UI/Items/RewardsPanelData.cs
  99. 11 0
      Assets/Scripts/GameUI/UI/Items/RewardsPanelData.cs.meta
  100. 1 1
      Assets/Scripts/GameUI/UI/Items/WidgetItem.cs

File diff suppressed because it is too large
+ 451 - 381
Assets/Art/Chapter/Chapter01.prefab


File diff suppressed because it is too large
+ 1279 - 98
Assets/Art/Chapter/Chapter02.prefab


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+ 7 - 7
Assets/Plugins/Android/AndroidManifest.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="com.unity3d.player" xmlns:tools="http://schemas.android.com/tools">
   <application android:name="com.youloft.core.YApplication" android:fullBackupContent="@xml/backup_rules" tools:replace="android:fullBackupContent">
-    <activity android:name="com.unity3d.player.UnityPlayerActivity" android:theme="@style/UnityThemeSelector">
+    <activity android:name="com.unity3d.player.UnityPlayerActivity" android:theme="@style/TuanjieThemeSelector">
       <intent-filter>
         <action android:name="android.intent.action.MAIN" />
         <category android:name="android.intent.category.LAUNCHER" />
@@ -13,17 +13,17 @@
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="fbyou id" />
+        <data android:scheme="fb123" />
       </intent-filter>
     </activity>
-    <provider android:authorities="com.facebook.app.FacebookContentProvideryou id" android:name="com.facebook.FacebookContentProvider" android:exported="true" />
+    <provider android:authorities="com.facebook.app.FacebookContentProvider123" android:name="com.facebook.FacebookContentProvider" android:exported="true" />
     <provider android:name="androidx.core.content.FileProvider" android:authorities="${applicationId}.provider" android:exported="false" android:grantUriPermissions="true">
       <meta-data android:name="android.support.FILE_PROVIDER_PATHS" android:resource="@xml/provider_paths" />
     </provider>
-    <meta-data android:name="com.google.android.gms.games.APP_ID" android:value="\u003谷歌游戏id" />
-    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="you facebook token" />
-    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fbyou id" />
+    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="123" />
+    <meta-data android:name="com.google.android.gms.games.APP_ID" android:value="\u003123" />
+    <meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb123" />
     <meta-data android:name="applovin.sdk.key" android:value="3A74IfT6NFU_AdrIDfHfgDUXOTq1_vyFDwcakL_Me-NtsxCz_rFucqXb2R_D4hH2S6OKcI36tREbu23MfoOrlH" />
-    <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="you id" />
+    <meta-data android:name="com.google.android.gms.ads.APPLICATION_ID" android:value="123" />
   </application>
 </manifest>

+ 1 - 1
Assets/Plugins/Android/AndroidManifest.xml.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: a8a1397b3fd5b4ab885ac7bc2f75b6e5
+guid: XnJOtCmkVClO+w+L1tELhFTa1FWQcQtOGDVNJqObVke62iPmV/9dXnc=
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 0 - 16
Assets/Plugins/Android/LauncherManifest.xml

@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:installLocation="preferExternal">
-    <supports-screens
-        android:smallScreens="true"
-        android:normalScreens="true"
-        android:largeScreens="true"
-        android:xlargeScreens="true"
-        android:anyDensity="true"/>
-
-    <application android:label="@string/app_name"
-                 android:icon="@mipmap/app_icon"/>
-</manifest>

+ 5 - 27
Assets/Plugins/Android/baseProjectTemplate.gradle

@@ -1,37 +1,15 @@
 plugins {
-    // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Unity
-    // See which Gradle version is preinstalled with Unity here https://docs.unity3d.com/Manual/android-gradle-overview.html
+    // If you are changing the Android Gradle Plugin version, make sure it is compatible with the Gradle version preinstalled with Tuanjie
+    // See which Gradle version is preinstalled with Tuanjie here https://docs.unity.cn/cn/2022.3/Manual/android-gradle-overview.html
     // See official Gradle and Android Gradle Plugin compatibility table here https://developer.android.com/studio/releases/gradle-plugin#updating-gradle
-    // To specify a custom Gradle version in Unity, go do "Preferences > External Tools", uncheck "Gradle Installed with Unity (recommended)" and specify a path to a custom Gradle version
-    id 'com.android.application' version '7.1.2' apply false
-    id 'com.android.library' version '7.1.2' apply false
+    // To specify a custom Gradle version in Tuanjie, go do "Preferences > External Tools", uncheck "Gradle Installed with Tuanjie (recommended)" and specify a path to a custom Gradle version
+    id 'com.android.application' version '7.4.2' apply false
+    id 'com.android.library' version '7.4.2' apply false
     id 'com.google.gms.google-services' version  '4.3.15'
     id 'com.google.firebase.crashlytics' version  '2.9.5'
     **BUILD_SCRIPT_DEPS**
 }
 
-
-
-repositories {
-    google()
-    jcenter()
-    maven {
-        url 'https://artifact.bytedance.com/repository/pangle'
-    }
-    maven {
-        url "https://maven.google.com"
-    }
-    maven {
-        url "https://sdk.tapjoy.com/"
-    }
-    maven {
-        url 'https://android-sdk.is.com/'
-    }
-    mavenLocal()
-    mavenCentral()
-}
-
-
 task clean(type: Delete) {
     delete rootProject.buildDir
 }

+ 1 - 1
Assets/Plugins/Android/baseProjectTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 19e481781a4164f358ed2b57989e4895
+guid: DnNKsSKsVHO196o76Da0zFmsQj3JY7W2/1F0GXfuO+10gIEIUEqEC9w=
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 0 - 1
Assets/Plugins/Android/build.gradle

@@ -1 +0,0 @@
-// Top-level build file where you can add configuration options common to all sub-projects/modules.

+ 0 - 7
Assets/Plugins/Android/build.gradle.meta

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

+ 3 - 3
Assets/Plugins/Android/gradleTemplate.properties

@@ -1,6 +1,6 @@
 org.gradle.jvmargs=-Xmx**JVM_HEAP_SIZE**M
 org.gradle.parallel=true
-unityStreamingAssets=**STREAMING_ASSETS**
-android.useAndroidX=true
+tuanjieStreamingAssets=**STREAMING_ASSETS**
+**ADDITIONAL_PROPERTIES**
 android.enableJetifier=true
-**ADDITIONAL_PROPERTIES**
+android.useAndroidX=true

+ 1 - 1
Assets/Plugins/Android/gradleTemplate.properties.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 47b0b9973c4834a64a14a3e6bc0798d8
+guid: C31NtXikWnxDB3980C2dfigCooxU+l8LS6/pm78A1WsLtWxa/UG9VF8=
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 23 - 13
Assets/Plugins/Android/launcherTemplate.gradle

@@ -2,11 +2,17 @@ apply plugin: 'com.android.application'
 apply plugin: 'com.google.gms.google-services'
 apply plugin: 'com.google.firebase.crashlytics'
 
+afterEvaluate {
+    generateReleaseBuildConfig.enabled = false
+    generateDebugBuildConfig.enabled =false
+}
+
 dependencies {
-    implementation project(':unityLibrary')
-    }
+    implementation project(':tuanjieLibrary')
+}
 
 android {
+    namespace "**NAMESPACE**"
     ndkPath "**NDKPATH**"
 
     compileSdkVersion **APIVERSION**
@@ -18,7 +24,6 @@ android {
     }
 
     defaultConfig {
-        multiDexEnabled true //添加此配置,是为了当代码行数超过64k的时候设置的
         minSdkVersion **MINSDKVERSION**
         targetSdkVersion **TARGETSDKVERSION**
         applicationId '**APPLICATIONID**'
@@ -27,10 +32,11 @@ android {
         }
         versionCode **VERSIONCODE**
         versionName '**VERSIONNAME**'
+        multiDexEnabled true
     }
 
     aaptOptions {
-        noCompress = **BUILTIN_NOCOMPRESS** + unityStreamingAssets.tokenize(', ')
+        noCompress = **BUILTIN_NOCOMPRESS** + tuanjieStreamingAssets.tokenize(', ')
         ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
     }**SIGN**
 
@@ -61,13 +67,17 @@ android {
             enableSplit = true
         }
     }
-        task copyJsonFile {
-    def unityProjectPath = $/file:///**DIR_UNITYPROJECT**/$.replace("\\", "/")
-    copy {
-        from(unityProjectPath + '/Assets/PottingMobileSDK/')
-        into('./')
-        include("google-services.json")
-    }
-}
-preBuild.dependsOn copyJsonFile
+    
+ task copyJsonFile {
+
+     copy {
+         delete("C:/TuanJiePorject/XY001/Library/Bee/Android/Prj/IL2CPP/Gradle/launcher/google-services.json")
+         from('C:/TuanJiePorject/XY001/Assets/PottingMobileSDK/')
+         into("C:/TuanJiePorject/XY001/Library/Bee/Android/Prj/IL2CPP/Gradle/launcher/")
+         include("google-services.json")
+         println "Copy google-services.json completed.--->> IL2CPP"
+     }
+ }
+ preBuild.dependsOn copyJsonFile  
+ 
 }**SPLITS_VERSION_CODE****LAUNCHER_SOURCE_BUILD_SETUP**

+ 1 - 1
Assets/Plugins/Android/launcherTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 7de599810887f4c9992a2f7b55d89970
+guid: CC5KsCOkW3oZpECVG7KGnMKpkkTnO6mSp346R7agxCcQMogSqrvvEWc=
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 88 - 6
Assets/Plugins/Android/mainTemplate.gradle

@@ -3,16 +3,97 @@ apply plugin: 'com.android.library'
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
+    //内购
+        //implementation 'com.android.billingclient:billing:7.0.0'
 
-    // 添加你的其他依赖项
+
+        def lifecycle_version = "2.0.0"
+        api "androidx.lifecycle:lifecycle-extensions:$lifecycle_version"
+        api "androidx.lifecycle:lifecycle-runtime:$lifecycle_version"
+        annotationProcessor "androidx.lifecycle:lifecycle-compiler:$lifecycle_version"
+        //google
+        implementation 'com.google.android.gms:play-services-base:17.6.0'
+        implementation 'com.google.android.gms:play-services-auth:20.2.0'
+        implementation "com.google.android.gms:play-services-games-v2:+"
+
+        configurations.all {
+            resolutionStrategy {
+                force 'com.google.android.gms:play-services-tasks:18.0.2'
+            }
+        }
+
+
+
+        implementation "androidx.core:core:1.1.0"
+        implementation "androidx.localbroadcastmanager:localbroadcastmanager:1.0.0"
+
+        //应用内评论
+        implementation 'com.google.android.play:review:2.0.1'
+
+        //gosn
+        implementation 'com.google.code.gson:gson:2.8.6'
+
+        implementation 'com.facebook.android:facebook-core:16.1.3'
+        implementation 'com.facebook.android:facebook-login:16.1.3'
+        implementation 'com.facebook.android:facebook-share:16.1.3'
+        implementation 'com.facebook.android:facebook-gamingservices:16.1.3'
+
+
+
+        implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+        implementation 'androidx.annotation:annotation:1.1.0'
+
+
+        implementation 'androidx.appcompat:appcompat:1.1.0'
+
+
+        //FireBase
+        implementation platform('com.google.firebase:firebase-bom:32.1.1')
+        implementation 'com.google.firebase:firebase-analytics'
+        implementation 'com.google.firebase:firebase-config'
+        implementation 'com.google.firebase:firebase-crashlytics'
+
+
+
+         //appsflyer
+       implementation 'com.appsflyer:af-android-sdk:6.12.1'
+       implementation 'com.android.installreferrer:installreferrer:2.2'
+       implementation 'com.appsflyer:adrevenue:6.9.0'
+
+        //okhttp
+        implementation("com.squareup.okhttp3:okhttp:4.9.2")
+
+        implementation("com.squareup.okhttp3:logging-interceptor:4.9.2")
+
+
+        implementation 'com.alibaba:fastjson:1.2.80'
+
+
+
+        //广告
+    implementation 'com.google.android.gms:play-services-ads:22.6.0'
+
+
+    implementation 'com.google.ads.mediation:facebook:6.16.0.0'
+    implementation 'com.google.ads.mediation:applovin:12.1.0.1'
+    implementation 'com.google.ads.mediation:ironsource:7.7.0.1'
+    implementation ('com.google.ads.mediation:tapjoy:13.0.1.0') {
+        exclude group: 'com.google.android.gms', module: 'services-ads-identifier'
+    }
+
+    implementation 'com.unity3d.ads:unity-ads:4.9.2'
+
+    implementation 'com.google.ads.mediation:unity:4.9.2.0'
+    implementation 'com.google.ads.mediation:vungle:6.12.1.1'
+    implementation 'com.google.ads.mediation:pangle:5.7.0.3.0'
+    implementation("com.google.android.ump:user-messaging-platform:2.2.0") 
 **DEPS**}
 
 android {
     namespace "com.unity3d.player"
     ndkPath "**NDKPATH**"
-
     compileSdkVersion **APIVERSION**
-    buildToolsVersion '30.0.3'
+    buildToolsVersion '**BUILDTOOLS**'
 
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_11
@@ -27,7 +108,7 @@ android {
         }
         versionCode **VERSIONCODE**
         versionName '**VERSIONNAME**'
-        consumerProguardFiles 'proguard-unity.txt'**USER_PROGUARD**
+        consumerProguardFiles 'proguard-tuanjie.txt'**USER_PROGUARD**
     }
 
     lintOptions {
@@ -35,11 +116,12 @@ android {
     }
 
     aaptOptions {
-//         noCompress = ['.unity3d', '.ress', '.resource', '.obb'] + tuanjieStreamingAssets
-        noCompress '.unity3d', '.ress', '.resource', '.obb'**STREAMING_ASSETS**
+        noCompress = **BUILTIN_NOCOMPRESS** + tuanjieStreamingAssets.tokenize(', ')
         ignoreAssetsPattern = "!.svn:!.git:!.ds_store:!*.scc:!CVS:!thumbs.db:!picasa.ini:!*~"
     }**PACKAGING_OPTIONS**
 }
+
+
 **IL_CPP_BUILD_SETUP**
 **SOURCE_BUILD_SETUP**
 **EXTERNAL_SOURCES**

+ 15 - 15
Assets/Plugins/Android/settingsTemplate.gradle

@@ -7,7 +7,7 @@ pluginManagement {
     }
 }
 
-include ':launcher', ':unityLibrary'
+include ':launcher', ':tuanjieLibrary'
 **INCLUDES**
 
 dependencyResolutionManagement {
@@ -16,21 +16,21 @@ dependencyResolutionManagement {
         **ARTIFACTORYREPOSITORY**
         google()
         mavenCentral()
-            maven {
-        url 'https://artifact.bytedance.com/repository/pangle'
-    }
-    maven {
-        url "https://maven.google.com"
-    }
-    maven {
-        url "https://sdk.tapjoy.com/"
-    }
-    maven {
-        url 'https://android-sdk.is.com/'
-    }
-    mavenLocal()
+        maven {
+            url 'https://artifact.bytedance.com/repository/pangle'
+        }
+        maven {
+            url "https://maven.google.com"
+        }
+        maven {
+            url "https://sdk.tapjoy.com/"
+        }
+        maven {
+            url 'https://android-sdk.is.com/'
+        }
+        mavenLocal()
         flatDir {
-            dirs "${project(':unityLibrary').projectDir}/libs"
+            dirs "${project(':tuanjieLibrary').projectDir}/libs"
         }
     }
 }

+ 1 - 1
Assets/Plugins/Android/settingsTemplate.gradle.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: 6f30b30f18cd64ed183b9d25d28bfd2f
+guid: CSwctXiuUy38Q6Nxr79S1yuhGfLfpmZJf79VMMh1sNnRzbqZaQ7JeDg=
 DefaultImporter:
   externalObjects: {}
   userData: 

+ 11 - 11
Assets/PottingMobileSDK/Resources/AdManagerSettings.asset

@@ -1,5 +1,5 @@
 %YAML 1.1
-%TAG !u! tag:unity3d.com,2011:
+%TAG !u! tag:yousandi.cn,2023:
 --- !u!114 &11400000
 MonoBehaviour:
   m_ObjectHideFlags: 0
@@ -24,22 +24,22 @@ MonoBehaviour:
   AndroidRewardedInterstitialID: []
   RepeatTime: 120
   iOSAdmobId: 
-  AppleID: you id
+  AppleID: 123
   iOSUmengAppid: 
   iOSPangleAppID: 
   iOSFacebookID: iosTest
   iOSFacebookDisplayname: ios
-  iOSFacebookClientToken: you facebook token
-  iOSGameId: you id
-  iOSGameSecret: you secret
-  AndroidAdmobId: you id
+  iOSFacebookClientToken: 123
+  iOSGameId: 123
+  iOSGameSecret: 123
+  AndroidAdmobId: 123
   AndroidUmengAppid: 
   AndroidPangleAppID: 
-  AndroidFacebookID: you id
-  AndroidFacebookClientToken: you facebook token
+  AndroidFacebookID: 123
+  AndroidFacebookClientToken: 123
   AndroidFacebookDisplayname: Android
-  AndroidGameId: you id
-  AndroidGameSecret: you secret
-  GoogleGamesAppID: "\u8C37\u6B4C\u6E38\u620Fid"
+  AndroidGameId: 123
+  AndroidGameSecret: 123
+  GoogleGamesAppID: 123
   umengChannel: GooglePlay
   isChcek: 0

+ 8 - 26
Assets/PottingMobileSDK/google-services.json

@@ -1,44 +1,26 @@
 {
   "project_info": {
-    "project_number": "200315252870",
-    "firebase_url": "https://unity-test-707a2.firebaseio.com",
-    "project_id": "unity-test-707a2",
-    "storage_bucket": "unity-test-707a2.appspot.com"
+    "project_number": "197380154534",
+    "project_id": "xy001-99d9d",
+    "storage_bucket": "xy001-99d9d.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:200315252870:android:0daea028e62391c95fe107",
+        "mobilesdk_app_id": "1:197380154534:android:55bd6ef3e9e12a54998067",
         "android_client_info": {
-          "package_name": "com.potting.test"
+          "package_name": "com.fort23.XY001"
         }
       },
-      "oauth_client": [
-        {
-          "client_id": "200315252870-h002gp2c2plpveuhvmo7sv5h4jmb5mv5.apps.googleusercontent.com",
-          "client_type": 3
-        }
-      ],
+      "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyBFqbgK93oxjNQota3pqd5HmTwH6EwU_3Y"
+          "current_key": "AIzaSyDTRozuAhTGotLRnF1U2FPqX3r4KgvkE6s"
         }
       ],
       "services": {
         "appinvite_service": {
-          "other_platform_oauth_client": [
-            {
-              "client_id": "200315252870-h002gp2c2plpveuhvmo7sv5h4jmb5mv5.apps.googleusercontent.com",
-              "client_type": 3
-            },
-            {
-              "client_id": "200315252870-qv79re5kgcbh6j18tk7g7segi1qo7tt4.apps.googleusercontent.com",
-              "client_type": 2,
-              "ios_info": {
-                "bundle_id": "çç"
-              }
-            }
-          ]
+          "other_platform_oauth_client": []
         }
       }
     }

+ 1 - 1
Assets/PottingMobileSDK/google-services.json.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: e94456ae1f0914542a9da3511e590550
+guid: WnMbsS+rAi4JNSkBnQbAZz6rIbhZgpnrCeFxVKbmW7BFfAZz/LrCExI=
 TextScriptImporter:
   externalObjects: {}
   userData: 

+ 1 - 1
Assets/Res/CombatScenes/NavMeshTarget.prefab

@@ -47,7 +47,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_AgentTypeID: 0
   m_CollectObjects: 1
-  m_Size: {x: 69.6, y: 10, z: 110}
+  m_Size: {x: 69.6, y: 10, z: 200}
   m_Center: {x: 0, y: 2, z: 0}
   m_LayerMask:
     serializedVersion: 2

+ 2 - 2
Assets/Res/UI/EqRecyclePanel.prefab

@@ -38,7 +38,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: 0, y: 4}
-  m_SizeDelta: {x: 750, y: 1624}
+  m_SizeDelta: {x: 750, y: 1334}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1521278904985518640
 CanvasRenderer:
@@ -1105,7 +1105,7 @@ MonoBehaviour:
   m_StartCorner: 0
   m_StartAxis: 0
   m_CellSize: {x: 80, y: 80}
-  m_Spacing: {x: 65, y: 80}
+  m_Spacing: {x: 65, y: 60}
   m_Constraint: 1
   m_ConstraintCount: 5
 --- !u!114 &7325045172901878179

+ 210 - 0
Assets/Res/UI/MainUIPanel.prefab

@@ -146,6 +146,8 @@ GameObject:
   - component: {fileID: 7295285484143575252}
   - component: {fileID: 5110367857571788923}
   - component: {fileID: 3173585067917471387}
+  - component: {fileID: 8460307177490204470}
+  - component: {fileID: 126865455933342945}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Diamon
@@ -219,6 +221,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
+--- !u!114 &8460307177490204470
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276298489757744287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 3173585067917471387}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &126865455933342945
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 276298489757744287}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &292838646372743710
 GameObject:
   m_ObjectHideFlags: 0
@@ -1017,6 +1078,8 @@ GameObject:
   - component: {fileID: 5433286787357854352}
   - component: {fileID: 5309631651483224709}
   - component: {fileID: 6524193313608138032}
+  - component: {fileID: 5744364923132583880}
+  - component: {fileID: 1259213702763062060}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_Coin
@@ -1090,6 +1153,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: e90cdb0036b7598e8196c482eccd4329
+--- !u!114 &5744364923132583880
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1211543753200599720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6524193313608138032}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &1259213702763062060
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1211543753200599720}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &1222237385420729871
 GameObject:
   m_ObjectHideFlags: 0
@@ -4557,6 +4679,33 @@ MonoBehaviour:
     - gameObject: {fileID: 6107101496507914859}
     - gameObject: {fileID: 397899105639740}
     - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_HeroExp_button
+    gameObject: {fileID: 4024069355568480163}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_Coin_button
+    gameObject: {fileID: 5744364923132583880}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
+  - key: Icon_Diamon_button
+    gameObject: {fileID: 8460307177490204470}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 9073062006211861286}
+    - gameObject: {fileID: 6107101496507914859}
+    - gameObject: {fileID: 397899105639740}
+    - gameObject: {fileID: 3469845461661622283}
   isAssetBundle: 1
 --- !u!1 &6750499123037776255
 GameObject:
@@ -4962,6 +5111,8 @@ GameObject:
   - component: {fileID: 6989071283435105637}
   - component: {fileID: 2473317446412967829}
   - component: {fileID: 2002673787439862528}
+  - component: {fileID: 4024069355568480163}
+  - component: {fileID: 3098295541360265216}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Icon_HeroExp
@@ -5036,6 +5187,65 @@ MonoBehaviour:
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
     lasetJsonGUID: ace5466faa841bb7b9046587aae54d38
+--- !u!114 &4024069355568480163
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7748391517457046766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 2002673787439862528}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &3098295541360265216
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7748391517457046766}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: e30737fa9d44e934eb9236105be999f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  duration: 0.07
+  ease: 5
+  animationSizeDelta: {x: 0.2, y: 0.2, z: 0}
 --- !u!1 &7803319478472451267
 GameObject:
   m_ObjectHideFlags: 0

+ 2370 - 0
Assets/Res/UI/RewardsPanel.prefab

@@ -0,0 +1,2370 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!1 &740482373566107707
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3011679360858695175}
+  - component: {fileID: 3379041156068266152}
+  - component: {fileID: 4103838766493606170}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Text (TMP) (2)
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3011679360858695175
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 740482373566107707}
+  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: 3307253881366362931}
+  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: 1.3, y: -41.8}
+  m_SizeDelta: {x: 45, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3379041156068266152
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 740482373566107707}
+  m_CullTransparentMesh: 1
+--- !u!114 &4103838766493606170
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 740482373566107707}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 700
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 0.6132076, g: 0.50040054, b: 0.50040054, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 22
+  m_fontSizeBase: 22
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 24
+  m_fontSizeMax: 35
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: -0.0026760097, z: 0.04476166, w: 0.44198227}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
+--- !u!1 &1627275322588555021
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4531763443267594299}
+  - component: {fileID: 6721900962482972644}
+  - component: {fileID: 3615077691807445327}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: decR
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4531763443267594299
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627275322588555021}
+  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: 7599982387852363157}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 170, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6721900962482972644
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627275322588555021}
+  m_CullTransparentMesh: 1
+--- !u!114 &3615077691807445327
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1627275322588555021}
+  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.8980392, g: 0.92941177, b: 0.9490196, 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_Divider_Right
+  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: 278bde855f239720008efb1760563849
+--- !u!1 &1883575884987749758
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3238674032568273118}
+  - component: {fileID: 1357357830105005760}
+  - component: {fileID: 8964501797127843016}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Alert_Circle_Red
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3238674032568273118
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1883575884987749758}
+  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: 3400172526585196132}
+  - {fileID: 2334820581331206621}
+  m_Father: {fileID: 3307253881366362931}
+  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: 40, y: 40.4}
+  m_SizeDelta: {x: 28, y: 28}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1357357830105005760
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1883575884987749758}
+  m_CullTransparentMesh: 1
+--- !u!114 &8964501797127843016
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1883575884987749758}
+  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: 0.14117648, b: 0.24313726, 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_Alert_Dot_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: 8e0fed06f6e134745d1fa1d786d61cbc
+--- !u!1 &2549914540529833566
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 923969490478116372}
+  - component: {fileID: 1443864604616705868}
+  - component: {fileID: 2697684662962736348}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: glow
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &923969490478116372
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2549914540529833566}
+  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: 3307253881366362931}
+  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: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &1443864604616705868
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2549914540529833566}
+  m_CullTransparentMesh: 1
+--- !u!114 &2697684662962736348
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2549914540529833566}
+  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.03137255, g: 0.9372549, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_BgGlow
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &2862292532613166389
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7751492326801150169}
+  - component: {fileID: 6539587015862239566}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: GameObject
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7751492326801150169
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2862292532613166389}
+  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: 4228000699599983962}
+  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: -20.349974}
+  m_SizeDelta: {x: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &6539587015862239566
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2862292532613166389}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 0
+  m_VerticalFit: 0
+--- !u!1 &3035665426128642480
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3517247172456046658}
+  - component: {fileID: 2395260049814012261}
+  - component: {fileID: 6013780947117029556}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3517247172456046658
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035665426128642480}
+  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: 3307253881366362931}
+  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: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &2395260049814012261
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035665426128642480}
+  m_CullTransparentMesh: 1
+--- !u!114 &6013780947117029556
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3035665426128642480}
+  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_eq_4_3_2
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 32b47635c42d8454b9f3385841ed0ede, type: 3}
+  packInfo:
+    packName: EquipmentIcon
+    packgJsonPath: /Art/UIAssets/TextrueJson\EquipmentIcon.txt
+    packgSpritePath: Assets/Res/UIAtlas/EquipmentIcon.spriteatlasv2
+    lasetJsonGUID: 3f341819198f0a90aee7b2673a546c13
+--- !u!1 &3587160291739471432
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2942798818567370217}
+  - component: {fileID: 7072721749655715383}
+  - component: {fileID: 4971533249731563693}
+  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 &2942798818567370217
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3587160291739471432}
+  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: 3307253881366362931}
+  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: 100, y: 100}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &7072721749655715383
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3587160291739471432}
+  m_CullTransparentMesh: 1
+--- !u!114 &4971533249731563693
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3587160291739471432}
+  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.09411765, g: 0.09411765, b: 0.20392157, 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_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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &3724772720786795118
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8150427964580176949}
+  - component: {fileID: 4022983029914649038}
+  - component: {fileID: 6046230828290279203}
+  - component: {fileID: 9010385271561948532}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Dimed
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8150427964580176949
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  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: 4728143542991051966}
+  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: 13}
+  m_SizeDelta: {x: 750, y: 1800}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4022983029914649038
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  m_CullTransparentMesh: 1
+--- !u!114 &6046230828290279203
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 21300000, guid: 55efdebed769a4f2fb81998fb87a2df5, type: 3}
+  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
+--- !u!114 &9010385271561948532
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 3724772720786795118}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 6046230828290279203}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &4226868228391283850
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 2334820581331206621}
+  - component: {fileID: 4071862942741496739}
+  - component: {fileID: 4848558990866735467}
+  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 &2334820581331206621
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4226868228391283850}
+  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: 3238674032568273118}
+  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: 30, y: 30}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4071862942741496739
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4226868228391283850}
+  m_CullTransparentMesh: 1
+--- !u!114 &4848558990866735467
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4226868228391283850}
+  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.3254902, g: 0.02745098, b: 0.05882353, 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_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: 8e0fed06f6e134745d1fa1d786d61cbc
+--- !u!1 &4688934361147581867
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6223258105488711688}
+  - component: {fileID: 107777712894178491}
+  - component: {fileID: 9079335746802258409}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: txtItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6223258105488711688
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4688934361147581867}
+  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: 7599982387852363157}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 373.6, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &107777712894178491
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4688934361147581867}
+  m_CullTransparentMesh: 1
+--- !u!114 &9079335746802258409
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4688934361147581867}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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: 1, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
+    m_FontSize: 38
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 131
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "\u83B7\u5F97\u5956\u52B1"
+--- !u!1 &4782283543027284549
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8636316870303425662}
+  - component: {fileID: 317096390748822503}
+  - component: {fileID: 7473827935908692917}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: txtLv
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8636316870303425662
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4782283543027284549}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 0.71428573, y: 0.71428573, z: 0.71428573}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 6096188442925312168}
+  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: 269.4, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &317096390748822503
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4782283543027284549}
+  m_CullTransparentMesh: 1
+--- !u!114 &7473827935908692917
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4782283543027284549}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 5f7201a12d95ffc409449d95f23cf332, 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: 1, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_FontData:
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 22
+    m_FontStyle: 0
+    m_BestFit: 0
+    m_MinSize: 0
+    m_MaxSize: 131
+    m_Alignment: 4
+    m_AlignByGeometry: 0
+    m_RichText: 1
+    m_HorizontalOverflow: 0
+    m_VerticalOverflow: 0
+    m_LineSpacing: 1
+  m_Text: "110\u7EA7"
+--- !u!1 &4791404325002115125
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7599982387852363157}
+  - component: {fileID: 3351630389936616225}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: titleObj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7599982387852363157
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4791404325002115125}
+  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: 3447204198347544916}
+  - {fileID: 6223258105488711688}
+  - {fileID: 4531763443267594299}
+  m_Father: {fileID: 1634819178839643118}
+  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: 349}
+  m_SizeDelta: {x: 628.12, y: 46}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &3351630389936616225
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 4791404325002115125}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 0
+    m_Bottom: 0
+  m_ChildAlignment: 4
+  m_Spacing: -93.1
+  m_ChildForceExpandWidth: 1
+  m_ChildForceExpandHeight: 0
+  m_ChildControlWidth: 0
+  m_ChildControlHeight: 0
+  m_ChildScaleWidth: 0
+  m_ChildScaleHeight: 0
+  m_ReverseArrangement: 0
+--- !u!1 &5010962187566599887
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8707071878549420236}
+  - component: {fileID: 4844835187688654193}
+  - component: {fileID: 8080471689451123104}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: CornerDeco
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8707071878549420236
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5010962187566599887}
+  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: 3307253881366362931}
+  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: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4844835187688654193
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5010962187566599887}
+  m_CullTransparentMesh: 1
+--- !u!114 &8080471689451123104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5010962187566599887}
+  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.17254902, g: 0.74509805, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_CornerDeco
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &5559425967478819441
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3628639589069020726}
+  - component: {fileID: 7624916811128111609}
+  - component: {fileID: 2280013247781259092}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Scroll View
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3628639589069020726
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5559425967478819441}
+  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: 4228000699599983962}
+  m_Father: {fileID: 1634819178839643118}
+  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: 255}
+  m_SizeDelta: {x: 750, y: 469.3}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!222 &7624916811128111609
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5559425967478819441}
+  m_CullTransparentMesh: 1
+--- !u!114 &2280013247781259092
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5559425967478819441}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 1aa08ab6e0800fa44ae55d278d1423e3, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Content: {fileID: 410575005933691755}
+  m_Horizontal: 0
+  m_Vertical: 1
+  m_MovementType: 1
+  m_Elasticity: 0.1
+  m_Inertia: 1
+  m_DecelerationRate: 0.135
+  m_ScrollSensitivity: 1
+  m_Viewport: {fileID: 4228000699599983962}
+  m_HorizontalScrollbar: {fileID: 0}
+  m_VerticalScrollbar: {fileID: 0}
+  m_HorizontalScrollbarVisibility: 2
+  m_VerticalScrollbarVisibility: 2
+  m_HorizontalScrollbarSpacing: -3
+  m_VerticalScrollbarSpacing: -3
+  m_OnValueChanged:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!1 &5734462447642843896
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1634819178839643118}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Middle
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &1634819178839643118
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5734462447642843896}
+  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: 7599982387852363157}
+  - {fileID: 3628639589069020726}
+  m_Father: {fileID: 4728143542991051966}
+  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: 750.0001, y: 510.00034}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!1 &5766858924223135015
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 1582499403214959858}
+  - component: {fileID: 5688113994931799094}
+  - component: {fileID: 4130519819476303000}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: numDi
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &1582499403214959858
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766858924223135015}
+  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: 8828565156944118344}
+  m_Father: {fileID: 3307253881366362931}
+  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: 28.9, y: -32.8}
+  m_SizeDelta: {x: 25, y: 25}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5688113994931799094
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766858924223135015}
+  m_CullTransparentMesh: 1
+--- !u!114 &4130519819476303000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 5766858924223135015}
+  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.14779866, g: 0.7343787, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Round04
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &6250749477084110177
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3400172526585196132}
+  - component: {fileID: 5245055805430618010}
+  - component: {fileID: 8972213035851116994}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Icon
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3400172526585196132
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6250749477084110177}
+  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: 3238674032568273118}
+  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: 6.26, y: 18.21}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &5245055805430618010
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6250749477084110177}
+  m_CullTransparentMesh: 1
+--- !u!114 &8972213035851116994
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6250749477084110177}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Alert_Circle_Icon_Exclamation
+  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: 8e0fed06f6e134745d1fa1d786d61cbc
+--- !u!1 &6285722103139319660
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3447204198347544916}
+  - component: {fileID: 4898960602705745530}
+  - component: {fileID: 4956538350314749866}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: decL
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &3447204198347544916
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6285722103139319660}
+  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: 7599982387852363157}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 0, y: 0}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 170, y: 42}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4898960602705745530
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6285722103139319660}
+  m_CullTransparentMesh: 1
+--- !u!114 &4956538350314749866
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6285722103139319660}
+  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.8980392, g: 0.92941177, b: 0.9490196, 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_Divider_Left
+  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: 278bde855f239720008efb1760563849
+--- !u!1 &6500886768100956520
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 7291082005182240192}
+  - component: {fileID: 6314731590922508265}
+  - component: {fileID: 5507657180928143902}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Light
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &7291082005182240192
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6500886768100956520}
+  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: 3307253881366362931}
+  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_SizeDelta: {x: 90, y: 40.4}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6314731590922508265
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6500886768100956520}
+  m_CullTransparentMesh: 1
+--- !u!114 &5507657180928143902
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6500886768100956520}
+  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.20784314, g: 0.9843137, 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: 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_BgLight
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &6825347329344314753
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 3307253881366362931}
+  - component: {fileID: 8571562622299407104}
+  - component: {fileID: 8648766527502400837}
+  - component: {fileID: 4415547109746084888}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: WidgetItem
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 0
+--- !u!224 &3307253881366362931
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825347329344314753}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1.2999997, y: 1.2999997, z: 1.2999997}
+  m_ConstrainProportionsScale: 1
+  m_Children:
+  - {fileID: 658228732486789499}
+  - {fileID: 8707071878549420236}
+  - {fileID: 7291082005182240192}
+  - {fileID: 2942798818567370217}
+  - {fileID: 923969490478116372}
+  - {fileID: 3517247172456046658}
+  - {fileID: 6096188442925312168}
+  - {fileID: 1582499403214959858}
+  - {fileID: 3238674032568273118}
+  - {fileID: 3011679360858695175}
+  m_Father: {fileID: 410575005933691755}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 0, y: 1}
+  m_AnchoredPosition: {x: 330, y: -60}
+  m_SizeDelta: {x: 80, y: 80}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!114 &8571562622299407104
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825347329344314753}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: btnClick
+    gameObject: {fileID: 8648766527502400837}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: bg
+    gameObject: {fileID: 8146924418359181491}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: icon
+    gameObject: {fileID: 6013780947117029556}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: num
+    gameObject: {fileID: 527169290942364365}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: numObj
+    gameObject: {fileID: 5766858924223135015}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: alertRed
+    gameObject: {fileID: 1883575884987749758}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: corner
+    gameObject: {fileID: 8080471689451123104}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: glow
+    gameObject: {fileID: 2697684662962736348}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: light
+    gameObject: {fileID: 5507657180928143902}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: border
+    gameObject: {fileID: 4971533249731563693}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: lvObj
+    gameObject: {fileID: 8790821337187410269}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: txtLv
+    gameObject: {fileID: 7473827935908692917}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  isAssetBundle: 1
+--- !u!114 &8648766527502400837
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825347329344314753}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 0
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 0}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &4415547109746084888
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6825347329344314753}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 06d86505a6dfd2f4dad16b669a8b3eb5, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  bgColors:
+  - {r: 0.096999995, g: 0.096999995, b: 0.096999995, a: 1}
+  - {r: 0.11372549, g: 0.7529412, b: 0.3372549, a: 1}
+  - {r: 0.11372549, g: 0.7529412, b: 0.3372549, a: 1}
+  - {r: 0, g: 0.65882355, b: 1, a: 1}
+  - {r: 0.69803923, g: 0.3764706, b: 0.99215686, a: 1}
+  - {r: 1, g: 0.7882353, b: 0, a: 1}
+  - {r: 0.8745098, g: 0.18431373, b: 0.21960784, a: 1}
+  cornerColors:
+  - {r: 0, g: 0, b: 0, a: 0}
+  - {r: 0.20392157, g: 0.8509804, b: 0.20392157, a: 1}
+  - {r: 0.20392157, g: 0.8509804, b: 0.20392157, a: 1}
+  - {r: 0.17254902, g: 0.74509805, b: 1, a: 1}
+  - {r: 0.78431374, g: 0.5019608, b: 0.99607843, a: 1}
+  - {r: 1, g: 0.87058824, b: 0, a: 1}
+  - {r: 0.99215686, g: 0.2784314, b: 0.29411766, a: 1}
+  lightColors:
+  - {r: 0.046, g: 0.046, b: 0.046, a: 1}
+  - {r: 0.6509804, g: 0.9607843, b: 0.31764707, a: 1}
+  - {r: 0.6509804, g: 0.9607843, b: 0.31764707, a: 1}
+  - {r: 0.20784314, g: 0.9843137, b: 1, a: 1}
+  - {r: 1, g: 0.654902, b: 1, a: 1}
+  - {r: 0.99607843, g: 0.99215686, b: 0.30588236, a: 1}
+  - {r: 1, g: 0.5254902, b: 0.5803922, a: 1}
+  borderColors:
+  - {r: 0.046, g: 0.046, b: 0.046, a: 1}
+  - {r: 0.09411765, g: 0.09411765, b: 0.20392157, a: 1}
+  - {r: 0.09411765, g: 0.09411765, b: 0.20392157, a: 1}
+  - {r: 0.09411765, g: 0.09411765, b: 0.20392157, a: 1}
+  - {r: 0.09411765, g: 0.09411765, b: 0.20392157, a: 1}
+  - {r: 0.03529412, g: 0.14901961, b: 0.37254903, a: 1}
+  - {r: 0.03529412, g: 0.14901961, b: 0.37254903, a: 1}
+  glowColors:
+  - {r: 0, g: 0, b: 0, a: 1}
+  - {r: 0.7529412, g: 1, b: 0.31764707, a: 1}
+  - {r: 0.7529412, g: 1, b: 0.31764707, a: 1}
+  - {r: 0.03137255, g: 0.9372549, b: 1, a: 1}
+  - {r: 0.7254902, g: 0.5882353, b: 1, a: 1}
+  - {r: 0.9529412, g: 1, b: 0.19215687, a: 1}
+  - {r: 1, g: 0.6156863, b: 0.6431373, a: 1}
+--- !u!1 &7283948330487173073
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 410575005933691755}
+  - component: {fileID: 3299222438529593724}
+  - component: {fileID: 8904064171685932178}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Content
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &410575005933691755
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7283948330487173073}
+  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: 3307253881366362931}
+  m_Father: {fileID: 4228000699599983962}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 1}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0.5, y: 1}
+--- !u!114 &3299222438529593724
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7283948330487173073}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 8a8695521f0d02e499659fee002a26c2, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Padding:
+    m_Left: 0
+    m_Right: 0
+    m_Top: 20
+    m_Bottom: 25
+  m_ChildAlignment: 4
+  m_StartCorner: 0
+  m_StartAxis: 0
+  m_CellSize: {x: 80, y: 80}
+  m_Spacing: {x: 65, y: 65}
+  m_Constraint: 1
+  m_ConstraintCount: 5
+--- !u!114 &8904064171685932178
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7283948330487173073}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3245ec927659c4140ac4f8d17403cc18, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_HorizontalFit: 2
+  m_VerticalFit: 2
+--- !u!1 &7328931249083998370
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4228000699599983962}
+  - component: {fileID: 612298229062360099}
+  - component: {fileID: 1885998775408875454}
+  - component: {fileID: 4436924158262112598}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: Viewport
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4228000699599983962
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7328931249083998370}
+  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: 410575005933691755}
+  - {fileID: 7751492326801150169}
+  m_Father: {fileID: 3628639589069020726}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0, y: 0}
+  m_AnchorMax: {x: 1, y: 1}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 0, y: 0}
+  m_Pivot: {x: 0, y: 1}
+--- !u!222 &612298229062360099
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7328931249083998370}
+  m_CullTransparentMesh: 1
+--- !u!114 &1885998775408875454
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7328931249083998370}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, 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: 10917, guid: 0000000000000000f000000000000000, type: 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
+--- !u!114 &4436924158262112598
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7328931249083998370}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_ShowMaskGraphic: 0
+--- !u!1 &7609847377679411260
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 658228732486789499}
+  - component: {fileID: 4730047746877899869}
+  - component: {fileID: 8146924418359181491}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: bg
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &658228732486789499
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7609847377679411260}
+  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: 3307253881366362931}
+  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: 90, y: 90}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &4730047746877899869
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7609847377679411260}
+  m_CullTransparentMesh: 1
+--- !u!114 &8146924418359181491
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 7609847377679411260}
+  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.65882355, 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: 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_Round12
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &8646299697326961619
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 4728143542991051966}
+  - component: {fileID: 9111758787558866785}
+  - component: {fileID: 9160525272223938117}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: RewardsPanel
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &4728143542991051966
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  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: 8150427964580176949}
+  - {fileID: 1634819178839643118}
+  m_Father: {fileID: 0}
+  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: -2037, y: 1755}
+  m_SizeDelta: {x: 750, y: 1624}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &9111758787558866785
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_CullTransparentMesh: 1
+--- !u!114 &9160525272223938117
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8646299697326961619}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4810a0857c909354fa00c3aafdeac753, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  data:
+  - key: txtlName
+    gameObject: {fileID: 9079335746802258409}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas: []
+  - key: diObj
+    gameObject: {fileID: 3724772720786795118}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: itemRoot
+    gameObject: {fileID: 410575005933691755}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: btnDi
+    gameObject: {fileID: 9010385271561948532}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  - key: widget
+    gameObject: {fileID: 6825347329344314753}
+    isAssetBundle: 0
+    isList: 0
+    ListCollectorDatas:
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+    - gameObject: {fileID: 0}
+  isAssetBundle: 1
+--- !u!1 &8790821337187410269
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 6096188442925312168}
+  - component: {fileID: 265793741786820829}
+  - component: {fileID: 9097154865538286497}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: lvObj
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &6096188442925312168
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8790821337187410269}
+  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: 8636316870303425662}
+  m_Father: {fileID: 3307253881366362931}
+  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: -50.8}
+  m_SizeDelta: {x: 82, y: 20}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &265793741786820829
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8790821337187410269}
+  m_CullTransparentMesh: 1
+--- !u!114 &9097154865538286497
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 8790821337187410269}
+  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.008232486, g: 0.008991327, b: 0.009433985, 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_Round12
+  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: 7c5e93e3331cd67b15983d0d2161d334
+--- !u!1 &9100379896694560647
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 8828565156944118344}
+  - component: {fileID: 3367840875830586065}
+  - component: {fileID: 527169290942364365}
+  m_Layer: 0
+  m_HasEditorInfo: 1
+  m_Name: txt
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &8828565156944118344
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9100379896694560647}
+  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: 1582499403214959858}
+  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: 72, y: 87}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &3367840875830586065
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9100379896694560647}
+  m_CullTransparentMesh: 1
+--- !u!114 &527169290942364365
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 9100379896694560647}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, 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_text: 3
+  m_isRightToLeft: 0
+  m_fontAsset: {fileID: 11400000, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_sharedMaterial: {fileID: 8527393934874279224, guid: 7137805b022d44869b12d93cb388c588, type: 2}
+  m_fontSharedMaterials: []
+  m_fontMaterial: {fileID: 0}
+  m_fontMaterials: []
+  m_fontColor32:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
+  m_enableVertexGradient: 0
+  m_colorMode: 3
+  m_fontColorGradient:
+    topLeft: {r: 1, g: 1, b: 1, a: 1}
+    topRight: {r: 1, g: 1, b: 1, a: 1}
+    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
+    bottomRight: {r: 1, g: 1, b: 1, a: 1}
+  m_fontColorGradientPreset: {fileID: 0}
+  m_spriteAsset: {fileID: 0}
+  m_tintAllSprites: 0
+  m_StyleSheet: {fileID: 0}
+  m_TextStyleHashCode: -1183493901
+  m_overrideHtmlColors: 0
+  m_faceColor:
+    serializedVersion: 2
+    rgba: 4294967295
+  m_fontSize: 16
+  m_fontSizeBase: 16
+  m_fontWeight: 400
+  m_enableAutoSizing: 0
+  m_fontSizeMin: 18
+  m_fontSizeMax: 42
+  m_fontStyle: 0
+  m_HorizontalAlignment: 2
+  m_VerticalAlignment: 512
+  m_textAlignment: 65535
+  m_characterSpacing: 0
+  m_wordSpacing: 0
+  m_lineSpacing: 0
+  m_lineSpacingMax: 0
+  m_paragraphSpacing: 0
+  m_charWidthMaxAdj: 0
+  m_enableWordWrapping: 1
+  m_wordWrappingRatios: 0.4
+  m_overflowMode: 0
+  m_linkedTextComponent: {fileID: 0}
+  parentLinkedComponent: {fileID: 0}
+  m_enableKerning: 1
+  m_enableExtraPadding: 0
+  checkPaddingRequired: 0
+  m_isRichText: 1
+  m_parseCtrlCharacters: 1
+  m_isOrthographic: 1
+  m_isCullingEnabled: 0
+  m_horizontalMapping: 0
+  m_verticalMapping: 0
+  m_uvLineOffset: 0
+  m_geometrySortingOrder: 0
+  m_IsTextObjectScaleStatic: 0
+  m_VertexBufferAutoSizeReduction: 0
+  m_useMaxVisibleDescender: 1
+  m_pageToDisplay: 1
+  m_margin: {x: 0, y: 0, z: 0, w: 0}
+  m_isUsingLegacyAnimationComponent: 0
+  m_isVolumetricText: 0
+  m_hasFontAssetChanged: 0
+  m_baseMaterial: {fileID: 0}
+  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}

+ 2 - 2
Assets/Plugins/Android/LauncherManifest.xml.meta → Assets/Res/UI/RewardsPanel.prefab.meta

@@ -1,6 +1,6 @@
 fileFormatVersion: 2
-guid: ded72b1f39e6c4b0da38d9b513d5b59f
-TextScriptImporter:
+guid: Dnkcty/8BXJf2gohrhgRljXW95MNP9EZrpSpI8nCOUWhYIpX062ebWo=
+PrefabImporter:
   externalObjects: {}
   userData: 
   assetBundleName: 

File diff suppressed because it is too large
+ 231 - 238
Assets/Scenes/UIBuild.scene


+ 38 - 1
Assets/Scripts/Core/DownloadFile/WXDownload.cs

@@ -1,16 +1,20 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using UnityEngine.Networking;
 using Utility;
+#if UNITY_WEBGL || UNITY_EDITOR  
 using WeChatWASM;
+#endif
 
 public class WXDownload : Singleton<WXDownload>
 {
     public void DownLoad(string url, string fileName, System.Action<bool> finish)
     {
+#if UNITY_WEBGL || UNITY_EDITOR        
         DownloadFileOption fileOption = new DownloadFileOption();
         fileOption.url = url;
-        fileOption.filePath = WX.PluginCachePath + "/" + fileName;
+        fileOption.filePath = GetPluginCachePath() + "/" + fileName;
         fileOption.fail = delegate(GeneralCallbackResult result)
         {
             Debug.LogError(url + "下载失败" + result.errMsg);
@@ -22,9 +26,42 @@ public class WXDownload : Singleton<WXDownload>
             // Debug.Log(url + "下载成功");
         };
         WX.DownloadFile(fileOption);
+#elif UNITY_ANDROID
+        UnityWebRequest unityWebRequest = UnityWebRequest.Get(url);
+        unityWebRequest.downloadHandler = new DownloadHandlerBuffer();
+        var unityWebRequestAsyncOperation  =  unityWebRequest.SendWebRequest();
+        unityWebRequestAsyncOperation.completed += operation =>
+        {
+        
+            if (unityWebRequest.result == UnityWebRequest.Result.Success)
+            {
+                finish?.Invoke(true);
+            }
+            else
+            {
+                Debug.LogError(url + "下载失败" + unityWebRequest.result);
+                finish?.Invoke(false);
+            }
+         
+        };
+#endif
     }
     public string GetCachePath(string url)
     { 
+#if UNITY_WEBGL || UNITY_EDITOR       
         return WX.GetCachePath(url);
+#elif UNITY_ANDROID
+        return url;
+#endif
+        
+    }
+
+    public string GetPluginCachePath()
+    {
+#if UNITY_WEBGL || UNITY_EDITOR    
+        return WX.PluginCachePath;
+#elif UNITY_ANDROID
+    return Application.persistentDataPath;
+#endif
     }
 }

+ 1 - 1
Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -195,7 +195,7 @@ namespace GameLogic.Bag
         {
             //掉落的数量
             long count = item.count.Value;
-
+// LogTool.Log("掉落装备的GUID=" + item.guid);
             // AddEqToDic(eqItemInfo);
             ItemInfo eqItemInfo = GetItemInfo(item);
             PlayerManager.Instance.eqController.AddEquipment(eqItemInfo);

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

@@ -54,6 +54,20 @@ namespace GameLogic.Bag
             
         }
 
+        /// <summary>
+        /// 是否是装备的Item
+        /// </summary>
+        /// <returns></returns>
+        public bool IsEquipItem()
+        {
+            if (eqInfo != null && eqInfo.basicEquipConfig.ID > 0)
+            {
+                return true;
+            }
+
+            return false;
+        }
+
         public AccountFileInfo.ItemData ToItemData()
         {
             AccountFileInfo.ItemData itemData = new AccountFileInfo.ItemData(itemID, count.Value, guid);

+ 2 - 2
Assets/Scripts/GameLogic/Combat/CombatTool/CombatSenceController.cs

@@ -67,7 +67,7 @@ namespace GameLogic.Combat.CombatTool
             await cTaskAwaitBuffer.WaitAll();
             for (int i = 0; i < _allCombatScenesConfigs.Count; i++)
             {
-                zoff = -i * 54;
+                zoff = -i * 97;
                 // index = i;
                 _allCombatScenesConfigs[i].transform.position = new Vector3(0, 0, zoff);
             }
@@ -95,7 +95,7 @@ namespace GameLogic.Combat.CombatTool
         {
             index++;
             index %= _allCombatScenesConfigs.Count;
-            zoff -= 54;
+            zoff -= 97;
             _allCombatScenesConfigs[index].transform.position = new Vector3(0, 0, zoff);
         }
 

+ 4 - 4
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -216,10 +216,10 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
                 _levelBattleConfig.miniExpAndGold[0]);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-            if (odds < 20)
+            if (odds < 70)
             {
-                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 1,
-                    1);
+                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 3,
+                    3);
             }
            
 
@@ -311,7 +311,7 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
                 _levelBattleConfig.bossExpAndGold);
             BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
-                30);
+                100);
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             isBossCombat = false;
             LevelBattleConfig levelBattleConfig =

+ 8 - 3
Assets/Scripts/GameLogic/Combat/Skill/S900001.cs

@@ -34,13 +34,18 @@ namespace GameLogic.Combat.Skill
 
             if (targetEntity.combatHeroEntity.CurrCombatHeroInfo.heroType == 4)
             {
-                BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position, 2,
-                    2);
+                int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
+                if (odds < 40)
+                {
+                    BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
+                        3,
+                        3);
+                }
             }
             else
             {
                 int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-                if (odds < 70)
+                if (odds < 30)
                 {
                     BagController.Instance.DropMonsterGold(targetEntity.combatHeroEntity.combatHeroGameObject.position,
                         1,

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

@@ -312,7 +312,22 @@ namespace GameLogic.Equipment
             {
                 if (bwDic.TryGetValue(bw, out var eqBwList))
                 {
-                    eqBwList.Add(eqItemInfo);
+                    bool isAdd = true;
+                    foreach (ItemInfo itemInfo in eqBwList)
+                    {
+                        if (itemInfo.guid == eqItemInfo.guid)
+                        {
+                            isAdd = false;
+                            // LogTool.Warning("已经有这个装备,不再重复添加:"+ eqItemInfo.guid);
+                            break;
+                        }
+                    }
+
+                    if (isAdd)
+                    {
+                        eqBwList.Add(eqItemInfo);
+                    }
+                    
                 }
                 else
                 {

+ 1 - 0
Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -171,6 +171,7 @@ namespace GameLogic.Player
                     itemInfo = PlayerManager.Instance.eqController.BuildEquipmentForItemId(dropItemConfig.itemID[0],
                         dropItemConfig.itemID[1],
                         dropItemConfig.itemID[2]);
+                    j += 2;
                     // itemInfo = DropEquipment(dropItemConfig.itemID[j]);
                 }
                 else

+ 54 - 3
Assets/Scripts/GameUI/SDK/YouLoftSDK.cs

@@ -1,14 +1,65 @@
 using System.Collections;
 using System.Collections.Generic;
 using UnityEngine;
+using Utility;
 
-public class YouLoftSDK : MonoBehaviour
+
+public class PottingMobileSDK : Singleton<PottingMobileSDK>
 {
     public void Init()
     {
 #if UNITY_ANDROID|| UNITY_IOS
-          PottingMobile.InitializeSdk();
+        PottingMobile.InitializeSdk();
+        PottingMobile.withLogDebug(true);
+        PottingMobileManger.Instance.MOnRewardedVideoLoadedEvent += MOnRewardedVideoLoadedEvent;
+        PottingMobileManger.Instance.MOnRewardedVideoFailedEvent += MOnRewardedVideoFailedEvent;
+        PottingMobileManger.Instance.MOnRewardedVideoShownEvent += MOnRewardedVideoShownEvent;
+        PottingMobileManger.Instance.MOnRewardedVideoReceivedRewardEvent += MOnRewardedVideoReceivedRewardEvent;
+        PottingMobileManger.Instance.MOnRewardedVideoClosedEvent += MOnRewardedVideoClosedEvent;
+#endif
+    }
+
+
+
+    public void ShowRewardedVideo()
+    {
+#if UNITY_ANDROID|| UNITY_IOS
+        if (PottingMobile._HasRewardedVideo())
+        {
+            PottingMobile._ShowRewardedVideoAd();
+        }
 #endif
-      
+    }
+    
+    
+    private void MOnRewardedVideoClosedEvent(string obj)
+    {
+        //广告关闭
+         Debug.Log($"OnRewardedVideoReceivedRewardEvent({obj})");
+    }
+
+    private void MOnRewardedVideoReceivedRewardEvent(string arg1, string arg2, float arg3)
+    {
+        //广告奖励发放
+        Debug.Log($"OnRewardedVideoReceivedRewardEvent({arg1}, {arg2}, {arg3})");
+    }
+
+
+    private void MOnRewardedVideoShownEvent(string obj)
+    {
+        //广告被显示
+        Debug.Log($"OnRewardedVideoShownEvent({obj})");
+    }
+
+    private void MOnRewardedVideoFailedEvent(string arg1, string errorCode)
+    {
+        //广告加载失败
+        Debug.Log($"OnRewardedVideoFailedEvent({arg1}, {errorCode})");
+    }
+
+    private void MOnRewardedVideoLoadedEvent(string obj)
+    {
+        //广告加载成功
+        Debug.Log($"OnRewardedVideoLoadedEvent({obj})");
     }
 }

+ 10 - 0
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -41,6 +41,11 @@ namespace Fort23.Mono
         {
             List<ItemInfo> allIitem = DropManager.Instance.DropItem(openBoxConfig.reward);
             BagController.Instance.AddItem(allIitem);
+
+            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(delegate(RewardsPanel panel)
+            {
+                panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
+            }, layer: UILayer.Top);
         }
 
         private void TenButtonCallBack()
@@ -53,6 +58,11 @@ namespace Fort23.Mono
             }
 
             BagController.Instance.AddItem(allIitem);
+            
+            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(delegate(RewardsPanel panel)
+            {
+                panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
+            }, layer: UILayer.Top);
         }
 
         private void CloseButtonCallBack()

+ 23 - 2
Assets/Scripts/GameUI/UI/Hero/EqRecyclePanel.cs

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -27,8 +28,16 @@ namespace Fort23.Mono
             btnRec.onClick.AddListener(OnClickRecycle);
         }
 
-        private void OnClickRecycle()
+        private async void OnClickRecycle()
         {
+
+            if (pendingEqs.Count <= 0)
+            {
+                LogTool.Log("暂无可以分解的装备");
+                return;
+            }
+
+    
             foreach (WidgetItem widgetItem in pendingEqs)
             {
                 ItemInfo itemInfo = BagController.Instance.allBagDic[widgetItem.itemInfo.guid];
@@ -50,6 +59,8 @@ namespace Fort23.Mono
                     BagController.Instance.ModifyItem(itemInfo, false);
                 }
             }
+
+            
             
             BagController.Instance.ReInitAllEqItem();
 
@@ -61,8 +72,18 @@ namespace Fort23.Mono
             AccountFileInfo.Instance.SavePlayerData(true);
             
             pendingEqs.Clear();
-            awardDic.Clear();
             
+
+            RewardsPanel rewardsPanel = await UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(null);
+            
+            rewardsPanel.InitRewardsPanel(awardDic, delegate
+            {
+                OnclickClose();
+                awardDic.Clear();
+            });
+            
+            
+
         }
 
         private void OnclickClose()

+ 1 - 1
Assets/Scripts/GameUI/UI/Hero/HeroUITools.cs

@@ -92,7 +92,7 @@ namespace Fort23.Mono
                 
                 if (empty)
                 {
-                    LogTool.Log(zy + "---" + i + "空");
+                    // LogTool.Log(zy + "---" + i + "空");
                     eqItem.SetEmpty(action);
                 }
                 else

+ 1 - 1
Assets/Scripts/GameUI/UI/Hero/WidgetHero.cs

@@ -39,7 +39,7 @@ namespace Fort23.Mono
 
         public override void AddButtonEvent()
         {
-            LogTool.Log("添加英雄点击事件");
+            // LogTool.Log("添加英雄点击事件");
             btnHero.onClick.AddListener(OnHeroClick);
             btnUpgrade.onClick.AddListener(OnUpgradeClick);
             btnHeroPanel.onClick.AddListener(OnHeroPanelClick);

+ 61 - 0
Assets/Scripts/GameUI/UI/Items/RewardsPanel.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using GameLogic.Bag;
+
+namespace Fort23.Mono
+{
+    [UIBinding(prefab = "RewardsPanel"  )]
+    public partial class RewardsPanel : UIPanel
+    {
+        private void Init()
+        {
+        }
+        protected override void AddEvent()
+        {
+        }
+        protected override void DelEvent()
+        {
+        }
+        public override void AddButtonEvent()
+        {
+            btnDi.onClick.AddListener(OnclickClose);
+        }
+
+        private void OnclickClose()
+        {
+            onClose?.Invoke();
+            UIManager.Instance.HideUIUIPanel(this);
+            UIManager.Instance.DormancyAllGComponent<WidgetItem>(rewardPool);
+        }
+
+        private Action onClose;
+        private string rewardPool = "rewardPool";
+        
+        public async void InitRewardsPanel(List<ItemInfo> rewards, Action onClose = null)
+        {
+            this.onClose = onClose;
+            foreach (ItemInfo reward in rewards)
+            {
+                GenerateWidget(reward);
+            }
+        }
+
+
+        public async void InitRewardsPanel(Dictionary<string, ItemInfo> rewardsDic, Action onClose = null)
+        {
+            this.onClose = onClose;
+            foreach (KeyValuePair<string,ItemInfo> keyValuePair in rewardsDic)
+            {
+                GenerateWidget(keyValuePair.Value);
+            }
+        }
+
+        private async void GenerateWidget(ItemInfo itemInfo)
+        {
+            WidgetItem widgetItem = await UIManager.Instance.CreateGComponentForObject<WidgetItem>(widget, null, isInstance: true,
+                poolName: rewardPool, root: itemRoot);
+            widgetItem.InitWidget(itemInfo);
+        }
+
+    }
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/Items/RewardsPanel.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: CykYtH/+WnK/dCKIS6sy1FrBuahqg0LFEGC1XmqwhWAVbmnI1xVd81I=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 73 - 0
Assets/Scripts/GameUI/UI/Items/RewardsPanelData.cs

@@ -0,0 +1,73 @@
+using Fort23.Core;
+using Fort23.UTool;
+using UnityEngine.UI;
+using UnityEngine;
+using System.Collections.Generic;
+namespace Fort23.Mono
+{
+	public partial class RewardsPanel 
+	{
+	  #region 自定义数据 
+	  private Text _txtlName;
+	  public Text txtlName
+	   {
+	   get{
+	      if (_txtlName == null)
+	       {
+	         _txtlName  = GetUIUnit<Text>("txtlName"); 
+	       }
+	      return _txtlName;
+	     }
+	   }
+	  private GameObject _diObj;
+	  public GameObject diObj
+	   {
+	   get{
+	      if (_diObj == null)
+	       {
+	         _diObj  = GetUIUnit<GameObject>("diObj"); 
+	       }
+	      return _diObj;
+	     }
+	   }
+	  private RectTransform _itemRoot;
+	  public RectTransform itemRoot
+	   {
+	   get{
+	      if (_itemRoot == null)
+	       {
+	         _itemRoot  = GetUIUnit<RectTransform>("itemRoot"); 
+	       }
+	      return _itemRoot;
+	     }
+	   }
+	  private Button _btnDi;
+	  public Button btnDi
+	   {
+	   get{
+	      if (_btnDi == null)
+	       {
+	         _btnDi  = GetUIUnit<Button>("btnDi"); 
+	       }
+	      return _btnDi;
+	     }
+	   }
+	  private GameObject _widget;
+	  public GameObject widget
+	   {
+	   get{
+	      if (_widget == null)
+	       {
+	         _widget  = GetUIUnit<GameObject>("widget"); 
+	       }
+	      return _widget;
+	     }
+	   }
+	  #endregion 自定义数据结束 
+	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
+	{
+	 await base.SetUIGameObject(gObjectPoolInterface);
+	 Init();
+	}
+	}
+}

+ 11 - 0
Assets/Scripts/GameUI/UI/Items/RewardsPanelData.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: WitJvH6pBiropCp239FdDfU0aWaM93M5+hptHb+oFxp2oQ7FOeVIR84=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Scripts/GameUI/UI/Items/WidgetItem.cs

@@ -40,7 +40,7 @@ namespace Fort23.Mono
             {
                 return;
             }
-            ItemPanel itemPanel = await UIManager.Instance.LoadAndOpenPanel<ItemPanel>(null);
+            ItemPanel itemPanel = await UIManager.Instance.LoadAndOpenPanel<ItemPanel>(null, layer: UILayer.Top);
             itemPanel.InitItemPanel(itemInfo);
             
         }

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