diff --git a/Assets/BuiltinAssets/Material/Default-Diffuse.mat b/Assets/BuiltinAssets/Material/Default-Diffuse.mat
index bd35bb224..f7f797eb5 100644
--- a/Assets/BuiltinAssets/Material/Default-Diffuse.mat
+++ b/Assets/BuiltinAssets/Material/Default-Diffuse.mat
@@ -18,6 +18,10 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
+ - _Detail:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
diff --git a/Assets/BuiltinAssets/Material/Default-Diffuse.mat.meta b/Assets/BuiltinAssets/Material/Default-Diffuse.mat.meta
index eacb4d26d..cc07cf681 100644
--- a/Assets/BuiltinAssets/Material/Default-Diffuse.mat.meta
+++ b/Assets/BuiltinAssets/Material/Default-Diffuse.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 4ab4e2a8a43b8a1478a357a07f831abb
-timeCreated: 1534843462
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Material/Default-Line.mat b/Assets/BuiltinAssets/Material/Default-Line.mat
index d431afccc..46e24ecd1 100644
--- a/Assets/BuiltinAssets/Material/Default-Line.mat
+++ b/Assets/BuiltinAssets/Material/Default-Line.mat
@@ -18,10 +18,64 @@ Material:
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}
- _MainTex:
m_Texture: {fileID: 0}
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
- _InvFade: 1
- m_Colors: []
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Shininess: 0.078125
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmisColor: {r: 0.2, g: 0.2, b: 0.2, a: 0}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Assets/BuiltinAssets/Material/Default-Line.mat.meta b/Assets/BuiltinAssets/Material/Default-Line.mat.meta
index 67a0a8b38..0f4571c10 100644
--- a/Assets/BuiltinAssets/Material/Default-Line.mat.meta
+++ b/Assets/BuiltinAssets/Material/Default-Line.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: fef346ae97b938642813784b48b0e972
-timeCreated: 1534843463
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Material/Default-Material.mat b/Assets/BuiltinAssets/Material/Default-Material.mat
index 0d0a84cfb..b961515ba 100644
--- a/Assets/BuiltinAssets/Material/Default-Material.mat
+++ b/Assets/BuiltinAssets/Material/Default-Material.mat
@@ -22,6 +22,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _Detail:
+ 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}
@@ -46,6 +50,10 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
+ - _Occlusion:
+ 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}
@@ -55,13 +63,16 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
+ - _AlphaTestRef: 0.5
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
+ - _EmissionScaleUI: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
+ - _Lightmapping: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
@@ -74,3 +85,5 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0.99999994}
+ - _EmissionColorUI: {r: 0, g: 0, b: 0, a: 1}
+ - _EmissionColorWithMapUI: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/BuiltinAssets/Material/Default-Particle.mat b/Assets/BuiltinAssets/Material/Default-Particle.mat
index 47dc3d686..0b812e75b 100644
--- a/Assets/BuiltinAssets/Material/Default-Particle.mat
+++ b/Assets/BuiltinAssets/Material/Default-Particle.mat
@@ -24,4 +24,7 @@ Material:
m_Offset: {x: 0, y: 0}
m_Floats:
- _InvFade: 1
- m_Colors: []
+ - _Shininess: 0.078125
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _SpecColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/BuiltinAssets/Material/Default-Skybox.mat b/Assets/BuiltinAssets/Material/Default-Skybox.mat
index cba18372d..eaca80a7e 100644
--- a/Assets/BuiltinAssets/Material/Default-Skybox.mat
+++ b/Assets/BuiltinAssets/Material/Default-Skybox.mat
@@ -23,6 +23,7 @@ Material:
- _Exposure: 1.3
- _SunDisk: 1
- _SunSize: 0.04
+ - _SunSizeConvergence: 5
m_Colors:
- _GroundColor: {r: 0.369, g: 0.349, b: 0.341, a: 1}
- _SkyTint: {r: 0.5, g: 0.5, b: 0.5, a: 1}
diff --git a/Assets/BuiltinAssets/Material/Default-Skybox.mat.meta b/Assets/BuiltinAssets/Material/Default-Skybox.mat.meta
index 9b1d5416f..92656897e 100644
--- a/Assets/BuiltinAssets/Material/Default-Skybox.mat.meta
+++ b/Assets/BuiltinAssets/Material/Default-Skybox.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 7c3cb3e1d1aa29c40b082464f58e713c
-timeCreated: 1534843463
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat b/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat
index 86b5aaa0a..1e23eb3f9 100644
--- a/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat
+++ b/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat
@@ -17,6 +17,87 @@ Material:
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
- m_TexEnvs: []
- m_Floats: []
- m_Colors: []
+ m_TexEnvs:
+ - _BackTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _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}
+ - _DownTex:
+ 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}
+ - _FrontTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _LeftTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ 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}
+ - _RightTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _UpTex:
+ 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
+ - _Exposure: 1
+ - _GlossMapScale: 1
+ - _Glossiness: 0.5
+ - _GlossyReflections: 1
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _Rotation: 0
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
+ - _Tint: {r: 0.5, g: 0.5, b: 0.5, a: 0.5}
diff --git a/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat.meta b/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat.meta
index 664ab50a8..3a314e753 100644
--- a/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat.meta
+++ b/Assets/BuiltinAssets/Material/SpatialMappingOcclusion.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: aeda6184b2e17a2468e17bf6f83e833e
-timeCreated: 1534843464
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat b/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat
index 54483ccba..f7ff0f1fb 100644
--- a/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat
+++ b/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat
@@ -17,7 +17,61 @@ Material:
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
- m_TexEnvs: []
+ 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}
+ - _MainTex:
+ m_Texture: {fileID: 0}
+ 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
+ - _Metallic: 0
+ - _Mode: 0
+ - _OcclusionStrength: 1
+ - _Parallax: 0.02
+ - _SmoothnessTextureChannel: 0
+ - _SpecularHighlights: 1
+ - _SrcBlend: 1
+ - _UVSec: 0
- _WireThickness: 100
- m_Colors: []
+ - _ZWrite: 1
+ m_Colors:
+ - _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
diff --git a/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat.meta b/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat.meta
index e2729ba90..bba23bc45 100644
--- a/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat.meta
+++ b/Assets/BuiltinAssets/Material/SpatialMappingWireframe.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: 62b29c63fa9101f4aab9d1b3e2374a0f
-timeCreated: 1534843464
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Material/Sprites-Default.mat b/Assets/BuiltinAssets/Material/Sprites-Default.mat
index d9cf7b405..d9caf3e13 100644
--- a/Assets/BuiltinAssets/Material/Sprites-Default.mat
+++ b/Assets/BuiltinAssets/Material/Sprites-Default.mat
@@ -18,11 +18,22 @@ Material:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
+ - _AlphaTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
+ - _DecalTex:
+ m_Texture: {fileID: 0}
+ m_Scale: {x: 1, y: 1}
+ m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- PixelSnap: 0
+ - _EnableExternalAlpha: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
+ - _Flip: {r: 1, g: 1, b: 1, a: 1}
+ - _RendererColor: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/BuiltinAssets/Material/Sprites-Mask.mat b/Assets/BuiltinAssets/Material/Sprites-Mask.mat
index 905f25232..3113bb0a2 100644
--- a/Assets/BuiltinAssets/Material/Sprites-Mask.mat
+++ b/Assets/BuiltinAssets/Material/Sprites-Mask.mat
@@ -30,5 +30,8 @@ Material:
- PixelSnap: 0
- _Cutoff: 0
- _EnableExternalAlpha: 0
+ - _MaskingAlphaCutoff: 0
+ - _Stencil: 1
+ - _StencilOp: 0
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 0.21568628}
diff --git a/Assets/BuiltinAssets/Material/Sprites-Mask.mat.meta b/Assets/BuiltinAssets/Material/Sprites-Mask.mat.meta
index 438b01d88..6d854b8f3 100644
--- a/Assets/BuiltinAssets/Material/Sprites-Mask.mat.meta
+++ b/Assets/BuiltinAssets/Material/Sprites-Mask.mat.meta
@@ -1,7 +1,5 @@
fileFormatVersion: 2
guid: d225cbc28247f74428d822199b9ff624
-timeCreated: 1534843461
-licenseType: Pro
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
diff --git a/Assets/BuiltinAssets/Texture/Checkmark.png b/Assets/BuiltinAssets/Texture/Checkmark.png
index 03d426c66..3b9026664 100644
Binary files a/Assets/BuiltinAssets/Texture/Checkmark.png and b/Assets/BuiltinAssets/Texture/Checkmark.png differ
diff --git a/Assets/BuiltinAssets/Texture/DropdownArrow.png b/Assets/BuiltinAssets/Texture/DropdownArrow.png
index 96b613578..a3251d985 100644
Binary files a/Assets/BuiltinAssets/Texture/DropdownArrow.png and b/Assets/BuiltinAssets/Texture/DropdownArrow.png differ
diff --git a/Assets/BuiltinAssets/Texture/Knob.png b/Assets/BuiltinAssets/Texture/Knob.png
index f0ff51efa..a069395a4 100644
Binary files a/Assets/BuiltinAssets/Texture/Knob.png and b/Assets/BuiltinAssets/Texture/Knob.png differ
diff --git a/Assets/BuiltinAssets/config.txt b/Assets/BuiltinAssets/config.txt
index 8acf76363..96439f1a3 100644
--- a/Assets/BuiltinAssets/config.txt
+++ b/Assets/BuiltinAssets/config.txt
@@ -108,4 +108,814 @@
Assets/BuiltinAssets/Texture/Default-Checker.png
10305
+
+ UnityEngine.Shader
+ Hidden/Internal-StencilWrite
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-StencilWrite.shader
+ 19
+
+
+ UnityEngine.Shader
+ Hidden/Internal-CombineDepthNormals
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-CombineDepthNormals.shader
+ 65
+
+
+ UnityEngine.Shader
+ Hidden/BlitCopy
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-BlitCopy.shader
+ 66
+
+
+ UnityEngine.Shader
+ Standard (Specular setup)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/StandardSpecular.shader
+ 45
+
+
+ UnityEngine.Shader
+ Standard
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Standard.shader
+ 46
+
+
+ UnityEngine.Shader
+ Hidden/Internal-PrePassLighting
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-PrePassLighting.shader
+ 63
+
+
+ UnityEngine.Shader
+ Hidden/Internal-ScreenSpaceShadows
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-ScreenSpaceShadows.shader
+ 64
+
+
+ UnityEngine.Shader
+ Hidden/Internal-DepthNormalsTexture
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-DepthNormalsTexture.shader
+ 62
+
+
+ UnityEngine.Shader
+ Hidden/Internal-DeferredReflections
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-DeferredReflections.shader
+ 74
+
+
+ UnityEngine.Shader
+ Hidden/Internal-DeferredShading
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-DeferredShading.shader
+ 69
+
+
+ UnityEngine.Shader
+ Hidden/Internal-MotionVectors
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-MotionVectors.shader
+ 75
+
+
+ UnityEngine.Shader
+ Legacy Shaders/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-VertexLit.shader
+ 6
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Diffuse Fast
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-DiffuseFast.shader
+ 1
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-Diffuse.shader
+ 7
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-Bumped.shader
+ 2
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-Glossy.shader
+ 3
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-BumpSpec.shader
+ 4
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Diffuse Detail
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-DiffuseDetail.shader
+ 5
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-VertexLit.shader
+ 14
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-Diffuse.shader
+ 10
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-Bumped.shader
+ 11
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-Glossy.shader
+ 12
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-BumpSpec.shader
+ 13
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-VertexLit.shader
+ 24
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Bumped Unlit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-BumpNolight.shader
+ 25
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-Diffuse.shader
+ 20
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-Bumped.shader
+ 21
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Bumped VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-BumpVertexLit.shader
+ 26
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-Glossy.shader
+ 22
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-BumpSpec.shader
+ 23
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-VertexLit.shader
+ 34
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-Diffuse.shader
+ 30
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-Bumped.shader
+ 31
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-Glossy.shader
+ 32
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-BumpSpec.shader
+ 33
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-VertexLit.shader
+ 50
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-Diffuse.shader
+ 51
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-Bumped.shader
+ 52
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-Glossy.shader
+ 53
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-BumpSpec.shader
+ 54
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Parallax Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-Parallax.shader
+ 8
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Parallax Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Normal-ParallaxSpec.shader
+ 9
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Parallax Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-Parallax.shader
+ 15
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Self-Illumin/Parallax Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Illumin-ParallaxSpec.shader
+ 16
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Parallax Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-Parallax.shader
+ 27
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Reflective/Parallax Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Reflect-ParallaxSpec.shader
+ 28
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Parallax Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-Parallax.shader
+ 35
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Parallax Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Alpha-ParallaxSpec.shader
+ 36
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Transparent/Cutout/Soft Edge Unlit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/AlphaTest-SoftEdgeUnlit.shader
+ 10512
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Decal
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Decal.shader
+ 100
+
+
+ UnityEngine.Shader
+ Hidden/Internal-Flare
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-Flare.shader
+ 102
+
+
+ UnityEngine.Shader
+ FX/Flare
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Flare.shader
+ 101
+
+
+ UnityEngine.Shader
+ Skybox/Cubemap
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Skybox-Cubed.shader
+ 103
+
+
+ UnityEngine.Shader
+ Skybox/6 Sided
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Skybox.shader
+ 104
+
+
+ UnityEngine.Shader
+ Hidden/Internal-Halo
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-Halo.shader
+ 105
+
+
+ UnityEngine.Shader
+ Skybox/Procedural
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Skybox-Procedural.shader
+ 106
+
+
+ UnityEngine.Shader
+ Particles/Additive
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle Add.shader
+ 200
+
+
+ UnityEngine.Shader
+ Particles/~Additive-Multiply
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle AddMultiply.shader
+ 201
+
+
+ UnityEngine.Shader
+ Particles/Additive (Soft)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle AddSmooth.shader
+ 202
+
+
+ UnityEngine.Shader
+ Particles/Alpha Blended
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle Alpha Blend.shader
+ 203
+
+
+ UnityEngine.Shader
+ Particles/Multiply
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle Multiply.shader
+ 205
+
+
+ UnityEngine.Shader
+ Particles/Multiply (Double)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle MultiplyDouble.shader
+ 206
+
+
+ UnityEngine.Shader
+ Particles/Alpha Blended Premultiply
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle Premultiply Blend.shader
+ 207
+
+
+ UnityEngine.Shader
+ Particles/VertexLit Blended
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Particle VertexLit Blended.shader
+ 208
+
+
+ UnityEngine.Shader
+ Sprites/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Sprites-Diffuse.shader
+ 10800
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Details/Vertexlit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Details/VertexLit.shader
+ 10500
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Details/WavingDoublePass
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Details/WavingGrass.shader
+ 10501
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Details/BillboardWavingDoublePass
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Details/WavingGrassBillboard.shader
+ 10502
+
+
+ UnityEngine.Shader
+ Nature/Terrain/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/FirstPass.shader
+ 10505
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Splatmap/Diffuse-AddPass
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/AddPass.shader
+ 10503
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/BillboardTree
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Trees/BillboardTree.shader
+ 10507
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Lightmapped/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Lightmap-VertexLit.shader
+ 40
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Lightmapped/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Lightmap-Diffuse.shader
+ 41
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Lightmapped/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Lightmap-Bumped.shader
+ 42
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Lightmapped/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Lightmap-Glossy.shader
+ 43
+
+
+ UnityEngine.Shader
+ Legacy Shaders/Lightmapped/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Lightmap-BumpSpec.shader
+ 44
+
+
+ UnityEngine.Shader
+ Hidden/Internal-GUITextureClip
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-GUITextureClip.shader
+ 9000
+
+
+ UnityEngine.Shader
+ Hidden/Internal-GUITextureClipText
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-GUITextureClipText.shader
+ 9001
+
+
+ UnityEngine.Shader
+ Hidden/Internal-GUITexture
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-GUITexture.shader
+ 9002
+
+
+ UnityEngine.Shader
+ Hidden/Internal-GUITextureBlit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Internal-GUITextureBlit.shader
+ 9003
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Soft Occlusion Bark Rendertex
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SoftOcclusion/TreeSoftOcclusionBarkRendertex.shader
+ 10508
+
+
+ UnityEngine.Shader
+ Nature/Tree Soft Occlusion Bark
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SoftOcclusion/TreeSoftOcclusionBark.shader
+ 10509
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Soft Occlusion Leaves Rendertex
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SoftOcclusion/TreeSoftOcclusionLeavesRendertex.shader
+ 10510
+
+
+ UnityEngine.Shader
+ Nature/Tree Soft Occlusion Leaves
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SoftOcclusion/TreeSoftOcclusionLeaves.shader
+ 10511
+
+
+ UnityEngine.Shader
+ Nature/Tree Creator Bark
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorBark.shader
+ 10600
+
+
+ UnityEngine.Shader
+ Nature/Tree Creator Leaves
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorLeaves.shader
+ 10601
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Creator Bark Rendertex
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorBarkRendertex.shader
+ 10602
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Creator Leaves Rendertex
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorLeavesRendertex.shader
+ 10603
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Creator Bark Optimized
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorBarkOptimized.shader
+ 10604
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Creator Leaves Optimized
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorLeavesOptimized.shader
+ 10605
+
+
+ UnityEngine.Shader
+ Nature/Tree Creator Leaves Fast
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorLeavesFast.shader
+ 10606
+
+
+ UnityEngine.Shader
+ Hidden/Nature/Tree Creator Leaves Fast Optimized
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/TreeCreator/TreeCreatorLeavesFastOptimized.shader
+ 10607
+
+
+ UnityEngine.Shader
+ Nature/Terrain/Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Specular-FirstPass.shader
+ 10620
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Splatmap/Specular-AddPass
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Specular-AddPass.shader
+ 10621
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Splatmap/Specular-Base
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Specular-Base.shader
+ 10622
+
+
+ UnityEngine.Shader
+ Nature/Terrain/Standard
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Standard-FirstPass.shader
+ 10623
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Splatmap/Standard-AddPass
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Standard-AddPass.shader
+ 10624
+
+
+ UnityEngine.Shader
+ Hidden/TerrainEngine/Splatmap/Standard-Base
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/TerrainShaders/Splats/Standard-Base.shader
+ 10625
+
+
+ UnityEngine.Shader
+ Mobile/Skybox
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Skybox.shader
+ 10700
+
+
+ UnityEngine.Shader
+ Mobile/VertexLit
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-VertexLit.shader
+ 10701
+
+
+ UnityEngine.Shader
+ Mobile/Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Diffuse.shader
+ 10703
+
+
+ UnityEngine.Shader
+ Mobile/Bumped Diffuse
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Bumped.shader
+ 10704
+
+
+ UnityEngine.Shader
+ Mobile/Bumped Specular
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-BumpSpec.shader
+ 10705
+
+
+ UnityEngine.Shader
+ Mobile/Bumped Specular (1 Directional Light)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-BumpSpec-1DirectionalLight.shader
+ 10706
+
+
+ UnityEngine.Shader
+ Mobile/VertexLit (Only Directional Lights)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-VertexLit-OnlyDirectionalLights.shader
+ 10707
+
+
+ UnityEngine.Shader
+ Mobile/Unlit (Supports Lightmap)
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Lightmap-Unlit.shader
+ 10708
+
+
+ UnityEngine.Shader
+ Mobile/Particles/Additive
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Particle-Add.shader
+ 10720
+
+
+ UnityEngine.Shader
+ Mobile/Particles/Alpha Blended
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Particle-Alpha.shader
+ 10721
+
+
+ UnityEngine.Shader
+ Mobile/Particles/VertexLit Blended
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Particle-Alpha-VertexLit.shader
+ 10722
+
+
+ UnityEngine.Shader
+ Mobile/Particles/Multiply
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Mobile/Mobile-Particle-Multiply.shader
+ 10723
+
+
+ UnityEngine.Shader
+ Unlit/Transparent
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Unlit/Unlit-Alpha.shader
+ 10750
+
+
+ UnityEngine.Shader
+ Unlit/Transparent Cutout
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Unlit/Unlit-AlphaTest.shader
+ 10751
+
+
+ UnityEngine.Shader
+ Unlit/Texture
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Unlit/Unlit-Normal.shader
+ 10752
+
+
+ UnityEngine.Shader
+ Sprites/Default
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Sprites-Default.shader
+ 10753
+
+
+ UnityEngine.Shader
+ Unlit/Color
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Unlit/Unlit-Color.shader
+ 10755
+
+
+ UnityEngine.Shader
+ UI/Unlit/Transparent
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Unlit-Transparent.shader
+ 10760
+
+
+ UnityEngine.Shader
+ UI/Unlit/Detail
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Unlit-Detail.shader
+ 10761
+
+
+ UnityEngine.Shader
+ UI/Unlit/Text
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Unlit-Text.shader
+ 10762
+
+
+ UnityEngine.Shader
+ UI/Unlit/Text Detail
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Unlit-TextDetail.shader
+ 10763
+
+
+ UnityEngine.Shader
+ UI/Lit/Transparent
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Lit-Transparent.shader
+ 10764
+
+
+ UnityEngine.Shader
+ UI/Lit/Bumped
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Lit-Bumped.shader
+ 10765
+
+
+ UnityEngine.Shader
+ UI/Lit/Detail
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Lit-Detail.shader
+ 10766
+
+
+ UnityEngine.Shader
+ UI/Lit/Refraction
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Lit-Refraction.shader
+ 10767
+
+
+ UnityEngine.Shader
+ UI/Lit/Refraction Detail
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Lit-RefractionDetail.shader
+ 10768
+
+
+ UnityEngine.Shader
+ UI/Default
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-Default.shader
+ 10770
+
+
+ UnityEngine.Shader
+ UI/Default Font
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-DefaultFont.shader
+ 10782
+
+
+ UnityEngine.Shader
+ UI/DefaultETC1
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/UI/UI-DefaultETC1.shader
+ 10783
+
+
+ UnityEngine.Shader
+ Nature/SpeedTree
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SpeedTree.shader
+ 14000
+
+
+ UnityEngine.Shader
+ Nature/SpeedTree Billboard
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Nature/SpeedTreeBillboard.shader
+ 14001
+
+
+ UnityEngine.Shader
+ Hidden/GIDebug/TextureUV
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/GIDebug/TextureUV.shader
+ 15100
+
+
+ UnityEngine.Shader
+ Hidden/GIDebug/UV1sAsPositions
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/GIDebug/UV1sAsPositions.shader
+ 15102
+
+
+ UnityEngine.Shader
+ Hidden/GIDebug/VertexColors
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/GIDebug/VertexColors.shader
+ 15103
+
+
+ UnityEngine.Shader
+ Hidden/CubeBlur
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Cubemaps/CubeBlur.shader
+ 15104
+
+
+ UnityEngine.Shader
+ Hidden/CubeCopy
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Cubemaps/CubeCopy.shader
+ 15105
+
+
+ UnityEngine.Shader
+ Hidden/CubeBlend
+ Assets/BuiltinAssets/Shader/DefaultResourcesExtra/Cubemaps/CubeBlend.shader
+ 15106
+
\ No newline at end of file
diff --git a/Assets/CSAssets/Resources/CSText/AssetPathData.bytes b/Assets/CSAssets/Resources/CSText/AssetPathData.bytes
index bfea94f09..df79965de 100644
Binary files a/Assets/CSAssets/Resources/CSText/AssetPathData.bytes and b/Assets/CSAssets/Resources/CSText/AssetPathData.bytes differ
diff --git a/Assets/CSAssets/Resources/CSText/CurrentVersion.txt b/Assets/CSAssets/Resources/CSText/CurrentVersion.txt
index d8263ee98..e440e5c84 100644
--- a/Assets/CSAssets/Resources/CSText/CurrentVersion.txt
+++ b/Assets/CSAssets/Resources/CSText/CurrentVersion.txt
@@ -1 +1 @@
-2
\ No newline at end of file
+3
\ No newline at end of file
diff --git a/Assets/CSAssets/Scenes/login.unity b/Assets/CSAssets/Scenes/login.unity
index 5fe129a98..5bfee6eed 100644
--- a/Assets/CSAssets/Scenes/login.unity
+++ b/Assets/CSAssets/Scenes/login.unity
@@ -343,7 +343,7 @@ Prefab:
objectReference: {fileID: 0}
- target: {fileID: 22400762, guid: 67117722a812a2e46ab8cb8eafbf5f5e, type: 2}
propertyPath: m_AnchoredPosition.y
- value: 0.00005340576
+ value: -0.000022888184
objectReference: {fileID: 0}
- target: {fileID: 224856348943071238, guid: 67117722a812a2e46ab8cb8eafbf5f5e,
type: 2}
diff --git a/Assets/Editor/Config/AssetVersionData.bytes b/Assets/Editor/Config/AssetVersionData.bytes
index 9cd902e31..ef8ddac02 100644
--- a/Assets/Editor/Config/AssetVersionData.bytes
+++ b/Assets/Editor/Config/AssetVersionData.bytes
@@ -1,4 +1,4 @@
-2
+3
depend/1/1000198448;fae5c5123690af668c1c104d99e38379;2;1;2188;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/1001081463;08286998a8de16e7a22e03b9c308e417;2;3;2117;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4077521342;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/1002970620;3f4b5a2c7f031d1dbafbf006fcd092a9;2;3;43029;0
@@ -562,7 +562,7 @@ depend/1/1536978329;cc70605a9f094e26120710c1e26f6816;2;1;164872;0;depend/1/10277
depend/1/1537768142;07fa64ffe00173d696d7563a0c283d1b;2;3;28595;-100
depend/1/1538262165;715b974476e36cc20b6bb125c15bf74f;2;1;24694;-69;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/3635494348;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4067462785;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/1538912604;f91770cfb89ef20ae4af64545817c32d;2;3;41855;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
-depend/1/1539925972;5b9e1349d09f2085b5898be6e5b8bc39;2;3;2034;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
+depend/1/1539925972;753fa9fe443f5d88b5bc3f2be4f09f2f;3;3;2082;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/154042108;8ad0921998c4cf64564ecfed78785b51;2;1;2231;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3382229191;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/489853628;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/1541082447;d2b552493533cd47d8efee75e76df2b0;2;1;5693;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/1/1542312253;0b4a3b904ebda18cb1eea41ce938214a;2;3;36181;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
@@ -1404,7 +1404,7 @@ depend/2/2333365223;67cd228ee015cc7a2d0af6a4b53591e2;2;1;45918;0;depend/1/102776
depend/2/233341639;9a6377a05a99ccaa8dbf2575aaf0fb33;2;1;13005;-75
depend/2/2333736639;59c07a9b168a008657a3a392820884fa;2;3;16983;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2333897161;db667c5edb90c95f3d34efa182384cb1;2;3;10717;0
-depend/2/2334654615;db5e22f1471f9844a61eeedfe7743fd1;2;3;4437;-100;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
+depend/2/2334654615;67649fa6ba622c05256a36bb5888cd80;3;3;4487;-100;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2335383360;5d72a7d37ad706d175a49a355c04a6bd;2;1;14949;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2336549111;3c4f9dbbbbe64c330da76ac5b67c355f;2;3;5715;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2338582088;db7885db4af8b1e313e1c7f4077705a3;2;1;2324;0;depend/1/1027766834;depend/1/113776281;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/1564135488;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/3/3997178108;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
@@ -1676,7 +1676,7 @@ depend/2/2598840852;288fc3b3686819c0067cb05e5d7da370;2;3;217728;0
depend/2/2599211592;06f1037cc8763b113cdf9e18fbcfc944;2;1;2124;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/3/3933918886;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2599405414;8f1731b11c930d8759b935a731db64e4;2;1;199871;0
depend/2/2601519717;b44f8463a1a6cdd29e7c76974cb51c6e;2;1;41751;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
-depend/2/2601896300;d629ce43ed463741a12f3a7dcb474c03;2;3;2405;-100;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
+depend/2/2601896300;c8422d5941e1559cb3c7560ce1566745;3;3;2470;-100;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2602054516;7ae47650b3e2e29f5c21b41d5cde067e;2;3;2533;0
depend/2/2604718896;ba3fd57602ae95b2adde839adc423214;2;1;4073;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2305499182;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
depend/2/2604827131;1d8e1a330e758f722f717ea8a8f61311;2;1;2268;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1425038016;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3382229191;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
@@ -4353,7 +4353,7 @@ effect/tx_jineng_huan;03360385279003ae2193a00d713fdb8c;2;1;24617;0;depend/1/1027
effect/tx_jineng_huo;0a8f98875ba5fd42183a7b465e071813;2;1;23474;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1948356726;depend/1/1956937168;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2882249427;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3312547480;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;depend/9/972499158;gameres;ui/sprite/4222891038
effect/tx_jineng_huo_1;31cdee6859ee5b05e0aafb31e99f0f75;2;1;24866;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1528496704;depend/1/1537768142;depend/1/160796244;depend/1/1618846029;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2482736432;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3023964416;depend/3/3127482339;depend/3/3160426112;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3516356441;depend/3/3562797024;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/3/3913014864;depend/4/4015372199;depend/4/4223679568;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
effect/tx_jineng_wu;797c8789066d9bda1f1523e1f1107107;2;1;24483;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1948356726;depend/1/1956937168;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3312547480;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
-effect/tx_jinengkaiqi;84849490c5a191fb1639a46b090bb7a9;2;3;23975;-64;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1748002635;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2452523518;depend/2/2472501616;depend/2/2541478264;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
+effect/tx_jinengkaiqi;21435f68e33101143c888fe38a91e06f;3;3;23912;-64;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1748002635;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2452523518;depend/2/2472501616;depend/2/2541478264;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
effect/tx_jinengkaiqi_1;5d5f0436bd2b63dfe1c73fe0b95d1ebd;2;3;89606;0;depend/1/1027766834;depend/1/1142751579;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1461113486;depend/1/1474459798;depend/1/1477197958;depend/1/1495415461;depend/1/1519246788;depend/1/1524541844;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1956937168;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2314696107;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3001086651;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/3/3938485123;depend/4/4015372199;depend/4/4229245076;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/7/769511699;depend/8/826932009;gameres;ui/sprite/4222891038
effect/tx_jinghua_cengmo;2c4664d8304a246a6b45dec01e51568b;2;1;26133;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1906179634;depend/1/1994054073;depend/2/2043987943;depend/2/2053284753;depend/2/2096887489;depend/2/216897158;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2538683853;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3023964416;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/500697519;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
effect/tx_jinghua_dingsheng;35ada95cab58a86e93ff3943ba1f6282;2;1;25097;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1906179634;depend/1/1994054073;depend/2/2043987943;depend/2/2053284753;depend/2/2096887489;depend/2/216897158;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2538683853;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3023964416;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/500697519;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
@@ -5958,7 +5958,7 @@ scene/guanning;d83c0995d04167603de085069c11e5be;2;1;6634375;-68;depend/1/1020178
scene/jbfuben;d567b727a4efac6b869e36a8f73328ea;2;1;4004241;-67;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1325434691;depend/1/1355106455;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1499821974;depend/1/1528496704;depend/1/1537768142;depend/1/160796244;depend/1/1618846029;depend/1/1628620790;depend/1/1719348208;depend/1/1727046337;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2482736432;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3029767002;depend/3/3037640802;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3420259691;depend/3/3457057516;depend/3/3489882576;depend/3/3516356441;depend/3/3562797024;depend/3/3567498200;depend/3/3579731428;depend/3/3748790519;depend/3/378649459;depend/3/3910392427;depend/3/3913014864;depend/3/3948525618;depend/3/3958341174;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/5/557388075;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/4222891038
scene/jiayuan;a4ce3b56b6bf383d3a34457f9ada85b0;2;1;14921320;-66;depend/1/1017812515;depend/1/1027766834;depend/1/1123611357;depend/1/1150394620;depend/1/1180189996;depend/1/1186393864;depend/1/1221497420;depend/1/1223065661;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/156828151;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1781397205;depend/1/1892282752;depend/1/1918674970;depend/2/2043987943;depend/2/2064313587;depend/2/2096887489;depend/2/2113248231;depend/2/2171185790;depend/2/2177207312;depend/2/2202092620;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2333335314;depend/2/2334654615;depend/2/243513539;depend/2/2536942046;depend/2/258166197;depend/2/2589057586;depend/2/2601896300;depend/2/2643644283;depend/2/2818780986;depend/2/2910114853;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/2/2958442326;depend/2/2986475575;depend/3/3018482563;depend/3/3098228416;depend/3/3101036446;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3255161426;depend/3/3366202510;depend/3/3391669028;depend/3/3457057516;depend/3/3489882576;depend/3/3515096982;depend/3/3567498200;depend/3/3576818818;depend/3/3579731428;depend/3/378649459;depend/3/3879591958;depend/3/3901399746;depend/3/3910392427;depend/3/3928816425;depend/4/4015372199;depend/4/4060165237;depend/4/4098496851;depend/4/4221047383;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/6/614949759;depend/7/712665874;depend/7/739010192;depend/7/764251141;depend/8/826932009;depend/9/978706743;gameres;model/model_tianji_90;ui/sprite/4222891038
scene/jiehun;43846e0009369e81179b9166533bfca8;2;1;5487074;-65;depend/1/1027766834;depend/1/1048672292;depend/1/1103618376;depend/1/1180189996;depend/1/1186393864;depend/1/1235790569;depend/1/1263199063;depend/1/1270109830;depend/1/1376320612;depend/1/1391877663;depend/1/1458434771;depend/1/1474459798;depend/1/1479763940;depend/1/1493093634;depend/1/1495415461;depend/1/1537768142;depend/1/1588156911;depend/1/160796244;depend/1/1612479378;depend/1/1628620790;depend/1/1671258511;depend/1/1774120509;depend/1/179984492;depend/1/1896985256;depend/2/202648662;depend/2/2043987943;depend/2/2096887489;depend/2/2169690460;depend/2/2171185790;depend/2/2176560009;depend/2/2203376118;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2306661984;depend/2/2334654615;depend/2/243513539;depend/2/258166197;depend/2/2601896300;depend/2/2671931287;depend/2/2710525936;depend/2/2807293719;depend/2/2818780986;depend/2/2848722503;depend/2/2877157119;depend/2/2884898608;depend/2/2893547090;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3071725281;depend/3/3108809016;depend/3/3113028338;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3293220816;depend/3/3337790348;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/381705827;depend/3/384534628;depend/3/3910392427;depend/3/3956833410;depend/4/4015372199;depend/4/4254251244;depend/4/4260174813;depend/4/496694051;depend/4/499273801;depend/5/517882810;depend/6/607984479;depend/6/697161867;depend/7/712665874;depend/7/739010192;depend/8/826932009;depend/8/829687270;depend/8/879899309;depend/9/928376846;depend/9/934915667;effect/tx_cj_denglong;gameres;ui/sprite/4222891038
-scene/jingyanfuben;d9d57b4a588d5a50c26b1298923b3b10;2;1;1028011;-64;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1325434691;depend/1/1355106455;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1748002635;depend/1/1774120509;depend/1/1995774293;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2452523518;depend/2/2472501616;depend/2/2473524779;depend/2/2541478264;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3497470315;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3787339895;depend/3/3910392427;depend/3/3977707739;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;effect/tx_caiji_jingwen;effect/tx_jinengkaiqi;gameres;ui/sprite/4222891038
+scene/jingyanfuben;a0dc5799276510a7da16e0ed7e304f58;3;1;1028011;-64;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1325434691;depend/1/1355106455;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1748002635;depend/1/1774120509;depend/1/1995774293;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2452523518;depend/2/2472501616;depend/2/2473524779;depend/2/2541478264;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3497470315;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3787339895;depend/3/3910392427;depend/3/3977707739;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;effect/tx_caiji_jingwen;effect/tx_jinengkaiqi;gameres;ui/sprite/4222891038
scene/kuafu;5d4a49140dd8e3fd57ee5f8c3454deb3;2;1;8731727;-63;depend/1/1027766834;depend/1/103082788;depend/1/1049963304;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1290709945;depend/1/1376320612;depend/1/1391877663;depend/1/1458434771;depend/1/1474459798;depend/1/1479763940;depend/1/1495415461;depend/1/1537768142;depend/1/1561951475;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/1/1907293659;depend/1/1911298769;depend/1/1942564919;depend/2/2033945204;depend/2/2043987943;depend/2/2096887489;depend/2/2121195255;depend/2/2171185790;depend/2/2202092620;depend/2/2212849602;depend/2/2224789983;depend/2/2248474003;depend/2/2252649069;depend/2/2296757621;depend/2/2314855654;depend/2/2334654615;depend/2/2360735544;depend/2/2406487683;depend/2/243513539;depend/2/2489602751;depend/2/2565706350;depend/2/2601896300;depend/2/2708972778;depend/2/2746857053;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/2/296190802;depend/3/3035887553;depend/3/3127482339;depend/3/3139738589;depend/3/3174131461;depend/3/3196030150;depend/3/3213860993;depend/3/3245670692;depend/3/3252996285;depend/3/3344617740;depend/3/3366202510;depend/3/3367521522;depend/3/3457057516;depend/3/3489882576;depend/3/3545990061;depend/3/3567498200;depend/3/3579731428;depend/3/37290674;depend/3/378649459;depend/3/3800372489;depend/3/3879591958;depend/3/3910392427;depend/3/3911324142;depend/3/3932112768;depend/3/3949246003;depend/3/3973412888;depend/4/4015372199;depend/4/4038950029;depend/4/4080215947;depend/4/4260174813;depend/4/4272746353;depend/4/4279534924;depend/4/45005222;depend/4/490546982;depend/4/495652375;depend/4/496694051;depend/5/517882810;depend/6/663544457;depend/6/697161867;depend/7/739010192;depend/8/826932009;depend/8/848455184;depend/8/85209654;depend/9/900855120;gameres;ui/sprite/4222891038
scene/miaojiang;9514176254cef380520ee36d0ef2b3b4;2;1;13130281;-90;depend/1/1020178782;depend/1/1027766834;depend/1/1158595446;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1376320612;depend/1/1382048193;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1643951371;depend/1/1774120509;depend/1/1784483774;depend/1/1869414453;depend/2/2043987943;depend/2/2096887489;depend/2/2158751908;depend/2/2171185790;depend/2/2202092620;depend/2/2224789983;depend/2/2248474003;depend/2/2274437440;depend/2/2296757621;depend/2/2314855654;depend/2/2334654615;depend/2/243513539;depend/2/2442029399;depend/2/2450607449;depend/2/2465426788;depend/2/2470523447;depend/2/2560099199;depend/2/258166197;depend/2/2601896300;depend/2/2642874906;depend/2/278748382;depend/2/279182005;depend/2/2799801198;depend/2/2818780986;depend/2/2901295335;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2944361125;depend/2/2947065547;depend/2/2956194923;depend/3/3072116811;depend/3/3127482339;depend/3/3136356592;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3495280608;depend/3/3567498200;depend/3/3579731428;depend/3/3632124846;depend/3/3660015818;depend/3/378649459;depend/3/3879591958;depend/3/3910392427;depend/4/4015372199;depend/4/4038898331;depend/4/4081192728;depend/4/4249975328;depend/4/4260174813;depend/4/45005222;depend/4/492814005;depend/4/496694051;depend/5/517882810;depend/5/524402943;depend/5/537348374;depend/5/598652231;depend/7/712665874;depend/7/739010192;depend/8/826932009;depend/8/892746115;depend/9/900855120;depend/9/908865583;gameres;ui/sprite/4222891038
scene/shimen;63655daf65fc6305d54761910445644b;2;3;5026619;0;depend/1/1027766834;depend/1/1028487124;depend/1/1079616378;depend/1/1085091260;depend/1/1099397546;depend/1/1167685730;depend/1/1180189996;depend/1/1186393864;depend/1/1263199063;depend/1/1275213498;depend/1/1276184600;depend/1/1337776270;depend/1/1372719355;depend/1/1376320612;depend/1/1383282852;depend/1/1397633672;depend/1/1432095454;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/1588156911;depend/1/1592880445;depend/1/1597100245;depend/1/160796244;depend/1/1628620790;depend/1/163750539;depend/1/1642596508;depend/1/1689522243;depend/1/1774120509;depend/1/1845657252;depend/1/1942564919;depend/1/196178632;depend/2/2043987943;depend/2/2062355716;depend/2/2095534106;depend/2/2096887489;depend/2/214243611;depend/2/2171185790;depend/2/2185382295;depend/2/2202092620;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2305291994;depend/2/2329445016;depend/2/2334654615;depend/2/2355309605;depend/2/243513539;depend/2/2488682199;depend/2/2498063780;depend/2/258166197;depend/2/2601896300;depend/2/2632897296;depend/2/2646377902;depend/2/2698816542;depend/2/2702312481;depend/2/2710155116;depend/2/2818780986;depend/2/2835527778;depend/2/2838916967;depend/2/2866284060;depend/2/2893547090;depend/2/2901372968;depend/2/2907503369;depend/2/2915279590;depend/2/2920764819;depend/2/2923438630;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/2/2951948498;depend/3/3127482339;depend/3/314032258;depend/3/3140524037;depend/3/3144550207;depend/3/318533646;depend/3/3196030150;depend/3/3196073671;depend/3/3213860993;depend/3/3229166970;depend/3/3231904458;depend/3/3245670692;depend/3/3261645489;depend/3/327794869;depend/3/3278961667;depend/3/3366202510;depend/3/3447257160;depend/3/3457057516;depend/3/3469184010;depend/3/3489882576;depend/3/3492979711;depend/3/3556129799;depend/3/3567498200;depend/3/3579731428;depend/3/3643410245;depend/3/376599083;depend/3/378649459;depend/3/3829811355;depend/3/3879591958;depend/3/3910392427;depend/3/3911324142;depend/3/3947825912;depend/3/3956833410;depend/3/3965157812;depend/4/4015372199;depend/4/4038950029;depend/4/4082027707;depend/4/4211171159;depend/4/4237353685;depend/4/4259947530;depend/4/4260174813;depend/4/4285724942;depend/4/496694051;depend/5/510935843;depend/5/517882810;depend/5/523838442;depend/5/588540563;depend/6/610749711;depend/6/636584885;depend/6/641671274;depend/6/642367579;depend/6/675117436;depend/7/712665874;depend/7/739010192;depend/7/780091916;depend/7/798775742;depend/8/822456740;depend/8/826932009;depend/8/840482451;depend/8/879899309;depend/9/994362004;gameres;ui/sprite/4222891038
@@ -6175,7 +6175,7 @@ sounds/zs_skill/se_zhanshi_atk_4;bd9bf474f8868a88858ca3b536b76697;2;3;25461;0
sounds/zs_skill/se_zhanshi_skill_1;f8b5d471a5298cc0283e19133abf13fb;2;1;18848;0
sounds/zs_skill/tj_newg;0ca099ee6165bd9638f4428b723959c4;2;3;117908;0
sounds/zs_skill/zhanlong;52d7614e634eb20ca1cba4934ac5fe35;2;3;14245;0
-tables;bc19225b5a1940f38a6963c7527f5ef9;2;3;3312438;0
+tables;08b4f020bea33f162472aeeb1eeb6b9e;3;3;3332325;0
ui/activebtns;d744a7335dedf1b395d7c80134773a55;2;3;51923;0;depend/1/1027766834;depend/1/1180189996;depend/1/1186393864;depend/1/1262955574;depend/1/1263199063;depend/1/1376320612;depend/1/1458434771;depend/1/1474459798;depend/1/1495415461;depend/1/1537768142;depend/1/160796244;depend/1/1628620790;depend/1/1774120509;depend/2/2043987943;depend/2/2096887489;depend/2/2171185790;depend/2/2224789983;depend/2/2248474003;depend/2/2296757621;depend/2/2334654615;depend/2/243513539;depend/2/2601896300;depend/2/2818780986;depend/2/2915279590;depend/2/292359647;depend/2/2938028208;depend/2/2947065547;depend/3/3127482339;depend/3/3196030150;depend/3/3245670692;depend/3/3366202510;depend/3/3457057516;depend/3/3489882576;depend/3/3567498200;depend/3/3579731428;depend/3/378649459;depend/3/3910392427;depend/4/4015372199;depend/4/4260174813;depend/4/496694051;depend/5/517882810;depend/7/739010192;depend/8/826932009;gameres;ui/sprite/1119732413;ui/sprite/4222891038
ui/activepresious;3cd3d6b70fd712fb652e828dddeeaac5;2;1;14224;0;depend/1/1833821382;depend/2/2171185790;depend/3/3579731428;ui/sprite/1913422661;ui/sprite/2440861615;ui/sprite/2488627058;ui/sprite/2745688426;ui/sprite/302417980;ui/sprite/3128911918;ui/sprite/3569674468;ui/sprite/3684872978;ui/sprite/3722481169;ui/sprite/3749876859;ui/sprite/456410936;ui/sprite/permanent
ui/activestarttip;6cea98f09c715c8d915ef38eacf84699;2;1;6610;0;depend/2/2171185790;depend/3/3579731428;ui/sprite/1974018230
@@ -6972,7 +6972,7 @@ ui/sprite/4198758768;107372b66dde4de0837fe34a55e8fdc2;2;3;7400;0
ui/sprite/420726291;b8c140ce998c83d34d4b4dfd3eacf438;2;1;3896;0
ui/sprite/4208827598;5a9234eba1d631bfd6901035087b4c19;2;1;74974;0
ui/sprite/4222891038;2fc79898a1a2aa53a30c9155929beb15;2;3;122335;-100
-ui/sprite/4223821279;2c34c74a2652b80e8b1185499feb054e;2;1;3742;0
+ui/sprite/4223821279;1fe52d6484d9ceafc8f075777e8ef69f;3;1;3727;0
ui/sprite/4235420133;ccb792bb32958f361a2b1ec32c914ccb;2;3;41806;0
ui/sprite/4238761688;9b0f60b798b0ea17d43cd4bf4aa0218f;2;1;108357;0
ui/sprite/4240800168;ecb97b3db8333701df059e4131e62a78;2;3;3661;0
@@ -7085,7 +7085,7 @@ ui/sprite/money;1b19c63b02225d2d931a64e8491bf0df;2;3;35640;0
ui/sprite/mysticalboxroot;25871de2972b3e41b529f12f9d7716b4;2;1;44142;0
ui/sprite/networktype;0ad0a9d21d20323433ea7add4420e3c9;2;3;3959;0
ui/sprite/npctype;fd3d82320b5621a16978473f3a30db4c;2;3;7121;0
-ui/sprite/permanent;574129e89b9084b47bb7287732bb2552;2;3;2427911;0
+ui/sprite/permanent;a5c3a6025cbb4786c027672b4188532c;3;3;2414324;0
ui/sprite/pkmode;f4b92a7b2edf5b37786c3c87b89b7df4;2;3;8558;0
ui/sprite/privilegevip;949f8d76494488a9984565bcd2283113;2;1;39412;0
ui/sprite/pvproleheadicon;939d328e1207fb7c83da0da55a9472a3;2;3;212673;0
diff --git a/Assets/Editor/Config/AtlasData.bytes b/Assets/Editor/Config/AtlasData.bytes
index 85ec7e233..a04f34699 100644
--- a/Assets/Editor/Config/AtlasData.bytes
+++ b/Assets/Editor/Config/AtlasData.bytes
@@ -1,5 +1,35 @@
+
+
+ Assets/Project3D/Resources/Model/HGSDKUI.prefab
+ Assets/Project3D/Resources/UI/Prefab/MarketingActs/NewYear/NewYearAdvanceSlotMachineTwo.prefab
+
+
+ Assets/Res_newMS/UI/12ÔÂÓÅ»¯/Ôªµ©½ÚÈջ/³é½±½çÃæ/³é½±ÇÐͼ/³é½±½çÃæ-ºÀ»ª/µ×°å.png
+ Assets/Res_newMS/UI/SDKUI/login_facebook.png
+ Assets/Res_newMS/UI/SDKUI/login_gamecenter.png
+ Assets/Res_newMS/UI/SDKUI/login_google.png
+ Assets/Res_newMS/UI/SDKUI/ui_agreement_0000_Shape-1-copy-2.png
+ Assets/Res_newMS/UI/SDKUI/ui_agreement_0001_????-¿½±´.png
+ Assets/Res_newMS/UI/SDKUI/ui_agreement_0002_????.png
+ Assets/Res_newMS/UI/SDKUI/ui_agreement_0003_???-copy-2.png
+
+ 2737448034
+
+
+
+ Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitFirstRecharge.prefab
+ Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitFirstRechargeItem.prefab
+ Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitMenItem.prefab
+
+
+ Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/н¨Îļþ¼Ð/ÎÄ×ֵ׿ò.png
+ Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/Ê׳äÀñ°ü-8ÔÂ?ÐÂÔö¼Ó/Ê׳ä´óÀñ°ü-ÈÕÆÚ°´Å¥.png
+ Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/Ê׳äÀñ°ü-8ÔÂ?ÐÂÔö¼Ó/Ê׳ä´óÀñ°ü-Ñ¡Öа´Å¥.png
+
+ 1669591853
+
Assets/Project3D/Resources/UI/Prefab/MarketingActs/SummerCarnival/SummerCarnivalRoot.prefab
@@ -29,36 +59,6 @@
2702235657
-
-
- Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitFirstRecharge.prefab
- Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitFirstRechargeItem.prefab
- Assets/Project3D/Resources/UI/Prefab/MarketingActs/SuperBenefitFirstRecharge/SuperBenefitMenItem.prefab
-
-
- Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/н¨Îļþ¼Ð/ÎÄ×ֵ׿ò.png
- Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/Ê׳äÀñ°ü-8ÔÂ?ÐÂÔö¼Ó/Ê׳ä´óÀñ°ü-ÈÕÆÚ°´Å¥.png
- Assets/Res_newMS/UI/µÚÁù°æ/C-³¬ÖµÊ׳å/Ê׳äÀñ°ü-8ÔÂ?ÐÂÔö¼Ó/Ê׳ä´óÀñ°ü-Ñ¡Öа´Å¥.png
-
- 1669591853
-
-
-
- Assets/Project3D/Resources/Model/HGSDKUI.prefab
- Assets/Project3D/Resources/UI/Prefab/MarketingActs/NewYear/NewYearAdvanceSlotMachineTwo.prefab
-
-
- Assets/Res_newMS/UI/12ÔÂÓÅ»¯/Ôªµ©½ÚÈջ/³é½±½çÃæ/³é½±ÇÐͼ/³é½±½çÃæ-ºÀ»ª/µ×°å.png
- Assets/Res_newMS/UI/SDKUI/login_facebook.png
- Assets/Res_newMS/UI/SDKUI/login_gamecenter.png
- Assets/Res_newMS/UI/SDKUI/login_google.png
- Assets/Res_newMS/UI/SDKUI/ui_agreement_0000_Shape-1-copy-2.png
- Assets/Res_newMS/UI/SDKUI/ui_agreement_0001_????-¿½±´.png
- Assets/Res_newMS/UI/SDKUI/ui_agreement_0002_????.png
- Assets/Res_newMS/UI/SDKUI/ui_agreement_0003_???-copy-2.png
-
- 2737448034
-
Assets/Project3D/Resources/UI/Prefab/MarketingActs/UpStarHelperPanel.prefab
diff --git a/Assets/GameInitScene.unity b/Assets/GameInitScene.unity
new file mode 100644
index 000000000..00ed32c84
--- /dev/null
+++ b/Assets/GameInitScene.unity
@@ -0,0 +1,155 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!29 &1
+OcclusionCullingSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 2
+ m_OcclusionBakeSettings:
+ smallestOccluder: 5
+ smallestHole: 0.25
+ backfaceThreshold: 100
+ m_SceneGUID: 00000000000000000000000000000000
+ m_OcclusionCullingData: {fileID: 0}
+--- !u!104 &2
+RenderSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 8
+ m_Fog: 0
+ m_FogColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
+ m_FogMode: 3
+ m_FogDensity: 0.01
+ m_LinearFogStart: 0
+ m_LinearFogEnd: 300
+ m_AmbientSkyColor: {r: 0.212, g: 0.227, b: 0.259, a: 1}
+ m_AmbientEquatorColor: {r: 0.114, g: 0.125, b: 0.133, a: 1}
+ m_AmbientGroundColor: {r: 0.047, g: 0.043, b: 0.035, a: 1}
+ m_AmbientIntensity: 1
+ m_AmbientMode: 0
+ m_SubtractiveShadowColor: {r: 0.42, g: 0.478, b: 0.627, a: 1}
+ m_SkyboxMaterial: {fileID: 10304, guid: 0000000000000000f000000000000000, type: 0}
+ m_HaloStrength: 0.5
+ m_FlareStrength: 1
+ m_FlareFadeSpeed: 3
+ m_HaloTexture: {fileID: 0}
+ m_SpotCookie: {fileID: 10001, guid: 0000000000000000e000000000000000, type: 0}
+ m_DefaultReflectionMode: 0
+ m_DefaultReflectionResolution: 128
+ m_ReflectionBounces: 1
+ m_ReflectionIntensity: 1
+ m_CustomReflection: {fileID: 0}
+ m_Sun: {fileID: 0}
+ m_IndirectSpecularColor: {r: 0.37311953, g: 0.38074014, b: 0.3587274, a: 1}
+--- !u!157 &3
+LightmapSettings:
+ m_ObjectHideFlags: 0
+ serializedVersion: 11
+ m_GIWorkflowMode: 0
+ m_GISettings:
+ serializedVersion: 2
+ m_BounceScale: 1
+ m_IndirectOutputScale: 1
+ m_AlbedoBoost: 1
+ m_TemporalCoherenceThreshold: 1
+ m_EnvironmentLightingMode: 0
+ m_EnableBakedLightmaps: 1
+ m_EnableRealtimeLightmaps: 1
+ m_LightmapEditorSettings:
+ serializedVersion: 9
+ m_Resolution: 2
+ m_BakeResolution: 40
+ m_TextureWidth: 1024
+ m_TextureHeight: 1024
+ m_AO: 0
+ m_AOMaxDistance: 1
+ m_CompAOExponent: 1
+ m_CompAOExponentDirect: 0
+ m_Padding: 2
+ m_LightmapParameters: {fileID: 0}
+ m_LightmapsBakeMode: 1
+ m_TextureCompression: 1
+ m_FinalGather: 0
+ m_FinalGatherFiltering: 1
+ m_FinalGatherRayCount: 256
+ m_ReflectionCompression: 2
+ m_MixedBakeMode: 2
+ m_BakeBackend: 0
+ m_PVRSampling: 1
+ m_PVRDirectSampleCount: 32
+ m_PVRSampleCount: 500
+ m_PVRBounces: 2
+ m_PVRFilterTypeDirect: 0
+ m_PVRFilterTypeIndirect: 0
+ m_PVRFilterTypeAO: 0
+ m_PVRFilteringMode: 1
+ m_PVRCulling: 1
+ m_PVRFilteringGaussRadiusDirect: 1
+ m_PVRFilteringGaussRadiusIndirect: 5
+ m_PVRFilteringGaussRadiusAO: 2
+ m_PVRFilteringAtrousPositionSigmaDirect: 0.5
+ m_PVRFilteringAtrousPositionSigmaIndirect: 2
+ m_PVRFilteringAtrousPositionSigmaAO: 1
+ m_ShowResolutionOverlay: 1
+ m_LightingDataAsset: {fileID: 0}
+ m_UseShadowmask: 1
+--- !u!196 &4
+NavMeshSettings:
+ serializedVersion: 2
+ m_ObjectHideFlags: 0
+ m_BuildSettings:
+ serializedVersion: 2
+ agentTypeID: 0
+ agentRadius: 0.5
+ agentHeight: 2
+ agentSlope: 45
+ agentClimb: 0.4
+ ledgeDropHeight: 0
+ maxJumpAcrossDistance: 0
+ minRegionArea: 2
+ manualCellSize: 0
+ cellSize: 0.16666667
+ manualTileSize: 0
+ tileSize: 256
+ accuratePlacement: 0
+ debug:
+ m_Flags: 0
+ m_NavMeshData: {fileID: 0}
+--- !u!1 &1695397705
+GameObject:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ serializedVersion: 5
+ m_Component:
+ - component: {fileID: 1695397707}
+ - component: {fileID: 1695397706}
+ m_Layer: 0
+ m_Name: GameObject
+ m_TagString: Untagged
+ m_Icon: {fileID: 0}
+ m_NavMeshLayer: 0
+ m_StaticEditorFlags: 0
+ m_IsActive: 1
+--- !u!114 &1695397706
+MonoBehaviour:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1695397705}
+ m_Enabled: 1
+ m_EditorHideFlags: 0
+ m_Script: {fileID: 11500000, guid: 13610b67edaad6444b1249769ff17cea, type: 3}
+ m_Name:
+ m_EditorClassIdentifier:
+--- !u!4 &1695397707
+Transform:
+ m_ObjectHideFlags: 0
+ m_PrefabParentObject: {fileID: 0}
+ m_PrefabInternal: {fileID: 0}
+ m_GameObject: {fileID: 1695397705}
+ 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: 0}
+ m_RootOrder: 0
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
diff --git a/Assets/GameInitScene.unity.meta b/Assets/GameInitScene.unity.meta
new file mode 100644
index 000000000..fd9d1e8df
--- /dev/null
+++ b/Assets/GameInitScene.unity.meta
@@ -0,0 +1,7 @@
+fileFormatVersion: 2
+guid: 0f5572f4b660dbd4fb2020c8bde9043a
+DefaultImporter:
+ externalObjects: {}
+ userData:
+ assetBundleName:
+ assetBundleVariant:
diff --git a/Assets/Plugins/Https/DownloadJsonFile.cs b/Assets/Plugins/Https/DownloadJsonFile.cs
index 60cc32f8d..5abad6646 100644
--- a/Assets/Plugins/Https/DownloadJsonFile.cs
+++ b/Assets/Plugins/Https/DownloadJsonFile.cs
@@ -65,6 +65,7 @@ public class DownloadJsonFile
{
if (_request == null && !_done)
{
+ Debug.Log("DownloadJsonFile Start , URL: " + _uri );
if (_uri == null)
Dispose("DownloadJsonFile uri is not correctly parsed!");
else
diff --git a/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab b/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab
index 9d68a1641..732f41e1c 100644
--- a/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab
+++ b/Assets/Plugins/IngameDebugConsole/IngameDebugConsole.prefab
@@ -1281,6 +1281,7 @@ MonoBehaviour:
receiveLogcatLogsInAndroid: 0
logcatArguments:
avoidScreenCutout: 1
+ popupAvoidsScreenCutout: 0
maxLogLength: 10000
autoFocusOnCommandInputField: 1
logItemPrefab: {fileID: 11408050, guid: 391be5df5ef62f345bb76a1051c04da7, type: 2}
@@ -3105,6 +3106,7 @@ MonoBehaviour:
m_PreferredHeight: -1
m_FlexibleWidth: 2
m_FlexibleHeight: -1
+ m_LayoutPriority: 1
--- !u!114 &114435636144975300
MonoBehaviour:
m_ObjectHideFlags: 1
diff --git a/Assets/Plugins/RuntimeInspector/Sprites/White.png.meta b/Assets/Plugins/RuntimeInspector/Sprites/White.png.meta
index 675bcf005..7175fef28 100644
--- a/Assets/Plugins/RuntimeInspector/Sprites/White.png.meta
+++ b/Assets/Plugins/RuntimeInspector/Sprites/White.png.meta
@@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: 796112823cc06244c9a472de097830dd
-timeCreated: 1506408647
-licenseType: Pro
TextureImporter:
fileIDToRecycleName: {}
+ externalObjects: {}
serializedVersion: 4
mipmaps:
mipMapMode: 0
@@ -12,6 +11,8 @@ TextureImporter:
linearTexture: 0
fadeOut: 0
borderMipMap: 0
+ mipMapsPreserveCoverage: 0
+ alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
@@ -27,10 +28,13 @@ TextureImporter:
textureFormat: 1
maxTextureSize: 2048
textureSettings:
+ serializedVersion: 2
filterMode: 1
aniso: -1
mipBias: -1
- wrapMode: 1
+ wrapU: 1
+ wrapV: 1
+ wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
@@ -39,8 +43,9 @@ TextureImporter:
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
- spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spritePixelsToUnits: 100
+ spriteBorder: {x: 0, y: 0, z: 0, w: 0}
+ spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
@@ -52,33 +57,40 @@ TextureImporter:
platformSettings:
- buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
+ resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ androidETC2FallbackOverride: 0
- buildTarget: Standalone
maxTextureSize: 2048
+ resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
+ androidETC2FallbackOverride: 0
- 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: []
- spritePackingTag: RuntimeInspector
+ physicsShape: []
+ spritePackingTag:
userData:
assetBundleName:
assetBundleVariant:
diff --git a/Assets/Plugins/Script/AssetUpdate/AssetUpdateManager.cs b/Assets/Plugins/Script/AssetUpdate/AssetUpdateManager.cs
index 1fcaea990..2e1f9cd63 100644
--- a/Assets/Plugins/Script/AssetUpdate/AssetUpdateManager.cs
+++ b/Assets/Plugins/Script/AssetUpdate/AssetUpdateManager.cs
@@ -1,6 +1,7 @@
// 在AssetBundleManagerç‰èµ„æºç®¡ç†å™¨ç”Ÿæˆå‰ï¼Œé¢„先处ç†èµ„æºé—®é¢˜çš„管ç†å™¨
// æå‰å¤„ç†èµ„æºæ›´æ–°ï¼ŒæœåŠ¡å™¨åˆ—è¡¨ä¸‹è½½ç‰ä¸€ç³»åˆ—情况
// 注:这个东西è¿ä½œçš„æ—¶å€™ï¼Œæ²¡æœ‰AssetBundle,没有Lua,ä¸è¦è¯•图åšä»»ä½•相关æ“作。
+
using System.Collections.Generic;
using System.Reflection;
using AssetUpdate;
@@ -17,28 +18,37 @@ public class AssetUpdateManager : MonoBehaviour
private IAssetAsyncAction _currentAction;
public static Assembly dllAssembly { get; private set; }
- public static string channel { get; private set; }
+
+ private static string _channel;
+
+ public static string channel
+ {
+ get { return _channel; }
+ private set { _channel = value; }
+ }
+
public static string assetVersionUri { get; private set; }
public static bool useResources
{
get { return _useResources; }
}
+
private static bool _useResources = true;
- public AssetUpdateState state { get; private set; }
- public AssetUpdateError error { get; private set; }
- public static string assetUri { get; private set; }
- public static int assetVersion { get; private set; }
- public static string apkUri { get; private set; }
- public static string apkVersion { get; private set; }
+ public AssetUpdateState state { get; private set; }
+ public AssetUpdateError error { get; private set; }
+ public static string assetUri { get; private set; }
+ public static int assetVersion { get; private set; }
+ public static string apkUri { get; private set; }
+ public static string apkVersion { get; private set; }
- public List downloadList { get; private set; }
- public AssetDependencyInfo mainInfo { get; private set; }
+ public List downloadList { get; private set; }
+ public AssetDependencyInfo mainInfo { get; private set; }
public Dictionary streamingPathInfo { get; private set; }
private const string currentVersionPref = "CurrentVersion";
-
+
public static int LoadCurrentVersion()
{
var currentVersion = PlayerPrefs.GetInt(currentVersionPref, default(int));
@@ -49,6 +59,7 @@ public class AssetUpdateManager : MonoBehaviour
if (int.TryParse(versionFile, out version))
currentVersion = version;
}
+
return currentVersion;
}
@@ -56,10 +67,10 @@ public class AssetUpdateManager : MonoBehaviour
{
PlayerPrefs.SetInt(currentVersionPref, assetVersion);
}
-
+
private void Awake()
{
- Debug.Log( "AssetUpdateManager Awake" );
+ Debug.Log("AssetUpdateManager Awake");
_useResources = false;
AssetUpdateDownloaderTick.CreateInstance();
if (!FirstSceneBg.instance)
@@ -80,7 +91,7 @@ public class AssetUpdateManager : MonoBehaviour
private void OnConfigLoad(WWW www)
{
- var text = string.IsNullOrEmpty(www.error) ? www.text : string.Empty;
+ var text = string.IsNullOrEmpty(www.error) ? www.text : string.Empty;
var channelError = false;
if (string.IsNullOrEmpty(text))
channelError = true;
@@ -91,7 +102,7 @@ public class AssetUpdateManager : MonoBehaviour
channelError = true;
else
{
- channel = lines[0].Trim();
+ channel = lines[0].Trim();
assetVersionUri = lines[1].Trim();
if (string.IsNullOrEmpty(channel) || string.IsNullOrEmpty(assetVersionUri))
channelError = true;
@@ -102,7 +113,8 @@ public class AssetUpdateManager : MonoBehaviour
FirstSceneBg.instance.SetPublishText(extra);
}
}
- }
+ }
+
if (channelError)
Debug.LogError("Unable to Parse Channel file! This is not recoverable!");
else
@@ -110,21 +122,23 @@ public class AssetUpdateManager : MonoBehaviour
// 清ç†ä¸Šæ¬¡æ‰§è¡Œæ®‹ç•™çš„rawJsonText
// 当å‰é¡¹ç›®æ²¡æœ‰ç±»ä¼¼æ•°æ®ç¼“å˜åº“ä¸€æ ·çš„ç±»ï¼Œæš‚æ—¶ç›´æŽ¥ç”¨é™æ€ä¼ 递
assetUri = string.Empty;
- state = AssetUpdateState.GetUpdateInfo;
+ state = AssetUpdateState.GetUpdateInfo;
StartCurrentAction();
}
+
FirstSceneBg.instance.ShowGameVersion();
// 清ç†ä¸Šæ¬¡æ‰§è¡Œæ®‹ç•™çš„rawJsonText
// 当å‰é¡¹ç›®æ²¡æœ‰ç±»ä¼¼æ•°æ®ç¼“å˜åº“ä¸€æ ·çš„ç±»ï¼Œæš‚æ—¶ç›´æŽ¥ç”¨é™æ€ä¼ 递
assetUri = string.Empty;
- state = AssetUpdateState.GetUpdateInfo;
+ state = AssetUpdateState.GetUpdateInfo;
StartCurrentAction();
}
-
+
private void Start()
{
// 特别处ç†Android Resume时期的诡异情况,该状况下,AssetBundle未被清空,但实际Bundle管ç†å™¨å·²è¢«æžæž„
AssetBundle.UnloadAllAssetBundles(true);
+ Debug.Log("åŠ è½½æ¸ é“æ–‡ä»¶" + _channelConfig);
AssetUpdateDownloaderTick.instance.LoadStreamingAsset(_channelConfig, OnConfigLoad);
}
@@ -196,9 +210,10 @@ public class AssetUpdateManager : MonoBehaviour
else
jsonAssetInfo = JsonAssetInfo.Create(httpAction.jsonData);
}
+
return jsonAssetInfo;
}
-
+
private void EndCurrentAction()
{
error = AssetUpdateError.UnknownError;
@@ -215,10 +230,10 @@ public class AssetUpdateManager : MonoBehaviour
Debug.LogError("Failed to convert jsonData to JsonAssetInfoï¼");
else
{
- assetUri = jsonAssetInfo.assetUri;
+ assetUri = jsonAssetInfo.assetUri;
assetVersion = jsonAssetInfo.assetVersion;
- apkUri = jsonAssetInfo.apkUri;
- apkVersion = jsonAssetInfo.apkVersion;
+ apkUri = jsonAssetInfo.apkUri;
+ apkVersion = jsonAssetInfo.apkVersion;
error = apkVersion == Application.version
? AssetUpdateError.Success
: AssetUpdateError.ApkUpdate;
@@ -242,9 +257,9 @@ public class AssetUpdateManager : MonoBehaviour
var assetCompareAction = ConvertAction(_currentAction);
if (assetCompareAction != null)
{
- downloadList = assetCompareAction.downloadList;
+ downloadList = assetCompareAction.downloadList;
streamingPathInfo = assetCompareAction.streamingPathInfo;
- error = AssetUpdateError.Success;
+ error = AssetUpdateError.Success;
}
}
break;
@@ -276,25 +291,25 @@ public class AssetUpdateManager : MonoBehaviour
case AssetUpdateError.AssetJsonError:
{
LiteConfirmWin.Open("资æºåŒæ¥é”™è¯¯", "æ— æ³•èŽ·å¾—æœåŠ¡å™¨æ–‡ä»¶ç‰ˆæœ¬å·ï¼\nè¯·åœ¨ç½‘ç»œé€šç•…çš„æƒ…å†µä¸‹å†æ¬¡å°è¯•ï¼",
- new LiteConfirmButtonData("确定", RestartProcess));
+ new LiteConfirmButtonData("确定", RestartProcess));
}
break;
case AssetUpdateError.VersionDataError:
{
LiteConfirmWin.Open("èµ„æºæ¸…å•错误", "æ— æ³•èŽ·å¾—æ£ç¡®çš„æœåŠ¡å™¨æ–‡ä»¶æ¸…å•ï¼\nè¯·åœ¨ç½‘ç»œé€šç•…çš„æƒ…å†µä¸‹å†æ¬¡å°è¯•ï¼",
- new LiteConfirmButtonData("确定", RestartProcess));
+ new LiteConfirmButtonData("确定", RestartProcess));
}
break;
case AssetUpdateError.DownloadError:
{
LiteConfirmWin.Open("资æºä¸‹è½½é”™è¯¯", "æ— æ³•ä¸‹è½½æ‰€éœ€æ–‡ä»¶ï¼\nè¯·åœ¨ç½‘ç»œé€šç•…çš„æƒ…å†µä¸‹å†æ¬¡å°è¯•ï¼",
- new LiteConfirmButtonData("确定", RestartProcess));
+ new LiteConfirmButtonData("确定", RestartProcess));
}
break;
case AssetUpdateError.FileCreateError:
{
LiteConfirmWin.Open("读写错误", "æ— æ³•æ›´æ–°èµ„æºæ–‡ä»¶ï¼\n请检查硬盘容é‡ï¼Œå¹¶ç¡®ä¿æ¸¸æˆæ‹¥æœ‰å“应读写æƒé™ï¼",
- new LiteConfirmButtonData("确定", RestartProcess));
+ new LiteConfirmButtonData("确定", RestartProcess));
}
break;
case AssetUpdateError.ApkError:
@@ -313,7 +328,7 @@ public class AssetUpdateManager : MonoBehaviour
{
Debug.LogError(string.Format("Unhandled error type {0} in HandleStateErrorï¼", error));
LiteConfirmWin.Open("网络错误", "æ— æ³•èŽ·å¾—æœåŠ¡å™¨åˆ—è¡¨\nè¯·åœ¨ç½‘ç»œé€šç•…çš„æƒ…å†µä¸‹å†æ¬¡å°è¯•ï¼",
- new LiteConfirmButtonData("确定", RestartProcess));
+ new LiteConfirmButtonData("确定", RestartProcess));
}
break;
}
@@ -336,9 +351,9 @@ public class AssetUpdateManager : MonoBehaviour
public static void OpenApkUri(string uri)
{
LiteConfirmWin.Open("安装包更新", "点击确定从商店下载最新版本的游æˆå®‰è£…包ï¼\n" + uri,
- new LiteConfirmButtonData("确定", () => OnApkUpdateConfirm(uri)));
+ new LiteConfirmButtonData("确定", () => OnApkUpdateConfirm(uri)));
}
-
+
private void RestartProcess()
{
SceneHub.LoadScene(SceneHub.GetActiveScene().name);
@@ -370,6 +385,7 @@ public class AssetUpdateManager : MonoBehaviour
private void TryToEndProcess()
{
// if (_complete && _ui.complete) EndProcess();
+ GameObject.DestroyObject(this);
if (state == AssetUpdateState.Complete)
StartGame();
}
diff --git a/Assets/Project/Script/Common/Utilities/CommonUtility.cs b/Assets/Project/Script/Common/Utilities/CommonUtility.cs
index 95f974f3a..0f4980a1c 100644
--- a/Assets/Project/Script/Common/Utilities/CommonUtility.cs
+++ b/Assets/Project/Script/Common/Utilities/CommonUtility.cs
@@ -15,6 +15,7 @@ using Object = UnityEngine.Object;
using UnityEditor;
#endif
+
///
/// Author: Blastom
/// 通用工具类型代ç
@@ -37,7 +38,7 @@ public static class CommonUtility
private const float _jumpAnimTime = 1f;
private static float _lastGetUnityTime;
- private static int _lastGetTime;
+ private static int _lastGetTime;
///
/// 数组Find方法
@@ -104,7 +105,7 @@ public static class CommonUtility
public static void ToCopyClip(string text)
{
- var textEditor = new TextEditor {text = text};
+ var textEditor = new TextEditor { text = text };
textEditor.SelectAll();
textEditor.Copy();
}
@@ -171,10 +172,10 @@ public static class CommonUtility
public static void TrimCloneInName(this GameObject gameObject)
{
const string clone = "(Clone)";
- var name = gameObject.name;
+ var name = gameObject.name;
if (name.EndsWith(clone))
{
- name = name.Remove(name.Length - clone.Length);
+ name = name.Remove(name.Length - clone.Length);
gameObject.name = name;
}
}
@@ -224,11 +225,11 @@ public static class CommonUtility
///
public static void CopyTo(this RectTransform source, RectTransform target)
{
- target.pivot = source.pivot;
- target.anchorMin = source.anchorMin;
- target.anchorMax = source.anchorMax;
+ target.pivot = source.pivot;
+ target.anchorMin = source.anchorMin;
+ target.anchorMax = source.anchorMax;
target.anchoredPosition = source.anchoredPosition;
- target.sizeDelta = source.sizeDelta;
+ target.sizeDelta = source.sizeDelta;
target.SetParent(source.parent, false);
}
@@ -279,8 +280,8 @@ public static class CommonUtility
result.AddKey(keyFrame);
}
- result.preWrapMode = (WrapMode) keyFrameList[0].PreWrapMode;
- result.postWrapMode = (WrapMode) keyFrameList[0].PostWrapMode;
+ result.preWrapMode = (WrapMode)keyFrameList[0].PreWrapMode;
+ result.postWrapMode = (WrapMode)keyFrameList[0].PostWrapMode;
}
}
#if UNITY_EDITOR
@@ -295,7 +296,7 @@ public static class CommonUtility
///
public static float LoopFloat(float source, float minValue, float maxValue)
{
- var cycle = maxValue - minValue;
+ var cycle = maxValue - minValue;
var multiplier = Mathf.Floor((source - minValue) / cycle);
return source - multiplier * cycle;
}
@@ -345,7 +346,7 @@ public static class CommonUtility
var target = source as TTarget;
if (target == null)
LogModule.ErrorLog(string.Format("æ— æ³•å°†ç»„ä»¶{0}转æ¢ä¸º{1}, 所在路径{2}", source.GetType(), typeof(TTarget),
- source.transform.GetHierarchyName()));
+ source.transform.GetHierarchyName()));
return target;
}
@@ -399,8 +400,8 @@ public static class CommonUtility
///
public static Tab_Impact GetMoveSkillImpact(this Tab_SkillEx skillEx)
{
- Tab_Impact result = null;
- var impactCount = skillEx.getImpactIdCount();
+ Tab_Impact result = null;
+ var impactCount = skillEx.getImpactIdCount();
for (var i = 0; i < impactCount; i++)
{
var impactId = skillEx.GetImpactIdbyIndex(i);
@@ -432,7 +433,8 @@ public static class CommonUtility
//}
//return hasNext;
- return skillEx.NextStageSkillId >= 0 && GameManager.gameManager.PlayerDataPool.GetOwnSkillInfo(skillEx.NextStageSkillId) != null;
+ return skillEx.NextStageSkillId >= 0 &&
+ GameManager.gameManager.PlayerDataPool.GetOwnSkillInfo(skillEx.NextStageSkillId) != null;
}
///
@@ -440,8 +442,8 @@ public static class CommonUtility
///
public static Tab_SkillTargetSelector GetSkillSelector(this Tab_SkillEx skillEx)
{
- Tab_SkillTargetSelector result = null;
- var selectorId = skillEx.GetSelectorIdbyIndex(0);
+ Tab_SkillTargetSelector result = null;
+ var selectorId = skillEx.GetSelectorIdbyIndex(0);
if (selectorId > -1)
result = TryGetTable(selectorId, a => TableManager.GetSkillTargetSelectorByID(a));
return result;
@@ -494,7 +496,7 @@ public static class CommonUtility
///
public static string GetCurrentTimeString(bool showInterval = true)
{
- var time = GetCurrentTimeInMilliseconds();
+ var time = GetCurrentTimeInMilliseconds();
var result = time.ToString();
if (showInterval)
result = string.Format("({0} - {1})", result, time - _lastGetTime);
@@ -516,12 +518,12 @@ public static class CommonUtility
///
private static int GetCurrentTimeInMilliseconds()
{
- return (int) (DateTime.Now - DateTime.Today).TotalMilliseconds;
+ return (int)(DateTime.Now - DateTime.Today).TotalMilliseconds;
}
public static Vector3 ParseVector3(string source)
{
- var result = Vector3.zero;
+ var result = Vector3.zero;
var segments = source.Split(';');
result.x = float.Parse(segments[0]);
result.y = float.Parse(segments[1]);
@@ -597,7 +599,7 @@ public static class CommonUtility
public static int FubenAutoType()
{
var fubenId = GlobeVar.INVALID_ID;
- var cache = GameManager.gameManager.PlayerDataPool.EnterSceneCache;
+ var cache = GameManager.gameManager.PlayerDataPool.EnterSceneCache;
if (cache != null)
fubenId = cache.EnterCopySceneID;
if (fubenId <= GlobeVar.INVALID_ID)
@@ -618,8 +620,8 @@ public static class CommonUtility
public static bool IsCopyScene(this Tab_SceneClass sceneClassData)
{
- return sceneClassData.SceneID != (int) GameDefine_Globe.SCENE_DEFINE.SCENE_GUILD &&
- sceneClassData.Type == (int) GameDefine_Globe.SCENE_TYPE.SCENETYPE_COPYSCENE;
+ return sceneClassData.SceneID != (int)GameDefine_Globe.SCENE_DEFINE.SCENE_GUILD &&
+ sceneClassData.Type == (int)GameDefine_Globe.SCENE_TYPE.SCENETYPE_COPYSCENE;
}
public static Tab_Jump GetFinialJumpData(this Tab_Jump jumpData)
@@ -681,15 +683,15 @@ public static class CommonUtility
public static Tab_SkillEx GetSkillMaxLevelByBaseId(int baseId)
{
- Tab_SkillEx result = null;
- var maxLevel = int.MinValue;
- var skillExDict = TableManager.GetSkillEx();
+ Tab_SkillEx result = null;
+ var maxLevel = int.MinValue;
+ var skillExDict = TableManager.GetSkillEx();
foreach (var value in skillExDict.Values)
{
var skillEx = value;
if (skillEx.BaseId == baseId && skillEx.Level > maxLevel)
{
- result = skillEx;
+ result = skillEx;
maxLevel = skillEx.Level;
}
}
@@ -700,7 +702,7 @@ public static class CommonUtility
// 注:C#䏿”¯æŒå¯¹æ³›åž‹é™åˆ¶ä¸ºæžšä¸¾
public static T GetMaxEnum() where T : struct, IComparable
{
- var values = (T[]) Enum.GetValues(typeof(T));
+ var values = (T[])Enum.GetValues(typeof(T));
return GetMaxValue(values);
}
@@ -735,7 +737,7 @@ public static class CommonUtility
break;
}
- startPos = corners[i];
+ startPos = corners[i];
distance -= length;
}
@@ -762,7 +764,7 @@ public static class CommonUtility
///
public static float GetTotalDistance(this NavMeshPath path)
{
- var length = 0f;
+ var length = 0f;
var corners = path.corners;
if (corners.Length > 1)
for (var i = 1; i < corners.Length; i++)
@@ -799,7 +801,7 @@ public static class CommonUtility
if (mode == ListGetMode.create && result == null)
{
- result = new TV {id = id};
+ result = new TV { id = id };
list.Add(result);
}
@@ -863,6 +865,12 @@ public static class CommonUtility
}
#endif
var bundleName = LoadAssetBundle.FixBundleName(LoadAssetBundle.BUNDLE_PATH_GAMERES);
+
+ if (AssetManager.instance == null)
+ {
+ throw new Exception("AssetManager.instance is null");
+ }
+
return AssetManager.instance.LoadAssetSync(bundleName, name);
}
@@ -890,8 +898,8 @@ public static class CommonUtility
// LoadAssetBundle.Instance.LoadGameObject(bundleName, assetName, callBack, null, archive);
// }
- public static void LoadAssetInstance(string bundleName, string assetName,
- LoadBundleAssetCallback callBack, bool archive)
+ public static void LoadAssetInstance(string bundleName, string assetName,
+ LoadBundleAssetCallback callBack, bool archive)
{
#if UNITY_EDITOR
if (AssetUpdateManager.useResources)
@@ -922,7 +930,7 @@ public class MyTuple
public MyTuple(T1 first, T2 second)
{
- this.first = first;
+ this.first = first;
this.second = second;
}
}
diff --git a/Assets/Project/Script/GUI/Advance/AdvanceBase.cs b/Assets/Project/Script/GUI/Advance/AdvanceBase.cs
index efa5fb022..6e4e5def4 100644
--- a/Assets/Project/Script/GUI/Advance/AdvanceBase.cs
+++ b/Assets/Project/Script/GUI/Advance/AdvanceBase.cs
@@ -69,7 +69,7 @@ public class AdvanceCanadvanceCtr
private bool CheckFuncOpen(int id)
{
- var table = TableManager.GetFunctionOpenByID(id);
+ Tab_FunctionOpen table = TableManager.GetFunctionOpenByID(id);
if (table != null)
{
//return table.OpenServerDay <= GlobalData.OpenServerDays && table.OpenVipLv <= GameManager.gameManager.PlayerDataPool.VipCost
diff --git a/Assets/Project/Script/GUI/Login/LoginUILogic.cs b/Assets/Project/Script/GUI/Login/LoginUILogic.cs
index 24a181a4d..a547a8892 100644
--- a/Assets/Project/Script/GUI/Login/LoginUILogic.cs
+++ b/Assets/Project/Script/GUI/Login/LoginUILogic.cs
@@ -25,6 +25,7 @@ public class LoginUILogic : MonoBehaviour
LoginData.Init();
// GuiTextDebug.debug("LoginUILogic awake");
AssetUpdateDownloaderTick.CreateInstance();
+ print("Init AssetUpdateDownloaderTick");
if (!LoadAssetBundle.Instance)
LoadAssetBundle.CreateInstance();
if (!FirstSceneBg.instance)
@@ -35,13 +36,14 @@ public class LoginUILogic : MonoBehaviour
public void Start()
{
+ Debug.Log("åˆå§‹åŒ– 游æˆ");
EventDispatcher.Instance.Add(EventId.SdkPhpLogin, OnPhpLoginComplete);
// 在开始执行画质Init,防æ¢å¤šä½™çš„Shaderå˜ä½“è¢«åŠ è½½
QualityDetector.InitQuality();
- QualitySettings.shadowCascades = 2;
- QualitySettings.shadowDistance = 32f;
+ QualitySettings.shadowCascades = 2;
+ QualitySettings.shadowDistance = 32f;
QualitySettings.shadowResolution = ShadowResolution.High;
- QualitySettings.shadowmaskMode = ShadowmaskMode.Shadowmask;
+ QualitySettings.shadowmaskMode = ShadowmaskMode.Shadowmask;
QualitySettings.shadowProjection = ShadowProjection.CloseFit;
if (FirstSceneBg.instance)
{
@@ -49,7 +51,7 @@ public class LoginUILogic : MonoBehaviour
FirstSceneBg.instance.ShowGameVersion();
}
- LoginData.onSdkEvent += OnSdkCallBack;
+ LoginData.onSdkEvent += OnSdkCallBack;
LoginData.onServerList += OnServerList;
if (_firstLaunch || AssetUpdateManager.useResources)
StartLoadResource();
@@ -67,7 +69,7 @@ public class LoginUILogic : MonoBehaviour
_instance = null;
if (!SdkControl.appQuit)
{
- LoginData.onSdkEvent -= OnSdkCallBack;
+ LoginData.onSdkEvent -= OnSdkCallBack;
LoginData.onServerList -= OnServerList;
EventDispatcher.Instance.Remove(EventId.SdkPhpLogin, OnPhpLoginComplete);
}
@@ -86,7 +88,7 @@ public class LoginUILogic : MonoBehaviour
AssetUpdateManager.OpenApkUri(jsonAssetInfo.apkUri);
else if (jsonAssetInfo.assetVersion != AssetUpdateManager.assetVersion)
LiteConfirmWin.Open("游æˆèµ„æºæ›´æ–°", "游æˆèµ„æºéœ€è¦æ›´æ–°ï¼\nè¯·é‡æ–°å¯åŠ¨æ¸¸æˆå¼€å§‹æ›´æ–°ï¼",
- new LiteConfirmButtonData("确定", OnRestartConfirm));
+ new LiteConfirmButtonData("确定", OnRestartConfirm));
else
StartLoadResource();
}
@@ -95,11 +97,12 @@ public class LoginUILogic : MonoBehaviour
{
StartCoroutine(CheckVersionAction());
}
+
private static void OnRestartConfirm()
{
SdkControl.instance.CloseGame();
}
-
+
public static LoginUILogic Instance()
{
return _instance;
@@ -119,9 +122,9 @@ public class LoginUILogic : MonoBehaviour
else
{
var segments = data.args.Split(',');
- var message = segments.Length > 1 ? segments[1] : "登录失败";
+ var message = segments.Length > 1 ? segments[1] : "登录失败";
MessageBoxLogic.OpenOKBox("登录失败", message,
- () => SdkControl.instance.LoginSdk(false));
+ () => SdkControl.instance.LoginSdk(false));
}
}
break;
@@ -156,14 +159,14 @@ public class LoginUILogic : MonoBehaviour
TryToInitGame();
else
MessageBoxLogic.OpenOKBox(error, error,
- () => SdkControl.instance.GetServerList());
+ () => SdkControl.instance.GetServerList());
}
private void InitUI()
{
GameManager.gameManager.SoundManager.PlaySceneMusic();
LoadAssetBundle.Instance.LoadUI(UIInfo.UiRoot.path, UIInfo.UiRoot.name,
- OnUiRootLoaded, new Hashtable());
+ OnUiRootLoaded, new Hashtable());
}
private void OnUiRootLoaded(string path, GameObject prefab, Hashtable hash)
@@ -258,7 +261,7 @@ public class LoginUILogic : MonoBehaviour
public static void RequestRandomName(int maleOrFemale)
{
- var packet = (CG_REQ_RANDOMNAME) PacketDistributed.CreatePacket(MessageID.PACKET_CG_REQ_RANDOMNAME);
+ var packet = (CG_REQ_RANDOMNAME)PacketDistributed.CreatePacket(MessageID.PACKET_CG_REQ_RANDOMNAME);
packet.SetSex(maleOrFemale);
packet.SendPacket();
}
@@ -282,7 +285,7 @@ public class LoginUILogic : MonoBehaviour
Complete
}
- private LoadStage _LoadStage = LoadStage.None;
+ private LoadStage _LoadStage = LoadStage.None;
private SceneHandle _loadSceneHandle;
private void TryToInitGame()
diff --git a/Assets/Project/Script/GameLogic/GameManager/LoadAssetBundle.cs b/Assets/Project/Script/GameLogic/GameManager/LoadAssetBundle.cs
index 65978f258..56e677544 100644
--- a/Assets/Project/Script/GameLogic/GameManager/LoadAssetBundle.cs
+++ b/Assets/Project/Script/GameLogic/GameManager/LoadAssetBundle.cs
@@ -23,13 +23,13 @@ public class LoadAssetBundle : MonoBehaviour
public const string atlasPathConvertTable = "AtlasPathConvert";
public const string BUNDLE_MAIN_BASE_UI = "MainBase";
- public const string BUNDLE_PATH_MODEL = "model/";
- public const string BUNDLE_PATH_PET = "model/";
- public const string BUNDLE_PATH_EFFECT = "effect/";
- public const string BUNDLE_PATH_UI = "ui/";
- public const string BUNDLE_PATH_SOUND = "sounds/";
- public const string BUNDLE_PATH_SPRITE = "ui/sprite/commonitem";
- public const string BUNDLE_PATH_Other = "other/";
+ public const string BUNDLE_PATH_MODEL = "model/";
+ public const string BUNDLE_PATH_PET = "model/";
+ public const string BUNDLE_PATH_EFFECT = "effect/";
+ public const string BUNDLE_PATH_UI = "ui/";
+ public const string BUNDLE_PATH_SOUND = "sounds/";
+ public const string BUNDLE_PATH_SPRITE = "ui/sprite/commonitem";
+ public const string BUNDLE_PATH_Other = "other/";
public const string bundleFileExtension = AssetConst.bundleVariant;
public const string BUNDLE_PATH_GAMERES = "gameres";
@@ -44,11 +44,11 @@ public class LoadAssetBundle : MonoBehaviour
public const string uiSpriteBundleHeader = "ui/sprite/";
private readonly LoadAssetRequestList _gameObjectList = new LoadAssetRequestList();
- private readonly LoadAssetRequestList