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

Assets/Art/UIAssets/bg/bg_Chest05.png.meta

@@ -42,7 +42,7 @@ TextureImporter:
     mipBias: 0
     wrapU: 1
     wrapV: 1
-    wrapW: 1
+    wrapW: 0
   nPOTScale: 0
   lightmap: 0
   compressionQuality: 50
@@ -143,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: bg_chest05
   assetBundleVariant: 

Assets/Art/UIAssets/bg/dec_topber_bg_top.png.meta

@@ -143,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: dec_topber_bg_top
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_gw_chuxian_smoke_gw03_big.prefab.meta

@@ -3,5 +3,5 @@ guid: DnpK4Xn4W3/qWD3LcaTcoRN8L7Fc7L1MFRp4cNtGvHUZAklc2Y8To3E=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_gw_chuxian_smoke_gw03_big
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_shouDong.prefab.meta

@@ -3,5 +3,5 @@ guid: CC5NvCmoB3ionfYxyy+fajYWpOsBICI75gboH34BPeIH8JEpBh4STXg=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shoudong
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi.prefab.meta

@@ -3,5 +3,5 @@ guid: Cn1KvSP7VHvL2vC8D+hUTODXewcp/a5p9WuFuSMyS1gREDRzKbRrmvk=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_skill_yunshi
   assetBundleVariant: 

Assets/Art/VFX/FXPrefabs/fx_skill_yunshi_hit.prefab.meta

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

Assets/Art/VFX/Materials/fx_dian1.mat.meta

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

Assets/Art/VFX/Materials/fx_shikuai1.mat.meta

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

Assets/Art/VFX/Materials/fx_shikuai1_ad.mat.meta

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

Assets/Art/VFX/Materials/fx_shikuai1_al.mat.meta

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

Assets/Art/VFX/Textures/Sheet/fx_explosion_sharp_flat_3x3.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_explosion_sharp_flat_3x3
   assetBundleVariant: 

Assets/Art/VFX/Textures/Trails/lz_Trail08.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: lz_trail08
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_dilie1.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_dilie1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai1.png.meta

@@ -157,5 +157,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: fx_gw05_jc
+  assetBundleName: fx_shikuai1
   assetBundleVariant: 

Assets/Art/VFX/Textures/fx_shikuai2.png.meta

@@ -112,6 +112,20 @@ TextureImporter:
     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
   spriteSheet:
     serializedVersion: 2
     sprites: []
@@ -129,5 +143,5 @@ TextureImporter:
   mipmapLimitGroupName: 
   pSDRemoveMatte: 0
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_shikuai2
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta

@@ -1,11 +1,7 @@
 fileFormatVersion: 2
-<<<<<<<< HEAD:Assets/Art/ArtHero/General.prefab.meta
 guid: XS5LtCKlBi6NiJbPoGnOCyeV8ULq5zWkiaN/K2CJGgI5RmbXdb8dQGs=
-========
-guid: DnkX5yirUXlj0kz6v8UOe148Nok5dfz8Aot+8cmXcFhJS9CnbufBRQI=
->>>>>>>> 5954d4ef30ea76e9037f4c7f4a5c53208a432430:Assets/Art/VFX/UIFXprefab/fx_ui_click.prefab.meta
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_click
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_coin.prefab.meta

@@ -3,5 +3,5 @@ guid: CisWti2tB3/yj2Fk9FI8yw0zR59G/ZdWpD/cE/Pj1wiND0StpDxE3YU=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_coin
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_exp.prefab.meta

@@ -3,5 +3,5 @@ guid: CCwa5CP+Wiql8NvIB6k+7J1GGtqN80RWi5GzxcecgNbOz5vgIkqz/E4=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_exp
   assetBundleVariant: 

Assets/Art/VFX/UIFXprefab/fx_ui_star.prefab.meta

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

Assets/Art/VFX/UIFXprefab/fx_ui_upgrade.prefab.meta

@@ -3,5 +3,5 @@ guid: CH5MtX6oVn0XTyr8nc8F0xX+rUlk+5IiY1JjIuYPTFx3YsuAJ40W6hw=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: fx_ui_upgrade
   assetBundleVariant: 

Assets/Plugins/Android/AndroidManifest.xml

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

Assets/Plugins/Android/AndroidManifest.xml.meta

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

Assets/Plugins/Android/LauncherManifest.xml

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

Assets/Plugins/Android/LauncherManifest.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: ded72b1f39e6c4b0da38d9b513d5b59f
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/Plugins/Android/baseProjectTemplate.gradle

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

