From 8637f933a9987b4b16dd9725189a1c6ee2685118 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Wed, 28 Oct 2020 10:12:05 +0800
Subject: [PATCH] 提交充能条特效修改 Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scenes/Levels/Battle/GemBattle.unity | 116 +--------------------------------------------------------
1 files changed, 3 insertions(+), 113 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/GemBattle.unity b/Assets/Scenes/Levels/Battle/GemBattle.unity
index ee496ae..6643eea 100644
--- a/Assets/Scenes/Levels/Battle/GemBattle.unity
+++ b/Assets/Scenes/Levels/Battle/GemBattle.unity
@@ -3704,116 +3704,6 @@
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 0
---- !u!1 &348560274
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 348560278}
- - component: {fileID: 348560277}
- - component: {fileID: 348560276}
- - component: {fileID: 348560275}
- - component: {fileID: 348560279}
- m_Layer: 0
- m_Name: EStart
- m_TagString: Untagged
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 0
---- !u!65 &348560275
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348560274}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 1, y: 1, z: 1}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &348560276
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348560274}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RayTracingMode: 2
- m_RayTraceProcedural: 0
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_ReceiveGI: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 1
- m_SelectedEditorRenderState: 3
- m_MinimumChartSize: 4
- m_AutoUVMaxDistance: 0.5
- m_AutoUVMaxAngle: 89
- m_LightmapParameters: {fileID: 0}
- m_SortingLayerID: 0
- m_SortingLayer: 0
- m_SortingOrder: 0
- m_AdditionalVertexStreams: {fileID: 0}
---- !u!33 &348560277
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348560274}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
---- !u!4 &348560278
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348560274}
- m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -25.41, y: 5, z: -3.78}
- m_LocalScale: {x: 1, y: 1, z: 1}
- m_Children: []
- m_Father: {fileID: 0}
- m_RootOrder: 9
- m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!114 &348560279
-MonoBehaviour:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 348560274}
- m_Enabled: 1
- m_EditorHideFlags: 0
- m_Script: {fileID: 11500000, guid: 13b97b2f668aa974daa5f83c66f8cf84, type: 3}
- m_Name:
- m_EditorClassIdentifier:
- particlePrefab: {fileID: 8994085123534126341, guid: 039a660889a547f44a33c414613f09a6,
- type: 3}
--- !u!1 &368843165
GameObject:
m_ObjectHideFlags: 0
@@ -5523,11 +5413,11 @@
- {fileID: 902738588}
- {fileID: 1643240603}
battleAreaObject: {fileID: 146816451}
- skillFirePrefab: {fileID: 8044661745672667018, guid: 557dc53e7cd0f8346a6f31e7bb42bd7d,
+ skillFirePrefab: {fileID: 3242227498573651035, guid: ac882e0998c69614ab2ee136bb504c8a,
type: 3}
- skillBombPrefab: {fileID: 5051328804516374939, guid: 1b11cbd1533e0024191ebe6028f8d8db,
+ skillBombPrefab: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174,
type: 3}
- bufStopMovePrefab: {fileID: 4951501550265840871, guid: 4324236b15aba1947815ef305dd216c0,
+ bufStopMovePrefab: {fileID: 7091104469017435009, guid: 393d187774e421848be71dd6a69be174,
type: 3}
--- !u!114 &567180765
MonoBehaviour:
--
Gitblit v1.9.1