Merge branch 'develop' into feature/dlg_setting

Assets/Jianghu/Materials/Skill/Xuruoshi/龙纹22.mat

@@ -11,7 +11,11 @@ Material:
   m_Shader: {fileID: 4800000, guid: 0a016a83287664641b867743f19faf14, type: 3}
   m_Parent: {fileID: 0}
   m_ModifiedSerializedProperties: 0
-  m_ValidKeywords: []
+  m_ValidKeywords:
+  - _DISSOLVETEXUVS_NORMAL
+  - _DISTORTTEXUVS_NORMAL
+  - _MAINTEXUVS_NORMAL
+  - _MASKTEXUVS_NORMAL
   m_InvalidKeywords:
   - _DISSOLVETEXAR_ON
   - _DISTORTTEXAR_ON
@@ -118,8 +122,11 @@ Material:
     - _DissolveFactor: 0
     - _DissolveSoft: 0.1
     - _DissolveTexAR: 1
+    - _DissolveTexClampU: 0
+    - _DissolveTexClampV: 0
     - _DissolveTexRotate: 0
     - _DissolveTexUSpeed: 0
+    - _DissolveTexUVS: 0
     - _DissolveTexVSpeed: 0
     - _DissolveWide: 0.05
     - _DistortDissolveTex: 0
@@ -127,8 +134,11 @@ Material:
     - _DistortMainTex: 0
     - _DistortMaskTex: 0
     - _DistortTexAR: 1
+    - _DistortTexClampU: 0
+    - _DistortTexClampV: 0
     - _DistortTexRotate: 0
     - _DistortTexUSpeed: 0
+    - _DistortTexUVS: 0
     - _DistortTexVSpeed: 0
     - _Dst: 1
     - _DstBlend: 0
@@ -146,12 +156,18 @@ Material:
     - _GlossyReflections: 0
     - _MainAlpha: 1
     - _MainTexAR: 0
+    - _MainTexClampU: 0
+    - _MainTexClampV: 0
     - _MainTexRotate: 0
     - _MainTexUSpeed: 0
+    - _MainTexUVS: 0
     - _MainTexVSpeed: 0
     - _MaskTexAR: 1
+    - _MaskTexClampU: 0
+    - _MaskTexClampV: 0
     - _MaskTexRotate: 0
     - _MaskTexUSpeed: 0
+    - _MaskTexUVS: 0
     - _MaskTexVSpeed: 0
     - _Metallic: 0
     - _OcclusionStrength: 1

Assets/ModelRenderer/Art/Gfx/gfx/策划联入/状态效果/睡眠.prefab

@@ -27,7 +27,7 @@ Transform:
   m_GameObject: {fileID: 3345156173100108586}
   serializedVersion: 2
   m_LocalRotation: {x: 0.2602121, y: -0, z: -0, w: 0.96555156}
-  m_LocalPosition: {x: 0, y: 0.768, z: 0.516}
+  m_LocalPosition: {x: 0, y: 0.77, z: 0.15}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -223,7 +223,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.8509804, g: 0, b: 0, a: 1}
+      maxColor: {r: 0.8509804, g: 0, b: 0, a: 0.078431375}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -4860,7 +4860,7 @@ Transform:
   m_GameObject: {fileID: 4120882056815218602}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0.38268343, z: 0, w: 0.92387956}
-  m_LocalPosition: {x: -0.508, y: -0, z: 0.508}
+  m_LocalPosition: {x: -0.508, y: 0, z: 0.14}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -5056,7 +5056,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0.88235295, g: 0.88235295, b: 0, a: 1}
+      maxColor: {r: 0.88235295, g: 0.88235295, b: 0, a: 0.078431375}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -9693,7 +9693,7 @@ Transform:
   m_GameObject: {fileID: 5457975807946421928}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: -0.21439447, z: 0, w: 0.9767472}
-  m_LocalPosition: {x: -0.092, y: 0, z: 0.618}
+  m_LocalPosition: {x: -0.092, y: 0, z: 0.25}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []
@@ -9889,7 +9889,7 @@ ParticleSystem:
       serializedVersion: 2
       minMaxState: 0
       minColor: {r: 1, g: 1, b: 1, a: 1}
-      maxColor: {r: 0, g: 0.62352943, b: 0, a: 1}
+      maxColor: {r: 0, g: 0.62352943, b: 0, a: 0.078431375}
       maxGradient:
         serializedVersion: 2
         key0: {r: 1, g: 1, b: 1, a: 1}
@@ -14526,7 +14526,7 @@ Transform:
   m_GameObject: {fileID: 6908437790466538459}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 1.199999}
+  m_LocalPosition: {x: 0, y: 0, z: 0.576}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

Assets/PerfectWorld/Scene/Bootstrap.unity

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:f2b5c4c3dc1914bf0df35a1c4cd95ea98efb036377ac98143600246db5d4ae49
-size 312235
+oid sha256:20826e4631ccd8df95267f53f85e8dd91287f8a8b5c61eeeb700e7f859c7b35e
+size 304738