DESKTOP-FB72PO8\Administrator 5 miesięcy temu
rodzic
commit
e87baacb01
100 zmienionych plików z 600 dodań i 78 usunięć
  1. 1 1
      Assets/Art/Chapter/Chapter01 1.prefab.meta
  2. 1 1
      Assets/Art/Chapter/Chapter02.prefab.meta
  3. 1 1
      Assets/Art/Chapter/NavMesh-Chapter01.asset.meta
  4. 15 1
      Assets/Art/Forest Ruins Pack Cute Series/Textures/Tree 02 Leaves.psd.meta
  5. 18 6
      Assets/Art/Monsters Ultimate Pack 02 Cute Series/Snake Naga Cute Series/Materials/Snake Naga.mat
  6. 15 1
      Assets/Art/VFX/Epic Toon FX/Textures/cloud_2x2_soft.png.meta
  7. 15 1
      Assets/Art/VFX/Epic Toon FX/Textures/glow1.png.meta
  8. 1 1
      Assets/Art/VFX/Epic Toon FX/Textures/slash03.png.meta
  9. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_at_sf1.prefab.meta
  10. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_at_sf2.prefab.meta
  11. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_die.prefab.meta
  12. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_sk2.prefab.meta
  13. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_at_hit.prefab.meta
  14. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_die.prefab.meta
  15. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk1_sf1.prefab.meta
  16. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk1_sf2.prefab.meta
  17. 1 1
      Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk3.prefab.meta
  18. 1 1
      Assets/Art/VFX/FXPrefabs/fx_hero_quan.prefab.meta
  19. 1 1
      Assets/Art/VFX/FXPrefabs/fx_hero_quan_seclect.prefab.meta
  20. 1 1
      Assets/Art/VFX/Materials/fx_glow1.mat.meta
  21. 1 1
      Assets/Art/VFX/Materials/fx_guaiwu01_suikuai.mat.meta
  22. 1 1
      Assets/Art/VFX/Materials/fx_hero_quan_al.mat.meta
  23. 1 1
      Assets/Art/VFX/Materials/fx_xl_yt_bz.mat.meta
  24. 1 1
      Assets/Art/VFX/Materials/fx_zhuahen.mat.meta
  25. 1 1
      Assets/Art/VFX/Materials/fx_zhuahen2.mat.meta
  26. 41 2
      Assets/Art/VFX/Textures/Noise/Noise382_1.png.meta
  27. 124 20
      Assets/Epic Toon FX/Textures/splat02_flat_3x3.png.meta
  28. 18 0
      Assets/PottingMobileSDK/Plugins/Editor/PottingMobileSDKEditor.asmdef
  29. 7 0
      Assets/PottingMobileSDK/Plugins/Editor/PottingMobileSDKEditor.asmdef.meta
  30. 1 1
      Assets/Res/CombatHero/Guaiwu01_gpu.prefab.meta
  31. 1 1
      Assets/Res/CombatHero/Guaiwu02_gpu.prefab.meta
  32. 1 1
      Assets/Res/CombatHero/GuaiwuBoss01_gpu.prefab.meta
  33. 1 1
      Assets/Res/CombatHero/GuaiwuBoss02_gpu.prefab.meta
  34. 1 1
      Assets/Res/CombatHero/GuaiwuJY01_gpu.prefab.meta
  35. 1 1
      Assets/Res/CombatHero/GuaiwuJY02_gpu.prefab.meta
  36. 1 1
      Assets/Res/CombatHero/Hero01.prefab.meta
  37. 1 1
      Assets/Res/CombatHero/Hero02.prefab.meta
  38. 1 1
      Assets/Res/CombatHero/Hero03.prefab.meta
  39. 1 1
      Assets/Res/CombatHero/Hero04.prefab.meta
  40. 1 1
      Assets/Res/CombatScenes/CombatRoot.prefab.meta
  41. 1 1
      Assets/Res/CombatScenes/NavMeshTarget.prefab.meta
  42. 6 3
      Assets/Res/Config/DropConfig.json
  43. 3 0
      Assets/Res/Config/DropGroupConfig.json
  44. 1 1
      Assets/Res/Config/SkillUpConfig.json.meta
  45. 1 1
      Assets/Res/TimeLineAssets/Guaiwu02_TD.txt.meta
  46. 1 1
      Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt.meta
  47. 1 1
      Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt.meta
  48. 55 0
      Assets/Res/UI/HeroDetailPanel.prefab
  49. 1 1
      Assets/Res/UI/SkillUIComponent.prefab.meta
  50. 1 1
      Assets/Res/UI/StartBossPanel.prefab.meta
  51. 1 1
      Assets/Res/UI/UIanima/HeroBags.controller.meta
  52. 1 1
      Assets/Res/UI/UIanima/HeroBags_idle.anim.meta
  53. 1 1
      Assets/Res/UI/UIanima/HeroBags_pick.anim.meta
  54. 1 1
      Assets/Res/UI/WidgetIconSkill.prefab.meta
  55. 8 0
      Assets/Res/UIPlayable.meta
  56. 22 0
      Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable
  57. 8 0
      Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable.meta
  58. 5 0
      Assets/Scripts/GameData/ExcelConfig/DropConfig.cs
  59. 5 0
      Assets/Scripts/GameData/ExcelConfig/DropGroupConfig.cs
  60. 151 0
      Assets/Scripts/GameLogic/Player/DropManager.cs
  61. 3 0
      Assets/Scripts/GameLogic/Player/DropManager.cs.meta
  62. 1 0
      Assets/Scripts/GameStart/GameStart.cs
  63. 4 1
      Assets/Scripts/GameUI/SDK/YouLoftSDK.cs
  64. 8 0
      Assets/Scripts/ThirdParty/PottingMobileSDK.meta
  65. 18 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PotingSkd.asmdef
  66. 7 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PotingSkd.asmdef.meta
  67. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK.meta
  68. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AdManagerSettings.cs
  69. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AdManagerSettings.cs.meta
  70. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AppEventsConstants.cs
  71. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AppEventsConstants.cs.meta
  72. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogGUI.cs
  73. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogGUI.cs.meta
  74. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogoZoom.cs
  75. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogoZoom.cs.meta
  76. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/MiniJSON.cs
  77. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/MiniJSON.cs.meta
  78. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/NetTimeCheck.cs
  79. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/NetTimeCheck.cs.meta
  80. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderAndroid.cs
  81. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderAndroid.cs.meta
  82. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderiOS.cs
  83. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderiOS.cs.meta
  84. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobVersion.cs
  85. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobVersion.cs.meta
  86. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobile.cs
  87. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobile.cs.meta
  88. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileAndroid.cs
  89. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileAndroid.cs.meta
  90. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileBase.cs
  91. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileBase.cs.meta
  92. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileContent.cs
  93. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileContent.cs.meta
  94. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileEditor.cs
  95. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileEditor.cs.meta
  96. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileManger.cs
  97. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileManger.cs.meta
  98. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtils.cs
  99. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtils.cs.meta
  100. 0 0
      Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtilsAndroid.cs

