同步前提交

master
lingmeng 2026-04-20 17:45:35 +08:00
parent 84b58f6088
commit d30925a8cf
65 changed files with 487 additions and 146 deletions

View File

@ -1,127 +1,32 @@
{
<<<<<<< HEAD
"libview.firstColumnWidth": 356,
=======
<<<<<<< HEAD
"libview.firstColumnWidth": 413,
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://5cdldr01qaqf9c",
"ui://5cdldr01qaqf61",
"ui://442j0uepygxga",
"ui://5cdldr01qaqfo",
"ui://c7j2rnvqtpf01p",
"ui://c7j2rnvqtpf06k",
"ui://c7j2rnvqtpf08q",
"ui://c7j2rnvqtpf06t",
"ui://z3z0ysurygxgd",
"ui://442j0uepygxgd",
"ui://c7j2rnvqtpf06p",
"ui://v6yvqp7waen81b0",
"ui://5cdldr01qaqfe0",
"ui://5cdldr01qaqfcn",
"ui://5cdldr01qaqf4n",
"ui://35sf1c1fr05e9k",
"ui://5cdldr01qaqfa2",
"ui://5cdldr01qaqf46",
"ui://5cdldr01qaqf4w",
"ui://5cdldr01qaqf4t",
"ui://5cdldr01qaqf3y",
"ui://5cdldr01qaqf4e"
"ui://niy3ldiwl9mn14"
],
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
"doc.activeDoc": "ui://442j0uepygxgd",
"libview.twoColumn": false,
"libview.iconScale": 0,
"doc.activeDoc": "ui://niy3ldiwl9mn14",
"libview.currentGroup": "",
"libview.expandedNodes": [
"442j0uep",
"27vd145b",
"/",
"442j0uep",
"/component/",
"442j0uep",
"/component/create_room/",
"z3z0ysur",
"27vd145b",
"/conMui/",
"niy3ldiw",
"/",
"z3z0ysur",
"niy3ldiw",
"/component/",
"z3z0ysur",
"/component/create_room/",
"z3z0ysur",
"/component/create_room/images/",
"z3z0ysur",
"/font/",
"z3z0ysur",
"/images/",
"z3z0ysur",
"/mgr/",
"z3z0ysur",
"/mgr/imgs/",
"z3z0ysur",
"/mgr/imgs/game/",
"5cdldr01",
"/"
],
"snapToGrid": true,
"backgroundColor": 6710886,
"libview.currentGroup": "",
"gridSize": 30,
"gridColor": 80
=======
"doc.openedDocs": [],
>>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed
"libview.iconScale": 0,
"doc.openedDocs": [
"ui://c7j2rnvqtpf06k",
"ui://c7j2rnvqtpf06t",
"ui://m7iejg46mpllhv2",
"ui://m7iejg46kwi0hkl",
"ui://m7iejg46mpllhv5",
"ui://27vd145blwcl28",
"ui://m7iejg46mkdvhdu",
"ui://c7j2rnvqtpf06q",
"ui://c7j2rnvqtpf02w",
"ui://c7j2rnvqtpf06p",
"ui://c7j2rnvqtpf06l"
],
"auxline1": true,
"canvasColor": 10066329,
"auxline2": true,
"doc.activeDoc": "ui://c7j2rnvqtpf06k",
"libview.twoColumn": false,
"libview.expandedNodes": [
"c7j2rnvq",
"/",
"c7j2rnvq",
"5cdldr01",
"/component/",
"c7j2rnvq",
"/component/ENJCSMui/",
"c7j2rnvq",
"/component/qishou_hu/",
"c7j2rnvq",
"/component/qishou_hu/images/",
"c7j2rnvq",
"/component/result/",
"c7j2rnvq",
"/component/result/component/",
"m7iejg46",
"5cdldr01",
"/component/clearing/",
"v6yvqp7w",
"/",
"m7iejg46",
"/mgr/",
"m7iejg46",
"/mgr/component/",
"m7iejg46",
"/mgr/component/play_set/"
"v6yvqp7w",
"/component/",
"v6yvqp7w",
"/component/clearing/"
],
<<<<<<< HEAD
"snapToGrid": true,
"backgroundColor": 6710886,
"libview.currentGroup": "",
"gridSize": 30,
"gridColor": 80
=======
"libview.firstColumnWidth": 356,
"libview.firstColumnWidth": 413,
"libview.twoColumn": false
>>>>>>> 0b0313d1f7fe0999ceff3986fd87f1d7c882b902
>>>>>>> 6118a3b899d4defab9eac80d5f8e30f0c01680ed
}

