DESKTOP-FB72PO8\Administrator 5 месяцев назад
Родитель
Сommit
7274cd469f
100 измененных файлов с 682 добавлено и 449 удалено
  1. 4 9
      Assets/Plugins/Android/AndroidManifest.xml
  2. 3 3
      Assets/Plugins/Android/launcherTemplate.gradle
  3. 1 1
      Assets/Plugins/Android/mainTemplate.gradle
  4. 3 1
      Assets/Plugins/Android/settingsTemplate.gradle
  5. 3 3
      Assets/PottingMobileSDK/Resources/AdManagerSettings.asset
  6. 8 7
      Assets/PottingMobileSDK/google-services.json
  7. 342 114
      Assets/Res/Config/LevelBattleConfig.json
  8. 77 3
      Assets/Scenes/testCombat.scene
  9. 6 3
      Assets/Scripts/Core/AssetLoadTool/Asset/AssetBundleLoadManager.cs
  10. 1 1
      Assets/Scripts/Core/AssetLoadTool/Asset/BundleLoadBasic.cs
  11. 3 3
      Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs
  12. 2 1
      Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs
  13. 2 0
      Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs
  14. 7 7
      Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs
  15. 2 1
      Assets/Scripts/GameLogic/Fort23.GameLogic.asmdef
  16. 2 1
      Assets/Scripts/GameLogic/Player/AccountFileInfo.cs
  17. 21 17
      Assets/Scripts/GameLogic/Player/DropManager.cs
  18. 10 5
      Assets/Scripts/GameLogic/Player/PlayerManager.cs
  19. 15 1
      Assets/Scripts/GameStart/GameStart.cs
  20. 3 1
      Assets/Scripts/GameStart/GameStartDll.asmdef
  21. 104 0
      Assets/Scripts/GameStart/GameZip.cs
  22. 11 0
      Assets/Scripts/GameStart/GameZip.cs.meta
  23. 2 1
      Assets/Scripts/GameUI/Fort23.Mono.asmdef
  24. 9 6
      Assets/Scripts/GameUI/SDK/YouLoftSDK.cs
  25. 36 9
      Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs
  26. 2 3
      Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs
  27. 2 2
      Assets/Scripts/GameUI/UI/Hero/HeroPowerUpPre.cs
  28. 1 0
      Assets/Settings/rpAsset_Renderer.asset
  29. 0 8
      Assets/StreamingAssets/Bundle.meta
  30. BIN
      Assets/StreamingAssets/Bundle/01_np_huanrao_950330ca7d2b2f97a1cfc040ce3c38fc
  31. 0 7
      Assets/StreamingAssets/Bundle/01_np_huanrao_950330ca7d2b2f97a1cfc040ce3c38fc.meta
  32. BIN
      Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64
  33. BIN
      Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77
  34. 0 7
      Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77.meta
  35. BIN
      Assets/StreamingAssets/Bundle/01np_dg3_ad81a93067643f49c016e2f84ee7ca42
  36. BIN
      Assets/StreamingAssets/Bundle/01np_dg_anse_ice2_a397f6b4606fed5e019c6e588bbc57c1
  37. 0 7
      Assets/StreamingAssets/Bundle/01np_dg_anse_ice2_a397f6b4606fed5e019c6e588bbc57c1.meta
  38. BIN
      Assets/StreamingAssets/Bundle/01np_dg_chu_add_ice_a36e2f1a09a03d2c4126c94e7652a46c
  39. 0 7
      Assets/StreamingAssets/Bundle/01np_dg_chu_add_ice_a36e2f1a09a03d2c4126c94e7652a46c.meta
  40. BIN
      Assets/StreamingAssets/Bundle/01np_dg_chu_anse_end_88a19a5e2d9581169469e6ca89033eda
  41. 0 7
      Assets/StreamingAssets/Bundle/01np_dg_chu_anse_end_88a19a5e2d9581169469e6ca89033eda.meta
  42. BIN
      Assets/StreamingAssets/Bundle/01np_dg_chu_mid_a6e7b9d45c5041936823148e343c2a74
  43. 0 7
      Assets/StreamingAssets/Bundle/01np_dg_chu_mid_a6e7b9d45c5041936823148e343c2a74.meta
  44. BIN
      Assets/StreamingAssets/Bundle/01np_sk3_dg_anse_7677b5eab6321798b3f13d0f63c0b112
  45. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_anse_7677b5eab6321798b3f13d0f63c0b112.meta
  46. BIN
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_1_d40a1970015cbf631237100bfc96c2c7
  47. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_1_d40a1970015cbf631237100bfc96c2c7.meta
  48. BIN
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_2_ef4c68aac7a621aaeba1b5e8edc62b50
  49. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_2_ef4c68aac7a621aaeba1b5e8edc62b50.meta
  50. BIN
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d
  51. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta
  52. BIN
      Assets/StreamingAssets/Bundle/01np_sk3_dg_zd_d3dd6a70bb95d99d2045f98a1c574f5f
  53. 0 7
      Assets/StreamingAssets/Bundle/01np_sk3_dg_zd_d3dd6a70bb95d99d2045f98a1c574f5f.meta
  54. BIN
      Assets/StreamingAssets/Bundle/01np_xuehua_8e9c613edf1cb889a923f38d6aeeada9
  55. 0 7
      Assets/StreamingAssets/Bundle/01np_xuehua_8e9c613edf1cb889a923f38d6aeeada9.meta
  56. BIN
      Assets/StreamingAssets/Bundle/09flowmap_smoke_32b99ce1ca4733990e8e560bd471ee00
  57. 0 7
      Assets/StreamingAssets/Bundle/09flowmap_smoke_32b99ce1ca4733990e8e560bd471ee00.meta
  58. BIN
      Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7
  59. 0 7
      Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7.meta
  60. BIN
      Assets/StreamingAssets/Bundle/501_huanrao_qi_4dc11bbf3cb2dfdb21bcddb43204699d
  61. 0 7
      Assets/StreamingAssets/Bundle/501_huanrao_qi_4dc11bbf3cb2dfdb21bcddb43204699d.meta
  62. BIN
      Assets/StreamingAssets/Bundle/603_ice_suikuai_4ccd42824ff759403fa6a22b88e757f5
  63. 0 7
      Assets/StreamingAssets/Bundle/603_ice_suikuai_4ccd42824ff759403fa6a22b88e757f5.meta
  64. BIN
      Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69
  65. 0 7
      Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69.meta
  66. 0 0
      Assets/StreamingAssets/Bundle/MD5.txt
  67. 0 7
      Assets/StreamingAssets/Bundle/MD5.txt.meta
  68. BIN
      Assets/StreamingAssets/Bundle/UnityBundle.unity3d
  69. 0 7
      Assets/StreamingAssets/Bundle/UnityBundle.unity3d.meta
  70. BIN
      Assets/StreamingAssets/Bundle/add01_731b813b73c3c7ece6cd5951f0bf6dae
  71. 0 7
      Assets/StreamingAssets/Bundle/add01_731b813b73c3c7ece6cd5951f0bf6dae.meta
  72. BIN
      Assets/StreamingAssets/Bundle/add05dot_72657cadd37041932dd81e1e3ad79bb1
  73. 0 7
      Assets/StreamingAssets/Bundle/add05dot_72657cadd37041932dd81e1e3ad79bb1.meta
  74. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb
  75. 0 7
      Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb.meta
  76. BIN
      Assets/StreamingAssets/Bundle/afx_ramp_hong_474c99f16bde1c577aa4747d3ce9ed1f
  77. 0 7
      Assets/StreamingAssets/Bundle/afx_ramp_hong_474c99f16bde1c577aa4747d3ce9ed1f.meta
  78. BIN
      Assets/StreamingAssets/Bundle/albedo_t1_da6bad6106d0eaf209f083590fa8614e
  79. 0 7
      Assets/StreamingAssets/Bundle/albedo_t1_da6bad6106d0eaf209f083590fa8614e.meta
  80. BIN
      Assets/StreamingAssets/Bundle/all_a64b3c0556608471848a3c1eab9ccb1f
  81. 0 7
      Assets/StreamingAssets/Bundle/all_a64b3c0556608471848a3c1eab9ccb1f.meta
  82. BIN
      Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a
  83. 0 7
      Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta
  84. BIN
      Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb
  85. 0 7
      Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta
  86. BIN
      Assets/StreamingAssets/Bundle/anse04_0cddc9140263d5afbf6a1f9c5aeb49d6
  87. 0 7
      Assets/StreamingAssets/Bundle/anse04_0cddc9140263d5afbf6a1f9c5aeb49d6.meta
  88. BIN
      Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e
  89. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta
  90. BIN
      Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278
  91. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta
  92. BIN
      Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc
  93. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc.meta
  94. BIN
      Assets/StreamingAssets/Bundle/arch_gate_debris_02_5c65b12a0d3a26d531d42e398d657fb0
  95. 0 7
      Assets/StreamingAssets/Bundle/arch_gate_debris_02_5c65b12a0d3a26d531d42e398d657fb0.meta
  96. 0 0
      Assets/StreamingAssets/Bundle/assetConfig.txt
  97. 0 7
      Assets/StreamingAssets/Bundle/assetConfig.txt.meta
  98. BIN
      Assets/StreamingAssets/Bundle/baodian03_e39e426a6d652463e471fe0a6eb8cbe1
  99. 0 7
      Assets/StreamingAssets/Bundle/baodian03_e39e426a6d652463e471fe0a6eb8cbe1.meta
  100. BIN
      Assets/StreamingAssets/Bundle/battleground_01_a3c788713c01a212a121b659be484d45