+ 1 - 1
Assets/Art/Chapter/Chapter01 1.prefab.meta

@@ -3,5 +3,5 @@ guid: WysXsC+uB3hjXw6kBvOSGGHuG/d1DaK/CPiWE7kY/K5VLq2VkCtETH8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: chapter01
+  assetBundleName: chapter01_1
   assetBundleVariant: 

+ 1 - 1
Assets/Art/Chapter/Chapter02.prefab.meta

@@ -3,5 +3,5 @@ guid: CngcvCj7BXtuR6tSW5fU42sYHB7W74ScijVOqItHcaFADl6e7IStFMQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: chapter02
   assetBundleVariant: 

+ 1 - 1
Assets/Art/Chapter/NavMesh-Chapter01.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 23800000
   userData: 
-  assetBundleName: 
+  assetBundleName: navmesh-chapter01
   assetBundleVariant: 

+ 15 - 1
Assets/Art/Forest Ruins Pack Cute Series/Textures/Tree 02 Leaves.psd.meta

@@ -126,6 +126,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 1
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 256
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 1
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: tree_02_leaves_t1
+  assetBundleName: tree_02_leaves_t2
   assetBundleVariant: 

+ 18 - 6
Assets/Art/Monsters Ultimate Pack 02 Cute Series/Snake Naga Cute Series/Materials/Snake Naga.mat

@@ -8,24 +8,25 @@ Material:
   m_PrefabInstance: {fileID: 0}
   m_PrefabAsset: {fileID: 0}
   m_Name: Snake Naga