View File

@ -1139,6 +1139,8 @@
<image id="mcrm7ikz" name="Group 518.png" path="/component/create_room/COMMui/"/>
<image id="mcrm7il0" name="Frame 1174(1).png" path="/conMui/"/>
<image id="mcrm7il1" name="Frame 1172.png" path="/conMui/"/>
<image id="l1oc7il2" name="Frame 1237.png" path="/conMui/"/>
<image id="l1oc7il3" name="Frame 1238.png" path="/conMui/"/>
</resources>
<publish name="Common" path="..\wb_unity_pro\Assets\ART\base\common\ui" packageCount="2">
<atlas name="默认" index="0"/>

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/common/af187115a4824290240734622129b80b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/lobby/4a425335ab0e1c246f741e6da62b244f
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_majiang/d2fa434d27dc07bf09395dc32491060b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: d2d1201bd63e5804c9d0d548e95ec807
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: -1
wrapV: -1
wrapW: -1
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
applyGammaDecoding: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/main_zipai/1b67e95de3db97b52dfe810c7d35f1b7
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: base/newgroup/1876b2140d79b7dc6c2674f954027415
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/majiang/changsha/d7829e76d3fb928cdbf041d12e51a83b
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -88,5 +88,5 @@ TextureImporter:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

View File

@ -18,5 +18,5 @@ AudioImporter:
ambisonic: 0
3D: 1
userData:
assetBundleName:
assetBundleName: extend/poker/runfast/4453ac44dfe0b10c314c4b7d0f517f22
assetBundleVariant:

Binary file not shown.

Before

Width:  |  Height:  |  Size: 148 KiB

After

Width:  |  Height:  |  Size: 1.3 MiB

View File

