Browse Source

打包的一些修改

lzx 3 weeks ago
parent
commit
69f96298dd

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

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

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_quan.mat

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

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

@@ -1,22 +1,27 @@
 <?xml version="1.0" encoding="utf-8"?>
 <?xml version="1.0" encoding="utf-8"?>
 <manifest
 <manifest
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.unity3d.player"
-    xmlns:tools="http://schemas.android.com/tools">
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        package="com.unity3d.player"
+        xmlns:tools="http://schemas.android.com/tools">
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
-    <application>
-        <meta-data
+    <application
+            android:allowBackup="false"
+            tools:replace="android:allowBackup"
+            android:theme="@style/TuanjieThemeSelector">
+
+    <meta-data
+                
                 android:name="Crasheye_appkey"
                 android:name="Crasheye_appkey"
-                android:value="djpz510z" />
+                android:value="djpz510z"/>
         <activity android:name="com.taptap.xy.yousanjie.MainActivity"
         <activity android:name="com.taptap.xy.yousanjie.MainActivity"
                   android:theme="@style/TuanjieThemeSelector">
                   android:theme="@style/TuanjieThemeSelector">
             <intent-filter>
             <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.LAUNCHER" />
+                <action android:name="android.intent.action.MAIN"/>
+                <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
             </intent-filter>
-            <meta-data android:name="unityplayer.UnityActivity" android:value="true" />
+            <meta-data android:name="unityplayer.UnityActivity" android:value="true"/>
         </activity>
         </activity>
     </application>
     </application>
 </manifest>
 </manifest>

File diff suppressed because it is too large
+ 0 - 0
Assets/Resources/PerformanceTestRunInfo.json


+ 0 - 7
Assets/Resources/PerformanceTestRunInfo.json.meta

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

+ 0 - 1
Assets/Resources/PerformanceTestRunSettings.json

@@ -1 +0,0 @@
-{"MeasurementCount":-1}

+ 0 - 7
Assets/Resources/PerformanceTestRunSettings.json.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: WigasS3/V30NZ/ulgpiliwL8E18uaU2fYcXqooM08d6MQ7ic7JzDBQQU8tIh
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 1 - 1
Assets/Resources/Shader/Shader Graphs_ShengShiShader.mat

@@ -66,5 +66,5 @@ Material:
     m_Colors:
     m_Colors:
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _mainColor: {r: 0.21314356, g: 1.4060051, b: 2.1517377, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
     - _off: {r: 0.01, g: 0.01, b: 0, a: 0}
-    - _pos: {r: -1.8000001, g: -5.3999996, b: -30, a: 0}
+    - _pos: {r: 0, g: -5, b: -30, a: 0}
   m_BuildTextureStacks: []
   m_BuildTextureStacks: []

+ 216 - 216
Assets/Scenes/testCombat.scene

@@ -916,221 +916,6 @@ AudioSource:
     m_PreInfinity: 2
     m_PreInfinity: 2
     m_PostInfinity: 2
     m_PostInfinity: 2
     m_RotationOrder: 4
     m_RotationOrder: 4
---- !u!213 &264507515
-Sprite:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_Name: dec_jianbian_tiao(Clone)
-  m_Rect:
-    serializedVersion: 2
-    x: 0
-    y: 0
-    width: 115
-    height: 33
-  m_Offset: {x: 0, y: 0}
-  m_Border: {x: 0, y: 0, z: 0, w: 0}
-  m_PixelsToUnits: 100
-  m_Pivot: {x: 0.5, y: 0.5}
-  m_Extrude: 1
-  m_IsPolygon: 0
-  m_AtlasName: 
-  m_PackingTag: 
-  m_RenderDataKey:
-    c0c46614f24bc234b92e828eae8336c3: 21300000
-  m_AtlasTags:
-  - tongyong
-  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-  m_RD:
-    serializedVersion: 3
-    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 0
-      y: 0
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: -1, y: -1}
-    settingsRaw: 64
-    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
-    downscaleMultiplier: 1
-  m_AtlasRD:
-    serializedVersion: 3
-    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
-    alphaTexture: {fileID: 0}
-    secondaryTextures: []
-    m_SubMeshes:
-    - serializedVersion: 2
-      firstByte: 0
-      indexCount: 6
-      topology: 0
-      baseVertex: 0
-      firstVertex: 0
-      vertexCount: 4
-      localAABB:
-        m_Center: {x: 0, y: 0, z: 0}
-        m_Extent: {x: 0, y: 0, z: 0}
-    m_IndexBuffer: 030000000100020001000000
-    m_VertexData:
-      serializedVersion: 3
-      m_VertexCount: 4
-      m_Channels:
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 3
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 1
-        offset: 0
-        format: 0
-        dimension: 2
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      - stream: 0
-        offset: 0
-        format: 0
-        dimension: 0
-      m_DataSize: 80
-      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
-    m_Bindpose: []
-    textureRect:
-      serializedVersion: 2
-      x: 285
-      y: 1481
-      width: 115
-      height: 33
-    textureRectOffset: {x: 0, y: 0}
-    atlasRectOffset: {x: 285, y: 1481}
-    settingsRaw: 67
-    uvTransform: {x: 100, y: 342.5, z: 100, w: 1497.5}
-    downscaleMultiplier: 1
-  m_PhysicsShape:
-  - - {x: 0.345, y: 0.16499999}
-    - {x: 0.345, y: -0.16499999}
-    - {x: 0.575, y: -0.16499999}
-    - {x: 0.575, y: 0.16499999}
-  m_Bones: []
-  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1 &376281604
 --- !u!1 &376281604
 GameObject:
 GameObject:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2638,6 +2423,221 @@ Sprite:
     - {x: 0.64, y: -0.83}
     - {x: 0.64, y: -0.83}
   m_Bones: []
   m_Bones: []
   m_SpriteID: 5e97eb03825dee720800000000000000
   m_SpriteID: 5e97eb03825dee720800000000000000