-  m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3}
+  m_Shader: {fileID: -6465566751694194690, guid: de8b10515e8c7b6419b7a2e25ccbf055, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords:
-  - _EMISSION
-  - _SPECULARHIGHLIGHTS_OFF
+  m_ValidKeywords: []
   m_InvalidKeywords: []
   m_LightmapFlags: 2
   m_EnableInstancingVariants: 0
   m_DoubleSidedGI: 0
   m_CustomRenderQueue: -1
-  stringTagMap:
-    RenderType: Opaque
+  stringTagMap: {}
   disabledShaderPasses: []
   m_LockedProperties: 
   m_SavedProperties:
     serializedVersion: 3
     m_TexEnvs:
+    - _AnimatedBoneMatrices:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _BaseMap:
         m_Texture: {fileID: 2800000, guid: 1ac823f9435f6134bb6f950ce62f373f, type: 3}
         m_Scale: {x: 1, y: 1}
@@ -58,6 +59,10 @@ Material:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
         m_Offset: {x: 0, y: 0}
+    - _Normal:
+        m_Texture: {fileID: 0}
+        m_Scale: {x: 1, y: 1}
+        m_Offset: {x: 0, y: 0}
     - _OcclusionMap:
         m_Texture: {fileID: 0}
         m_Scale: {x: 1, y: 1}
@@ -97,6 +102,7 @@ Material:
     - _DetailNormalMapScale: 1
     - _DstBlend: 0
     - _DstBlendAlpha: 0
+    - _EnableAnimation: 0
     - _EnvironmentReflections: 1
     - _GlossMapScale: 1
     - _Glossiness: 0
@@ -105,6 +111,7 @@ Material:
     - _Mode: 0
     - _OcclusionStrength: 1
     - _Parallax: 0.02
+    - _QueueControl: 0
     - _QueueOffset: 0
     - _ReceiveShadows: 1
     - _Smoothness: 0
@@ -116,11 +123,16 @@ Material:
     - _UVSec: 0
     - _WorkflowMode: 1
     - _ZWrite: 1
+    - _edgeStrength: 3
+    - _injuriedStrength: 0.41
     m_Colors:
     - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
     - _Color: {r: 1, g: 1, b: 1, a: 1}
     - _EmissionColor: {r: 1, g: 0, b: 0, a: 1}
     - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
+    - _edgeColor: {r: 0.9811321, g: 0.032395888, b: 0.032395888, a: 1}
+    - _injuriedColor: {r: 1, g: 1, b: 1, a: 0}
+    - _mainColor: {r: 1, g: 1, b: 1, a: 1}
   m_BuildTextureStacks: []
 --- !u!114 &5802882930522352371
 MonoBehaviour:

+ 15 - 1
Assets/Art/VFX/Epic Toon FX/Textures/cloud_2x2_soft.png.meta

@@ -126,6 +126,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: cloud_2x2_soft_t3
+  assetBundleName: cloud_2x2_soft_t4
   assetBundleVariant: 

+ 15 - 1
Assets/Art/VFX/Epic Toon FX/Textures/glow1.png.meta

@@ -126,6 +126,20 @@ TextureImporter:
     ignorePlatformSupport: 0
     androidETC2FallbackOverride: 0
     forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -143,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: glow1_t2
+  assetBundleName: glow1_t1
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Epic Toon FX/Textures/slash03.png.meta

@@ -199,5 +199,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: slash03_t4
+  assetBundleName: slash03_t6
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_at_sf1.prefab.meta

@@ -3,5 +3,5 @@ guid: WitJtXyrUHOlIXz2UVgRHtfPYnpXeCPeTATpE2mOBZrR0D6nY6W0yZ0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss01_at_sf1
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_at_sf2.prefab.meta

@@ -3,5 +3,5 @@ guid: Xn0f5nn4VShqHe4GkmiAsmsC2CVeCm1HxoydQN6sVtP+ThfpsgT8WXQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss01_at_sf2
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_die.prefab.meta

@@ -3,5 +3,5 @@ guid: W3tNvSqlASpvceggZIKHQs5KVmqxj3VCWUGqxPOt4tpnsg4t9BmDpm8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss01_die
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss01_sk2.prefab.meta

@@ -3,5 +3,5 @@ guid: Bygdsy6vAng7dKhdjcYXO20OhMhgeNKtHM8/9hGw3vMPnP+46ksKM+U=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss01_sk2
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_at_hit.prefab.meta

@@ -3,5 +3,5 @@ guid: C3oYvS+qUyrcoalrA3SveV14RAL3IgT6GaJ9+PKekU/M6LHTHPEqhQM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss02_at_hit
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_die.prefab.meta

@@ -3,5 +3,5 @@ guid: D3gevCL8By2bJ2nSEh2jXAFT7VIudJU/nOsZ9/2bxFCXRXzKGLAWrU4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss02_die
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk1_sf1.prefab.meta

@@ -3,5 +3,5 @@ guid: DClNvSOoUi0V/PgS1xqzSIoryAg9E8ORofehQe4lChm1HHrcGNJI4qI=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss02_sk1_sf1
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk1_sf2.prefab.meta

@@ -3,5 +3,5 @@ guid: WXpMtSz4W3kFlyRk0axZ+ACstqeK6Mw8Kb4A2CPVKXQrCOnw/Eb1pf0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss02_sk1_sf2
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_GuaiwuBoss02_sk3.prefab.meta

@@ -3,5 +3,5 @@ guid: DC4d5H74UHuSZjcbvSzCivHIlchjZkcZAwGhoWwrQHNquqcAkDIAAQo=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwuboss02_sk3
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_hero_quan.prefab.meta

@@ -3,5 +3,5 @@ guid: WXpLvH6pWnpQmBLdxIF7muvIVDlNSfWVTJ5PGHCGbO60i2n2Alf1ocA=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero_quan
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_hero_quan_seclect.prefab.meta

@@ -3,5 +3,5 @@ guid: CnMetnyoUHuIzvH+BXsldI08r5kiqmoRsPdPVhDh4kJ8n3MfrUEeVQg=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero_quan_seclect
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_glow1.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_glow1
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_guaiwu01_suikuai.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_guaiwu01_suikuai
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_hero_quan_al.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_hero_quan_al
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_xl_yt_bz.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_xl_yt_bz
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_zhuahen.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_zhuahen
   assetBundleVariant: 

+ 1 - 1
Assets/Art/VFX/Materials/fx_zhuahen2.mat.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 2100000
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_zhuahen2
   assetBundleVariant: 

+ 41 - 2
Assets/Art/VFX/Textures/Noise/Noise382_1.png.meta

@@ -1,5 +1,5 @@
 fileFormatVersion: 2
-guid: ed03ebad7dbda1d49b4b879ae969f4a0
+guid: Wi4ftn//Ai/YYNfa8iU50FnxM3DWHJQYJW3lj6n/NexWUWOsUCsoCOI=
 TextureImporter:
   internalIDToNameTable: []
   externalObjects: {}
@@ -22,6 +22,9 @@ TextureImporter:
     normalMapFilter: 0
     flipGreenChannel: 0
   isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
   streamingMipmaps: 0
   streamingMipmapsPriority: 0
   vTOnly: 0
@@ -70,6 +73,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: DefaultTexturePlatform
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -83,6 +87,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: Standalone
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -96,6 +101,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: iPhone
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: 48
     textureCompression: 1
@@ -109,6 +115,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: Android
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: 48
     textureCompression: 1
@@ -122,6 +129,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: Windows Store Apps
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -135,6 +143,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: Server
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -148,6 +157,7 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: iOS
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: 48
     textureCompression: 1
@@ -161,6 +171,35 @@ TextureImporter:
   - serializedVersion: 3
     buildTarget: WebGL
     maxTextureSize: 8192
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: HMIAndroid
+    maxTextureSize: 8192
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: 48
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 1
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 8192
+    maxPlaceholderSize: 32
     resizeAlgorithm: 0
     textureFormat: -1
     textureCompression: 1
@@ -188,5 +227,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: noise382_1_t49
+  assetBundleName: noise382_1_t5
   assetBundleVariant: 

+ 124 - 20
Assets/Epic Toon FX/Textures/splat02_flat_3x3.png.meta

@@ -1,17 +1,18 @@
 fileFormatVersion: 2
-guid: 4e7fadba81fbb72408f12d8d10b1a0c6
-timeCreated: 1445866993
-licenseType: Store
+guid: Cy8Y43v5ASoqS2cfey94/xMfa087pUvGx1glGZixpQsoMImyXzn3A3U=
 TextureImporter:
-  fileIDToRecycleName: {}
-  serializedVersion: 2
+  internalIDToNameTable: []
+  externalObjects: {}
+  serializedVersion: 13
   mipmaps:
     mipMapMode: 0
     enableMipMap: 1
+    sRGBTexture: 1
     linearTexture: 0
-    correctGamma: 0
     fadeOut: 0
     borderMipMap: 0
+    mipMapsPreserveCoverage: 0
+    alphaTestReferenceValue: 0.5
     mipMapFadeDistanceStart: 1
     mipMapFadeDistanceEnd: 3
   bumpmap:
@@ -19,39 +20,142 @@ TextureImporter:
     externalNormalMap: 0
     heightScale: 0.25
     normalMapFilter: 0
+    flipGreenChannel: 0
   isReadable: 0
+  webStreaming: 0
+  priorityLevel: 0
+  uploadedMode: 2
+  streamingMipmaps: 0
+  streamingMipmapsPriority: 0
+  vTOnly: 0
+  ignoreMipmapLimit: 0
   grayScaleToAlpha: 0
-  generateCubemap: 0
+  generateCubemap: 6
   cubemapConvolution: 0
-  cubemapConvolutionSteps: 8
-  cubemapConvolutionExponent: 1.5
   seamlessCubemap: 0
   textureFormat: -1
   maxTextureSize: 2048
   textureSettings:
-    filterMode: -1
-    aniso: -1
-    mipBias: -1
-    wrapMode: -1
+    serializedVersion: 2
+    filterMode: 1
+    aniso: 1
+    mipBias: 0
+    wrapU: 0
+    wrapV: 0
+    wrapW: 0
   nPOTScale: 1
   lightmap: 0
-  rGBM: 0
   compressionQuality: 50
-  allowsAlphaSplitting: 0
   spriteMode: 0
   spriteExtrude: 1
   spriteMeshType: 1
   alignment: 0
   spritePivot: {x: 0.5, y: 0.5}
-  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
   spritePixelsToUnits: 100
+  spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+  spriteGenerateFallbackPhysicsShape: 1
+  alphaUsage: 1
   alphaIsTransparency: 1
-  textureType: -1
-  buildTargetSettings: []
+  spriteTessellationDetail: -1
+  textureType: 0
+  textureShape: 1
+  singleChannelComponent: 0
+  flipbookRows: 1
+  flipbookColumns: 1
+  maxTextureSizeSet: 0
+  compressionQualitySet: 0
+  textureFormatSet: 0
+  ignorePngGamma: 0
+  applyGammaDecoding: 1
+  swizzle: 50462976
+  cookieLightType: 1
+  platformSettings:
+  - serializedVersion: 3
+    buildTarget: DefaultTexturePlatform
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Standalone
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: Server
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WeixinMiniGame
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
+  - serializedVersion: 3
+    buildTarget: WebGL
+    maxTextureSize: 2048
+    maxPlaceholderSize: 32
+    resizeAlgorithm: 0
+    textureFormat: -1
+    textureCompression: 1
+    compressionQuality: 50
+    crunchedCompression: 0
+    allowsAlphaSplitting: 0
+    overridden: 0
+    ignorePlatformSupport: 0
+    androidETC2FallbackOverride: 0
+    forceMaximumCompressionQuality_BC6H_BC7: 0
   spriteSheet:
+    serializedVersion: 2
     sprites: []
     outline: []
-  spritePackingTag: 
+    physicsShape: []
+    bones: []
+    spriteID: 
+    internalID: 0
+    vertices: []
+    indices: 
+    edges: []
+    weights: []
+    secondaryTextures: []
+    nameFileIdTable: {}
+  mipmapLimitGroupName: 
+  pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: splat02_flat_3x3_t3
   assetBundleVariant: 

+ 18 - 0
Assets/PottingMobileSDK/Plugins/Editor/PottingMobileSDKEditor.asmdef

@@ -0,0 +1,18 @@
+{
+    "name": "PottingMobileSDKEditor",
+    "rootNamespace": "",
+    "references": [
+        "GUID:097df4f93bd329c408144db3d97c0d92"
+    ],
+    "includePlatforms": [
+        "Editor"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

+ 7 - 0
Assets/PottingMobileSDK/Plugins/Editor/PottingMobileSDKEditor.asmdef.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: WSwbtyOrAHq0c4gY9rut4vcCjqE55hB4nb8xM7FtFuDMg3ACaYL/QDs=
+AssemblyDefinitionImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu01_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: DitKsymkVHowSYYJvcvwd3DlW7+Kjdl+Cr49nRPigqn0sTIk2MnhpCk=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu01_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Guaiwu02_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: WikY4XukAnv7buHAtLCYMcSm3yda3VBkpSYrqxgVvJMoL3zqRwocvcs=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu02_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/GuaiwuBoss01_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: XXoWtnykVHJbwXvNjtxz5M9YnQOInP8Sg456oOshDqWTphnQuDF7UF8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwuboss01_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/GuaiwuBoss02_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: Xnob4CisWn5A1Znmx2M6JTRUyMtbsFhJvI1tZJAZuQm34wZFfGoilBk=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwuboss02_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/GuaiwuJY01_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: B3lMsSitWynj8qrJw8fQAJWLqffKNb8E+zB7Tbg/1bJtb7Cybm+TCLQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwujy01_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/GuaiwuJY02_gpu.prefab.meta

@@ -3,5 +3,5 @@ guid: DnkfvCivU36rpjTai9A4r2INnWkZU4p8N4wgUt0aJYv3HDnLTuNFZ8Q=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwujy02_gpu
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Hero01.prefab.meta

@@ -3,5 +3,5 @@ guid: C3NO4CKrV39C9L7psO7pgU2B4VQu8xD10HMk92d/MiSR/NqqEF0xF38=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: hero01
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Hero02.prefab.meta

@@ -3,5 +3,5 @@ guid: DC4bvS6oUShy9jaAITQo10yURogA2NRfspa17GoF/BMtHloTCY+I9b8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: hero02
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Hero03.prefab.meta

@@ -3,5 +3,5 @@ guid: CC9KsX77Uy1imBfwX4WqCPMgqO6xW2jDxzp+Y7qGOj5BaWmI+rxIsl4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: hero03
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatHero/Hero04.prefab.meta

@@ -3,5 +3,5 @@ guid: CCwf4HyrVnsOwWd/sTNbeHpW3IZHbPzpuybveZOY1XBaqjVGeBGbge4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: hero04
   assetBundleVariant: 

+ 1 - 1
Assets/Res/CombatScenes/CombatRoot.prefab.meta

@@ -3,5 +3,5 @@ guid: WSgcvHuvUim8lOvO5Ne/1wHjeY6bC6XoOmQYm+QRIfTXcg9wer0B9Y8=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: combatroot
   assetBundleVariant: 

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

@@ -3,5 +3,5 @@ guid: XigevC3+Uy1mNc3J2WNkZ41Cci+rL8ZxpUZgUDz+b3I5VOFG7CPDcn0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: navmeshtarget
   assetBundleVariant: 

+ 6 - 3
Assets/Res/Config/DropConfig.json

@@ -4,19 +4,22 @@
       "ID": 10001,
       "dropGroupID": [
         10001
-      ]
+      ],
+      "dropType": 2
     },
     {
       "ID": 10002,
       "dropGroupID": [
         10002
-      ]
+      ],
+      "dropType": 2
     },
     {
       "ID": 10003,
       "dropGroupID": [
         10003
-      ]
+      ],
+      "dropType": 2
     }
   ]
 }

