打包

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: f80e8f7b487eb4eccb6d3db6fa9f64c5
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 369efabd8c5434cdc8a303cd78dc2010
+folderAsset: yes
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml

@@ -0,0 +1,5 @@
+<dependencies>
+    <androidPackages>
+        <androidPackage spec="com.android.support:design:28.0.0"/>
+    </androidPackages>
+</dependencies>

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml.meta

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

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/anythink_network_unity_kuaishou.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: 1ee83d47151684fa7974146eb691e7b4
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/kssdk-ad-4.6.30.1-publishRelease-4e360ba1fe.aar.meta

@@ -0,0 +1,32 @@
+fileFormatVersion: 2
+guid: a0f04458561c44fa7a1b280cc2b92e6b
+PluginImporter:
+  externalObjects: {}
+  serializedVersion: 2
+  iconMap: {}
+  executionOrder: {}
+  defineConstraints: []
+  isPreloaded: 0
+  isOverridable: 0
+  isExplicitlyReferenced: 0
+  validateReferences: 1
+  platformData:
+  - first:
+      Android: Android
+    second:
+      enabled: 1
+      settings: {}
+  - first:
+      Any: 
+    second:
+      enabled: 0
+      settings: {}
+  - first:
+      Editor: Editor
+    second:
+      enabled: 0
+      settings:
+        DefaultValueInitialized: true
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json

@@ -0,0 +1 @@
+{"name":"kuaishou","version":"4.6.30.1","country":1,"path":"Assets/AnyThinkPlugin/AnyThinkAds\\Plugins/Android/China/mediation/kuaishou"}

Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/network_data.json.meta

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

Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.15928245
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

Assets/Plugins/Android/mainTemplate.gradle

@@ -5,6 +5,7 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
 // Android Resolver Dependencies Start
     implementation 'com.android.support:appcompat-v7:28.0.0' // Assets/Scripts/ThirdParty/AnyThinkAds/Plugins/Android/China/Editor/Dependencies.xml:3
+    implementation 'com.android.support:design:28.0.0' // Assets/AnyThinkPlugin/AnyThinkAds/Plugins/Android/China/mediation/kuaishou/Editor/Dependencies.xml:3
     implementation 'com.taptap.sdk:tap-cloudsave-unity:4.8.2' // Assets/TapSDK/CloudSave/Mobile/Editor/NativeDependencies.xml:7
     implementation 'com.taptap.sdk:tap-core-unity:4.8.2' // Assets/TapSDK/Core/Mobile/Editor/NativeDependencies.xml:7
     implementation 'com.taptap.sdk:tap-login-unity:4.8.2' // Assets/TapSDK/Login/Mobile/Editor/NativeDependencies.xml:7

Assets/Scenes/testCombat.scene

@@ -158,7 +158,7 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   ShaderVariantCollection: {fileID: 20000000, guid: 3536136831feec548bbaa7febad775f8, type: 2}
   LoadType: 0
-  h5Url: http://127.0.0.1:8000
+  h5Url: http://fort23.cn:3333/XiuXian1
   isOpenHotFix: 0
   isLoadDll: 0
 --- !u!4 &123020045
@@ -1256,7 +1256,7 @@ MonoBehaviour:
   m_OnValueChanged:
     m_PersistentCalls:
       m_Calls: []
---- !u!213 &1787246934
+--- !u!213 &1495277679
 Sprite:
   m_ObjectHideFlags: 0
   m_CorrespondingSourceObject: {fileID: 0}
@@ -1529,7 +1529,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
     m_PersistentCalls:
       m_Calls: []
-  m_Sprite: {fileID: 1787246934}
+  m_Sprite: {fileID: 1495277679}
   m_Type: 0
   m_PreserveAspect: 0
   m_FillCenter: 1

Assets/Scripts/GameLogic/Bag/BagController.cs

@@ -224,7 +224,7 @@ namespace GameLogic.Bag
                     skillData.level = 1;
                     skillData.useIndex = -1;
                     AccountFileInfo.Instance.playerData.AllSkillDatas.Add(skillData);
