Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
ZhangBiao 2021-08-06 14:21:48 +08:00
commit f40d297086
44 changed files with 148441 additions and 86 deletions

View File

@ -415,15 +415,37 @@ public class AutoPack : EditorWindow
GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>>" + APKPath + "/_log.txt"); GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>>" + APKPath + "/_log.txt");
EditorUtility.DisplayProgressBar("正在导出APK", "", 1f); EditorUtility.DisplayProgressBar("正在导出APK", "", 1f);
string versionStr = GetAPKVersionStr(PackConfig[index][2]);
string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk"; string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk";
if (File.Exists(apkFilePath)) if (File.Exists(apkFilePath))
{ {
File.Copy(apkFilePath, APKPath + "/" + PackConfig[index][2] + ".apk"); File.Copy(apkFilePath, APKPath + "/" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk");
} }
Debug.Log(PackConfig[index][0] + ":打包完成"); Debug.Log(PackConfig[index][0] + ":打包完成");
EditorUtility.ClearProgressBar(); EditorUtility.ClearProgressBar();
} }
private static string GetAPKVersionStr(string folder)
{
string tpath = _MomPackPath + folder + "/build.gradle";
string[] lines = File.ReadAllLines(tpath);
string versionCode = "";
string versionName = "";
foreach (string l in lines)
{
string lt = l.Trim();
if (lt.StartsWith("versionCode"))
{
versionCode = lt.Split(' ')[1];
}else if (lt.StartsWith("versionName"))
{
versionName = lt.Split('\'')[1];
}
}
return string.Format("{0}({1})", versionName, versionCode);
}
private static void GitUpdate(int index) private static void GitUpdate(int index)
{ {
EditorUtility.DisplayProgressBar("正在更新母包", "", 0f); EditorUtility.DisplayProgressBar("正在更新母包", "", 0f);
@ -434,13 +456,14 @@ public class AutoPack : EditorWindow
{ {
if (CommitToGit) if (CommitToGit)
{ {
string versionStr = GetAPKVersionStr(PackConfig[index][2]);
EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); EditorUtility.DisplayProgressBar("正在提交修改", "", 0f);
string printlog = ">>" + APKPath + "/_log.txt"; string printlog = ">>" + APKPath + "/_log.txt";
string[] commands = new string[]{ string[] commands = new string[]{
"echo git add ." + printlog, "echo git add ." + printlog,
"git add ." + printlog, "git add ." + printlog,
"echo git commit -m 'AutoPack" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, "echo git commit -m 'AutoPack" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk'" + printlog,
"git commit -m 'AutoPack" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, "git commit -m 'AutoPack" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk'" + printlog,
"git push", "git push",
}; };
ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands); ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands);

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 16 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 500471d4950908b46b1a9e6f7ab2a611 guid: afc28245507055045ad3a0f580613f28
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
platformSettings: platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2 - serializedVersion: 2
buildTarget: Android buildTarget: Android
maxTextureSize: 2048 maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 206e1a99938185741bca8ca44b4fff76 spriteID: 5bd397e9eded009468f11d22d93a2ab5
vertices: [] vertices: []
indices: indices:
edges: [] edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 246 KiB

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 5c24c49833ddaab448d2b230ef08c944 guid: 1dbc9e0a4bd0ab0439201555cf85cfa4
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
platformSettings: platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2 - serializedVersion: 2
buildTarget: Android buildTarget: Android
maxTextureSize: 2048 maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 7c8b8528bcbf8b541942c86bb2d95848 spriteID: 241abe3693028564f82bea615990d0f2
vertices: [] vertices: []
indices: indices:
edges: [] edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 240 KiB

After

Width:  |  Height:  |  Size: 17 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 0c04391d20670eb41b2748ac1f25c304 guid: b314cce6fa1642e45b059c29f91130fd
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
platformSettings: platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2 - serializedVersion: 2
buildTarget: Android buildTarget: Android
maxTextureSize: 2048 maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 337da567e7aacaa4c82d0ff6ccc4da8d spriteID: 036a9c10c365b5642bf757f8ac0c8fee
vertices: [] vertices: []
indices: indices:
edges: [] edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 245 KiB

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: a23b83bbf2ea0e549acd65b42cb2ec20 guid: 98d8200b96572a24eae5802a12851661
TextureImporter: TextureImporter:
fileIDToRecycleName: {} fileIDToRecycleName: {}
externalObjects: {} externalObjects: {}
@ -58,6 +58,17 @@ TextureImporter:
compressionQualitySet: 0 compressionQualitySet: 0
textureFormatSet: 0 textureFormatSet: 0
platformSettings: platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2 - serializedVersion: 2
buildTarget: Android buildTarget: Android
maxTextureSize: 2048 maxTextureSize: 2048
@ -80,24 +91,13 @@ TextureImporter:
allowsAlphaSplitting: 0 allowsAlphaSplitting: 0
overridden: 1 overridden: 1
androidETC2FallbackOverride: 0 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: spriteSheet:
serializedVersion: 2 serializedVersion: 2
sprites: [] sprites: []
outline: [] outline: []
physicsShape: [] physicsShape: []
bones: [] bones: []
spriteID: 0b11c230ab065cd4cb7b0a8998210f14 spriteID: a4179c37407322e4b9407cebfb282b95
vertices: [] vertices: []
indices: indices:
edges: [] edges: []

View File

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

View File

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

View File

@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_daoxuanab
m_Shader: {fileID: 4800000, guid: 48fc47a7c6414184d94d4f73bd7d79eb, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2998
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: a10311cca838a864ab2b813125eb1319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 08d287e92b5dbd54195ab27d5cadc8f7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Main_Tex_RA: 0
- _Metallic: 0
- _Mode: 0
- _Msak_RA: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0, g: 2.0122213, b: 27.452448, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8884d7da00cf33e42a35598250156bee
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_daoxuanadd
m_Shader: {fileID: 4800000, guid: 4acbea0382cd6854ca0fbf80a29dd0b6, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: b60920f909a056a4ca620cf58d967354, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1.1643723, g: 1.4475187, b: 3.177073, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 7fa7c2010fa6855418cf2a60d02f4246
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_fochanab
m_Shader: {fileID: 4800000, guid: 48fc47a7c6414184d94d4f73bd7d79eb, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2998
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: a10311cca838a864ab2b813125eb1319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 08d287e92b5dbd54195ab27d5cadc8f7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Main_Tex_RA: 0
- _Metallic: 0
- _Mode: 0
- _Msak_RA: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 3.5648696, g: 2.34689, b: 0.5212781, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 1b51a7aa839766849a4753bdf2f60f45
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_fochanadd
m_Shader: {fileID: 4800000, guid: 4acbea0382cd6854ca0fbf80a29dd0b6, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: b60920f909a056a4ca620cf58d967354, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1.7824348, g: 1.3127468, b: 0.4456087, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 738b65047b5abea4282c199cefc88ad2
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_renjieab
m_Shader: {fileID: 4800000, guid: 48fc47a7c6414184d94d4f73bd7d79eb, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2998
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: a10311cca838a864ab2b813125eb1319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 08d287e92b5dbd54195ab27d5cadc8f7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Main_Tex_RA: 0
- _Metallic: 0
- _Mode: 0
- _Msak_RA: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1.3018868, g: 0.46255845, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: fde8fdb7cbee46344a1454731f57d82b
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_renjieadd
m_Shader: {fileID: 4800000, guid: 4acbea0382cd6854ca0fbf80a29dd0b6, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: b60920f909a056a4ca620cf58d967354, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 2.1960785, g: 1.4117647, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 90eb829444b69f444a22c309cec8ec30
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,64 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_siban
m_Shader: {fileID: 4800000, guid: cd73b754ea97c04468b1349981704714, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 842bfc8e0ad971e4b81197bae68b3819, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BlendOp: 0
- _BumpScale: 1
- _CameraFadingEnabled: 0
- _CameraFarFadeDistance: 2
- _CameraNearFadeDistance: 1
- _ColorMode: 0
- _Cull: 2
- _Cutoff: 0.5
- _DistortionBlend: 0.5
- _DistortionEnabled: 0
- _DistortionStrength: 1
- _DistortionStrengthScaled: 0
- _DstBlend: 0
- _EmissionEnabled: 0
- _FlipbookMode: 0
- _InvFade: 1
- _LightingEnabled: 0
- _Mode: 0
- _SoftParticlesEnabled: 0
- _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0
- _SrcBlend: 1
- _ZWrite: 1
m_Colors:
- _CameraFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}
- _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 20e637da944d3a541bde987badfbb1cc
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,98 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_yaolinab
m_Shader: {fileID: 4800000, guid: 48fc47a7c6414184d94d4f73bd7d79eb, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: 2998
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: a10311cca838a864ab2b813125eb1319, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: 08d287e92b5dbd54195ab27d5cadc8f7, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Main_Tex_RA: 0
- _Metallic: 0
- _Mode: 0
- _Msak_RA: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1.2919158, g: 0, b: 1.715778, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 0d89a6b70cd371643b83521e6ca81424
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,96 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: fx_shiyuanzheng_yaolingadd
m_Shader: {fileID: 4800000, guid: 4acbea0382cd6854ca0fbf80a29dd0b6, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Grain:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6d1fb08b384ef144791adab43dfc41d0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Main_Tex:
m_Texture: {fileID: 2800000, guid: 69ecf84b4716d8543844cccca9e4815f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _Mask:
m_Texture: {fileID: 2800000, guid: b60920f909a056a4ca620cf58d967354, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Grain_U_Speed: 1
- _Grain_V_Speed: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _Rotator: 0
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _U_Speed: -1
- _V_Speed: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 2.181311, g: 1.1539369, b: 3.1770732, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _Grain_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}
- _Main_Color: {r: 2.9960785, g: 2.9960785, b: 2.9960785, a: 1}

View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a17dedcdd22540749bc775276daca205
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

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

View File

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

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 530e7e6701a3d984a8d9ec1a12ebad58
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

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

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

View File

@ -0,0 +1,110 @@
fileFormatVersion: 2
guid: 842bfc8e0ad971e4b81197bae68b3819
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: -1
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: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 2
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
- serializedVersion: 2
buildTarget: Android
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: 4cdce6b09b8d5364a8f6571c693e8447
vertices: []
indices:
edges: []
weights: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

View File

@ -22,6 +22,7 @@ ServerConfigManager.SettingConfig = {
IS_SELECT_RESLUTION = "IS_SELECT_RESLUTION", -- 是否可以选择帧率 IS_SELECT_RESLUTION = "IS_SELECT_RESLUTION", -- 是否可以选择帧率
USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道 USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道
USER_PROTO = "USER_PROTO", -- 用户协议功能是否开启 USER_PROTO = "USER_PROTO", -- 用户协议功能是否开启
IS_NO_NOTICE = "IS_NO_NOTICE", -- 是否禁用公告
} }

View File

@ -305,7 +305,7 @@ end
function this.CheckNoticeShow() function this.CheckNoticeShow()
-- 判断公告显示 -- 判断公告显示
IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 IsShowNotice = not ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_NO_NOTICE)
this.btnNotice:SetActive(IsShowNotice) this.btnNotice:SetActive(IsShowNotice)
end end
-- 打开公告界面 -- 打开公告界面
@ -317,6 +317,11 @@ function this.ShowNotice()
local subNoticeID = PackageManager.GetSubNoticeID() local subNoticeID = PackageManager.GetSubNoticeID()
if subNoticeID then if subNoticeID then
noticeChannel = noticeChannel.. subNoticeID noticeChannel = noticeChannel.. subNoticeID
else
local packID = PackageManager.GetPackageID()
if packID then
noticeChannel = noticeChannel .. packID
end
end end
local url = LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..noticeChannel local url = LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..noticeChannel
Log(url) Log(url)

View File

@ -22,6 +22,7 @@ function ElementDrawCardPanelNew:InitComponent()
self.getCardPanel = Util.GetGameObject(self.transform, "getCardPanel") self.getCardPanel = Util.GetGameObject(self.transform, "getCardPanel")
self.getCardPanel.gameObject:SetActive(false) self.getCardPanel.gameObject:SetActive(false)
self.getCardPanelCanvas = self.getCardPanel:GetComponent("Canvas")
self.root = Util.GetGameObject(self.getCardPanel, "root") self.root = Util.GetGameObject(self.getCardPanel, "root")
self.content2 = Util.GetGameObject(self.getCardPanel,"content2") self.content2 = Util.GetGameObject(self.getCardPanel,"content2")
self.buyOneBtn = Util.GetGameObject(self.getCardPanel,"content2/btn1") self.buyOneBtn = Util.GetGameObject(self.getCardPanel,"content2/btn1")
@ -39,9 +40,12 @@ function ElementDrawCardPanelNew:InitComponent()
self.itemPos[i] = {} self.itemPos[i] = {}
self.itemPos[i].pos = Util.GetGameObject(self.transform, "enterCardPanel/itemPos/itemPre"..i) self.itemPos[i].pos = Util.GetGameObject(self.transform, "enterCardPanel/itemPos/itemPre"..i)
self.itemPos[i].btn = Util.GetGameObject(self.itemPos[i].pos, "Button") self.itemPos[i].btn = Util.GetGameObject(self.itemPos[i].pos, "Button")
self.itemPos[i].codeLayer = Util.GetGameObject(self.itemPos[i].pos, "Image"):GetComponent("Canvas")
self.itemPos[i].effect = Util.GetGameObject(self.itemPos[i].pos, "effect")
end end
self.effect=Util.GetGameObject(self.transform, "effect") self.effect=Util.GetGameObject(self.transform, "effect")
self.UI_effect_RecruitPanel_particle=Util.GetGameObject(self.effect, "UI_effect_RecruitPanel_particle") self.UI_effect_RecruitPanel_particle=Util.GetGameObject(self.effect, "UI_effect_RecruitPanel_particle")
self.fx_shiyuanzheng_diban=Util.GetGameObject(self.transform, "fx_shiyuanzheng_diban")
self.qianghua=Util.GetGameObject(self.effect, "qianghua") self.qianghua=Util.GetGameObject(self.effect, "qianghua")
self.bgImage=Util.GetGameObject(self.transform, "bgImage") self.bgImage=Util.GetGameObject(self.transform, "bgImage")
self.previewBtn = Util.GetGameObject(self.transform, "enterCardPanel/previewBtn") self.previewBtn = Util.GetGameObject(self.transform, "enterCardPanel/previewBtn")
@ -201,7 +205,15 @@ end
function ElementDrawCardPanelNew:OnSortingOrderChange(sortingOrder) function ElementDrawCardPanelNew:OnSortingOrderChange(sortingOrder)
self.sortingOrder = sortingOrder self.sortingOrder = sortingOrder
Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1)
Util.SetParticleSortLayer(self.qianghua, self.sortingOrder + 1) Util.SetParticleSortLayer(self.qianghua, self.sortingOrder + 4)
Util.SetParticleSortLayer(self.fx_shiyuanzheng_diban, self.sortingOrder + 1)
self.getCardPanelCanvas.overrideSorting = true
self.getCardPanelCanvas.sortingOrder = self.sortingOrder + 3
for i = 1,4 do
self.itemPos[i].codeLayer.overrideSorting = true
self.itemPos[i].codeLayer.sortingOrder = self.sortingOrder + 2
Util.SetParticleSortLayer(self.itemPos[i].effect , self.sortingOrder + 1)
end
end end
--界面打开时调用(用于子类重写) --界面打开时调用(用于子类重写)
@ -223,7 +235,15 @@ function ElementDrawCardPanelNew:OnShow(orginLayer)
self.parent.mask2.sprite = self.spLoader:LoadSprite(self.config.Icon[3]) self.parent.mask2.sprite = self.spLoader:LoadSprite(self.config.Icon[3])
self.parent.mask1.sprite = self.spLoader:LoadSprite(self.config.Icon[3]) self.parent.mask1.sprite = self.spLoader:LoadSprite(self.config.Icon[3])
Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1) Util.SetParticleSortLayer(self.UI_effect_RecruitPanel_particle, self.sortingOrder + 1)
Util.SetParticleSortLayer(self.qianghua, self.sortingOrder + 1) Util.SetParticleSortLayer(self.fx_shiyuanzheng_diban, self.sortingOrder + 1)
Util.SetParticleSortLayer(self.qianghua, self.sortingOrder + 4)
self.getCardPanelCanvas.overrideSorting = true
self.getCardPanelCanvas.sortingOrder = self.sortingOrder + 3
for i = 1,4 do
self.itemPos[i].codeLayer.overrideSorting = true
self.itemPos[i].codeLayer.sortingOrder = self.sortingOrder + 2
Util.SetParticleSortLayer(self.itemPos[i].effect, self.sortingOrder + 1)
end
self.itemPosCom.enabled = false self.itemPosCom.enabled = false
if isPlayAnim then if isPlayAnim then
isPlayAnim = false isPlayAnim = false

View File

@ -78,7 +78,7 @@ local function SetItemIndex(self, curIndex)
end end
end end
local function SetPosition(self, dv2) local function SetPosition(self, dv2,isBack)
local av2 = self.dragGOTran.anchoredPosition local av2 = self.dragGOTran.anchoredPosition
if self.dragType == 1 then if self.dragType == 1 then
dv2.x = 0 dv2.x = 0
@ -92,12 +92,16 @@ local function SetPosition(self, dv2)
if self.dragType == 1 then if self.dragType == 1 then
if fv2.y < (0 - self.maxOffSet) or fv2.y > (self.itemDis + self.maxOffSet) then if fv2.y < (0 - self.maxOffSet) or fv2.y > (self.itemDis + self.maxOffSet) then
fv2.y = math.clamp(fv2.y, 0, self.itemDis) fv2.y = math.clamp(fv2.y, 0, self.itemDis)
return if not isBack then
return
end
end end
elseif self.dragType == 2 then elseif self.dragType == 2 then
if fv2.x < (0 - self.maxOffSet) or fv2.x > (self.itemDis + self.maxOffSet) then if fv2.x < (0 - self.maxOffSet) or fv2.x > (self.itemDis + self.maxOffSet) then
fv2.x = math.clamp(-fv2.x, -self.itemDis, 0) fv2.x = math.clamp(-fv2.x, -self.itemDis, 0)
return if not isBack then
return
end
end end
end end
else else
@ -142,7 +146,7 @@ end
local function OnEndDrag(self, Pointgo, data) local function OnEndDrag(self, Pointgo, data)
if not self.isBeginDrag then return end if not self.isBeginDrag then return end
if not self.dataList then return end if not self.dataList then return end
SetPosition(self, data.delta) SetPosition(self, data.delta,true)
self.moveTween.IsUseCallBack = true self.moveTween.IsUseCallBack = true
data:Use() data:Use()
self.isBeginDrag = false self.isBeginDrag = false

View File

@ -1,6 +1,5 @@
包配置PackConfig.txt参数字段说明 包配置PackConfig.txt参数字段说明
PackID 用于标识母包的唯一ID PackID 用于标识母包的唯一ID
SubNoticeID 用于子包自定义公告用的ID
UpdatePanelBG 更新界面背景只支持png UpdatePanelBG 更新界面背景只支持png
LoginPanelBG 登录界面背景只支持png LoginPanelBG 登录界面背景只支持png
LoginPanelLogo 登录界面Logo只支持png LoginPanelLogo 登录界面Logo只支持png