Assets/Plugins/Android/baseProjectTemplate.gradle.meta

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

Assets/Plugins/Android/build.gradle

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

Assets/Plugins/Android/build.gradle.meta

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

Assets/Plugins/Android/gradleTemplate.properties

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

Assets/Plugins/Android/gradleTemplate.properties.meta

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

Assets/Plugins/Android/launcherTemplate.gradle

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

Assets/Plugins/Android/launcherTemplate.gradle.meta

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

Assets/Plugins/Android/mainTemplate.gradle

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

Assets/Plugins/Android/settingsTemplate.gradle

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

Assets/Plugins/Android/settingsTemplate.gradle.meta

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

Assets/PottingMobileSDK/Resources/AdManagerSettings.asset

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

Assets/PottingMobileSDK/google-services.json

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

Assets/PottingMobileSDK/google-services.json.meta

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

Assets/Res/Aduio/UI/jingbi.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: jingbi
   assetBundleVariant: 

Assets/Res/Aduio/UI/openui.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: openui
   assetBundleVariant: 

Assets/Res/Aduio/UI/shibai.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: shibai
   assetBundleVariant: 

Assets/Res/Aduio/UI/zhuangbei.wav.meta

@@ -19,5 +19,5 @@ AudioImporter:
   ambisonic: 0
   3D: 1
   userData: 
-  assetBundleName: 
+  assetBundleName: zhuangbei
   assetBundleVariant: 

Assets/Res/Config/OpenBoxConfig.json.meta

@@ -3,5 +3,5 @@ guid: CShNs3z+Vn8HpxMS7vKOYWPAffLFKFBhBGbvRuH4fvyEh9as+tWNckA=
 TextScriptImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: openboxconfig
   assetBundleVariant: 

Assets/Res/Font/wryh.ttf.meta

@@ -9,8 +9,9 @@ TrueTypeFontImporter:
   characterPadding: 1
   includeFontData: 1
   fontNames:
-  - Arial
-  fallbackFontReferences: []
+  - BigYoungBoldGB2.0
+  fallbackFontReferences:
+  - {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
   customCharacters: 
   fontRenderingMode: 0
   ascentCalculationMode: 1

Assets/Res/TimeLineAssets/General_TD.txt.meta

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

Assets/Res/UI/BoxPanel.prefab

@@ -151,7 +151,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.05490196, g: 0.49803922, b: 0.9490196, a: 1}
+  m_Color: {r: 0.176, g: 0.584386, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -238,7 +238,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 35
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 9
     m_MaxSize: 43
@@ -340,6 +340,135 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
+--- !u!1 &1901584059914874739
+GameObject:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  serializedVersion: 7
+  m_Component:
+  - component: {fileID: 671376058743289274}
+  - component: {fileID: 6970032159206589122}
+  - component: {fileID: 7708093179394439336}
+  - component: {fileID: 8745496088663452512}
+  m_Layer: 5
+  m_HasEditorInfo: 1
+  m_Name: close_x
+  m_TagString: Untagged
+  m_Icon: {fileID: 0}
+  m_NavMeshLayer: 0
+  m_StaticEditorFlags: 0
+  m_IsActive: 1
+--- !u!224 &671376058743289274
+RectTransform:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1901584059914874739}
+  m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+  m_LocalPosition: {x: 0, y: 0, z: 0}
+  m_LocalScale: {x: 1, y: 1, z: 1}
+  m_ConstrainProportionsScale: 0
+  m_Children: []
+  m_Father: {fileID: 5225214374428017297}
+  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
+  m_AnchorMin: {x: 0.5, y: 0.5}
+  m_AnchorMax: {x: 0.5, y: 0.5}
+  m_AnchoredPosition: {x: 0, y: 0}
+  m_SizeDelta: {x: 55, y: 55}
+  m_Pivot: {x: 0.5, y: 0.5}
+--- !u!222 &6970032159206589122
+CanvasRenderer:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1901584059914874739}
+  m_CullTransparentMesh: 1
+--- !u!114 &7708093179394439336
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1901584059914874739}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 4e29b1a8efbd4b44bb3f3716e73f07ff, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Navigation:
+    m_Mode: 3
+    m_WrapAround: 0
+    m_SelectOnUp: {fileID: 0}
+    m_SelectOnDown: {fileID: 0}
+    m_SelectOnLeft: {fileID: 0}
+    m_SelectOnRight: {fileID: 0}
+  m_Transition: 1
+  m_Colors:
+    m_NormalColor: {r: 1, g: 1, b: 1, a: 1}
+    m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1}
+    m_SelectedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1}
+    m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608}
+    m_ColorMultiplier: 1
+    m_FadeDuration: 0.1
+  m_SpriteState:
+    m_HighlightedSprite: {fileID: 0}
+    m_PressedSprite: {fileID: 0}
+    m_SelectedSprite: {fileID: 0}
+    m_DisabledSprite: {fileID: 0}
+  m_AnimationTriggers:
+    m_NormalTrigger: Normal
+    m_HighlightedTrigger: Highlighted
+    m_PressedTrigger: Pressed
+    m_SelectedTrigger: Selected
+    m_DisabledTrigger: Disabled
+  m_Interactable: 1
+  m_TargetGraphic: {fileID: 8745496088663452512}
+  m_OnClick:
+    m_PersistentCalls:
+      m_Calls: []
+--- !u!114 &8745496088663452512
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 1901584059914874739}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: 3c247620ca3a1fd4ab2a2f3a5b287e07, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_Material: {fileID: 0}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
+  m_RaycastTarget: 1
+  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
+  m_Maskable: 1
+  m_OnCullStateChanged:
+    m_PersistentCalls:
+      m_Calls: []
+  m_Sprite: {fileID: 0}
+  m_Type: 0
+  m_PreserveAspect: 0
+  m_FillCenter: 1
+  m_FillMethod: 4
+  m_FillAmount: 1
+  m_FillClockwise: 1
+  m_FillOrigin: 0
+  m_UseSpriteMesh: 0
+  m_PixelsPerUnitMultiplier: 1
+  _icon_name: dec_Close02
+  isNotLoadDeftIcon: 0
+  CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
+  packInfo:
+    packName: all
+    packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
+    packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
+    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
 --- !u!1 &2458509628799875232
 GameObject:
   m_ObjectHideFlags: 0