-
+                
                     SkillInfo skillInfo = new SkillInfo(skillData);
                     skillInfo.index = skillData.useIndex;
                     PlayerManager.Instance.GongFaControl.AddSkillInfo(skillInfo);
@@ -243,7 +243,7 @@ namespace GameLogic.Bag
             }
 
             item.count += count;
-
+            //
             EventManager.Instance.Dispatch(CustomEventType.ItemUpdate,
                 new ItemUpdateData() { ItemInfo = item, Count = (int)count });
             EventManager.Instance.Dispatch(CustomEventType.AddItem,

Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -680,7 +680,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             lasetSaveTime = currTime;
 
 #if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
-                  await CloudSaveManager.Instance.UpdateArchiveAsync();
+                  // await CloudSaveManager.Instance.UpdateArchiveAsync();
 
 #endif
         }

Assets/Scripts/GameLogic/SDK/TakuSDKManager.cs

@@ -2,6 +2,7 @@ using System.Collections.Generic;
 using AnyThinkAds.Api;
 using AnyThinkAds.ThirdParty.LitJson;
 using Fort23.Core;
+using Fort23.Mono;
 using Fort23.UTool;
 using Utility;
 
@@ -55,18 +56,22 @@ public class TakuSDKManager : Singleton<TakuSDKManager>, ATSDKInitListener
 
     public async CTask<bool> ShowAutoAd()
     {
+        UIManager.Instance.SetEventSystemEnable(false);
         _cTask = CTask<bool>.Create();
         isOK = false;
         if (IsReady())
         {
-            ATRewardedAutoVideo.Instance.showAutoAd("b68d9eefb9ad72");
+            ATRewardedAutoVideo.Instance.showAutoAd(jsonList[0]);
         }
         else
         {
             return false;
         }
 
-        return await _cTask;
+        bool isCom = await _cTask;
+        await TimerComponent.Instance.WaitAsync(1000);
+        UIManager.Instance.SetEventSystemEnable(true);
+        return isCom;
     }
 
 

Assets/Scripts/GameUI/GameApplction.cs

@@ -89,6 +89,7 @@ public class GameApplction : IGameStart
         _root.AddComponent<TimerComponent>();
         _root.AddComponent<CoroutineLockComponent>();
 
+        
         gameStartUIPanel.ClearSlider();
         gameStartUIPanel.ShowMassge("loadBundle");
         gameStartUIPanel.SetSliderMaxValue(1);
@@ -146,7 +147,8 @@ public class GameApplction : IGameStart
         //     return;
         // }
 
-#if UNITY_ANDROID && !UNITY_EDITOR&& Taptap
+        //&& !UNITY_EDITOR
+#if UNITY_ANDROID && Taptap
             //登录
         await TapSDKManager.Instance.Login();
 

Assets/Scripts/GameUI/UI/ShopPanel/ShopBoxWidget.cs

@@ -101,7 +101,12 @@ namespace Fort23.Mono
             //测试代码
             List<ItemInfo> allIitem = await BoxHelper.OneBox(openBoxConfig.ID);
             if (allIitem != null)
+            {
+                // await TimerComponent.Instance.WaitAsync(2000);
+                // Debug.Log("cg");
                 ShopGachaPanel.OpenPanel(allIitem, 1, openBoxConfig.ID);
+            }
+              
             UpdateUi();
         }
 
@@ -110,7 +115,11 @@ namespace Fort23.Mono
             //测试代码
             List<ItemInfo> allIitem = await BoxHelper.TenBox(openBoxConfig.ID);
             if (allIitem != null)
