LT 2 dienas atpakaļ
vecāks
revīzija
54495a0e17

+ 1 - 1
Assets/Art/ArtHero/Boss_BeiHaiGui.prefab

@@ -362,7 +362,7 @@ Transform:
   m_GameObject: {fileID: 2519648025125859061}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.464, z: 0}
+  m_LocalPosition: {x: 0, y: 3.02, z: 1.63}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 1 - 1
Assets/Art/ArtHero/Boss_Tree.prefab

@@ -2112,7 +2112,7 @@ Transform:
   m_GameObject: {fileID: 7929749335026090219}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.464, z: 0}
+  m_LocalPosition: {x: 0, y: 4.05, z: 0.51}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 1 - 1
Assets/Art/ArtHero/Gw_Man.prefab

@@ -798,7 +798,7 @@ Transform:
   m_GameObject: {fileID: 7396157168333250774}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.13, z: 0}
+  m_LocalPosition: {x: -0.11, y: 2.11, z: 0.09}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 1 - 1
Assets/Art/ArtHero/Gw_Woman.prefab

@@ -572,7 +572,7 @@ Transform:
   m_GameObject: {fileID: 4932037394597179643}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 2.23, z: 0}
+  m_LocalPosition: {x: 0, y: 2.37, z: 0.16}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 1 - 1
Assets/Art/ArtHero/Nanzhu.prefab

@@ -4791,7 +4791,7 @@ Transform:
   m_GameObject: {fileID: 7266971181550505288}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 1.802, z: 0}
+  m_LocalPosition: {x: 0, y: 1.89, z: 0.14}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 1 - 1
Assets/Art/ArtHero/gw_huli.prefab

@@ -1871,7 +1871,7 @@ Transform:
   m_GameObject: {fileID: 6174042556456720990}
   serializedVersion: 2
   m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 3.37, z: 1.04}
+  m_LocalPosition: {x: 0, y: 2.3, z: 0.77}
   m_LocalScale: {x: 1, y: 1, z: 1}
   m_ConstrainProportionsScale: 0
   m_Children: []

+ 6 - 6
Assets/Art/Character/Guaiwu/xianhe/gw_xianhe.playable

@@ -1191,14 +1191,14 @@ MonoBehaviour:
   randomGroup: 0
   isUseRandom: 1
   xoff:
-    x: 1
-    y: -1
+    x: 0.3
+    y: -0.3
   yoff:
-    x: 1
-    y: -1
+    x: 0.3
+    y: -0.3
   zoff:
-    x: 1
-    y: -1
+    x: 0.3
+    y: -0.3
   hitPointGroupName: 
   isGround: 0
   isFollowTarget: 0

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx gw 9091 zd.prefab

@@ -19574,7 +19574,7 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 12
+  speed: 17
   roatRoot: {fileID: 0}
   raotIndex: 0
   parabolaCurveType: 1

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx gw 9101 zd hit.prefab

@@ -19549,7 +19549,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24450,7 +24450,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 1
   m_MeshDistribution: 0
   m_SortMode: 0

+ 5 - 5
Assets/Art/VFX/FXPrefabs/fx gw 9101 zd.prefab

@@ -9780,10 +9780,10 @@ MonoBehaviour:
   customTargetEndPosIndex: 0
   size: 1
   isInit: 0
-  speed: 10
+  speed: 18
   roatRoot: {fileID: 0}
   raotIndex: 0
-  parabolaCurveType: 2
+  parabolaCurveType: 1
   isTriggerGroundEnd: 0
   GroundHitFxName: 
   isUseX: 0
@@ -14704,7 +14704,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -19680,7 +19680,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24514,7 +24514,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0

+ 3 - 3
Assets/Art/VFX/FXPrefabs/fx_boss01_sk4_jian.prefab

@@ -4868,7 +4868,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 2
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -4978,7 +4978,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.25
   m_PreviewTimeScale: 1
   m_Parameters:
@@ -10132,7 +10132,7 @@ TrailRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_Time: 0.25
   m_PreviewTimeScale: 1
   m_Parameters:

+ 1 - 1
Assets/Art/VFX/FXPrefabs/fx_boss01_sk4_jian_hit.prefab

@@ -14599,7 +14599,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 2 - 2
Assets/Art/VFX/FXPrefabs/fx_boss01_sk4_jian_sf.prefab

@@ -9778,7 +9778,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 4
   m_MeshDistribution: 0
   m_SortMode: 0
@@ -24463,7 +24463,7 @@ ParticleSystemRenderer:
   m_LightmapParameters: {fileID: 0}
   m_SortingLayerID: 0
   m_SortingLayer: 0
-  m_SortingOrder: 0
+  m_SortingOrder: 1
   m_RenderMode: 0
   m_MeshDistribution: 0
   m_SortMode: 0

+ 1 - 1
Assets/Art/VFX/Materials/UIMat/ui_ob_yindao_glow_add.mat