@ -0,0 +1,141 @@
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
using UnityEditor;
using System.IO;
using taurus.client;
using taurus.unity;
class ReadAssetBase : Editor
{
private static string baseVersion = "1.0.10";
#if UNITY_IPHONE
static string PACK_PATH = Path.Combine(Path.GetFullPath(Path.Combine(Application.dataPath, "..")), "Pack", "iOS");
#else
static string PACK_PATH = Path.Combine(Path.GetFullPath(Path.Combine(Application.dataPath, "..")), "Pack", "Android32");
#endif
static string READ_PATH = Path.Combine(Application.streamingAssetsPath, "Pack");
static string READ_ZIP = Path.Combine(Application.streamingAssetsPath, "Pack.byte");
static string READ_VERSION = Path.Combine(Application.streamingAssetsPath, "version.txt");
[MenuItem("BuildTools/Read Pack In Local")]
static public void ReadAssetBaseRun()
{
if (!Directory.Exists(PACK_PATH))
{
Debug.LogError("请打包后再运行解压操作");
return;
}
try
{
EditorApplication.LockReloadAssemblies();
EditorUtility.DisplayProgressBar("正在解压资源包中", "请稍候,正在处理资源...", 0f);
if (Directory.Exists(READ_PATH))
{
Directory.Delete(READ_PATH, true);
}
Directory.CreateDirectory(READ_PATH);
if (File.Exists(READ_ZIP))
{
File.Delete(READ_ZIP);
}
if (File.Exists(READ_VERSION))
{
File.Delete(READ_VERSION);
}
string baseString = Path.Combine(Application.streamingAssetsPath , "init2_1.json");
string baseBytes = File.ReadAllText(baseString);
ArrayList baseList = (ArrayList)MiniJSON.Json.Deserialize(baseBytes);
for (int i = 0; i < baseList.Count; i++)
{
var tem = (Hashtable)baseList[i];
string _base_path = Path.Combine("base", tem["name"] as string);
string version = tem["version"] as string;
__UnPack(version, _base_path);
}
string extendString = Path.Combine(Application.streamingAssetsPath, "init1_1.json");
string extendBytes = File.ReadAllText(extendString);
ArrayList extendList = (ArrayList)MiniJSON.Json.Deserialize(extendBytes);
for (int i = 0; i < extendList.Count; i++)
{
var tem = (Hashtable)extendList[i];
string extendBundle = tem["bundle"] as string;
string[] extendNameTem = extendBundle.Split('/');
string _extend_path = Path.Combine(extendNameTem);
string version = tem["version"] as string;
__UnPack(version, _extend_path);
}
string arv = Path.Combine(READ_PATH, string.Format("asset_config{0}.json", baseVersion));
File.WriteAllText(arv, baseBytes);
string rv = Path.Combine(READ_PATH , "version.txt");
File.WriteAllText(rv, baseVersion);
File.WriteAllText(READ_VERSION, baseVersion);
IFilePack zf = null;
zf = new FilePack20(READ_ZIP, PackMode.Write);
zf.PackFile(READ_PATH, ".meta|.manifest");
zf = null;
Directory.Delete(READ_PATH, true);
EditorUtility.DisplayDialog("完成", "处理完毕!", "确定");
}
finally
{
EditorUtility.ClearProgressBar();
EditorApplication.UnlockReloadAssemblies();
}
}
static void __UnPack(string version, string _base_path)
{
try
{
string dir = PACK_PATH;
var zip_path = Path.Combine(dir, _base_path, $"asset_pack{version}.bytes");
if (!File.Exists(zip_path))
{
Debug.LogError("打包文件不完全,请将打包所有资源包");
throw new System.Exception();
}
IFilePack zip = null;
zip = new FilePack20(zip_path, PackMode.Read);
zip.UnPackFile(READ_PATH);
var lua_pack_path = Path.Combine(READ_PATH, "lua_pack");
if (File.Exists(lua_pack_path))
{
var lua_dir = Path.Combine(READ_PATH, "lua/");
if (!Directory.Exists(READ_PATH))
Directory.CreateDirectory(READ_PATH);
zip = new FilePack20(lua_pack_path, PackMode.Read);
zip.UnPackFile(lua_dir);
File.Delete(lua_pack_path);
}
string rv = Path.Combine(READ_PATH, _base_path, "version.txt");
string directory = Path.GetDirectoryName(rv);
if (!Directory.Exists(directory))
{
Directory.CreateDirectory(directory); // 递归创建所有不存在的文件夹
}
File.WriteAllText(rv, version, System.Text.Encoding.ASCII);
}
catch
{
Directory.Delete(READ_PATH, true);
}
}
}

