GemBattle.git - Gitblit

New file
			@@ -0,0 +1,92 @@
			%YAML 1.1
			%TAG !u! tag:unity3d.com,2011:
			--- !u!21 &2100000
			Material:
			serializedVersion: 6
			m_ObjectHideFlags: 0
			m_CorrespondingSourceObject: {fileID: 0}
			m_PrefabInstance: {fileID: 0}
			m_PrefabAsset: {fileID: 0}
			m_Name: EffectShader_Niuqu_001 1
			m_Shader: {fileID: 4800000, guid: bb80d5a11259d934b92ef9060d89a7b4, type: 3}
			m_ShaderKeywords:
			m_LightmapFlags: 4
			m_EnableInstancingVariants: 0
			m_DoubleSidedGI: 0
			m_CustomRenderQueue: -1
			stringTagMap: {}
			disabledShaderPasses: []
			m_SavedProperties:
			serializedVersion: 3
			m_TexEnvs:
			- _BumpMap:
			m_Texture: {fileID: 0}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _DetailAlbedoMap:
			m_Texture: {fileID: 0}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _DetailMask:
			m_Texture: {fileID: 0}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _DetailNormalMap:
			m_Texture: {fileID: 0}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _EmissionMap:
			m_Texture: {fileID: 0}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _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}
			- _NioseMask:
			m_Texture: {fileID: 2800000, guid: ed446a8edadab1c46ba1fc2f2a390aab, type: 3}
			m_Scale: {x: 1, y: 1}
			m_Offset: {x: 0, y: 0}
			- _NoiseTex:
			m_Texture: {fileID: 2800000, guid: 1d92905ed2b5d0543bbbf41ee2db9e32, type: 3}
			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
			- _CullModle: 0
			- _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
			- _X_Maskspeed: 0
			- _X_speed: 0
			- _Y_Maskspeed: 0
			- _Y_speed: 0
			- _ZWrite: 1
			- _qianduo: 0.39
			m_Colors:
			- _Color: {r: 1, g: 1, b: 1, a: 1}
			- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
			m_BuildTextureStacks: []

New file
			@@ -0,0 +1,8 @@
			fileFormatVersion: 2
			guid: 19cba028d42988640b0ad771feb2f4dd
			NativeFormatImporter:
			externalObjects: {}
			mainObjectFileID: 0
			userData:
			assetBundleName:
			assetBundleVariant:

			@@ -4928,7 +4928,7 @@
			m_GameObject: {fileID: 313942322829799861}
			m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
			m_LocalPosition: {x: 0, y: 0, z: 0}
			m_LocalScale: {x: 1.3, y: 1.5, z: 1.5}
			m_LocalScale: {x: 1.3, y: 1.8, z: 1.8}
			m_Children:
			- {fileID: 313942322772481724}
			- {fileID: 313942324321907690}
			@@ -15431,7 +15431,7 @@
			rateOverTime:
			serializedVersion: 2
			minMaxState: 0
			scalar: 20
			scalar: 10
			minScalar: 10
			maxCurve:
			serializedVersion: 2

Diff too large

			@@ -26,7 +26,7 @@
			m_PrefabAsset: {fileID: 0}
			m_GameObject: {fileID: 642997296}
			m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
			m_LocalPosition: {x: 0, y: 10.3, z: 0}
			m_LocalPosition: {x: 0, y: 13.9, z: -0}
			m_LocalScale: {x: 1, y: 1, z: 1}
			m_Children: []
			m_Father: {fileID: 557383556256151776}
			@@ -337,7 +337,7 @@
			startSizeY:
			serializedVersion: 2
			minMaxState: 0
			scalar: 30
			scalar: 40
			minScalar: 1
			maxCurve:
			serializedVersion: 2
			@@ -5017,7 +5017,7 @@
			startLifetime:
			serializedVersion: 2
			minMaxState: 0
			scalar: 1.5
			scalar: 2
			minScalar: 5
			maxCurve:
			serializedVersion: 2

	Assets/00000/package/Materials/EffectShader_Niuqu_002.mat	92 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Materials/EffectShader_Niuqu_002.mat.meta	8 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_Elf_Shui_SpAtk.prefab	4 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_JiNengBaoShi_Huo.prefab	24455 ●●●●● patch \| view \| raw \| blame \| history
	Assets/00000/package/Prefab/Prefab/Effect_UI_GongJiFanWei.prefab	6 ●●●●● patch \| view \| raw \| blame \| history