+            {
+          
                 ShopGachaPanel.OpenPanel(allIitem, 2, openBoxConfig.ID);
+            }
+               
             else
             {
                 LogTool.Error("失败1");

Assets/StreamingAssets/Dll/DllMD5.txt

@@ -1 +1 @@
-{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"252ef60ca26130adf058c8f59f3e97ce","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"99793525c7b3e05b76917f3f3d89c767","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"66a2681b05176860a4a045883dbb4cec","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"607caf6ec97b30f4276bfe64c8b80fd5","size":329728},{"fileName":"Fort23.Mono.dll.bytes","md5":"f581cc9b3e991e90142b96ba3b0775d6","size":920576},{"fileName":"GameTimeLine.dll.bytes","md5":"76e9f9a384f3b24118ff154fc917d9f5","size":52224},{"fileName":"mscorlib.dll.bytes","md5":"6720ca3ecc69bac6e6f4d95c765891bd","size":2668544},{"fileName":"NetCoreBasic.dll.bytes","md5":"510da4f4ef70ba018d49685158eb4b1c","size":10752},{"fileName":"Protocol.dll.bytes","md5":"ba94799fcb1a3542fe1c52204a9c9b62","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"b2b3d4e7bbd8f4a28cd5c3e783835d5d","size":899584},{"fileName":"ThirdParty.dll.bytes","md5":"68a609e080e77e5125f4d9f32bfa3be5","size":281600},{"fileName":"Unity.Timeline.dll.bytes","md5":"90da2499f74467c0879feea95656d0ab","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"fc51f09b192b0e3b7780ebeb716a5c6d","size":991232}]}
+{"fileInfo":[{"fileName":"Assembly-CSharp.dll.bytes","md5":"535f2a8d49af9333e9e3536e0e98aa41","size":163328},{"fileName":"Fort23.Core.dll.bytes","md5":"dcec57582f1ba82eae57eb3c36779e3e","size":379392},{"fileName":"Fort23.GameData.dll.bytes","md5":"e5fe12231ef5c77040a3976375511fb3","size":45056},{"fileName":"Fort23.GameLogic.dll.bytes","md5":"37240c8c422898f61d61531eae84864b","size":345088},{"fileName":"Fort23.Mono.dll.bytes","md5":"34b766042e74f0cf3b84a5449ebde286","size":921600},{"fileName":"GameTimeLine.dll.bytes","md5":"ff662b7d5dba1aa323c92ef51e7990d4","size":52224},{"fileName":"mscorlib.dll.bytes","md5":"d651b91b1bd5fe7bac73cc9517e91a0b","size":2669568},{"fileName":"NetCoreBasic.dll.bytes","md5":"b1ad7ea63405659130e661fe60bf581a","size":10752},{"fileName":"Protocol.dll.bytes","md5":"62d937b33d1b6e5e71e17cc0cda2dfbb","size":15360},{"fileName":"System.Core.dll.bytes","md5":"11ada542f3966c6d5dd5b42021137d1f","size":449536},{"fileName":"System.dll.bytes","md5":"487a944af7eee8a2c9c7ec47fa23c3c8","size":911872},{"fileName":"ThirdParty.dll.bytes","md5":"2e9085d41e3596342ab5b561e38b1d4b","size":534016},{"fileName":"Unity.Timeline.dll.bytes","md5":"2ba1802df332ee4eedbbb0939354d9b8","size":126976},{"fileName":"UnityEngine.AndroidJNIModule.dll.bytes","md5":"9c0b016ab66f3ae1f0dc2d25fb7db470","size":78848},{"fileName":"UnityEngine.CoreModule.dll.bytes","md5":"380c1b7f8330cf9125a25d22b6bf8c37","size":991232}]}

Assets/StreamingAssets/assetBundle.zip.meta

@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: DSxJ43uoUH8kT0YwMiNbOE+4J0BQp6l+fEMrKmhKdWq4r0S/FEZZQeH4/d3n
+DefaultImporter:
+  externalObjects: {}
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

Assets/StreamingAssets/assetMD5.txt

@@ -1 +1 @@
-638976043826530029
+638977766037740912

ProjectSettings/AndroidResolverDependencies.xml

@@ -1,6 +1,7 @@
 <dependencies>
   <packages>
     <package>com.android.support:appcompat-v7:28.0.0</package>
+    <package>com.android.support:design:28.0.0</package>
     <package>com.taptap.sdk:tap-cloudsave-unity:4.8.2</package>
     <package>com.taptap.sdk:tap-core-unity:4.8.2</package>
     <package>com.taptap.sdk:tap-login-unity:4.8.2</package>