View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 55efdee799c9f77498775894b7930d6d
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -7,6 +7,7 @@ using UnityEngine.Networking;
using taurus.unity;
using System.Text;
using System;
using taurus.client;
/// <summary>
/// 版本检查与资源更新管理器
@ -354,7 +355,7 @@ public class VerCheck : MonoBehaviour
string asset_config_text = null;
// 如果本地版本为空或包含服务器版本的所有内容,需要下载资源配置
if (local_version == null || local_version.ContainAll(server_version))
if (local_version == null)
{
// 构建资源配置文件的URL
string ac_url="";
@ -390,6 +391,179 @@ public class VerCheck : MonoBehaviour
yield return null;
}
yield return request;
if (string.IsNullOrEmpty(request.error))
{
asset_config_text = request.text;
asset_config_list = Json.Deserialize(asset_config_text) as ArrayList;
if (asset_config_list == null)
{
ShowTip("连接错误导致游戏配置下载异常,请检查您的网络设置!", () =>
{
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}
//
v_tex_info.text = "正在检查资源。。。";
GSlider _pd = _version_view.GetChild("pb_progress").asSlider;
_pd.value = 0;
if (!Directory.Exists(ResourcesManager.PACK_PATH))
{
Directory.CreateDirectory(ResourcesManager.PACK_PATH);
}
string copyVersionPath = Path.Combine(Application.streamingAssetsPath, "version.txt");
#if UNITY_IPHONE
string copyVersionString = "";
if (File.Exists(copyVersionPath))
{
copyVersionString = File.ReadAllText(copyVersionPath).Trim();
}
else
{
ShowTip("本地缓存版本加载失败", () =>
{
File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), "1.0.0");
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}
#endif
#if UNITY_ANDROID
UnityWebRequest copyRequest = UnityWebRequest.Get(copyVersionPath);
yield return copyRequest.SendWebRequest();
if (copyRequest.isNetworkError || copyRequest.isHttpError)
{
/* ShowTip("本地缓存版本加载失败", () =>
{*/
File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), "1.0.0");
StartCoroutine(CheckAssetConfig(server_version));
//});
yield break;
}
string copyVersionString = copyRequest.downloadHandler.text.Trim();
#endif
bool isSame = copyVersionString.Equals(server_version.ToString());
if (isSame)
{
string copyZipPath = Path.Combine(Application.streamingAssetsPath, "Pack.byte");
#if UNITY_IPHONE
Byte[] zipData;
if (File.Exists(copyZipPath))
{
zipData = File.ReadAllBytes(copyZipPath);
}
else
{
ShowTip("本地缓存压缩包加载失败", () =>
{
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}
/* if (zipData.LongLength < 1024)
{
ShowTip("本地缓存压缩包加载失败", () =>
{
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}*/
string zipString = Path.Combine(Application.persistentDataPath, "Pack.byte");
File.WriteAllBytes(zipString, zipData);
#endif
#if UNITY_ANDROID
UnityWebRequest copyZipRequest = UnityWebRequest.Get(copyZipPath);
yield return copyZipRequest.SendWebRequest();
if (copyZipRequest.isNetworkError || copyZipRequest.isHttpError)
{
ShowTip("本地缓存压缩包加载失败", () =>
{
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}
byte[] zipData = copyZipRequest.downloadHandler.data;
string zipString = Path.Combine(Application.persistentDataPath, "Pack.byte");
File.WriteAllBytes(zipString, zipData);
#endif
IFilePack zip = null;
zip = new FilePack20(zipString, PackMode.Read);
zip.UnPackFileSyn(ResourcesManager.PACK_PATH);
while (!zip.Complete)
{
_pd.value = zip.Progress*100;
yield return null;
}
StartCoroutine(CheckAssetConfig(server_version));
yield break;
}
else
{
File.WriteAllText(Path.Combine(ResourcesManager.PACK_PATH, "version.txt"), copyVersionString);
StartCoroutine(CheckAssetConfig(server_version));
yield break;
}
}
else
{
ShowTip("游戏资源下载失败,请检查您的网络设置!", () =>
{
StartCoroutine(CheckAssetConfig(server_version));
});
yield break;
}
}
}
else if (local_version.ContainAll(server_version))
{
string ac_url="";
if(isGFF==false)
ac_url = string.Format("{0}/config/asset_config{1}.json", Hotupdate.PackUrl, server_version.ToString());
else
ac_url = string.Format("http://{0}/NewFK/config/asset_config{1}.json", conn.ip + ":" + conn.port, server_version.ToString());
// Debugger.LogError("CheckAssetConfig===>>>");
// Debugger.LogError(ac_url);
float downTimeOut = 5;
using (var request = new WWW(ac_url))
{
float timeOut = Time.time;
float process = request.progress;
while (request != null && request.isDone == false)
{
if (process < request.progress)
{
timeOut = Time.time;
process = request.progress;
}
if (Time.time - timeOut > downTimeOut)
{
ShowTip("连接超时导致游戏配置下载异常,请检查您的网络设置!", () =>
{
StartCoroutine(CheckNet());
});
yield break;
}
yield return null;
}
yield return request;
// 检查下载是否成功
if (string.IsNullOrEmpty(request.error))

Binary file not shown.

View File

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

View File

@ -0,0 +1 @@
1.0.10

View File

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

View File

@ -38,6 +38,7 @@ GraphicsSettings:
- {fileID: 16000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16001, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 17000, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 16003, guid: 0000000000000000f000000000000000, type: 0}
m_PreloadedShaders: []
m_SpritesDefaultMaterial: {fileID: 10754, guid: 0000000000000000f000000000000000,
type: 0}