From f6dd3a9acd245d94f35fc8c5f75eeb7e2b6cd8ce Mon Sep 17 00:00:00 2001
From: wangguan <wangguan@kt007.com>
Date: Fri, 06 Nov 2020 14:41:05 +0800
Subject: [PATCH] Merge branch 'master' of ssh://172.16.1.52:8091/GemBattle
---
Assets/00000/package/Prefab/Effect_baomihua_00.prefab | 42 ++++++++++----------
Assets/00000/package/Texture/Normal_001.tif.meta | 0
Assets/00000/package/Prefab/Effect_baomihua_01.prefab | 40 ++++++++++----------
Assets/00000/package/Materials/Sequence_010_3X4.mat | 2
Assets/00000/package/Texture/Normal_001.tif | 0
Assets/00000/package/Prefab/Effect_baomihua_04.prefab | 14 +++---
Assets/00000/package/Materials/Effectshader_ice_001.mat | 2
7 files changed, 50 insertions(+), 50 deletions(-)
diff --git a/Assets/00000/package/Materials/Effectshader_ice_001.mat b/Assets/00000/package/Materials/Effectshader_ice_001.mat
index 40deb31..6ad509b 100644
--- a/Assets/00000/package/Materials/Effectshader_ice_001.mat
+++ b/Assets/00000/package/Materials/Effectshader_ice_001.mat
@@ -56,7 +56,7 @@
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _NormalTex:
- m_Texture: {fileID: 2800000, guid: ed8b05169a7eca840a65a29950d5ee0a, type: 3}
+ m_Texture: {fileID: 2800000, guid: 900a2c5651c1afb43bfc18dc58845152, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
diff --git a/Assets/00000/package/Materials/Sequence_010_3X4.mat b/Assets/00000/package/Materials/Sequence_010_3X4.mat
index f2a80b9..04ca349 100644
--- a/Assets/00000/package/Materials/Sequence_010_3X4.mat
+++ b/Assets/00000/package/Materials/Sequence_010_3X4.mat
@@ -7,7 +7,7 @@
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: 515404a7-a87a-40e5-bf26-34711766ab8b
+ m_Name: Sequence_010_3X4
m_Shader: {fileID: 203, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
diff --git a/Assets/00000/package/Prefab/Effect_baomihua_00.prefab b/Assets/00000/package/Prefab/Effect_baomihua_00.prefab
index df466bd..447d254 100644
--- a/Assets/00000/package/Prefab/Effect_baomihua_00.prefab
+++ b/Assets/00000/package/Prefab/Effect_baomihua_00.prefab
@@ -283,9 +283,9 @@
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
- minMaxState: 0
- scalar: 1
- minScalar: 1
+ minMaxState: 3
+ scalar: 0.5
+ minScalar: 1.5
maxCurve:
serializedVersion: 2
m_Curve:
@@ -336,7 +336,7 @@
m_RotationOrder: 4
startSizeY:
serializedVersion: 2
- minMaxState: 0
+ minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -389,7 +389,7 @@
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
- minMaxState: 0
+ minMaxState: 3
scalar: 1
minScalar: 1
maxCurve:
@@ -658,7 +658,7 @@
m_RotationOrder: 4
ShapeModule:
serializedVersion: 6
- enabled: 1
+ enabled: 0
type: 4
angle: 90
length: 5
@@ -4852,7 +4852,7 @@
m_CameraVelocityScale: 0
m_VelocityScale: 0
m_LengthScale: 2
- m_SortingFudge: 0
+ m_SortingFudge: -0.84
m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0
@@ -9705,7 +9705,7 @@
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 6418646829760599892}
- m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
+ 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:
@@ -9788,7 +9788,7 @@
m_Time: 0.1
m_Parameters:
serializedVersion: 3
- widthMultiplier: 6
+ widthMultiplier: 4
widthCurve:
serializedVersion: 2
m_Curve:
@@ -9815,9 +9815,9 @@
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
- key0: {r: 1, g: 0.63203406, b: 0.27843142, a: 0}
- key1: {r: 1, g: 0.5282353, b: 0.34509802, a: 0.48235294}
- key2: {r: 0.9622642, g: 0.63418657, b: 0.33134568, a: 0}
+ key0: {r: 1, g: 0.52408797, b: 0.23113209, a: 0}
+ key1: {r: 1, g: 0.52408797, b: 0.23113209, a: 1}
+ key2: {r: 1, g: 0.53973544, b: 0.0990566, a: 1}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
@@ -9825,15 +9825,15 @@
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
- ctime2: 54741
+ ctime2: 65535
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
- atime1: 15806
- atime2: 65535
+ atime1: 10794
+ atime2: 35852
atime3: 65535
atime4: 0
atime5: 0
@@ -9841,7 +9841,7 @@
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
- m_NumAlphaKeys: 3
+ m_NumAlphaKeys: 4
numCornerVertices: 0
numCapVertices: 0
alignment: 0
@@ -9956,7 +9956,7 @@
serializedVersion: 2
key0: {r: 1, g: 0.7221005, b: 0.16470587, a: 0.7411765}
key1: {r: 0.8392157, g: 0.40072, b: 0, a: 0.7411765}
- key2: {r: 0.9622642, g: 0.63418657, b: 0.33134568, a: 0}
+ key2: {r: 0.8392157, g: 0.15733984, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
@@ -9964,7 +9964,7 @@
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 25636
- ctime2: 54741
+ ctime2: 53585
ctime3: 0
ctime4: 0
ctime5: 0
@@ -9979,7 +9979,7 @@
atime6: 0
atime7: 0
m_Mode: 0
- m_NumColorKeys: 2
+ m_NumColorKeys: 3
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
@@ -10025,7 +10025,7 @@
- {fileID: 6418646829986070342}
m_Father: {fileID: 6418646829760599895}
m_RootOrder: 0
- m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
+ m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &6418646830064199717
ParticleSystem:
m_ObjectHideFlags: 0
@@ -15050,7 +15050,7 @@
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
- maxColor: {r: 0.3301887, g: 0.19037907, b: 0, a: 0.62352943}
+ maxColor: {r: 0.3301887, g: 0.19037907, b: 0, a: 0.5058824}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
diff --git a/Assets/00000/package/Prefab/Effect_baomihua_01.prefab b/Assets/00000/package/Prefab/Effect_baomihua_01.prefab
index 551ea5c..0edf37a 100644
--- a/Assets/00000/package/Prefab/Effect_baomihua_01.prefab
+++ b/Assets/00000/package/Prefab/Effect_baomihua_01.prefab
@@ -116,7 +116,7 @@
startLifetime:
serializedVersion: 2
minMaxState: 0
- scalar: 0.5
+ scalar: 0.3
minScalar: 5
maxCurve:
serializedVersion: 2
@@ -150,8 +150,8 @@
m_RotationOrder: 0
startSpeed:
serializedVersion: 2
- minMaxState: 3
- scalar: 10
+ minMaxState: 0
+ scalar: 0
minScalar: 3
maxCurve:
serializedVersion: 2
@@ -187,7 +187,7 @@
serializedVersion: 2
minMaxState: 0
minColor: {r: 1, g: 1, b: 1, a: 1}
- maxColor: {r: 1, g: 1, b: 1, a: 0.101960786}
+ maxColor: {r: 1, g: 1, b: 1, a: 0.14901961}
maxGradient:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
@@ -248,7 +248,7 @@
m_NumAlphaKeys: 2
startSize:
serializedVersion: 2
- minMaxState: 3
+ minMaxState: 0
scalar: 20
minScalar: 10
maxCurve:
@@ -283,7 +283,7 @@
m_RotationOrder: 0
startSizeY:
serializedVersion: 2
- minMaxState: 3
+ minMaxState: 0
scalar: 1
minScalar: 1
maxCurve:
@@ -336,7 +336,7 @@
m_RotationOrder: 4
startSizeZ:
serializedVersion: 2
- minMaxState: 3
+ minMaxState: 0
scalar: 1
minScalar: 1
maxCurve:
@@ -969,22 +969,22 @@
m_Curve:
- serializedVersion: 3
time: 0
+ value: 0
+ inSlope: 2
+ outSlope: 2
+ tangentMode: 0
+ weightedMode: 0
+ inWeight: 0
+ outWeight: 0
+ - serializedVersion: 3
+ time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
- - serializedVersion: 3
- time: 0.9839357
- value: 0.47959185
- inSlope: -1.0719069
- outSlope: -1.0719069
- tangentMode: 0
- weightedMode: 0
- inWeight: 0.33333334
- outWeight: 0.33333334
+ inWeight: 0
+ outWeight: 0
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
@@ -4899,7 +4899,7 @@
serializedVersion: 2
minMaxState: 3
scalar: 0.3
- minScalar: 0.7
+ minScalar: 0.5
maxCurve:
serializedVersion: 2
m_Curve:
@@ -15493,7 +15493,7 @@
countCurve:
serializedVersion: 2
minMaxState: 0
- scalar: 20
+ scalar: 10
minScalar: 55
maxCurve:
serializedVersion: 2
diff --git a/Assets/00000/package/Prefab/Effect_baomihua_04.prefab b/Assets/00000/package/Prefab/Effect_baomihua_04.prefab
index 741b42a..da46ec1 100644
--- a/Assets/00000/package/Prefab/Effect_baomihua_04.prefab
+++ b/Assets/00000/package/Prefab/Effect_baomihua_04.prefab
@@ -9868,7 +9868,7 @@
m_Time: 0.1
m_Parameters:
serializedVersion: 3
- widthMultiplier: 7
+ widthMultiplier: 5
widthCurve:
serializedVersion: 2
m_Curve:
@@ -9895,16 +9895,16 @@
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
- key0: {r: 1, g: 0.7363857, b: 0.2783019, a: 0}
- key1: {r: 1, g: 0.7617623, b: 0.3443396, a: 0.41568628}
- key2: {r: 0.9622642, g: 0.63418657, b: 0.33134568, a: 0}
+ key0: {r: 1, g: 0.5715369, b: 0.27843142, a: 0}
+ key1: {r: 1, g: 0.23769481, b: 0.16509432, a: 0.6039216}
+ key2: {r: 0.9622642, g: 0.63418657, b: 0.33134568, a: 0.6039216}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
- ctime1: 65535
+ ctime1: 45682
ctime2: 54741
ctime3: 0
ctime4: 0
@@ -9913,7 +9913,7 @@
ctime7: 0
atime0: 0
atime1: 16191
- atime2: 65535
+ atime2: 37586
atime3: 65535
atime4: 0
atime5: 0
@@ -9921,7 +9921,7 @@
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
- m_NumAlphaKeys: 3
+ m_NumAlphaKeys: 4
numCornerVertices: 0
numCapVertices: 0
alignment: 0
diff --git a/Assets/00000/package/Texture/Texmap_0187.tif b/Assets/00000/package/Texture/Normal_001.tif
similarity index 100%
rename from Assets/00000/package/Texture/Texmap_0187.tif
rename to Assets/00000/package/Texture/Normal_001.tif
Binary files differ
diff --git a/Assets/00000/package/Texture/Texmap_0187.tif.meta b/Assets/00000/package/Texture/Normal_001.tif.meta
similarity index 100%
rename from Assets/00000/package/Texture/Texmap_0187.tif.meta
rename to Assets/00000/package/Texture/Normal_001.tif.meta
--
Gitblit v1.9.1