+ 3 - 0
Assets/Res/Config/DropGroupConfig.json

@@ -2,18 +2,21 @@
   "configList": [
     {
       "ID": 10001,
+      "dropRate": 1000,
       "dropItemID": [
         10001
       ]
     },
     {
       "ID": 10002,
+      "dropRate": 1000,
       "dropItemID": [
         10002
       ]
     },
     {
       "ID": 10003,
+      "dropRate": 1000,
       "dropItemID": [
         10003
       ]

+ 1 - 1
Assets/Res/Config/SkillUpConfig.json.meta

@@ -3,5 +3,5 @@ guid: WnMcvSKtVS3h1ShNZRsnyEsJp5u31xuQPlpim+wFpO1MQsbMlygco7Y=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: skillupconfig
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/Guaiwu02_TD.txt.meta

@@ -3,5 +3,5 @@ guid: Xn5Jtnn7AnvEo4DuvUfQAr00ZYzVHoLLzkZmmwGnu0RAOWyI8AGmlZM=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwu02_td
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/GuaiwuBoss02_TD.txt.meta

@@ -3,5 +3,5 @@ guid: DigasX+pBS8Pmrq8WY7dHYX30hbMsqOaV3NaCP75RLVIEdv6S9tFg1M=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwuboss02_td
   assetBundleVariant: 

+ 1 - 1
Assets/Res/TimeLineAssets/GuaiwuJY02_TD.txt.meta

@@ -3,5 +3,5 @@ guid: CSsX5iykV3oXJE74R65qeBfaDEYq2IxV/Pt+Y9ELM9+UgdixSpWeyBs=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: guaiwujy02_td
   assetBundleVariant: 

+ 55 - 0
Assets/Res/UI/HeroDetailPanel.prefab

@@ -2956,6 +2956,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   DotName: sk1_trigger
   followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &2664411918127213144
 GameObject:
   m_ObjectHideFlags: 0
@@ -4154,6 +4155,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -4271,6 +4274,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -5360,6 +5365,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   DotName: hitpos
   followSkeleton: 0
+  myRotation: {x: 0, y: 0, z: 0}
 --- !u!1 &4268106224602604728
 GameObject:
   m_ObjectHideFlags: 0
@@ -5419,6 +5425,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6057,6 +6065,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -6601,6 +6611,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -7798,6 +7810,8 @@ GameObject:
   - component: {fileID: 8042150479497634541}
   - component: {fileID: 8963168838308406584}
   - component: {fileID: 5422228824707887719}
+  - component: {fileID: 4738937348683330745}
+  - component: {fileID: 4187952801782332659}
   m_Layer: 0
   m_HasEditorInfo: 1
   m_Name: HeroDetailPanel
@@ -8100,6 +8114,39 @@ MonoBehaviour:
     - gameObject: {fileID: 7900421520403642917}
     - gameObject: {fileID: 1181932463234986561}
   isAssetBundle: 1
+--- !u!320 &4738937348683330745
+PlayableDirector:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6213300356282155384}
+  m_Enabled: 1
+  serializedVersion: 3
+  m_PlayableAsset: {fileID: 11400000, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
+  m_InitialState: 1
+  m_WrapMode: 0
+  m_DirectorUpdateMode: 1
+  m_InitialTime: 0
+  m_SceneBindings:
+  - key: {fileID: -4398279264670304355, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
+    value: {fileID: 8323024823130982353}
+  - key: {fileID: 3098885728808021784, guid: 185c5bcffa9aa1941b49529246fc7c68, type: 2}
+    value: {fileID: 8323024823130982353}
+  m_ExposedReferences:
+    m_References: []
+--- !u!225 &4187952801782332659
+CanvasGroup:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 6213300356282155384}
+  m_Enabled: 1
+  m_Alpha: 1
+  m_Interactable: 1
+  m_BlocksRaycasts: 1
+  m_IgnoreParentGroups: 0
 --- !u!1 &6353668298983276286
 GameObject:
   m_ObjectHideFlags: 0
@@ -8758,6 +8805,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9099,6 +9148,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9497,6 +9548,8 @@ MeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 2
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:
@@ -9572,6 +9625,8 @@ SkinnedMeshRenderer:
   m_ReflectionProbeUsage: 1
   m_RayTracingMode: 3
   m_RayTraceProcedural: 0
+  m_virtualGeometry: 0
+  m_virtualGeometryShadow: 0
   m_RenderingLayerMask: 1
   m_RendererPriority: 0
   m_Materials:

+ 1 - 1
Assets/Res/UI/SkillUIComponent.prefab.meta

@@ -3,5 +3,5 @@ guid: Dy8ct3yvAH2Tj+GuKNMRS+ROQYohe5B6JDjsSNAPCjIptba0upMh2Oc=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: skilluicomponent
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/StartBossPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: WnJO4HuuAS803scIC4Icmc3TuL0N0y/N9guZj1ncEua56+PAJzbCYQM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: startbosspanel
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/UIanima/HeroBags.controller.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 9100000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobags
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/UIanima/HeroBags_idle.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobags_idle
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/UIanima/HeroBags_pick.anim.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 7400000
   userData: 
-  assetBundleName: 
+  assetBundleName: herobags_pick
   assetBundleVariant: 

+ 1 - 1
Assets/Res/UI/WidgetIconSkill.prefab.meta

@@ -3,5 +3,5 @@ guid: DHtL4y/4Wi+YnM8fyLUQGjEv/usGFmSZXak6xuve4hSB4LPXll2hzaM=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: widgeticonskill
   assetBundleVariant: 

+ 8 - 0
Assets/Res/UIPlayable.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: DHwf5H+oAHJ/MtrYOXDPvIOVqP80AmLs7krjWqhrZzHjN/e4h44CzL0=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 22 - 0
Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable

@@ -0,0 +1,22 @@
+%YAML 1.1
+%TAG !u! tag:yousandi.cn,2023:
+--- !u!114 &11400000
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 0}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: bfda56da833e2384a9677cd3c976a436, type: 3}
+  m_Name: HeroDetailPanelTimeline
+  m_EditorClassIdentifier: 
+  m_Version: 0
+  m_Tracks: []
+  m_FixedDuration: 0
+  m_EditorSettings:
+    m_Framerate: 60
+    m_ScenePreview: 1
+  m_DurationMode: 0
+  m_MarkerTrack: {fileID: 0}