@@ -376,7 +505,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -63, y: 75}
-  m_SizeDelta: {x: 40, y: 45}
+  m_SizeDelta: {x: 42, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &1939410472599022345
 CanvasRenderer:
@@ -436,6 +565,7 @@ GameObject:
   - component: {fileID: 3853264504965204706}
   - component: {fileID: 1395504526245340398}
   - component: {fileID: 7498556988576361376}
+  - component: {fileID: 4062822801457872003}
   m_Layer: 5
   m_HasEditorInfo: 1
   m_Name: Text (Legacy)
@@ -460,7 +590,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -1.6, y: 299.5}
+  m_AnchoredPosition: {x: 0, y: 299.5}
   m_SizeDelta: {x: 595.7, y: 84.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3853264504965204706
@@ -494,7 +624,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 12800000, guid: a61334e31cf014203a72ff5de1c54c27, type: 3}
     m_FontSize: 46
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 0
     m_MaxSize: 46
@@ -517,8 +647,23 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0.1509434, g: 0.1273358, b: 0.08757565, a: 0.5}
-  m_EffectDistance: {x: 1, y: -1}
+  m_EffectColor: {r: 0.131, g: 0.11031579, b: 0.075842105, a: 0.67058825}
+  m_EffectDistance: {x: 1.5, y: -1.5}
+  m_UseGraphicAlpha: 1
+--- !u!114 &4062822801457872003
+MonoBehaviour:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_GameObject: {fileID: 2480383054228350462}
+  m_Enabled: 1
+  m_EditorHideFlags: 0
+  m_Script: {fileID: 11500000, guid: cfabb0440166ab443bba8876756fdfa9, type: 3}
+  m_Name: 
+  m_EditorClassIdentifier: 
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectDistance: {x: 3.03, y: -2.77}
   m_UseGraphicAlpha: 1
 --- !u!1 &2972985852202581853
 GameObject:
@@ -556,7 +701,7 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: -13, y: -29.6}
+  m_AnchoredPosition: {x: -13, y: -54}
   m_SizeDelta: {x: 558.9, y: 178.5}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &8313633874709827031
@@ -588,11 +733,11 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
-    m_FontSize: 22
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
+    m_FontSize: 20
     m_FontStyle: 0
     m_BestFit: 0
-    m_MinSize: 2
+    m_MinSize: 1
     m_MaxSize: 43
     m_Alignment: 0
     m_AlignByGeometry: 0