+--- !u!213 &1720963864
+Sprite:
+  m_ObjectHideFlags: 0
+  m_CorrespondingSourceObject: {fileID: 0}
+  m_PrefabInstance: {fileID: 0}
+  m_PrefabAsset: {fileID: 0}
+  m_Name: dec_jianbian_tiao(Clone)
+  m_Rect:
+    serializedVersion: 2
+    x: 0
+    y: 0
+    width: 115
+    height: 33
+  m_Offset: {x: 0, y: 0}
+  m_Border: {x: 0, y: 0, z: 0, w: 0}
+  m_PixelsToUnits: 100
+  m_Pivot: {x: 0.5, y: 0.5}
+  m_Extrude: 1
+  m_IsPolygon: 0
+  m_AtlasName: 
+  m_PackingTag: 
+  m_RenderDataKey:
+    c0c46614f24bc234b92e828eae8336c3: 21300000
+  m_AtlasTags:
+  - tongyong
+  m_SpriteAtlas: {fileID: 100100200, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+  m_RD:
+    serializedVersion: 3
+    texture: {fileID: 2800000, guid: c0c46614f24bc234b92e828eae8336c3, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 0
+      y: 0
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: -1, y: -1}
+    settingsRaw: 64
+    uvTransform: {x: 100, y: 57.5, z: 100, w: 16.5}
+    downscaleMultiplier: 1
+  m_AtlasRD:
+    serializedVersion: 3
+    texture: {fileID: 8711939763936270973, guid: b02f6b41a7a9fa8458f4226ab6b3ea47, type: 3}
+    alphaTexture: {fileID: 0}
+    secondaryTextures: []
+    m_SubMeshes:
+    - serializedVersion: 2
+      firstByte: 0
+      indexCount: 6
+      topology: 0
+      baseVertex: 0
+      firstVertex: 0
+      vertexCount: 4
+      localAABB:
+        m_Center: {x: 0, y: 0, z: 0}
+        m_Extent: {x: 0, y: 0, z: 0}
+    m_IndexBuffer: 030000000100020001000000
+    m_VertexData:
+      serializedVersion: 3
+      m_VertexCount: 4
+      m_Channels:
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 3
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 1
+        offset: 0
+        format: 0
+        dimension: 2
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      - stream: 0
+        offset: 0
+        format: 0
+        dimension: 0
+      m_DataSize: 80
+      _typelessdata: 333313bfc3f5283e000000003333133fc3f528be000000003333133fc3f5283e00000000333313bfc3f528be000000000000000000000000000000000000000000000000000000000000000000000000
+    m_Bindpose: []
+    textureRect:
+      serializedVersion: 2
+      x: 285
+      y: 1481
+      width: 115
+      height: 33
+    textureRectOffset: {x: 0, y: 0}
+    atlasRectOffset: {x: 285, y: 1481}
+    settingsRaw: 67
+    uvTransform: {x: 100, y: 342.5, z: 100, w: 1497.5}
+    downscaleMultiplier: 1
+  m_PhysicsShape:
+  - - {x: 0.345, y: 0.16499999}
+    - {x: 0.345, y: -0.16499999}
+    - {x: 0.575, y: -0.16499999}
+    - {x: 0.575, y: 0.16499999}
+  m_Bones: []
+  m_SpriteID: 5e97eb03825dee720800000000000000
 --- !u!1001 &1733556487
 --- !u!1001 &1733556487
 PrefabInstance:
 PrefabInstance:
   m_ObjectHideFlags: 0
   m_ObjectHideFlags: 0
@@ -2805,7 +2805,7 @@ MonoBehaviour:
   m_OnCullStateChanged:
   m_OnCullStateChanged:
     m_PersistentCalls:
     m_PersistentCalls:
       m_Calls: []
       m_Calls: []
-  m_Sprite: {fileID: 264507515}
+  m_Sprite: {fileID: 1720963864}
   m_Type: 0
   m_Type: 0
   m_PreserveAspect: 0
   m_PreserveAspect: 0
   m_FillCenter: 1
   m_FillCenter: 1

+ 21 - 7
Assets/Scripts/GameLogic/Player/AccountFileInfo.cs

@@ -20,7 +20,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
 {
 {
     public string persistentDataPath = Application.persistentDataPath + "/playerData.txt";
     public string persistentDataPath = Application.persistentDataPath + "/playerData.txt";
     public PlayerData playerData = new PlayerData();
     public PlayerData playerData = new PlayerData();
-
+    public long lasetSaveTime;
 
 
     /// <summary>
     /// <summary>
     /// 索引,用于快速查找
     /// 索引,用于快速查找
@@ -508,7 +508,7 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
     /// <summary>
     /// <summary>
     /// 加载玩家数据,一切数据:从这里开始
     /// 加载玩家数据,一切数据:从这里开始
     /// </summary>
     /// </summary>
-    public async void LoadPlayerData()
+    public async CTask LoadPlayerData()
     {
     {
 #if UNITY_WEIXINMINIGAME && !UNITY_EDITOR
 #if UNITY_WEIXINMINIGAME && !UNITY_EDITOR
         persistentDataPath = WX.env.USER_DATA_PATH + fileName;
         persistentDataPath = WX.env.USER_DATA_PATH + fileName;
@@ -526,16 +526,17 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
             SavePlayerData();
             SavePlayerData();
         }
         }
 #else
 #else
+        // await CloudSaveManager.Instance.LoadArchiveAsync();
         if (!File.Exists(persistentDataPath))
         if (!File.Exists(persistentDataPath))
         {
         {
             LogTool.Log("没有文件: " + persistentDataPath);
             LogTool.Log("没有文件: " + persistentDataPath);
             await ClearInitPlayerData();
             await ClearInitPlayerData();
-            await CloudSaveManager.Instance.CreateArchiveAsync();
-        }
-        else
-        {
-            await CloudSaveManager.Instance.LoadArchiveAsync();
+            // await CloudSaveManager.Instance.CreateArchiveAsync();
         }
         }
+        // else
+        // {
+        //     await CloudSaveManager.Instance.LoadArchiveAsync();
+        // }
 
 
         LogTool.Log("读取=文件: " + persistentDataPath);
         LogTool.Log("读取=文件: " + persistentDataPath);
         StreamReader sr = File.OpenText(persistentDataPath);
         StreamReader sr = File.OpenText(persistentDataPath);
@@ -643,6 +644,19 @@ public class AccountFileInfo : Singleton<AccountFileInfo>
         {
         {
             CleanEmptyData();
             CleanEmptyData();
         }
         }
+        
+        if (lasetSaveTime == 0)
+        {
+            lasetSaveTime = System.DateTime.Now.Ticks;
+        }
+
+        long currTime = System.DateTime.Now.Ticks;
+        if ( currTime - lasetSaveTime < 600000000)
+        {
+            return;
+        }
+
+        lasetSaveTime = currTime;
 
 
         if (!string.IsNullOrEmpty(persistentDataPath))
         if (!string.IsNullOrEmpty(persistentDataPath))
         {
         {

+ 1 - 1
Assets/Scripts/GameLogic/Player/PlayerManager.cs

@@ -81,7 +81,7 @@ public class PlayerManager : Singleton<PlayerManager>
 
 
     public void Init()
     public void Init()
     {
     {
-        AccountFileInfo.Instance.LoadPlayerData();
+     
         SetConfigs();
         SetConfigs();
 
 
         InitGameData();
         InitGameData();

+ 63 - 16
Assets/Scripts/GameLogic/SDK/CloudSaveManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System;
 using System.Collections.Generic;
 using System.Collections.Generic;
 using System.IO;
 using System.IO;
+using System.Text;
 using System.Threading.Tasks;
 using System.Threading.Tasks;
 using Fort23.Core;
 using Fort23.Core;
 using Fort23.UTool;
 using Fort23.UTool;
@@ -12,13 +13,59 @@ using TapSDK.UI;
 
 
 public class CloudSaveManager : Singleton<CloudSaveManager>
 public class CloudSaveManager : Singleton<CloudSaveManager>
 {
 {
-    public CloudSaveManager()
+    private CloudSaveManager()
     {
     {
         TapCloudSaveCallback callback = new TapCloudSaveCallback();
         TapCloudSaveCallback callback = new TapCloudSaveCallback();
         TapTapCloudSave.RegisterCloudSaveCallback(callback);
         TapTapCloudSave.RegisterCloudSaveCallback(callback);
     }
     }
 
 
 
 
+    // 检查是否存在存档,若存在则加载,否则创建新存档
+    public async CTask LoadOrCreateArchiveAsync()
+    {
+        try
+        {
+            // 获取存档列表
+            List<ArchiveData> archives = await TapTapCloudSave.GetArchiveList();
+
+
+            if (archives != null && archives.Count > 0)
+            {
+                // 存在存档,加载第一个存档
+                ArchiveData archive = archives[0];
+
+                if (archive == null || string.IsNullOrEmpty(archive.Uuid) || archive.Uuid.Length > 64)
+                {
+                    AccountFileInfo.Instance.LoadPlayerData();
+                    // 创建新存档
+                    await CreateArchiveAsync();
+                    return;
+                }
+
+
+                PlayerManager.Instance.Uuid = archive.Uuid;
+                await LoadArchiveAsync();
+                AccountFileInfo.Instance.LoadPlayerData();
+            }
+            else
+            {
+                // 无存档,创建新存档
+
+                AccountFileInfo.Instance.LoadPlayerData();
+                await CreateArchiveAsync();
+            }
+        }
+        catch (TapException ex)
+        {
+            LogTool.Error($"Failed to check/load archive: {ex.Code} - {ex.Message}");
+        }
+        catch (Exception ex)
+        {
+            LogTool.Error($"Unexpected error checking/loading archive: {ex.Message}");
+        }
+    }
+
+
     /// <summary>
     /// <summary>
     /// 创建存档
     /// 创建存档
     /// </summary>
     /// </summary>
@@ -30,14 +77,18 @@ public class CloudSaveManager : Singleton<CloudSaveManager>
             ArchiveMetadata metadata = new ArchiveMetadata(
             ArchiveMetadata metadata = new ArchiveMetadata(
                 archiveName: "playerData",
                 archiveName: "playerData",
                 archiveSummary: "玩家数据",
                 archiveSummary: "玩家数据",
-                archiveExtra: "",
+                archiveExtra: "额外信息",
                 archivePlaytime: 0
                 archivePlaytime: 0
             );
             );
 
 
+
             // 创建存档
             // 创建存档
             ArchiveData createdArchive =
             ArchiveData createdArchive =
                 await TapTapCloudSave.CreateArchive(metadata, AccountFileInfo.Instance.persistentDataPath, null);
                 await TapTapCloudSave.CreateArchive(metadata, AccountFileInfo.Instance.persistentDataPath, null);
-            LogTool.Log($"存档创建成功,UUID: {createdArchive.Uuid}");
+            AccountFileInfo.Instance.lasetSaveTime = System.DateTime.Now.Ticks;
+            PlayerManager.Instance.Uuid = createdArchive.Uuid;
+            LogTool.Error($"存档创建成功,UUID: {createdArchive.Uuid}");
+
             return createdArchive.Uuid;
             return createdArchive.Uuid;
         }
         }
         catch (TapException ex)
         catch (TapException ex)
@@ -63,7 +114,7 @@ public class CloudSaveManager : Singleton<CloudSaveManager>
             ArchiveMetadata metadata = new ArchiveMetadata(
             ArchiveMetadata metadata = new ArchiveMetadata(
                 archiveName: "playerData",
                 archiveName: "playerData",
                 archiveSummary: "玩家数据",
                 archiveSummary: "玩家数据",
-                archiveExtra: "",
+                archiveExtra: "额外信息",
                 archivePlaytime: 0
                 archivePlaytime: 0
             );
             );
 
 
@@ -91,24 +142,20 @@ public class CloudSaveManager : Singleton<CloudSaveManager>
     {
     {
         try
         try
         {
         {
-            // 获取存档数据
+            // 获取存档列表
             List<ArchiveData> archives = await TapTapCloudSave.GetArchiveList();
             List<ArchiveData> archives = await TapTapCloudSave.GetArchiveList();
-            if (archives == null)
-            {
-                throw new Exception("存档不存在");
-            }
-
-            PlayerManager.Instance.Uuid = archives[0].Uuid;
-
 
 
+            ArchiveData archive = archives[0];
             // 下载存档文件
             // 下载存档文件
 
 
             byte[] data =
             byte[] data =
-                await TapTapCloudSave.GetArchiveData(archives[0].Uuid, AccountFileInfo.Instance.persistentDataPath);
+                await TapTapCloudSave.GetArchiveData(PlayerManager.Instance.Uuid,
+                    archive.FileId);
 
 
-            // // 读取 JSON 文件
-            // string json = File.ReadAllText(AccountFileInfo.Instance.persistentDataPath);
-            // return json;
+            string str1 = Encoding.UTF8.GetString(data);
+            LogTool.Log(str1);
+            File.WriteAllBytes(AccountFileInfo.Instance.persistentDataPath, data);
+            LogTool.Error("读取存档成功");
         }
         }
         catch (TapException ex)
         catch (TapException ex)
         {
         {

+ 2 - 2
Assets/Scripts/GameLogic/SDK/TakuSDKManager.cs

@@ -9,7 +9,7 @@ public class TakuSDKManager : Singleton<TakuSDKManager>, ATSDKInitListener
 {
 {
     private bool isOK;
     private bool isOK;
     private CTask<bool> _cTask;
     private CTask<bool> _cTask;
-    string[] jsonList = { "n67dd01ce07ec2" };
+    string[] jsonList = { "b68d9eefb9ad72" };
 
 
     public void CustomInit()
     public void CustomInit()
     {
     {
@@ -59,7 +59,7 @@ public class TakuSDKManager : Singleton<TakuSDKManager>, ATSDKInitListener
         isOK = false;
         isOK = false;
         if (IsReady())
         if (IsReady())
         {
         {
-            ATRewardedAutoVideo.Instance.showAutoAd("n67dd01ce07ec2");
+            ATRewardedAutoVideo.Instance.showAutoAd("b68d9eefb9ad72");
         }
         }
         else
         else
         {
         {

+ 2 - 2
Assets/Scripts/GameLogic/SDK/TapSDKManager.cs

@@ -29,8 +29,8 @@ namespace GameMono
                 // 是否开启日志,Release 版本请设置为 false
                 // 是否开启日志,Release 版本请设置为 false
                 enableLog = true
                 enableLog = true
             };
             };
-            // TapSDK 初始化
-            TapTapSDK.Init(coreOptions);
+            // // TapSDK 初始化
+            // TapTapSDK.Init(coreOptions);
             // 当需要添加其他模块的初始化配置项,例如合规认证、成就等, 请使用如下 API
             // 当需要添加其他模块的初始化配置项,例如合规认证、成就等, 请使用如下 API
             TapTapSdkBaseOptions[] otherOptions = new TapTapSdkBaseOptions[]
             TapTapSdkBaseOptions[] otherOptions = new TapTapSdkBaseOptions[]
             {
             {

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

@@ -19,7 +19,8 @@
         "GUID:ab67fb10353d84448ac887a7367cbda8",
         "GUID:ab67fb10353d84448ac887a7367cbda8",
         "GUID:86bc95e6fdb13ff43aa04316542905ae",
         "GUID:86bc95e6fdb13ff43aa04316542905ae",
         "GUID:df380645f10b7bc4b97d4f5eb6303d95",
         "GUID:df380645f10b7bc4b97d4f5eb6303d95",
-        "CrasheyeForUnityLib"
+        "CrasheyeForUnityLib",
+        "GUID:7d5ef2062f3704e1ab74aac0e4d5a1a7"
     ],
     ],
     "includePlatforms": [],
     "includePlatforms": [],
     "excludePlatforms": [],
     "excludePlatforms": [],

+ 6 - 2
Assets/Scripts/GameUI/GameApplction.cs

@@ -46,8 +46,8 @@ public class GameApplction : IGameStart
     {
     {
         gameApplction = this;
         gameApplction = this;
         Debug.Log("开始游戏逻辑");
         Debug.Log("开始游戏逻辑");
-        Crasheye.SetIsBetaVersion(true);
-        Crasheye.SendScriptException("测试错误", "测试错误", "ZH");
+        // Crasheye.SetIsBetaVersion(true);
+        // Crasheye.SendScriptException("测试错误", "测试错误", "ZH");
         // UnityEngine.Screen.SetResolution(Screen.width);
         // UnityEngine.Screen.SetResolution(Screen.width);
         GameUpdateAsset.Instance.Init(h5Url);
         GameUpdateAsset.Instance.Init(h5Url);
         this.gameStartUIPanel = gameStartUIPanel;
         this.gameStartUIPanel = gameStartUIPanel;
@@ -129,8 +129,12 @@ public class GameApplction : IGameStart
         //     return;
         //     return;
         // }
         // }
 
 
+        //登录
         await TapSDKManager.Instance.Login();
         await TapSDKManager.Instance.Login();
 
 
+        //获取玩家数据
+        await CloudSaveManager.Instance.LoadOrCreateArchiveAsync();
+
         EventManager.Instance.RemoveEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
         EventManager.Instance.RemoveEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
         EventManager.Instance.AddEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
         EventManager.Instance.AddEventListener(CustomEventType.DialoguePanelOpen, DialoguePanelOpenEvent);
         UIManager.Instance.Canvas.gameObject.SetActive(true);
         UIManager.Instance.Canvas.gameObject.SetActive(true);

BIN
Assets/StreamingAssets/assetBundle.zip


+ 1 - 1
Assets/StreamingAssets/assetMD5.txt

@@ -1 +1 @@
-638960561352921500
+638961217328588845

+ 0 - 4
Assets/TapSDK/CloudSave/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.CloudSave.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.CloudSave.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/CloudSave/link.xml.meta

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

+ 0 - 4
Assets/TapSDK/Core/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Core.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Core.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/Core/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: XC4asS34UClzItH+/+JuTO4QNLkpQA2+mHdGlXlbGUgMnvGNisvJ5crcWdWo
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 0 - 4
Assets/TapSDK/Login/link.xml

@@ -1,4 +0,0 @@
-<linker>
-  <assembly fullname="TapSDK.Login.Runtime" preserve="all" />
-  <assembly fullname="TapSDK.Login.Mobile.Runtime" preserve="all" />
-</linker>

+ 0 - 7
Assets/TapSDK/Login/link.xml.meta

@@ -1,7 +0,0 @@
-fileFormatVersion: 2
-guid: DC9Jsin/VChXZE6deLk2KwHKoSXpLS84OYOkkz+5dZ9rQ6MZM/0mMI04C7iL
-TextScriptImporter:
-  externalObjects: {}
-  userData: 
-  assetBundleName: 
-  assetBundleVariant: 

+ 2 - 2
ProjectSettings/ProjectSettings.asset

@@ -195,8 +195,8 @@ PlayerSettings:
     tvOS: 0
     tvOS: 0
   overrideDefaultApplicationIdentifier: 1
   overrideDefaultApplicationIdentifier: 1
   AndroidBundleVersionCode: 4
   AndroidBundleVersionCode: 4
-  AndroidMinSdkVersion: 22
-  AndroidTargetSdkVersion: 33
+  AndroidMinSdkVersion: 24
+  AndroidTargetSdkVersion: 35
   AndroidPreferredInstallLocation: 1
   AndroidPreferredInstallLocation: 1
   aotOptions: 
   aotOptions: 
   stripEngineCode: 1
   stripEngineCode: 1

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