+ 8 - 0
Assets/Res/UIPlayable/HeroDetailPanelTimeline.playable.meta

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

+ 5 - 0
Assets/Scripts/GameData/ExcelConfig/DropConfig.cs

@@ -26,6 +26,11 @@ public int ID;
 public int[] dropGroupID;
 
 
+		/// <summary>
+		///掉落方式 1.每个掉落组根据掉落概率掉落 2.所有掉落组根据掉落权重掉落
+		/// </summary>
+public int dropType;
+
 
 		/// <summary>
 		///显示ID -99:通过工厂表决定显示

+ 5 - 0
Assets/Scripts/GameData/ExcelConfig/DropGroupConfig.cs

@@ -20,6 +20,11 @@ namespace Excel2Json
 public int ID;
 
 
+		/// <summary>
+		///掉落概率\权重 1000为100%
+		/// </summary>
+public int dropRate;
+
 
 		/// <summary>
 		///

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

@@ -0,0 +1,151 @@
+using System;
+using System.Collections.Generic;
+using Excel2Json;
+using Fort23.UTool;
+using GameLogic.Bag;
+using Utility;
+
+namespace GameLogic.Player
+{
+    public class DropManager : Singleton<DropManager>
+    {
+        public Random Random = new Random();
+
+
+        private Map<int, List<DropCountConfig>> dropCountGroupDic = new Map<int, List<DropCountConfig>>();
+        private Map<int, int> maxWight = new Map<int, int>();
+
+        public DropManager()
+        {
+            Random = new Random(System.DateTime.Now.Millisecond);
+            DropCountConfig[] allDropCountConfigs = ConfigComponent.Instance.GetAll<DropCountConfig>();
+            for (int i = 0; i < allDropCountConfigs.Length; i++)
+            {
+                DropCountConfig dropCountConfig = allDropCountConfigs[i];
+                if (dropCountGroupDic.TryGetValue(dropCountConfig.ID, out var list))
+                {
+                    maxWight[dropCountConfig.ID] += dropCountConfig.weight;
+                    list.Add(dropCountConfig);
+                }
+                else
+                {
+                    list = new List<DropCountConfig>();
+                    list.Add(dropCountConfig);
+                    dropCountGroupDic.Add(dropCountConfig.ID, list);
+                    maxWight.Add(dropCountConfig.ID, dropCountConfig.weight);
+                }
+            }
+        }
+
+        public List<ItemInfo> DropItem(int dropId)
+        {
+            DropConfig dropConfig = ConfigComponent.Instance.Get<DropConfig>(dropId);
+            if (dropConfig.ID <= 0)
+            {
+                LogTool.Error("没有这个掉落组" + dropId);
+                return null;
+            }
+
+            if (dropConfig.dropType == 1)
+            {
+                return DropItemFor1(dropConfig);
+            }
+            else
+            {
+                return DropItemFor2(dropConfig);
+            }
+        }
+
+        private List<ItemInfo> DropItemFor1(DropConfig dropConfig)
+        {
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
+            for (int i = 0; i < dropConfig.dropGroupID.Length; i++)
+            {
+                int dropGroupId = dropConfig.dropGroupID[i];
+                DropGroupConfig dropGroupConfig = ConfigComponent.Instance.Get<DropGroupConfig>(dropGroupId);
+                int odd = Random.Next(0, 1000);
+                if (odd <= dropGroupConfig.dropRate)
+                {
+                    DropItemConfig(itemInfos, dropGroupConfig.dropItemID);
+                }
+            }
+
+            return itemInfos;
+        }
+
+        private void DropItemConfig(List<ItemInfo> itemInfos, int[] dropItemID)
+        {
+            for (int i = 0; i < dropItemID.Length; i++)
+            {
+                DropItemConfig dropItemConfig = ConfigComponent.Instance.Get<DropItemConfig>(dropItemID[i]);
+                for (int j = 0; j < dropItemConfig.itemID.Length; j++)
+                {
+                    int c = 0;
+                    if (dropItemConfig.dropCountGoupID > 0)
+                    {
+                        DropCountConfig dropCountConfig = GetCountBl(dropItemConfig.dropCountGoupID);
+                        c = (dropItemConfig.dropMaxV * dropCountConfig.proportion) / 100;
+                    }
+                    else
+                    {
+                        c = Random.Next(dropItemConfig.dropMinV, dropItemConfig.dropMaxV + 1);
+                    }
+
+                    ItemInfo itemInfo = new ItemInfo(dropItemConfig.itemID[j], c);
+                    itemInfos.Add(itemInfo);
+                }
+            }
+        }
+
+        private DropCountConfig GetCountBl(int dropCountGroupID)
+        {
+            if (dropCountGroupDic.TryGetValue(dropCountGroupID, out var dropCountGroupConfig))
+            {
+                int wight = maxWight[dropCountGroupID];
+                int currWight = Random.Next(0, wight);
+                int addWidght = 0;
+                for (int i = 0; i < dropCountGroupConfig.Count; i++)
+                {
+                    DropCountConfig dropCountConfig = dropCountGroupConfig[i];
+                    addWidght += dropCountConfig.weight;
+                    if (currWight <= addWidght)
+                    {
+                        return dropCountConfig;
+                    }
+                }
+            }
+
+            LogTool.Error("没有掉落的数量" + dropCountGroupID);
+
+            return default;
+        }
+
+        private List<ItemInfo> DropItemFor2(DropConfig dropConfig)
+        {
+            List<ItemInfo> itemInfos = new List<ItemInfo>();
+            int allRate = 0;
+            for (int i = 0; i < dropConfig.dropGroupID.Length; i++)
+            {
+                int dropGroupId = dropConfig.dropGroupID[i];
+                DropGroupConfig dropGroupConfig = ConfigComponent.Instance.Get<DropGroupConfig>(dropGroupId);
+                allRate += dropGroupConfig.dropRate;
+            }
+
+            int currWight = Random.Next(0, allRate);
+            int addWidght = 0;
+            for (int i = 0; i < dropConfig.dropGroupID.Length; i++)
+            {
+                int dropGroupId = dropConfig.dropGroupID[i];
+                DropGroupConfig dropGroupConfig = ConfigComponent.Instance.Get<DropGroupConfig>(dropGroupId);
+                addWidght += dropGroupConfig.dropRate;
+                if (currWight <= addWidght)
+                {
+                    DropItemConfig(itemInfos, dropGroupConfig.dropItemID);
+                    return itemInfos;
+                }
+            }
+
+            return itemInfos;
+        }
+    }
+}