@@ -600,7 +745,7 @@ MonoBehaviour:
     m_HorizontalOverflow: 0
     m_VerticalOverflow: 0
     m_LineSpacing: 1
-  m_Text: "\u6D88\u8017\u5BF9\u5E94\u7684\u91D1\u5E01\u5F00\u542F\u5B9D\u7BB1\uFF0C\u83B7\u5F97\u6765\u81EA\u5927\u81EA\u7136\u7684\u6069\u60E0\uFF0C\u6709\u6982\u7387\u80FD\u83B7\u5F97\u4E00\u4E0B\u7269\u54C1\uFF08\u82F1\u96C4\u8FDB\u9636\u6750\u6599\u3001
+  m_Text: "\u6D88\u8017\u5BF9\u5E94\u7684\u91D1\u5E01\u5F00\u542F\u5B9D\u7BB1\uFF0C\u83B7\u5F97\u5927\u81EA\u7136\u7684\u6069\u60E0\uFF0C\u6709\u6982\u7387\u80FD\u83B7\u5F97\u4EE5\u4E0B\u7269\u54C1\uFF08\u82F1\u96C4\u8FDB\u9636\u6750\u6599\u3001
     \u5404\u79CD\u54C1\u8D28\u7684\u6B66\u5668\uFF09"
 --- !u!114 &3505250749968322634
 MonoBehaviour:
@@ -685,9 +830,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 9
     m_MaxSize: 43
@@ -710,7 +855,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
 --- !u!1 &4923044900321880700
@@ -783,7 +928,7 @@ MonoBehaviour:
   m_FontData:
     m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
     m_FontSize: 35
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 9
     m_MaxSize: 43
@@ -876,7 +1021,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0
@@ -957,9 +1102,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
-    m_FontStyle: 0
+    m_FontStyle: 1
     m_BestFit: 0
     m_MinSize: 9
     m_MaxSize: 43
@@ -982,7 +1127,7 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: e19747de3f5aca642ab2be37e372fb86, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  m_EffectColor: {r: 0, g: 0, b: 0, a: 0.5}
+  m_EffectColor: {r: 0, g: 0, b: 0, a: 1}
   m_EffectDistance: {x: 1, y: -1}
   m_UseGraphicAlpha: 1
 --- !u!1 &5948516582202927321
@@ -1100,13 +1245,14 @@ RectTransform:
   m_LocalPosition: {x: 0, y: 0, z: 0}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
-  m_Children: []
+  m_Children:
+  - {fileID: 671376058743289274}
   m_Father: {fileID: 7858018693182147813}
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
-  m_AnchoredPosition: {x: 325, y: 346}
-  m_SizeDelta: {x: 75, y: 75}
+  m_AnchoredPosition: {x: 309, y: 354}
+  m_SizeDelta: {x: 94, y: 96}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &5426885997382038609
 CanvasRenderer:
@@ -1173,7 +1319,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 0, b: 0, a: 1}
+  m_Color: {r: 1, g: 1, b: 1, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1190,14 +1336,14 @@ MonoBehaviour:
   m_FillOrigin: 0
   m_UseSpriteMesh: 0
   m_PixelsPerUnitMultiplier: 1
-  _icon_name: dec_Close02
+  _icon_name: btn_Round06_Red
   isNotLoadDeftIcon: 0
   CurrSpriteAtlas: {fileID: 100100200, guid: 7b02f32fa59cd4e3085208946b112537, type: 3}
   packInfo:
     packName: all
     packgJsonPath: /Art/UIAssets/TextrueJson/all.txt
     packgSpritePath: Assets/Res/UIAtlas/all.spriteatlasv2
-    lasetJsonGUID: fdc09952e21a713f23682168cce500b3
+    lasetJsonGUID: e8ac4a11df23a3327a9a6fed106efb0a
 --- !u!1 &6989034640253556327
 GameObject:
   m_ObjectHideFlags: 0
@@ -1258,7 +1404,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0, g: 0, b: 0, a: 0.5254902}
+  m_Color: {r: 0, g: 0, b: 0, a: 0.44705883}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1618,8 +1764,8 @@ RectTransform:
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: 0.36999512, y: -24.000015}
-  m_SizeDelta: {x: 0.74000645, y: 48}
+  m_AnchoredPosition: {x: -0.08996582, y: -24.000015}
+  m_SizeDelta: {x: -0.18009682, y: 48}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &7902734765833693517
 CanvasRenderer:
@@ -1642,7 +1788,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.14117648, g: 0.63529414, b: 0.9647059, a: 1}
+  m_Color: {r: 0.19197647, g: 0.655614, b: 0.9647059, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -1695,7 +1841,7 @@ RectTransform:
   m_AnchorMin: {x: 0.5, y: 0.5}
   m_AnchorMax: {x: 0.5, y: 0.5}
   m_AnchoredPosition: {x: -63, y: 75}
-  m_SizeDelta: {x: 40, y: 45}
+  m_SizeDelta: {x: 42, y: 45}
   m_Pivot: {x: 0.5, y: 0.5}
 --- !u!222 &3940946052060343082
 CanvasRenderer:

Assets/Res/UI/BoxPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Cnoa4yj7B3mzjUPg5EJqojQZGrzhV+VUc1ZadxKxrGZz/tzW7YD1kNQ=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: boxpanel
   assetBundleVariant: 

Assets/Res/UI/CombatHeroDiePanel.prefab

@@ -466,7 +466,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 28
     m_FontStyle: 0
     m_BestFit: 0
@@ -548,7 +548,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 63
     m_FontStyle: 1
     m_BestFit: 0
@@ -863,9 +863,9 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 35
-    m_FontStyle: 1
+    m_FontStyle: 0
     m_BestFit: 0
     m_MinSize: 2
     m_MaxSize: 55

Assets/Res/UI/CombatHeroDiePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: BnsXvH+lBi/eCcyuhrkqmZUhzkluiobzvPZIeKFxz7hONDQCa/ONZ8Q=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: combatherodiepanel
   assetBundleVariant: 

Assets/Res/UI/EqRecyclePanel.prefab.meta

@@ -3,5 +3,5 @@ guid: WX4Wtyn8V31WBe37O5/bUzojw/3NppVriSaUOfUv0H7g4yacCt8G0o0=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: eqrecyclepanel
   assetBundleVariant: 

Assets/Res/UI/ItemPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: B3lJt3ypU3PViYXshGzrEJCLHc0jxZNzbY1YmePeKrw0Xe3ied+P68w=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: itempanel
   assetBundleVariant: 

Assets/Res/UI/MainUIPanel.prefab

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

Assets/Res/UI/RewardsPanel.prefab.meta

@@ -3,5 +3,5 @@ guid: Dnkcty/8BXJf2gohrhgRljXW95MNP9EZrpSpI8nCOUWhYIpX062ebWo=
 PrefabImporter:
   externalObjects: {}
   userData: 
-  assetBundleName: 
+  assetBundleName: rewardspanel
   assetBundleVariant: 

Assets/Res/UI/TipMessagePanel.prefab

@@ -384,7 +384,7 @@ MonoBehaviour:
     m_PersistentCalls:
       m_Calls: []
   m_FontData:
-    m_Font: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
+    m_Font: {fileID: 12800000, guid: bb5b55cc5861a4951990bcc1caccc50e, type: 3}
     m_FontSize: 18
     m_FontStyle: 0
     m_BestFit: 0

Assets/Res/UI/TipMessagePanel.prefab.meta

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

Assets/Res/UIAnimRes/TweenAssetInfoButton_huiQiu.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfobutton_huiqiu
   assetBundleVariant: 

Assets/Res/UIAnimRes/TweenAssetInfoTop.asset.meta

@@ -4,5 +4,5 @@ NativeFormatImporter:
   externalObjects: {}
   mainObjectFileID: 11400000
   userData: 
-  assetBundleName: 
+  assetBundleName: tweenassetinfotop
   assetBundleVariant: 

Assets/Res/UIAtlas/bg.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: bg
   assetBundleVariant: 

Assets/Res/UIAtlas/box.spriteatlasv2.meta

@@ -27,5 +27,5 @@ SpriteAtlasImporter:
   variantMultiplier: 1
   bindAsDefault: 1
   userData: 
-  assetBundleName: moban
+  assetBundleName: box
   assetBundleVariant: 

Assets/Scenes/testCombat.scene

@@ -1201,67 +1201,6 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!1001 &5342889083889272969
-PrefabInstance:
-  m_ObjectHideFlags: 0
-  serializedVersion: 2
-  m_Modification:
-    serializedVersion: 3
-    m_TransformParent: {fileID: 0}
-    m_Modifications:
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_Name
-      value: fx_shouDong
-      objectReference: {fileID: 0}
-    - target: {fileID: 3357280071999411125, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_IsActive
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.x
-      value: -4.3
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.y
-      value: -21.1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalPosition.z
-      value: 1.48
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.w
-      value: 1
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalRotation.z
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.x
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.y
-      value: 0
-      objectReference: {fileID: 0}
-    - target: {fileID: 8344817462337826228, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
-      propertyPath: m_LocalEulerAnglesHint.z
-      value: 0
-      objectReference: {fileID: 0}
-    m_RemovedComponents: []
-    m_RemovedGameObjects: []
-    m_AddedGameObjects: []
-    m_AddedComponents: []
-  m_SourcePrefab: {fileID: 100100000, guid: 7db935d3dff91684fbbc2dec04e408b0, type: 3}
 --- !u!1660057539 &9223372036854775807
 SceneRoots:
   m_ObjectHideFlags: 0
@@ -1270,4 +1209,3 @@ SceneRoots:
   - {fileID: 111679908}
   - {fileID: 235899921}
   - {fileID: 123020045}
-  - {fileID: 5342889083889272969}

Assets/Scripts/Core/DownloadFile/WXDownload.cs

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

Assets/Scripts/GameLogic/Combat/CombatType/LevelBattleCombatType.cs

@@ -154,11 +154,14 @@ namespace GameLogic.Combat.CombatType
             HarmReturnInfo newharm = new HarmReturnInfo();
             newharm.harmType = HarmType.SystemKo;
             CombatHeroEntity[] allHero = combatController.CombatHeroController.GetHero(true);
-            List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
-            heroEntities.AddRange(allHero);
-            for (int i = 0; i < heroEntities.Count; i++)
+            if (allHero != null)
             {
-                heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                List<CombatHeroEntity> heroEntities = new List<CombatHeroEntity>();
+                heroEntities.AddRange(allHero);
+                for (int i = 0; i < heroEntities.Count; i++)
+                {
+                    heroEntities[i].CombatAIBasic.ChangeState(CombatHeroStateType.Disappear);
+                }
             }
 
             Debug.Log("英雄死完了，等待全部英雄复活,这个版本等待2秒全体复活");
@@ -216,10 +219,10 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 3,
                 _levelBattleConfig.miniExpAndGold[0]);
             int odds = CombatCalculateTool.Instance.GetOdd(0, 100);
-            if (odds < 20)
+            if (odds < 70)
             {
-                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 1,
-                    1);
+                BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 3,
+                    3);
             }
            
 