+ 4 - 9
Assets/Plugins/Android/AndroidManifest.xml

@@ -13,17 +13,12 @@
         <action android:name="android.intent.action.VIEW" />
         <category android:name="android.intent.category.DEFAULT" />
         <category android:name="android.intent.category.BROWSABLE" />
-        <data android:scheme="fb123" />
+        <data android:scheme="fb1702319900313784" />
       </intent-filter>
     </activity>
-    <provider android:authorities="com.facebook.app.FacebookContentProvider123" android:name="com.facebook.FacebookContentProvider" android:exported="true" />
+    <provider android:authorities="com.facebook.app.FacebookContentProvider1702319900313784" 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.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="123" />
-  </application>
+    </provider>G
+    <meta-data android:name="com.facebook.sdk.ClientToken" android:value="dbc1931d0ec6e6b668e3a9b37e8e6ab8" /><meta-data android:name="com.google.android.gms.games.APP_ID" android:value="\u003123" /><meta-data android:name="com.facebook.sdk.ApplicationId" android:value="fb1702319900313784" /><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="ca-app-pub-3477755457457214~8868165337" /></application>
 </manifest>

+ 3 - 3
Assets/Plugins/Android/launcherTemplate.gradle

@@ -71,9 +71,9 @@ android {
  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/")
+         delete("D:/unityProject/XY001/Library/Bee/Android/Prj/IL2CPP/Gradle/launcher/google-services.json")
+         from('D:/unityProject/XY001/Assets/PottingMobileSDK/')
+         into("D:/unityProject/XY001/Library/Bee/Android/Prj/IL2CPP/Gradle/launcher/")
          include("google-services.json")
          println "Copy google-services.json completed.--->> IL2CPP"
      }

+ 1 - 1
Assets/Plugins/Android/mainTemplate.gradle

@@ -81,7 +81,7 @@ dependencies {
         exclude group: 'com.google.android.gms', module: 'services-ads-identifier'
     }
 
-    implementation 'com.unity3d.ads:unity-ads:4.9.2'
+    //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'

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