+ 3 - 0
Assets/Scripts/GameLogic/Player/DropManager.cs.meta

@@ -0,0 +1,3 @@
+fileFormatVersion: 2
+guid: 79e1a8d03b0147d8bf94f167170583c0
+timeCreated: 1733366168

+ 1 - 0
Assets/Scripts/GameStart/GameStart.cs

@@ -11,6 +11,7 @@ public class GameStart : MonoBehaviour
 
     public void Start()
     {
+        ShaderVariantCollection.WarmUp();
         _gameStartUIPanel = GetComponent<GameStartUIPanel>();
         StartLoadGame();
     }

+ 4 - 1
Assets/Scripts/GameUI/SDK/YouLoftSDK.cs

@@ -6,6 +6,9 @@ public class YouLoftSDK : MonoBehaviour
 {
     public void Init()
     {
-        PottingMobile.InitializeSdk();
+#if UNITY_ANDROID|| UNITY_IOS
+          PottingMobile.InitializeSdk();
+#endif
+      
     }
 }

+ 8 - 0
Assets/Scripts/ThirdParty/PottingMobileSDK.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: C3NM43z5BylnvOQVs6Q0hQYQJ8/TsVpo/DMFdj7mkOWRgKDoEwO2LAw=
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 18 - 0
Assets/Scripts/ThirdParty/PottingMobileSDK/PotingSkd.asmdef