@@ -311,7 +314,7 @@ namespace GameLogic.Combat.CombatType
             BagController.Instance.DropHeroExp(combatHeroEntity.combatHeroGameObject.position, 20,
                 _levelBattleConfig.bossExpAndGold);
             BagController.Instance.DropMonsterGold(combatHeroEntity.combatHeroGameObject.position, 30,
-                30);
+                100);
             CombatController.currActiveCombat.CombatHeroController.SetFollowTarget();
             isBossCombat = false;
             LevelBattleConfig levelBattleConfig =

Assets/Scripts/GameLogic/Combat/Skill/S900001.cs

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

Assets/Scripts/GameUI/SDK/YouLoftSDK.cs

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

Assets/Scripts/GameUI/UI/Combat/CombatHeroDiePanel.cs

@@ -9,9 +9,12 @@ namespace Fort23.Mono
     public partial class CombatHeroDiePanel : UIPanel
     {
         private int time;
+        private TimerEntity _timerEntity;
+
         public static async void OpenCombatHeroDiePanel()
         {
-            CombatHeroDiePanel combatHeroDiePanel= await     UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
+            CombatHeroDiePanel combatHeroDiePanel =
+                await UIManager.Instance.LoadAndOpenPanel<CombatHeroDiePanel>(null, layer: UILayer.Top);
             combatHeroDiePanel.ShowCombatHeroDiePanel();
         }
 
@@ -34,10 +37,12 @@ namespace Fort23.Mono
 
         private void Button_ok_onClick()
         {
-            LevelBattleCombatType levelBattleCombatType=    CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
+            LevelBattleCombatType levelBattleCombatType =
+                CombatController.currActiveCombat.CombatTypeBasic as LevelBattleCombatType;
             levelBattleCombatType.Resume();
+            TimerComponent.Instance.Remove(_timerEntity);
+            _timerEntity = null;
             UIManager.Instance.HideUIUIPanel(this);
-            
         }
 
         public void ShowCombatHeroDiePanel()
@@ -46,17 +51,23 @@ namespace Fort23.Mono
             AudioManager.Instance.PlayAudio("shibai.wav");
             time = 30;
             clickTime.text = time.ToString();
-            TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
+            _timerEntity = TimerComponent.Instance.AddTimer(1000, delegate { }, 10000, delegate
             {
+                if (_timerEntity == null)
+                {
+                    return;
+                }
+
                 time--;
                 clickTime.text = time.ToString();
                 if (time <= 0)
                 {
                     Button_ok_onClick();
                 }
+
+                TimerComponent.Instance.Remove(_timerEntity);
+                _timerEntity = null;
             });
         }