@@ -1,6 +1,7 @@
 pluginManagement {
     repositories {
         **ARTIFACTORYREPOSITORY**
+       mavenLocal()
         gradlePluginPortal()
         google()
         mavenCentral()
@@ -14,6 +15,7 @@ dependencyResolutionManagement {
     repositoriesMode.set(RepositoriesMode.PREFER_SETTINGS)
     repositories {
         **ARTIFACTORYREPOSITORY**
+        mavenLocal()
         google()
         mavenCentral()
         maven {
@@ -28,7 +30,7 @@ dependencyResolutionManagement {
         maven {
             url 'https://android-sdk.is.com/'
         }
-        mavenLocal()
+       
         flatDir {
             dirs "${project(':tuanjieLibrary').projectDir}/libs"
         }

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

@@ -32,11 +32,11 @@ MonoBehaviour:
   iOSFacebookClientToken: 123
   iOSGameId: 123
   iOSGameSecret: 123
-  AndroidAdmobId: 123
+  AndroidAdmobId: ca-app-pub-3477755457457214~8868165337
   AndroidUmengAppid: 
   AndroidPangleAppID: 
-  AndroidFacebookID: 123
-  AndroidFacebookClientToken: 123
+  AndroidFacebookID: 1702319900313784
+  AndroidFacebookClientToken: dbc1931d0ec6e6b668e3a9b37e8e6ab8
   AndroidFacebookDisplayname: Android
   AndroidGameId: 123
   AndroidGameSecret: 123

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

@@ -1,28 +1,29 @@
 {
   "project_info": {
-    "project_number": "197380154534",
-    "project_id": "xy001-99d9d",
-    "storage_bucket": "xy001-99d9d.firebasestorage.app"
+    "project_number": "54374026703",
+    "project_id": "mythic-heroes--guild-and",
+    "storage_bucket": "mythic-heroes--guild-and.firebasestorage.app"
   },
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:197380154534:android:55bd6ef3e9e12a54998067",
+        "mobilesdk_app_id": "1:54374026703:android:5106cd0c8b06eea14a16ba",
         "android_client_info": {
-          "package_name": "com.fort23.XY001"
+          "package_name": "com.fort23.xy001"
         }
       },
       "oauth_client": [],
       "api_key": [
         {
-          "current_key": "AIzaSyDTRozuAhTGotLRnF1U2FPqX3r4KgvkE6s"
+          "current_key": "AIzaSyBrNjsjL0PA5tcgLRwXgJ-_l_tAQ8KpCcY"
         }
       ],
       "services": {
         "appinvite_service": {
           "other_platform_oauth_client": []
         }
-      }
+      },
+      "admob_app_id": "ca-app-pub-3477755457457214~8868165337"
     }
   ],
   "configuration_version": "1"

Разница между файлами не показана из-за своего большого размера
+ 342 - 114
Assets/Res/Config/LevelBattleConfig.json


+ 77 - 3
Assets/Scenes/testCombat.scene

@@ -177,8 +177,8 @@ Light:
   serializedVersion: 10
   m_Type: 1
   m_Shape: 0
-  m_Color: {r: 0.18553928, g: 0.49055827, b: 0.9547169, a: 1}
-  m_Intensity: 1.2
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_Intensity: 1
   m_Range: 10
   m_SpotAngle: 30
   m_InnerSpotAngle: 21.80208
@@ -276,7 +276,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
-  LoadType: 0
+  LoadType: 1
   h5Url: https://gamedata-1332030654.cos-website.ap-chengdu.myqcloud.com/Bundle/
 --- !u!4 &123020045
 Transform:
@@ -601,6 +601,79 @@ Transform:
   m_Children: []
   m_Father: {fileID: 0}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+--- !u!1001 &240720438
+PrefabInstance:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Modification:
+    serializedVersion: 3
+    m_TransformParent: {fileID: 0}
+    m_Modifications:
+    - target: {fileID: 100000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_Name
+      value: Advanced FPS Counter
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalPosition.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalPosition.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalPosition.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalRotation.w
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalRotation.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalRotation.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalRotation.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.x
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.y
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: m_LocalEulerAnglesHint.z
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 11400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: forceFrameRate
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: forcedFrameRate
+      value: 60
+      objectReference: {fileID: 0}
+    - target: {fileID: 11400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: fpsCounter.render
+      value: 1
+      objectReference: {fileID: 0}
+    - target: {fileID: 11400000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
+      propertyPath: memoryCounter.monoUsage
+      value: 1
+      objectReference: {fileID: 0}
+    m_RemovedComponents: []
+    m_RemovedGameObjects: []
+    m_AddedGameObjects: []
+    m_AddedComponents: []
+  m_SourcePrefab: {fileID: 100100000, guid: e84b65f6b68cbca4a9a9c63e390ea836, type: 3}
 --- !u!1 &376281604
 GameObject:
   m_ObjectHideFlags: 0
@@ -1209,3 +1282,4 @@ SceneRoots:
   - {fileID: 111679908}
   - {fileID: 235899921}
   - {fileID: 123020045}
+  - {fileID: 240720438}

+ 6 - 3
Assets/Scripts/Core/AssetLoadTool/Asset/AssetBundleLoadManager.cs

@@ -191,12 +191,10 @@ public class AssetBundleLoadManager : Singleton<AssetBundleLoadManager>
             unityWebRequest.SetRequestHeader("Content-Type", "application/json");
             unityWebRequest.SetRequestHeader("Accept", "application/json");
             unityWebRequest.certificateHandler = new CustomCertificateHandler();
-      
+
             UnityWebRequestAsyncOperation webRequestAsyncOperation = unityWebRequest.SendWebRequest();
             webRequestAsyncOperation.completed += delegate(AsyncOperation operation)
             {
-              
-
                 if (!string.IsNullOrEmpty(webRequestAsyncOperation.webRequest.downloadHandler.error))
                 {
                     LogTool.Error(Application.streamingAssetsPath + "m_assetConfigName buchunzai" + m_assetConfigName);
@@ -258,6 +256,10 @@ public class AssetBundleLoadManager : Singleton<AssetBundleLoadManager>
             url = h5Url + m_manifestName;
         }
 
+
+#if UNITY_ANDROID&&!UNITY_EDITOR
+        url = "file://" + url;
+#endif
         Debug.Log(url);
         UnityWebRequest webRequest = UnityWebRequestAssetBundle.GetAssetBundle(url);
         webRequest.certificateHandler = new CustomCertificateHandler();
@@ -385,6 +387,7 @@ public class AssetBundleLoadManager : Singleton<AssetBundleLoadManager>
         {
             bundleName = hash;
         }
+
         if (m_currLoadBundle.ContainsKey(bundleName))
         {
             bundleLoadTask = m_currLoadBundle[bundleName];

+ 1 - 1
Assets/Scripts/Core/AssetLoadTool/Asset/BundleLoadBasic.cs

@@ -179,7 +179,7 @@ namespace Core.AssetLoadTool.Asset
 
                 CTask cTask = CTask.Create(false);
                 loadInfoAsset = new LoadInfoAsset();
-                AssetBundleRequest assetBundleRequest=  _currBundle.LoadAssetAsync(assetName);
+                AssetBundleRequest assetBundleRequest=  _currBundle.LoadAssetAsync<T>(assetName);
                 assetBundleRequest.completed += delegate(AsyncOperation obj)
                 {
                     loadInfoAsset.asset = assetBundleRequest.asset;

+ 3 - 3
Assets/Scripts/GameData/ExcelConfig/LevelBattleConfig.cs

@@ -65,13 +65,13 @@ public int bossExpAndGold;
 		/// <summary>
 		///打死小怪可以获得的奖励
 		/// </summary>
-public string[] miniMonsterItem;
+public int[] miniMonsterItem;
 
 
 		/// <summary>
 		///杀死精英怪可以获得的奖励
 		/// </summary>
-public string[] eliteMonsterItem;
+public int[] eliteMonsterItem;
 
 
 		/// <summary>
@@ -101,7 +101,7 @@ public int bossMonsterId;
 		/// <summary>
 		///打死boss可以获得的奖励
 		/// </summary>
-public string[] bossItem;
+public int[] bossItem;
 
 
 		/// <summary>

+ 2 - 1
Assets/Scripts/GameLogic/Combat/CombatType/CombatTypeBasic.cs

@@ -6,8 +6,9 @@ using GameLogic.Combat.CombatTool;
 using GameLogic.Combat.Hero;
 using GameLogic.CombatScenesTool;
 using UnityEngine;
+#if UNITY_WEIXINMINIGAME
 using WeChatWASM;
-
+#endif
 namespace GameLogic.Combat.CombatType
 {
     public class CombatTypeBasic : IDisposable

+ 2 - 0
Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -165,6 +165,7 @@ namespace GameLogic.Combat.CombatType
             }
 
             Debug.Log("英雄死完了,等待全部英雄复活,这个版本等待2秒全体复活");
+            PottingMobile._FailLevel(_levelBattleConfig.levelName);
             PlayBgm();
             AccountFileInfo.Instance.playerData.isAllHeroDie = true;
             TimerComponent.Instance.AddTimer(1000, delegate
@@ -295,6 +296,7 @@ namespace GameLogic.Combat.CombatType
 
         protected void BossKo(CombatHeroEntity combatHeroEntity)
         {
+            PottingMobile._FinishLevel(_levelBattleConfig.levelName);
             dieHeroCount = 0;
             AccountFileInfo.Instance.playerData.isAllHeroDie = false;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);

+ 7 - 7
Assets/Scripts/GameLogic/Equipment/EquipmentInfo.cs

@@ -64,13 +64,13 @@ namespace GameLogic.Equipment
                 lvInfo.dropItemConfig.dropItemType != 3 &&
                 qualityInfo.dropItemConfig.dropItemType != 2)
             {
-                string errorTip = "modelInfo.dropItemConfig.dropItemType=" +
-                                  modelInfo.dropItemConfig.dropItemType +
-                                  " |lvInfo.dropItemConfig.dropItemType" +
-                                  lvInfo.dropItemConfig.dropItemType +
-                                  " |qualityInfo.dropItemConfig.dropItemType" +
-                                  qualityInfo.dropItemConfig.dropItemType;
-                LogTool.Error(errorTip);
+                // string errorTip = "modelInfo.dropItemConfig.dropItemType=" +
+                //                   modelInfo.dropItemConfig.dropItemType +
+                //                   " |lvInfo.dropItemConfig.dropItemType" +
+                //                   lvInfo.dropItemConfig.dropItemType +
+                //                   " |qualityInfo.dropItemConfig.dropItemType" +
+                //                   qualityInfo.dropItemConfig.dropItemType;
+                // LogTool.Error(errorTip);
             }
 
             myItemInfo = modelInfo;

+ 2 - 1
Assets/Scripts/GameLogic/Fort23.GameLogic.asmdef

@@ -9,7 +9,8 @@
         "GUID:fa5baf2c58faab54689c976e76104564",
         "GUID:fdb14afa911c65e4982db867bfd7afce",
         "GUID:d8b63aba1907145bea998dd612889d6b",
-        "GUID:5efd170ecd8084500bed5692932fe14e"
+        "GUID:5efd170ecd8084500bed5692932fe14e",
+        "PotingSkd"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 2 - 1
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -7,8 +7,9 @@ using GameLogic.Bag;
 using GameLogic.Hero;
 using UnityEngine;
 using Utility;
+#if UNITY_WEIXINMINIGAME
 using WeChatWASM;
-
+#endif
 public class AccountFileInfo : Singleton<AccountFileInfo>
 {
     public string persistentDataPath = Application.persistentDataPath + "/playerData.txt";

+ 21 - 17
Assets/Scripts/GameLogic/Player/DropManager.cs

@@ -37,20 +37,20 @@ namespace GameLogic.Player
             }
         }
 
-        public ItemInfo DropEquipment(string eqDropDataStr)
+        public ItemInfo DropEquipment(int equipModelDropID, int qualityDropID, int lvDropID)
         {
-            string[] eqDropData = eqDropDataStr.Split(',');
-
-            if (eqDropData.Length != 3)
-            {
-                LogTool.Error("装备掉落格式错误:" + eqDropDataStr);
-                return null;
-            }
+            // string[] eqDropData = eqDropDataStr.Split(',');
+            //
+            // if (eqDropData.Length != 3)
+            // {
+            //     LogTool.Error("装备掉落格式错误:" + eqDropDataStr);
+            //     return null;
+            // }
 
             ItemInfo eqItemInfo = PlayerManager.Instance.eqController.BuildEquipment(
-                int.Parse(eqDropData[0]),
-                int.Parse(eqDropData[1]),
-                int.Parse(eqDropData[2]));
+                equipModelDropID,
+                qualityDropID,
+                lvDropID);
 
             if (eqItemInfo != null)
                 BagController.Instance.AddEquipmentItem(eqItemInfo);
@@ -72,23 +72,27 @@ namespace GameLogic.Player
 
             if (monsterType == 1)
             {
-                foreach (string eqDropStr in levelBattleConfig.miniMonsterItem)
+                for (int i = 0; i < levelBattleConfig.miniMonsterItem.Length; i++)
                 {
-                    itemInfo = DropEquipment(eqDropStr);
+                    itemInfo = DropEquipment( levelBattleConfig.miniMonsterItem[0], levelBattleConfig.miniMonsterItem[1], levelBattleConfig.miniMonsterItem[2]);
+                    i += 2;
                 }
             }
             else if (monsterType == 2)
             {
-                foreach (string eqDropStr in levelBattleConfig.eliteMonsterItem)
+                for (int i = 0; i < levelBattleConfig.eliteMonsterItem.Length; i++)
                 {
-                    itemInfo = DropEquipment(eqDropStr);
+                    itemInfo = DropEquipment( levelBattleConfig.eliteMonsterItem[0], levelBattleConfig.eliteMonsterItem[1], levelBattleConfig.eliteMonsterItem[2]);
+                    i += 2;
                 }
+               
             }
             else if (monsterType == 3)
             {
-                foreach (string eqDropStr in levelBattleConfig.bossItem)
+                for (int i = 0; i < levelBattleConfig.bossItem.Length; i++)
                 {
-                    itemInfo = DropEquipment(eqDropStr);
+                    itemInfo = DropEquipment( levelBattleConfig.bossItem[0], levelBattleConfig.bossItem[1], levelBattleConfig.bossItem[2]);
+                    i += 2;
                 }
             }
 

+ 10 - 5
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -20,13 +20,13 @@ public class PlayerManager : Singleton<PlayerManager>
     public GameConstantConfig gameConstantConfig;
     public SkillUpConfig[] skillUpConfigs;
     public SkillConfig[] SkillConfigs;
-    
+
     public Dictionary<int, List<SkillConfig>> groupSkillDic = new Dictionary<int, List<SkillConfig>>();
 
     public long coin;
     public long diamond;
     public long heroExp;
-    
+
     /// <summary>
     /// 上一个强化的英雄
     /// </summary>
@@ -62,6 +62,11 @@ public class PlayerManager : Singleton<PlayerManager>
     {
         InitBags();
         heroController.InitHeroes();
+        Dictionary<string, string> gameInfo = new Dictionary<string, string>();
+        gameInfo.Add("battleLevel", AccountFileInfo.Instance.playerData.levelBattle.ToString());
+        gameInfo.Add("userlevel", heroController.mainLevel.ToString());
+        // gameInfo.Add("battleLevel",  AccountFileInfo.Instance.playerData.levelBattle.ToString());
+        PottingMobile._YouLoftGameInfo(gameInfo);
         // InitHeroes();
     }
 
@@ -69,7 +74,7 @@ public class PlayerManager : Singleton<PlayerManager>
     {
         BagController.Instance.Init();
     }
-    
+
 
     // public void InitTestHero()
     // {
@@ -144,7 +149,7 @@ public class PlayerManager : Singleton<PlayerManager>
     public void SaveHeroData(HeroInfo heroInfo)
     {
         AccountFileInfo.Instance.SaveHeroData(heroInfo);
-        
+
         // if (!QuickSaveHeroData(heroInfo))
         // {
         //     for (int i = 0; i < AccountFileInfo.Instance.playerData.HeroListInLeadDatas.Count; i++)
@@ -161,4 +166,4 @@ public class PlayerManager : Singleton<PlayerManager>
         //     }
         // }
     }
-}
+}

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

@@ -11,17 +11,26 @@ public class GameStart : MonoBehaviour
 
     private GameStartUIPanel _gameStartUIPanel;
 
+    private GameZip _gameZip;
+
     [ContextMenu("asdada")]
     public void Test()
     {
-       
     }
 
     public void Start()
     {
+        PottingMobile.InitializeSdk();
+        PottingMobile.withLogDebug(true);
         ShaderVariantCollection.WarmUp();
         _gameStartUIPanel = GetComponent<GameStartUIPanel>();
+      
+#if UNITY_ANDROID&& !UNITY_EDITOR
+        _gameZip = new GameZip();
+            _gameZip.Start(_gameStartUIPanel, this, StartLoadGame);
+#else
         StartLoadGame();
+#endif
     }
 
     private void StartLoadGame()
@@ -37,4 +46,9 @@ public class GameStart : MonoBehaviour
             iGameStart.StartGame(LoadType, h5Url, _gameStartUIPanel, delegate { gameObject.SetActive(false); });
         }
     }
+
+    private void Update()
+    {
+        FileDownloadSystem.Instance.Update();
+    }
 }

+ 3 - 1
Assets/Scripts/GameStart/GameStartDll.asmdef

@@ -3,7 +3,9 @@
     "rootNamespace": "",
     "references": [
         "DownloadSystem",
-        "HybridCLR.Runtime"
+        "HybridCLR.Runtime",
+        "ThirdParty",
+        "PotingSkd"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 104 - 0
Assets/Scripts/GameStart/GameZip.cs

@@ -0,0 +1,104 @@
+using System.Collections;
+using System.Collections.Generic;
+using System.IO;
+using ThirdParty.DownloadSystem;
+using UnityEngine;
+
+public class GameZip
+{
+    private UnZipThreadPool _unZipThreadPool;
+    private string md5Value;
+    public GameStart GameStart;
+    private System.Action callBack;
+
+    private string streamingPath;
+    private GameStartUIPanel _gameStartUIPanel;
+    public void Start(GameStartUIPanel gameStartUIPanel,GameStart gameStart, System.Action callBack)
+    {
+        this.GameStart = gameStart;
+        this.callBack = callBack;
+        _gameStartUIPanel = gameStartUIPanel;
+        streamingPath = Application.streamingAssetsPath;
+
+#if UNITY_IPHONE
+           streamingPath = "file://"+streamingPath;
+#endif
+        LoadMd5();
+    }
+
+    private void LoadMd5()
+    {
+        string md5 = UnityEngine.PlayerPrefs.GetString("assetMD5", "");
+        Debug.Log(" Application.version" + Application.version);
+        if (!md5.Equals(Application.version)) //需要解压文件
+        {
+            Debug.Log(Application.persistentDataPath);
+            GameStart.StartCoroutine(DowFile());
+        }
+        else
+        {
+            Finish();
+        }
+    }
+
+    private IEnumerator DowFile()
+    {
+        _gameStartUIPanel.SetMassge("转移文件");
+        string url = streamingPath + "/assetBundle.zip";
+        string dowFinle = Application.persistentDataPath + "/assetBundle.zip";
+        AddLoad("转移解压文件");
+        DownloadFileData downloadFileData = new DownloadFileData();
+        downloadFileData.remoteUrl = url;
+        downloadFileData.localPath = dowFinle;
+        DownloadHander downloadHander = FileDownloadSystem.Instance.DownloadFile(downloadFileData);
+
+        while (!downloadHander.isFinish)
+        {
+            yield return new WaitForSeconds(1);
+        }
+
+        if (!File.Exists(dowFinle))
+        {
+            Finish();
+            yield break;
+        }
+
+        string unzipPath = Application.persistentDataPath + "/Bundle";
+
+        _unZipThreadPool = new UnZipThreadPool();
+        AddLoad("开始解压" + unzipPath);
+        _gameStartUIPanel.SetMassge("开始解压,解压过程中不消耗流量");
+        _unZipThreadPool.InitUnZip(dowFinle, unzipPath);
+        SliderData sliderData = new SliderData();
+        sliderData.maxValue = _unZipThreadPool.maxSize;
+        sliderData.CcurrValue = delegate { return sliderData.maxValue - _unZipThreadPool.CurrCount(); };
+        _gameStartUIPanel.SetSlider(sliderData);
+
+        while (!_unZipThreadPool.isEnd)
+        {
+            yield return new WaitForSeconds(1);
+        }
+
+        _gameStartUIPanel.ClearSlider();
+        _gameStartUIPanel.SetMassge("解压完成");
+        AddLoad("解压完成");
+        _unZipThreadPool.Cloas();
+        UnityEngine.PlayerPrefs.SetString("assetMD5", Application.version);
+        Finish();
+    }
+
+    private void Finish()
+    {
+        // LoadDll.StartDllLoad();
+        callBack?.Invoke();
+    }
+
+    private void Update()
+    {
+        FileDownloadSystem.Instance.Update();
+    }
+
+    public void AddLoad(string message)
+    {
+    }
+}

+ 11 - 0
Assets/Scripts/GameStart/GameZip.cs.meta

@@ -0,0 +1,11 @@
+fileFormatVersion: 2
+guid: XnwWsyipVyhx6b0/LoR0e+VtbYQS1WeuL8uTVbL1rPrV+iVnQoOpYvE=
+MonoImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  defaultReferences: []
+  executionOrder: 0
+  icon: {instanceID: 0}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 2 - 1
Assets/Scripts/GameUI/Fort23.Mono.asmdef

@@ -13,7 +13,8 @@
         "GUID:a53833a977d49cb4993f5eabd5a75200",
         "GUID:5efd170ecd8084500bed5692932fe14e",
         "GUID:4c25c05f410a3a447a75c3b0909152ef",
-        "GUID:c03a7518d60db354c9d04ea9d1517aa1"
+        "GUID:c03a7518d60db354c9d04ea9d1517aa1",
+        "GUID:097df4f93bd329c408144db3d97c0d92"
     ],
     "includePlatforms": [],
     "excludePlatforms": [],

+ 9 - 6
Assets/Scripts/GameUI/SDK/YouLoftSDK.cs

@@ -9,8 +9,7 @@ public class PottingMobileSDK : Singleton<PottingMobileSDK>
     public void Init()
     {
 #if UNITY_ANDROID|| UNITY_IOS
-        PottingMobile.InitializeSdk();
-        PottingMobile.withLogDebug(true);
+
         PottingMobileManger.Instance.MOnRewardedVideoLoadedEvent += MOnRewardedVideoLoadedEvent;
         PottingMobileManger.Instance.MOnRewardedVideoFailedEvent += MOnRewardedVideoFailedEvent;
         PottingMobileManger.Instance.MOnRewardedVideoShownEvent += MOnRewardedVideoShownEvent;
@@ -20,6 +19,10 @@ public class PottingMobileSDK : Singleton<PottingMobileSDK>
     }
 
 
+    public void SendGameInfo(Dictionary<string, string> gameInfo)
+    {
+       
+    }
 
     public void ShowRewardedVideo()
     {
@@ -30,12 +33,12 @@ public class PottingMobileSDK : Singleton<PottingMobileSDK>
         }
 #endif
     }
-    
-    
+
+
     private void MOnRewardedVideoClosedEvent(string obj)
     {
         //广告关闭
-         Debug.Log($"OnRewardedVideoReceivedRewardEvent({obj})");
+        Debug.Log($"OnRewardedVideoReceivedRewardEvent({obj})");
     }
 
     private void MOnRewardedVideoReceivedRewardEvent(string arg1, string arg2, float arg3)
@@ -62,4 +65,4 @@ public class PottingMobileSDK : Singleton<PottingMobileSDK>
         //广告加载成功
         Debug.Log($"OnRewardedVideoLoadedEvent({obj})");
     }
-}
+}