@@ -0,0 +1,18 @@
+{
+    "name": "PotingSkd",
+    "rootNamespace": "",
+    "references": [],
+    "includePlatforms": [
+        "Android",
+        "Editor",
+        "iOS"
+    ],
+    "excludePlatforms": [],
+    "allowUnsafeCode": false,
+    "overrideReferences": false,
+    "precompiledReferences": [],
+    "autoReferenced": true,
+    "defineConstraints": [],
+    "versionDefines": [],
+    "noEngineReferences": false
+}

+ 7 - 0
Assets/Scripts/ThirdParty/PottingMobileSDK/PotingSkd.asmdef.meta

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

+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/AdManagerSettings.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AdManagerSettings.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/AdManagerSettings.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AdManagerSettings.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/AppEventsConstants.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AppEventsConstants.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/AppEventsConstants.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/AppEventsConstants.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/LogGUI.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogGUI.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/LogGUI.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogGUI.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/LogoZoom.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogoZoom.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/LogoZoom.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/LogoZoom.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/MiniJSON.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/MiniJSON.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/MiniJSON.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/MiniJSON.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/NetTimeCheck.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/NetTimeCheck.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/NetTimeCheck.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/NetTimeCheck.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/OrderAndroid.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderAndroid.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/OrderAndroid.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderAndroid.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/OrderiOS.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderiOS.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/OrderiOS.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/OrderiOS.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobVersion.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobVersion.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobVersion.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobVersion.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobile.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobile.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobile.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobile.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileAndroid.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileAndroid.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileAndroid.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileAndroid.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileBase.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileBase.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileBase.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileBase.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileContent.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileContent.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileContent.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileContent.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileEditor.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileEditor.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileEditor.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileEditor.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileManger.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileManger.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileManger.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileManger.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileUtils.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtils.cs


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileUtils.cs.meta → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtils.cs.meta


+ 0 - 0
Assets/Scripts/Core/PottingMobileSDK/PottingMobileUtilsAndroid.cs → Assets/Scripts/ThirdParty/PottingMobileSDK/PottingMobileSDK/PottingMobileUtilsAndroid.cs


Niektóre pliki nie zostały wyświetlone z powodu dużej ilości zmienionych plików