Merge branch 'china/dev' into 0功能/命格
commit
a0675baeb8
|
@ -5,35 +5,78 @@ using LuaInterface;
|
|||
using System;
|
||||
using System.IO;
|
||||
using UnityEditor;
|
||||
using System.Security.Cryptography;
|
||||
|
||||
namespace GameLogic {
|
||||
public static class MEncyptUtil {
|
||||
//
|
||||
//加密/解密
|
||||
//异或加密
|
||||
static byte[] crypt(byte[] data, string key)
|
||||
{
|
||||
int[] ri = new int[data.Length];
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(key);
|
||||
for(long i = 0; i<data.Length; i++)
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(key);
|
||||
byte[] r = new byte[data.Length];
|
||||
for (long i = 0; i < data.Length; i++)
|
||||
{
|
||||
ri[i] = data[i] ^ cl[i % cl.Length];
|
||||
}
|
||||
byte[] rb = new byte[ri.Length * sizeof(int)];
|
||||
Buffer.BlockCopy(ri, 0, rb, 0, rb.Length);
|
||||
|
||||
|
||||
byte[] r = new byte[ri.Length];
|
||||
int x = 0;
|
||||
for (int i = 0; i < rb.Length; i++)
|
||||
{
|
||||
if(i%4 == 0)
|
||||
if (i % 4 == 0)
|
||||
{
|
||||
r[x++] = rb[i];
|
||||
r[i] = BitConverter.GetBytes(data[i] ^ cl[i % cl.Length])[0];
|
||||
|
||||
}
|
||||
else
|
||||
{
|
||||
r[i] = data[i];
|
||||
}
|
||||
}
|
||||
return r;
|
||||
}
|
||||
// AES加密
|
||||
static byte[] encryptAES(byte[] data, string key)
|
||||
{
|
||||
RijndaelManaged rij = new RijndaelManaged();
|
||||
rij.Key = System.Text.Encoding.Default.GetBytes(key);
|
||||
rij.Mode = CipherMode.ECB;
|
||||
rij.Padding = PaddingMode.PKCS7;
|
||||
ICryptoTransform ctr = rij.CreateEncryptor();
|
||||
return ctr.TransformFinalBlock(data, 0, data.Length);
|
||||
}
|
||||
static byte[] decryptAES(byte[] data, string key)
|
||||
{
|
||||
RijndaelManaged rij = new RijndaelManaged();
|
||||
rij.Key = System.Text.Encoding.Default.GetBytes(key);
|
||||
rij.Mode = CipherMode.ECB;
|
||||
rij.Padding = PaddingMode.PKCS7;
|
||||
ICryptoTransform ctr = rij.CreateDecryptor();
|
||||
return ctr.TransformFinalBlock(data, 0, data.Length);
|
||||
}
|
||||
|
||||
// 头部混淆
|
||||
static byte[] encryptHead(byte[] data, string key)
|
||||
{
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(key);
|
||||
byte[] r = new byte[data.Length + cl.Length];
|
||||
long x = 0;
|
||||
for (long i = 0; i < cl.Length; i++)
|
||||
{
|
||||
r[x++] = cl[i];
|
||||
}
|
||||
for (long i = 0; i < data.Length; i++)
|
||||
{
|
||||
r[x++] = data[i];
|
||||
}
|
||||
return r;
|
||||
}
|
||||
// 头部混淆
|
||||
static byte[] decryptHead(byte[] data, string key)
|
||||
{
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(key);
|
||||
byte[] r = new byte[data.Length - cl.Length];
|
||||
long x = 0;
|
||||
for (long i = cl.Length; i < data.Length; i++)
|
||||
{
|
||||
r[x++] = data[i];
|
||||
}
|
||||
return r;
|
||||
}
|
||||
|
||||
|
||||
// 加载AB包
|
||||
|
@ -41,18 +84,23 @@ namespace GameLogic {
|
|||
{
|
||||
byte[] rb ;
|
||||
|
||||
//System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
|
||||
//sw.Start();
|
||||
if (key == null || key == "")
|
||||
{
|
||||
rb = data;
|
||||
}
|
||||
else {
|
||||
rb = crypt(data, key);
|
||||
rb = decryptHead(data, key);
|
||||
}
|
||||
//Debug.Log("_"+sw.Elapsed.TotalMilliseconds);
|
||||
byte[] r = new byte[rb.Length - (int)offset];
|
||||
for (int i = (int)offset; i < rb.Length; i++)
|
||||
{
|
||||
r[i - (int)offset] = rb[i];
|
||||
}
|
||||
//Debug.Log("_"+sw.Elapsed.TotalMilliseconds);
|
||||
//sw.Stop();
|
||||
return r;
|
||||
}
|
||||
// 文件加密
|
||||
|
@ -72,7 +120,7 @@ namespace GameLogic {
|
|||
return;
|
||||
}
|
||||
byte[] data = File.ReadAllBytes(path);
|
||||
byte[] rb = crypt(data, key);
|
||||
byte[] rb = encryptHead(data, key);
|
||||
|
||||
File.WriteAllBytes(path, rb);
|
||||
}
|
||||
|
@ -86,7 +134,10 @@ namespace GameLogic {
|
|||
}
|
||||
else
|
||||
{
|
||||
ab = AssetBundle.LoadFromMemory(GameLogic.MEncyptUtil.DecyptAB(File.ReadAllBytes(path), encryptKey, offset));
|
||||
//ab = AssetBundle.LoadFromMemory(DecyptAB(File.ReadAllBytes(path), encryptKey, offset));
|
||||
if (encryptKey == null) encryptKey = "";
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(encryptKey);
|
||||
ab = AssetBundle.LoadFromFile(path, 0, (ulong)(cl.Length + (int)offset));
|
||||
}
|
||||
return ab;
|
||||
}
|
||||
|
@ -100,43 +151,78 @@ namespace GameLogic {
|
|||
}
|
||||
else
|
||||
{
|
||||
ab = AssetBundle.LoadFromMemoryAsync(GameLogic.MEncyptUtil.DecyptAB(File.ReadAllBytes(path), encryptKey, offset));
|
||||
//ab = AssetBundle.LoadFromMemoryAsync(DecyptAB(File.ReadAllBytes(path), encryptKey, offset));
|
||||
|
||||
byte[] cl = System.Text.Encoding.Default.GetBytes(encryptKey);
|
||||
ab = AssetBundle.LoadFromFileAsync(path, 0, (ulong)(cl.Length + (int)offset));
|
||||
}
|
||||
return ab;
|
||||
}
|
||||
//[MenuItem("Build/TEST")]
|
||||
//static void load()
|
||||
//{
|
||||
// byte[] a = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
|
||||
// string s = "";
|
||||
// for(int i = 0;i < a.Length; i++)
|
||||
// {
|
||||
// s += a[i];
|
||||
// }
|
||||
// XDebug.Log.l("a = " + s);
|
||||
static void Test()
|
||||
{
|
||||
AssetBundle.UnloadAllAssetBundles(true);
|
||||
System.Diagnostics.Stopwatch sw = new System.Diagnostics.Stopwatch();
|
||||
sw.Start();
|
||||
byte[] b = File.ReadAllBytes("/Users/ljsd/Documents/JieLing/Packager/IOS/TCX_CN_XIPU/Data/Raw/IOS/lz4_atlas_dyact_activity4.unity3d");
|
||||
Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
byte[] d = DecyptAB(b, "ae125efkk4_54eeff444ferfkny6oxi8", 128);
|
||||
Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
//AssetBundle.LoadFromMemory(d);
|
||||
//Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
sw.Stop();
|
||||
|
||||
// //AssetBundle.UnloadAllAssetBundles(true);
|
||||
// //sw.Start();
|
||||
// //AssetBundle.LoadFromFile("/Users/ljsd/Documents/JieLing/UnityProject/JL_china_ios/BuildABs/IOS/lz4_atlas_dyact_activity4.unity3d", 0, 128);
|
||||
// //Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
// //sw.Stop();
|
||||
|
||||
|
||||
// //AssetBundle.UnloadAllAssetBundles(true);
|
||||
// //sw.Start();
|
||||
// //byte[] bb = File.ReadAllBytes("/Users/ljsd/Documents/JieLing/UnityProject/JL_china_ios/BuildABs/IOS/lz4_atlas_dyact_activity4.unity3d");
|
||||
// //Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
// //byte[] dd = DecyptAB(bb, "", 128);
|
||||
// //Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
// //AssetBundle.LoadFromMemory(dd);
|
||||
// //Debug.Log(sw.Elapsed.TotalMilliseconds);
|
||||
// //sw.Stop();
|
||||
|
||||
}
|
||||
//[MenuItem("Build/TEST2")]
|
||||
static void load()
|
||||
{
|
||||
byte[] a = new byte[] { 1, 2, 3, 4, 5, 6, 7, 8, 9, 0 };
|
||||
string s = "";
|
||||
for (int i = 0; i < a.Length; i++)
|
||||
{
|
||||
s += a[i];
|
||||
}
|
||||
XDebug.Log.l("a = " + s);
|
||||
|
||||
|
||||
|
||||
// byte[] b = crypt(a, "key");
|
||||
// s = "";
|
||||
// for (int i = 0; i < b.Length; i++)
|
||||
// {
|
||||
// s += b[i];
|
||||
// }
|
||||
// XDebug.Log.l("b = " + s);
|
||||
byte[] b = encryptHead(a, "ae125efkk4_54eeff444ferfkny6oxi8");
|
||||
s = "";
|
||||
for (int i = 0; i < b.Length; i++)
|
||||
{
|
||||
s += b[i];
|
||||
}
|
||||
XDebug.Log.l("b = " + s);
|
||||
|
||||
|
||||
|
||||
// byte[] c = crypt(b, "key");
|
||||
// s = "";
|
||||
// for (int i = 0; i < c.Length; i++)
|
||||
// {
|
||||
// s += c[i];
|
||||
// }
|
||||
// XDebug.Log.l("c = " + s);
|
||||
byte[] c = decryptHead(b, "ae125efkk4_54eeff444ferfkny6oxi8");
|
||||
s = "";
|
||||
for (int i = 0; i < c.Length; i++)
|
||||
{
|
||||
s += c[i];
|
||||
}
|
||||
XDebug.Log.l("c = " + s);
|
||||
|
||||
|
||||
// //File.ReadAllBytes("");
|
||||
//}
|
||||
//File.ReadAllBytes("");
|
||||
}
|
||||
}
|
||||
}
|
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 308a28cba6275ae45818a4e4cb5c59e2
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 5c1ed125ea9ea0242a54268c516bb7db
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BattleAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 3.7 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 8a1bdb328c3c97246a338a439b05c2ae
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: cfead959ea914614790264222330e1ee
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BattleAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 4.2 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: cc8b0963b2abd7a4481753179b2ca8b7
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 0f188217e747fbd46a307d79592e3f84
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BattleAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 3.1 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: fe34870354ec0b04699c872747a05c72
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 4081e1af533624e46a54aa963892872b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BattleAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
After Width: | Height: | Size: 2.6 KiB |
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 0c416a854ed06b24a869b4042c28d252
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
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: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
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: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 56
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 84168f490acbd23459b731b93f1509b6
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag: BattleAtlas
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 6dff4fd50783d9b47abdac503f324b06
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3bc6930a46a10534eb58b88b041f03e5
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 53a3649449481da4e87e41e29a80a65e
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
Binary file not shown.
|
@ -0,0 +1,22 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ef8a895886007434cb9fcf76e64517f8
|
||||
AudioImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 6
|
||||
defaultSettings:
|
||||
loadType: 0
|
||||
sampleRateSetting: 0
|
||||
sampleRateOverride: 44100
|
||||
compressionFormat: 1
|
||||
quality: 1
|
||||
conversionMode: 0
|
||||
platformSettingOverrides: {}
|
||||
forceToMono: 0
|
||||
normalize: 1
|
||||
preloadAudioData: 1
|
||||
loadInBackground: 0
|
||||
ambisonic: 0
|
||||
3D: 1
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
|
@ -5054,6 +5054,7 @@ RectTransform:
|
|||
- {fileID: 208247563920512486}
|
||||
- {fileID: 1478133659566952327}
|
||||
- {fileID: 6979685406578874528}
|
||||
- {fileID: 6680226171587101182}
|
||||
- {fileID: 2043961333174016206}
|
||||
- {fileID: 2052763838201650754}
|
||||
- {fileID: 3088456174784992059}
|
||||
|
@ -14960,6 +14961,80 @@ ParticleSystemRenderer:
|
|||
m_Mesh2: {fileID: 0}
|
||||
m_Mesh3: {fileID: 0}
|
||||
m_MaskInteraction: 0
|
||||
--- !u!1 &1163096677516369895
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 299595285830895849}
|
||||
- component: {fileID: 968871098129697423}
|
||||
- component: {fileID: 2469121043055395424}
|
||||
m_Layer: 5
|
||||
m_Name: Img2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &299595285830895849
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1163096677516369895}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 6680226171587101182}
|
||||
m_RootOrder: 1
|
||||
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: -38.8}
|
||||
m_SizeDelta: {x: 117, y: 39}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &968871098129697423
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1163096677516369895}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2469121043055395424
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1163096677516369895}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 27d3e3bfba04a224c9694ce5e6e9c79f, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &1166631468014762931
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -15418,7 +15493,7 @@ RectTransform:
|
|||
- {fileID: 1971531226912261817}
|
||||
- {fileID: 2634665790303701291}
|
||||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 5
|
||||
m_RootOrder: 6
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
|
@ -35237,7 +35312,7 @@ RectTransform:
|
|||
- {fileID: 4452344794313098835}
|
||||
- {fileID: 8329855622185798631}
|
||||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 6
|
||||
m_RootOrder: 7
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 0}
|
||||
|
@ -40816,6 +40891,100 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &5121633682624462941
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 9171893541478643663}
|
||||
- component: {fileID: 1428778453636457313}
|
||||
- component: {fileID: 5233655276826746282}
|
||||
- component: {fileID: 8588285587988790546}
|
||||
m_Layer: 5
|
||||
m_Name: Img
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &9171893541478643663
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5121633682624462941}
|
||||
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_Children: []
|
||||
m_Father: {fileID: 6680226171587101182}
|
||||
m_RootOrder: 0
|
||||
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: 3.6}
|
||||
m_SizeDelta: {x: 120, y: 101}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1428778453636457313
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5121633682624462941}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &5233655276826746282
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5121633682624462941}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: f9195d99260587f49a39e815c6ba7bf6, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!95 &8588285587988790546
|
||||
Animator:
|
||||
serializedVersion: 3
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 5121633682624462941}
|
||||
m_Enabled: 1
|
||||
m_Avatar: {fileID: 0}
|
||||
m_Controller: {fileID: 9100000, guid: 5d9ac99b75d220c43ba06f575523555c, type: 2}
|
||||
m_CullingMode: 0
|
||||
m_UpdateMode: 0
|
||||
m_ApplyRootMotion: 0
|
||||
m_LinearVelocityBlending: 0
|
||||
m_WarningMessage:
|
||||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!1 &5197284246680073614
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -61070,7 +61239,7 @@ RectTransform:
|
|||
- {fileID: 5439423017807525752}
|
||||
- {fileID: 2092466590503268333}
|
||||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 4
|
||||
m_RootOrder: 5
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
|
@ -76233,6 +76402,126 @@ MonoBehaviour:
|
|||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!1 &8745388661372296966
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6680226171587101182}
|
||||
- component: {fileID: 6852460667181259617}
|
||||
- component: {fileID: 4256345495411969344}
|
||||
- component: {fileID: 6231140805489773553}
|
||||
m_Layer: 5
|
||||
m_Name: zqbgold
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &6680226171587101182
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8745388661372296966}
|
||||
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_Children:
|
||||
- {fileID: 9171893541478643663}
|
||||
- {fileID: 299595285830895849}
|
||||
- {fileID: 4738047345300084531}
|
||||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 4
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -97.5, y: -386.5}
|
||||
m_SizeDelta: {x: 129, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6852460667181259617
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8745388661372296966}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &4256345495411969344
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8745388661372296966}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: de99e18ee6101e146b6d63540708cc25, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
--- !u!114 &6231140805489773553
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8745388661372296966}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Navigation:
|
||||
m_Mode: 3
|
||||
m_SelectOnUp: {fileID: 0}
|
||||
m_SelectOnDown: {fileID: 0}
|
||||
m_SelectOnLeft: {fileID: 0}
|
||||
m_SelectOnRight: {fileID: 0}
|
||||
m_Transition: 3
|
||||
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_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_DisabledSprite: {fileID: 0}
|
||||
m_AnimationTriggers:
|
||||
m_NormalTrigger: Normal
|
||||
m_HighlightedTrigger: Highlighted
|
||||
m_PressedTrigger: Pressed
|
||||
m_DisabledTrigger: Disabled
|
||||
m_Interactable: 1
|
||||
m_TargetGraphic: {fileID: 4256345495411969344}
|
||||
m_OnClick:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0,
|
||||
Culture=neutral, PublicKeyToken=null
|
||||
--- !u!1 &8901245275490365540
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
@ -81297,11 +81586,6 @@ PrefabInstance:
|
|||
m_Modification:
|
||||
m_TransformParent: {fileID: 6979685406578874528}
|
||||
m_Modifications:
|
||||
- target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Fx_Circle 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
|
@ -81407,6 +81691,11 @@ PrefabInstance:
|
|||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Fx_Circle 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3}
|
||||
--- !u!224 &184284645826008713 stripped
|
||||
|
@ -81415,3 +81704,128 @@ RectTransform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 368702410255057534}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1001 &5067602908007744452
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
m_TransformParent: {fileID: 6680226171587101182}
|
||||
m_Modifications:
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: -0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_RootOrder
|
||||
value: 2
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchoredPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.x
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_SizeDelta.y
|
||||
value: 100
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMin.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_AnchorMax.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.x
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_Pivot.y
|
||||
value: 0.5
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 545869090935395574, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: Fx_Circle 1
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ccf72b26803e0d34cb0033c5bdd37418, type: 3}
|
||||
--- !u!224 &4738047345300084531 stripped
|
||||
RectTransform:
|
||||
m_CorrespondingSourceObject: {fileID: 545869090935395575, guid: ccf72b26803e0d34cb0033c5bdd37418,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 5067602908007744452}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
|
|
@ -123,4 +123,6 @@ SoundConfig = {
|
|||
Audio_linglongbaojing_longpanxuan_005 = "Audio_linglongbaojing_longpanxuan_005",
|
||||
Audio_linglongbaojing_waiquandianliang_008 = "Audio_linglongbaojing_waiquandianliang_008",
|
||||
Audio_linglongbaojing_waiquanlunge_009 = "Audio_linglongbaojing_waiquanlunge_009",
|
||||
Audio_fangcunzhuanpan_0 = "Audio_fangcunzhuanpan_0",
|
||||
Audio_fangcunzhuanpan_1 = "Audio_fangcunzhuanpan_1",
|
||||
}
|
|
@ -5664,15 +5664,20 @@ local passivityList = {
|
|||
end
|
||||
role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role)
|
||||
end,
|
||||
--技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害,并降低其[b]点怒气
|
||||
-- a[float],b[int]
|
||||
--技能击杀目标溢出伤害的[a]%将对生命百分比最高的攻击目标造成伤害,并降低其[b]点怒气,每回合最多减[c]点怒气
|
||||
-- a[float],b[int],c[int]
|
||||
[257]=function(role,args,id,judge)
|
||||
local f1 = args[1]
|
||||
local num = args[2]
|
||||
local maxNum=args[3]
|
||||
if not args[2] then
|
||||
num=0
|
||||
end
|
||||
if args[3]==nil then
|
||||
maxNum=6
|
||||
end
|
||||
local point=nil
|
||||
local curNum=0
|
||||
-- 直接伤害后
|
||||
local onRoleHit = function(target, damage, bCrit, finalDmg, damageType, skill)
|
||||
if skill and not skill.isTriggerJudge and judge==1 then
|
||||
|
@ -5688,16 +5693,22 @@ local passivityList = {
|
|||
point=list[1]
|
||||
end
|
||||
BattleUtil.FinalDamage(nil,role,point,dmg)
|
||||
if curNum>=maxNum then
|
||||
return
|
||||
end
|
||||
if num>0 then
|
||||
BattleUtil.CalRage(role,point,num,CountTypeName.Sub)
|
||||
curNum=curNum+num
|
||||
end
|
||||
|
||||
end
|
||||
|
||||
-- end
|
||||
end
|
||||
end
|
||||
role.Event:AddEvent(BattleEventName.RoleHit, onRoleHit,nil,nil,role)
|
||||
|
||||
local onRoundChange=function()
|
||||
curNum=0
|
||||
end
|
||||
BattleLogic.Event:AddEvent(BattleEventName.BattleRoundChange,onRoundChange,nil,nil,role)
|
||||
end,
|
||||
--技能追加的普攻额外造成目标[a][b]%的伤害。,生命每下降[c]%,额外生命百分比加[d]%(c d 不填不增加)
|
||||
--a[int 属性id] b[float],c[float],d[float]
|
||||
|
|
|
@ -278,7 +278,7 @@ function BattleLogic.TurnRound(debugTurn)
|
|||
-- 检测一次灵兽技能
|
||||
SkillManager.CheckMonsterSkill(function()
|
||||
--轮数变化后延时0.2秒用于初始化监听回合数被动的初始化
|
||||
BattleLogic.WaitForTrigger(1,function()
|
||||
BattleLogic.WaitForTrigger(0.5,function()
|
||||
-- 进入新轮
|
||||
BattleLogic.CheckBattleLogic()
|
||||
end)
|
||||
|
@ -288,7 +288,7 @@ function BattleLogic.TurnRound(debugTurn)
|
|||
-- 检测一次灵兽技能
|
||||
SkillManager.CheckMonsterSkill(function()
|
||||
--轮数变化后延时0.2秒用于初始化监听回合数被动的初始化
|
||||
BattleLogic.WaitForTrigger(1,function()
|
||||
BattleLogic.WaitForTrigger(0.5,function()
|
||||
-- 切换阵营
|
||||
if not insertSkillRole then
|
||||
CurCamp = (CurCamp + 1) % 2
|
||||
|
|
|
@ -311,6 +311,7 @@ end
|
|||
function IncarnationLottery:TurnEffectReset(turnSpeed,isStop,pos,func)
|
||||
local s = function()
|
||||
if isStop then
|
||||
SoundManager.PlaySound(SoundConfig.Audio_fangcunzhuanpan_0)
|
||||
self._last = self.center.transform.localRotation.z
|
||||
local a = self._cyclesNum * -360 - (10 - pos + 1) * 36;
|
||||
self.tween:Kill()
|
||||
|
|
|
@ -192,6 +192,10 @@ function this:BindEvent()
|
|||
|
||||
--SDK 登录
|
||||
Util.AddClick(this.sdkLoginBtn, function()
|
||||
-- 喜扑IOS包sdk无法屏蔽点击事件,不允许主动触发
|
||||
if LoginRoot_Channel == "XP2" then
|
||||
return
|
||||
end
|
||||
this.SDKLogin()
|
||||
end)
|
||||
|
||||
|
|
|
@ -732,6 +732,8 @@ local jumpDic = {
|
|||
local id2= ActivityGiftManager.IsActivityTypeOpen(ActivityTypeDef.YiJingBaoKu)
|
||||
if id then
|
||||
JumpManager.GoJump(40050,nil,id2)
|
||||
else
|
||||
this.JumpActivity(JumpType.zhenqibaoge,data[1])
|
||||
end
|
||||
end,
|
||||
[JumpType.LingShouTehui] = function(data)--零售特惠
|
||||
|
|
|
@ -72,7 +72,8 @@ function RoleAwakeSuccessPanel:OnOpen(_curHeroData,_nextHeroUpStarId,_curHeroRan
|
|||
this.LiveName = GetResourcePath(curHeroData.heroConfig.Live)
|
||||
this.LiveGO = poolManager:LoadLive(this.LiveName, this.live2dRoot.transform,
|
||||
Vector3.one * curHeroData.heroConfig.Scale, Vector3.New(curHeroData.heroConfig.Position[1],curHeroData.heroConfig.Position[2],0))
|
||||
local star,starType = curHeroData.GetStar(1)
|
||||
local star,starType = curHeroData.GetStar(1)
|
||||
SetHEeroLiveToward(this.LiveGO,curHeroData.heroConfig.Toward,curHeroData.heroConfig.Position)
|
||||
local starSize = Vector2.New(60,60)
|
||||
local starScale = -11
|
||||
if starType == 3 then
|
||||
|
|
|
@ -32,6 +32,9 @@ function TailsmanSoulChipLottery:InitComponent()
|
|||
self.zqbgEffect = Util.GetGameObject(self.zhenqibaogeBtn,"Fx_Circle 1")
|
||||
self.btn_soul = Util.GetGameObject(self.rightUp, "btn_hero")
|
||||
self.upSoulImg= Util.GetGameObject(self.btn_soul, "Icon"):GetComponent("Image")
|
||||
|
||||
self.zqbgOldBtn = Util.GetGameObject(self.rightUp,"zqbgold")
|
||||
self.zqbgOldEffect = Util.GetGameObject(self.zqbgOldBtn,"Fx_Circle 1")
|
||||
Util.GetGameObject(self.btn_soul,"InfoImg"):GetComponent("Image").sprite = self.spLoader:LoadSprite("t_tdhl_genghuansuipian")
|
||||
|
||||
self.btns = {}
|
||||
|
@ -63,9 +66,12 @@ end
|
|||
--绑定事件(用于子类重写)
|
||||
function TailsmanSoulChipLottery:BindEvent()
|
||||
Util.AddOnceClick(self.zhenqibaogeBtn, function()
|
||||
JumpManager.GoJump(40050,nil,self.actId)
|
||||
end)
|
||||
Util.AddOnceClick(self.zqbgOldBtn, function()
|
||||
JumpManager.GoJump(40011)
|
||||
end)
|
||||
Util.AddOnceClick(self.btnHelp, function()
|
||||
Util.AddOnceClick(self.btnHelp, function()
|
||||
UIManager.OpenPanel(UIName.HelpPopup,self.actConfig.HelpId,self.helpPosition.x,self.helpPosition.y)
|
||||
end)
|
||||
|
||||
|
@ -73,11 +79,11 @@ function TailsmanSoulChipLottery:BindEvent()
|
|||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.RecrutDetail,self.actConfig.HelpId,self.actType,PRE_REWARD_POOL_TYPE.TIANDIHONGLU_UP,PRE_REWARD_POOL_TYPE.TIANDIHONGLU)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.btnStore, function()
|
||||
Util.AddOnceClick(self.btnStore, function()
|
||||
JumpManager.GoJump(40047)
|
||||
end)
|
||||
|
||||
Util.AddOnceClick(self.btn_soul, function()
|
||||
Util.AddOnceClick(self.btn_soul, function()
|
||||
UIManager.OpenPanel(UIName.GeneralBigPopup,GENERAL_POPUP_TYPE.chooseTailsManSoul)
|
||||
end)
|
||||
|
||||
|
@ -117,6 +123,7 @@ end
|
|||
function TailsmanSoulChipLottery:OnSortingOrderChange(_sortingOrder)
|
||||
sortingOrder = _sortingOrder or 0
|
||||
Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1)
|
||||
Util.SetParticleSortLayer(self.zqbgOldEffect, sortingOrder+1)
|
||||
for i = 1, 5 do
|
||||
if self.icons[i] and self.icons[i].effect then
|
||||
Util.SetParticleSortLayer(self.icons[i].effect.gameObject, sortingOrder+1)
|
||||
|
@ -129,6 +136,7 @@ function TailsmanSoulChipLottery:OnShow(_sortingOrder)
|
|||
self.gameObject:SetActive(true)
|
||||
sortingOrder = _sortingOrder
|
||||
Util.SetParticleSortLayer(self.zqbgEffect, sortingOrder+1)
|
||||
Util.SetParticleSortLayer(self.zqbgOldEffect, sortingOrder+1)
|
||||
self.actId = self.actConfig.ActId
|
||||
self.actType = self.actConfig.ActiveType > 0 and self.actConfig.ActiveType or self.actConfig.FunType
|
||||
if self.actConfig.IfBack == 1 then
|
||||
|
@ -148,6 +156,7 @@ function TailsmanSoulChipLottery:OnShow(_sortingOrder)
|
|||
self.tenRecruit = array[2]
|
||||
self.freeTimesId=self.singleRecruit.FreeTimes
|
||||
self.maxtimesId=self.singleRecruit.MaxTimes
|
||||
CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,self.actId)
|
||||
self:refreshMagicNum()
|
||||
self:refreshBtnShow()--刷新按钮显示
|
||||
self:contentShow()
|
||||
|
|
|
@ -125,6 +125,7 @@ function XunBaoMiZong:Refresh()
|
|||
|
||||
local isActive = CommonActPageManager.HasContinueGift(self.actData.activityId)
|
||||
self.btnGift:SetActive(isActive)
|
||||
CommonActPageManager.ShowIcon(self.zhenqibaogeBtn,self.actData.activityId)
|
||||
|
||||
CompleteMap = self.actData.value == 1
|
||||
CheckRedPointStatus(RedPointType.XunBaoMiZong)
|
||||
|
|
Loading…
Reference in New Issue