+ 36 - 9
Assets/Scripts/GameUI/UI/BoxPanel/BoxPanel.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using Core.Utility;
 using Excel2Json;
 using Fort23.UTool;
 using GameLogic.Bag;
@@ -39,30 +40,56 @@ namespace Fort23.Mono
 
         private void OnButtonCallBack()
         {
+            ItemInfo itemInfo=   BagController.Instance.GetItemInfo(GlobalParam.Item_Coin_ID);
+            if (itemInfo.count < 500)
+            {
+                return;
+            }
+
             List<ItemInfo> allIitem = DropManager.Instance.DropItem(openBoxConfig.reward);
             BagController.Instance.AddItem(allIitem);
-
-            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(delegate(RewardsPanel panel)
+            if (allIitem.Count > 0)
             {
-                panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
-            }, layer: UILayer.Top);
+                Dictionary<string, string> lable = new Dictionary<string, string>();
+                lable.Add("one", allIitem[0].itemID.ToString());
+                PottingMobile._CustomEvent("oneBox", lable);
+            }
+            BagController.Instance.DeductCoin(500);
+            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
+                delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
+                layer: UILayer.Top);
         }
 
         private void TenButtonCallBack()
         {
+            ItemInfo itemInfo=   BagController.Instance.GetItemInfo(GlobalParam.Item_Coin_ID);
+            if (itemInfo.count < 4500)
+            {
+                return;
+            }
             List<ItemInfo> allIitem = new List<ItemInfo>();
+            string message = "";
             for (int i = 0; i < 10; i++)
             {
                 List<ItemInfo> currItem = DropManager.Instance.DropItem(openBoxConfig.reward);
+                for (int j = 0; j < currItem.Count; j++)
+                {
+                    message += "_" + currItem[j].itemID.ToString();
+                }
                 allIitem.AddRange(currItem);
             }
+            if (allIitem.Count > 0)
+            {
+                Dictionary<string, string> lable = new Dictionary<string, string>();
+                lable.Add("tenBox", message);
+                PottingMobile._CustomEvent("oneBox", lable);
+            }
 
             BagController.Instance.AddItem(allIitem);
-            
-            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(delegate(RewardsPanel panel)
-            {
-                panel.InitRewardsPanel(allIitem, CloseButtonCallBack);
-            }, layer: UILayer.Top);
+            BagController.Instance.DeductCoin(4500);
+            UIManager.Instance.LoadAndOpenPanel<RewardsPanel>(
+                delegate(RewardsPanel panel) { panel.InitRewardsPanel(allIitem, CloseButtonCallBack); },
+                layer: UILayer.Top);
         }
 
         private void CloseButtonCallBack()