@@ -57,7 +57,7 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0
+    - _Alpha: 0.387241
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0

+ 2 - 2
Assets/Art/VFX/Materials/UIMat/ui_renwu_lg.mat

@@ -57,13 +57,13 @@ Material:
         m_Offset: {x: 0, y: 0}
     m_Ints: []
     m_Floats:
-    - _Alpha: 0.209014
+    - _Alpha: 0.20801252
     - _AlphaCutoff: 0.5
     - _ColorMask: 15
     - _EnableExternalAlpha: 0
     - _MainSpeedU: 0.5
     - _MainSpeedV: 0.5
-    - _MainTexOffsetU: 0.20130575
+    - _MainTexOffsetU: 0.20250392
     - _MainTexOffsetV: 0
     - _MainTilingU: 0.8
     - _MainTilingV: 1

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
Assets/Res/TimeLineAssets/gw_xianhe_TD.txt


+ 62 - 2
Assets/Res/UI/DivineSence/ComBatFrontPanel.prefab

@@ -1287,10 +1287,46 @@ PrefabInstance:
       propertyPath: m_LocalEulerAnglesHint.z
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 111
+      objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 44
+      objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: 110
+      objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 71
+      objectReference: {fileID: 0}
+    - target: {fileID: 1464823603100771770, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 28
+      objectReference: {fileID: 0}
     - target: {fileID: 3196028676890684697, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_Name
       value: ComBatFrontWidgetMonster
       objectReference: {fileID: 0}
+    - target: {fileID: 6065336713380051556, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -3
+      objectReference: {fileID: 0}
+    - target: {fileID: 6065336713380051556, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_AnchoredPosition.y
+      value: 2
+      objectReference: {fileID: 0}
+    - target: {fileID: 8881386805482311671, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_Type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8881386805482311671, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: _icon_name
+      value: dec_xinxi_wenzi_di
+      objectReference: {fileID: 0}
     m_RemovedComponents: []
     m_RemovedGameObjects: []
     m_AddedGameObjects: []
@@ -1398,13 +1434,25 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.x
       value: -98.7
       objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.x
+      value: 111
+      objectReference: {fileID: 0}
+    - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_SizeDelta.y
+      value: 44
+      objectReference: {fileID: 0}
     - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
-      value: -99
+      value: -96.6
       objectReference: {fileID: 0}
     - target: {fileID: 1289024867470926365, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.y
-      value: 87.7
+      value: 76.8
+      objectReference: {fileID: 0}
+    - target: {fileID: 1464823603100771770, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_FontData.m_FontSize
+      value: 28
       objectReference: {fileID: 0}
     - target: {fileID: 3144987251888430088, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_SizeDelta.y
@@ -1434,6 +1482,10 @@ PrefabInstance:
       propertyPath: _icon_name
       value: dec_duizhan_db1
       objectReference: {fileID: 0}
+    - target: {fileID: 6065336713380051556, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_AnchoredPosition.x
+      value: -2
+      objectReference: {fileID: 0}
     - target: {fileID: 6562329879155009941, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 57.1
@@ -1450,6 +1502,14 @@ PrefabInstance:
       propertyPath: m_AnchoredPosition.y
       value: 0
       objectReference: {fileID: 0}
+    - target: {fileID: 8881386805482311671, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: m_Type
+      value: 0
+      objectReference: {fileID: 0}
+    - target: {fileID: 8881386805482311671, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
+      propertyPath: _icon_name
+      value: dec_xinxi_wenzi_di
+      objectReference: {fileID: 0}
     - target: {fileID: 9156683410866268513, guid: 9b6e1fff843f6de44b6f755b85adc32f, type: 3}
       propertyPath: m_AnchoredPosition.x
       value: 36

+ 2 - 2
Assets/Res/UI/DivineSence/ShengShiEventWidgetType2.prefab

@@ -60,7 +60,7 @@ MonoBehaviour:
   m_Name: 
   m_EditorClassIdentifier: 
   m_Material: {fileID: 0}
-  m_Color: {r: 0.6784314, g: 0.6627451, b: 0.6313726, a: 1}
+  m_Color: {r: 0.7294118, g: 0.70980394, b: 0.70980394, a: 1}
   m_RaycastTarget: 1
   m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
   m_Maskable: 1
@@ -105,7 +105,7 @@ MonoBehaviour:
     - Target: {fileID: 533257899024031940}
       UIStateV4Types: 80000000
       UIStateV4Datas:
-      - {x: 1, y: 0.77873516, z: 0, w: 1}
+      - {x: 0.9528301, y: 0.5023181, z: 0.08090052, w: 1}
       UIStateStrTypes: 
       UIStateStrDatas: []
   AllComs:

Failā izmaiņas netiks attēlotas, jo tās ir par lielu
+ 0 - 0
Assets/StreamingAssets/assetConfig.txt


Daži faili netika attēloti, jo izmaiņu fails ir pārāk liels