-        
-
     }
 }

Assets/Scripts/GameUI/UI/MainUIPanel.cs

@@ -98,6 +98,27 @@ namespace Fort23.Mono
             Button_battleBoss.onClick.AddListener(OnClickButtonBattleBoss);
             box.onClick.AddListener(OnOpenBox);
             Button_huiQiu.onClick.AddListener(OnClickPlayerSkill);
+            Icon_HeroExp_button.onClick.AddListener(OnClickIcon_HeroExp_button);
+            Icon_Coin_button.onClick.AddListener(OnClickIcon_Coin_button);
+            Icon_Diamon_button.onClick.AddListener(OnClickIcon_Diamon_button);
+        }
+
+        private void OnClickIcon_HeroExp_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("英雄经验，可用于升级英雄等级<color=#ff0000>（每杀死一个小怪能获得经验，击杀boss能获得大量经验）</color>",
+                new Vector2(Icon_HeroExp_button.transform.position.x, Icon_HeroExp_button.transform.position.y - 0.5f));
+        }
+
+        private void OnClickIcon_Coin_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("金币，用于抽取英雄宝箱<color=#ff0000>（每杀死一个小怪有几率获得金币，击杀boss能获得大量金币）</color>",
+                new Vector2(Icon_Coin_button.transform.position.x, Icon_Coin_button.transform.position.y - 0.5f));
+        }
+
+        private void OnClickIcon_Diamon_button()
+        {
+            TipMessagePanel.OpenTipMessagePanel("紫砖（敬请期待）",
+                new Vector2(Icon_Diamon_button.transform.position.x, Icon_Diamon_button.transform.position.y - 0.5f));
         }
 
         private void OnOpenBox()
@@ -120,7 +141,7 @@ namespace Fort23.Mono
         {
             Debug.Log("显示描述");
             RectTransform huoQiu = Button_huiQiu.GetComponent<RectTransform>();
-            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有70%概率获得1枚金币（boss怪必定掉落，金币数量+2）",
+            TipMessagePanel.OpenTipMessagePanel("点击屏幕空白处从天空中召唤一个陨石，对怪物造成1点伤害，并有<color=#ff0000>30%</color>概率获得1枚金币（boss怪<color=#ff0000>40%</color>掉落，金币数量<color=#ff0000>+2</color>）",
                 new Vector2(huoQiu.position.x, huoQiu.position.y + 0.5f));
         }
 

Assets/Scripts/GameUI/UI/MainUIPanelData.cs

@@ -144,6 +144,7 @@ namespace Fort23.Mono
 	     }
 	   }
 	  private TextMeshProUGUI _txtDiamond;
+        
 	  public TextMeshProUGUI txtDiamond
 	   {
 	   get{
@@ -264,6 +265,39 @@ namespace Fort23.Mono
 	      return _Button_huiQiu_tween;
 	     }
 	   }
+	  private Button _Icon_HeroExp_button;
+	  public Button Icon_HeroExp_button
+	   {
+	   get{
+	      if (_Icon_HeroExp_button == null)
+	       {
+	         _Icon_HeroExp_button  = GetUIUnit<Button>("Icon_HeroExp_button"); 
+	       }
+	      return _Icon_HeroExp_button;
+	     }
+	   }
+	  private Button _Icon_Coin_button;
+	  public Button Icon_Coin_button
+	   {
+	   get{
+	      if (_Icon_Coin_button == null)
+	       {
+	         _Icon_Coin_button  = GetUIUnit<Button>("Icon_Coin_button"); 
+	       }
+	      return _Icon_Coin_button;
+	     }
+	   }
+	  private Button _Icon_Diamon_button;
+	  public Button Icon_Diamon_button
+	   {
+	   get{
+	      if (_Icon_Diamon_button == null)
+	       {
+	         _Icon_Diamon_button  = GetUIUnit<Button>("Icon_Diamon_button"); 
+	       }
+	      return _Icon_Diamon_button;
+	     }
+	   }
 	  #endregion 自定义数据结束 
 	 public override async CTask SetUIGameObject(GameObject gObjectPoolInterface)
 	{

Assets/Scripts/GameUI/UI/TipMessage/TipMessagePanel.cs

@@ -14,6 +14,12 @@ namespace Fort23.Mono
             tipMessagePanel.SetTipMessage(meg, worldPos);
         }
 