+ 2 - 3
Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs

@@ -62,11 +62,10 @@ namespace Fort23.Mono
                 clickTime.text = time.ToString();
                 if (time <= 0)
                 {
+                    TimerComponent.Instance.Remove(_timerEntity);
+                    _timerEntity = null;
                     Button_ok_onClick();
                 }
-
-                TimerComponent.Instance.Remove(_timerEntity);
-                _timerEntity = null;
             });
         }
     }

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

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

+ 1 - 0
Assets/Settings/rpAsset_Renderer.asset

@@ -19,6 +19,7 @@ MonoBehaviour:
   m_RendererFeatureMap: 
   m_UseNativeRenderPass: 0
   postProcessData: {fileID: 11400000, guid: 41439944d30ece34e96484bdb6645b55, type: 2}
+  xrSystemData: {fileID: 11400000, guid: 60e1133243b97e347b653163a8c01b64, type: 2}
   shaders:
     blitPS: {fileID: 4800000, guid: c17132b1f77d20942aa75f8429c0f8bc, type: 3}
     copyDepthPS: {fileID: 4800000, guid: d6dae50ee9e1bfa4db75f19f99355220, type: 3}

+ 0 - 8
Assets/StreamingAssets/Bundle.meta

@@ -1,8 +0,0 @@
-fileFormatVersion: 2
-guid: Bi9OvCioBnt+FyAt4Ei4ufnpLwUFBG3247ActRJ2LBmPs/qpj26LqGU=
-folderAsset: yes
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01_np_huanrao_950330ca7d2b2f97a1cfc040ce3c38fc


+ 0 - 7
Assets/StreamingAssets/Bundle/01_np_huanrao_950330ca7d2b2f97a1cfc040ce3c38fc.meta

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

BIN
Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64


BIN
Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77.meta

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

BIN
Assets/StreamingAssets/Bundle/01np_dg3_ad81a93067643f49c016e2f84ee7ca42


BIN
Assets/StreamingAssets/Bundle/01np_dg_anse_ice2_a397f6b4606fed5e019c6e588bbc57c1


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg_anse_ice2_a397f6b4606fed5e019c6e588bbc57c1.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS9OvS+kUXJ5ZPCr+ONr2u6/d0jE+282I7qg3fM2Kesn2h4G0LqEPKY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg_chu_add_ice_a36e2f1a09a03d2c4126c94e7652a46c


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg_chu_add_ice_a36e2f1a09a03d2c4126c94e7652a46c.meta

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

BIN
Assets/StreamingAssets/Bundle/01np_dg_chu_anse_end_88a19a5e2d9581169469e6ca89033eda


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg_chu_anse_end_88a19a5e2d9581169469e6ca89033eda.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: B34cti/4AHxRt86zawJvgiP9exA1XlpbOpiEOUWVTuiVYmMU/RAAsTU=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_dg_chu_mid_a6e7b9d45c5041936823148e343c2a74


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_dg_chu_mid_a6e7b9d45c5041936823148e343c2a74.meta

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