+        public override async CTask Open()
+        {
+            await base.Open();
+            GObjectPoolInterface.SetActive(false);
+        }
+
         private void Init()
         {
         }
@@ -85,6 +91,7 @@ namespace Fort23.Mono
             dotPoint.anchoredPosition = pos;
             LayoutRebuilder.MarkLayoutForRebuild(bgTran);
             LayoutRebuilder.ForceRebuildLayoutImmediate(bgTran);
+            GObjectPoolInterface.SetActive(true);
         }
     }
 }

Assets/Scripts/GameUI/UI/UpdateAsset/GameUpdateAsset.cs

@@ -1,6 +1,6 @@
 using UnityEngine;
 using Utility;
-using WeChatWASM;
+// using WeChatWASM;
 
 namespace Fort23.Mono.UpdateAsset
 {
@@ -17,7 +17,7 @@ namespace Fort23.Mono.UpdateAsset
         private void LoadMD5()
         {
             string md5 = urlRoot + "MD5.txt";
-            string loadMd5 = WX.PluginCachePath + "Bundle/MD5.txt";
+            string loadMd5 = WXDownload.Instance.GetPluginCachePath() + "Bundle/MD5.txt";
             string str = WXDownload.Instance.GetCachePath(loadMd5);
             if (!string.IsNullOrEmpty(str))
             {

Assets/Settings/rpAsset.asset

@@ -84,7 +84,7 @@ MonoBehaviour:
     bayerMatrixTex: {fileID: 2800000, guid: f9ee4ed84c1d10c49aabb9b210b0fc44, type: 3}
   m_PrefilteringModeMainLightShadows: 3
   m_PrefilteringModeAdditionalLight: 3
-  m_PrefilteringModeAdditionalLightShadows: 0
+  m_PrefilteringModeAdditionalLightShadows: 2
   m_PrefilterXRKeywords: 1
   m_PrefilteringModeForwardPlus: 0
   m_PrefilteringModeDeferredRendering: 0

Assets/StreamingAssets/Bundle/01lz_0ad29b4898d10b0991fe6eded5a56db5.meta

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

Assets/StreamingAssets/Bundle/01lz_71f0ce79b3ee33efd8bb9e4297c55b64.meta

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

Assets/StreamingAssets/Bundle/01np_dg2_0b3e2d5668aecc74b2f6100efb52bf77.meta

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

Assets/StreamingAssets/Bundle/01np_dg2_f452b9178c4536327ea8ca6647dfcc04.meta

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

Assets/StreamingAssets/Bundle/01np_dg3_ad81a93067643f49c016e2f84ee7ca42.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: CnlKtCL/B37IV1+yE26Ngch0K5+H1EoNgIqgUwzN0GPf9azgM7iB5Bs=
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_dg3_be9b9eb6431cc8e2284e36ff4bbadc76.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DS5MvC+vUXqqu5+euZQgSVEypQpx4fDE9KzCU3+lUZepaIXJKPfNLM8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_3bae5e586c014355dca7e35f75311fb2.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XXMa5H6rVHiX7EmBQxjSR8mpljYpcjz+kv/11NEVhlR3CwbmYbcj1EA=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/01np_sk3_dg_l_ba1a423bffb934784e96b6c0f964d87d.meta

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

Assets/StreamingAssets/Bundle/403_banyuan_glow_2559b52d037c2923d788d278dacf97a7.meta

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

Assets/StreamingAssets/Bundle/403_banyuan_glow_51eaf96e4f246ba17184759d49f9ac19.meta

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

Assets/StreamingAssets/Bundle/603_ice_zd_441cf9da0e3ce9663a22c232fc9f5c69.meta

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

Assets/StreamingAssets/Bundle/603_ice_zd_d39237c4a8dd53eb744db58fff59e3c2.meta

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

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_5dc024a06b595f262bc81ab8873b9d4b.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WXtNsyL8UCns9En/w+14X2HU9n3S6PRaETORR6La2k8ZEdWtw//MeN8=
-DefaultImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

Assets/StreamingAssets/Bundle/afx_ramp_hl_1_f85664717d50d121aedbc2f2ec558dbb.meta

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