BIN
Assets/StreamingAssets/Bundle/01np_sk3_dg_anse_7677b5eab6321798b3f13d0f63c0b112


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_anse_7677b5eab6321798b3f13d0f63c0b112.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DnsXtiv8WyhpMMxHPKi/hSkTxD4WK+60sbXmg8Z7Z2nqUyUhDZv0fp4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_1_d40a1970015cbf631237100bfc96c2c7


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_1_d40a1970015cbf631237100bfc96c2c7.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CCgcvCmkV3xTlfe/jmle18bnIVrx3X790jb+8IXlIdKRRd5HFakYKYE=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_2_ef4c68aac7a621aaeba1b5e8edc62b50


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_2_ef4c68aac7a621aaeba1b5e8edc62b50.meta

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

BIN
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XChOsCL/An5/JH90PivXP9EElIAZO+fozGMTZtBBqUTDlYFgQIiOtzo=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_sk3_dg_zd_d3dd6a70bb95d99d2045f98a1c574f5f


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_sk3_dg_zd_d3dd6a70bb95d99d2045f98a1c574f5f.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CntL5Cj7Un4J/tefVp2p/nfsEaWKvG30o4Td85fLwZqxfdYSkQIwW+4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/01np_xuehua_8e9c613edf1cb889a923f38d6aeeada9


+ 0 - 7
Assets/StreamingAssets/Bundle/01np_xuehua_8e9c613edf1cb889a923f38d6aeeada9.meta

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

BIN
Assets/StreamingAssets/Bundle/09flowmap_smoke_32b99ce1ca4733990e8e560bd471ee00


+ 0 - 7
Assets/StreamingAssets/Bundle/09flowmap_smoke_32b99ce1ca4733990e8e560bd471ee00.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DX9OvX6rUn87e637V2zNH38ZATS1hxG/mSE7L0lHOsilX/30iUpaUns=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7


+ 0 - 7
Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7.meta

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

BIN
Assets/StreamingAssets/Bundle/501_huanrao_qi_4dc11bbf3cb2dfdb21bcddb43204699d


+ 0 - 7
Assets/StreamingAssets/Bundle/501_huanrao_qi_4dc11bbf3cb2dfdb21bcddb43204699d.meta

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

BIN
Assets/StreamingAssets/Bundle/603_ice_suikuai_4ccd42824ff759403fa6a22b88e757f5


+ 0 - 7
Assets/StreamingAssets/Bundle/603_ice_suikuai_4ccd42824ff759403fa6a22b88e757f5.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Wika43mvUHyREXzIGROuYno3oDHA4xQ/5YNd+adGr2lfQ943Db08mTY=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69


+ 0 - 7
Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69.meta

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Assets/StreamingAssets/Bundle/MD5.txt


+ 0 - 7
Assets/StreamingAssets/Bundle/MD5.txt.meta

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

BIN
Assets/StreamingAssets/Bundle/UnityBundle.unity3d


+ 0 - 7
Assets/StreamingAssets/Bundle/UnityBundle.unity3d.meta

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

BIN
Assets/StreamingAssets/Bundle/add01_731b813b73c3c7ece6cd5951f0bf6dae


+ 0 - 7
Assets/StreamingAssets/Bundle/add01_731b813b73c3c7ece6cd5951f0bf6dae.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CX8a4yOvVy0DYQbi6yJ08K/Wj399HkxfRieQAUZfHLYInod+EYaQ+Yg=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/add05dot_72657cadd37041932dd81e1e3ad79bb1


+ 0 - 7
Assets/StreamingAssets/Bundle/add05dot_72657cadd37041932dd81e1e3ad79bb1.meta

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

BIN
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb


+ 0 - 7
Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb.meta

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

BIN
Assets/StreamingAssets/Bundle/afx_ramp_hong_474c99f16bde1c577aa4747d3ce9ed1f


+ 0 - 7
Assets/StreamingAssets/Bundle/afx_ramp_hong_474c99f16bde1c577aa4747d3ce9ed1f.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DStKsC//AX7AFgyBmzd3BlGu8ec5/WdkcUKnYdnz/YD6e1ZMA1hva18=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/albedo_t1_da6bad6106d0eaf209f083590fa8614e


+ 0 - 7
Assets/StreamingAssets/Bundle/albedo_t1_da6bad6106d0eaf209f083590fa8614e.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: C3xJ53//VXytDDwAbyv8bqWj/Xr+1NR9DydOARrGZNDNcnxTkdgKHB4=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/all_a64b3c0556608471848a3c1eab9ccb1f


+ 0 - 7
Assets/StreamingAssets/Bundle/all_a64b3c0556608471848a3c1eab9ccb1f.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CygavH78AXu+Leh/TQpneGrU5RuWE++ymZR+mFQLYhDzZe5bcXB+ybw=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a


+ 0 - 7
Assets/StreamingAssets/Bundle/alpha_bd3_c38d602bd0598cfec0a38962f631665a.meta

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

BIN
Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb


+ 0 - 7
Assets/StreamingAssets/Bundle/ancient_pillar_01_b544f258f24ded7317a938a22a5a5dfb.meta

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

BIN
Assets/StreamingAssets/Bundle/anse04_0cddc9140263d5afbf6a1f9c5aeb49d6


+ 0 - 7
Assets/StreamingAssets/Bundle/anse04_0cddc9140263d5afbf6a1f9c5aeb49d6.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Dn5KtHz+WnIR1ct2GndnD1Mk+vgw7WUo8NeISDeHRR6KtA+G5OtSUIk=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e


+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_01_02d9adee8f3dc6dfd7c696a965f7911e.meta

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

BIN
Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278


+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_02_bac7d4b06a120dc570ccc540c27a9278.meta

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

BIN
Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc


+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_debris_01_d3dc7c4fdd170f727e29e65e33f801fc.meta

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

BIN
Assets/StreamingAssets/Bundle/arch_gate_debris_02_5c65b12a0d3a26d531d42e398d657fb0


+ 0 - 7
Assets/StreamingAssets/Bundle/arch_gate_debris_02_5c65b12a0d3a26d531d42e398d657fb0.meta

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

Разница между файлами не показана из-за своего большого размера
+ 0 - 0
Assets/StreamingAssets/Bundle/assetConfig.txt


+ 0 - 7
Assets/StreamingAssets/Bundle/assetConfig.txt.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: CS8cs3+uUS2ri/Frc2kbkiW5uzIdhaOiRA/+5YNDgDMjhPEZT9Eq8kM=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/baodian03_e39e426a6d652463e471fe0a6eb8cbe1


+ 0 - 7
Assets/StreamingAssets/Bundle/baodian03_e39e426a6d652463e471fe0a6eb8cbe1.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: Xn0asi+rUikDFRNSwQw6vOfZNKxYENxUCu+8nfQB/5vMA2OEaKu9HDc=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

BIN
Assets/StreamingAssets/Bundle/battleground_01_a3c788713c01a212a121b659be484d45


Некоторые файлы не были показаны из-за большого количества измененных файлов