From 4fe7a27d965c1433c940d5b3eaa13930fa999621 Mon Sep 17 00:00:00 2001
From: River Jiang <546213258@qq.com>
Date: Wed, 28 Oct 2020 10:00:08 +0800
Subject: [PATCH] 提交充能技能条动画
---
Assets/Scenes/Levels/Battle/GemBattle.unity | 55 ++++++++++++++++++++++++++++++++-----------------------
1 files changed, 32 insertions(+), 23 deletions(-)
diff --git a/Assets/Scenes/Levels/Battle/GemBattle.unity b/Assets/Scenes/Levels/Battle/GemBattle.unity
index 96d5ef0..ee496ae 100644
--- a/Assets/Scenes/Levels/Battle/GemBattle.unity
+++ b/Assets/Scenes/Levels/Battle/GemBattle.unity
@@ -1653,7 +1653,7 @@
- {fileID: 1776264327}
- {fileID: 512550108}
m_Father: {fileID: 925045745}
- m_RootOrder: 4
+ m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -2995,7 +2995,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 283190499}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -20.53, y: 0.9, z: -6}
+ m_LocalPosition: {x: -20.04, y: 0.9, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -4579,7 +4579,7 @@
m_Children:
- {fileID: 1172682253}
m_Father: {fileID: 925045745}
- m_RootOrder: 1
+ m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -4728,7 +4728,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 470704233}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -10.3, y: 0.98, z: -6}
+ m_LocalPosition: {x: -9.97, y: 0.98, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -4964,7 +4964,7 @@
- {fileID: 1457595363}
- {fileID: 1810904458}
m_Father: {fileID: 925045745}
- m_RootOrder: 8
+ m_RootOrder: 7
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
@@ -5243,7 +5243,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 557254050}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -26, y: 0, z: 74.1}
+ m_LocalPosition: {x: -25.13, y: 0, z: 74.4}
m_LocalScale: {x: 9.25, y: 1, z: 9.22}
m_Children: []
m_Father: {fileID: 1765964312}
@@ -5269,7 +5269,11 @@
type: 3}
towerBulletUIPrefab: {fileID: 4636030447447409971, guid: f6edf4c41f0dac54d94e67945bca23f0,
type: 3}
+ towerEnergyUIPrefab: {fileID: 4636030447447409971, guid: 0d97566feabc1d644862df3fb52071a3,
+ type: 3}
waitBuyBtnPrefab: {fileID: 1470395276146401766, guid: c05f40848dbdf1a4da8b4e45d7b9f1e3,
+ type: 3}
+ energyEffectPrefab: {fileID: 6740320714111919447, guid: c9fb6497ab1288942a4dd67d131473c9,
type: 3}
TestParticle: {fileID: 0}
debugImg: {fileID: 2956664473313611620, guid: d4086517241a50e49aaca47484c61113,
@@ -5278,7 +5282,7 @@
dimensions:
x: 5
y: 1
- gridSize: 1.12
+ gridSize: 1.1
--- !u!65 &557254053
BoxCollider:
m_ObjectHideFlags: 2
@@ -5290,8 +5294,8 @@
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 5.6, y: 0, z: 1.12}
- m_Center: {x: 2.8, y: 0, z: 0.56}
+ m_Size: {x: 5.5, y: 0, z: 1.1}
+ m_Center: {x: 2.75, y: 0, z: 0.55}
--- !u!1 &565601936
GameObject:
m_ObjectHideFlags: 0
@@ -5901,7 +5905,7 @@
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 925045745}
- m_RootOrder: 9
+ m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -8245,12 +8249,14 @@
m_Children:
- {fileID: 992080607}
- {fileID: 783401285}
- - {fileID: 157945768}
+ - {fileID: 441929933}
+ - {fileID: 998930542}
- {fileID: 996808778}
- {fileID: 1571374742}
- {fileID: 1622783961}
- {fileID: 508973503}
- {fileID: 624594681}
+ - {fileID: 157945768}
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -8984,7 +8990,7 @@
m_Children:
- {fileID: 851418740}
m_Father: {fileID: 925045745}
- m_RootOrder: 5
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9060,7 +9066,7 @@
m_Children:
- {fileID: 1474713017}
m_Father: {fileID: 925045745}
- m_RootOrder: 2
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -9694,7 +9700,7 @@
m_RenderMode: 0
m_CullingMask:
serializedVersion: 2
- m_Bits: 4294967295
+ m_Bits: 130871
m_RenderingLayerMask: 1
m_Lightmapping: 4
m_LightShadowCasterMode: 0
@@ -11537,7 +11543,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1324890350}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: 20.68, y: 0.98, z: -6}
+ m_LocalPosition: {x: 20.6, y: 0.98, z: -6}
m_LocalScale: {x: 0.8, y: 1, z: 3}
m_Children: []
m_Father: {fileID: 304173789}
@@ -13212,7 +13218,7 @@
m_Children:
- {fileID: 114205549}
m_Father: {fileID: 925045745}
- m_RootOrder: 6
+ m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13856,7 +13862,7 @@
- {fileID: 1006785496}
- {fileID: 2029757850}
m_Father: {fileID: 925045745}
- m_RootOrder: 7
+ m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
@@ -13971,7 +13977,7 @@
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1632078501}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
- m_LocalPosition: {x: -26, y: 0, z: -28.3}
+ m_LocalPosition: {x: -25.13, y: 0, z: -28.3}
m_LocalScale: {x: 9.25, y: 1, z: 9.22}
m_Children: []
m_Father: {fileID: 1765964312}
@@ -13997,17 +14003,20 @@
type: 3}
towerBulletUIPrefab: {fileID: 4636030447447409971, guid: f6edf4c41f0dac54d94e67945bca23f0,
type: 3}
+ towerEnergyUIPrefab: {fileID: 4636030447447409971, guid: 0d97566feabc1d644862df3fb52071a3,
+ type: 3}
waitBuyBtnPrefab: {fileID: 1470395276146401766, guid: c05f40848dbdf1a4da8b4e45d7b9f1e3,
type: 3}
- TestParticle: {fileID: 312346380397794538, guid: bd7af3572d4954542a9b552ea0736ac6,
+ energyEffectPrefab: {fileID: 6740320714111919447, guid: c9fb6497ab1288942a4dd67d131473c9,
type: 3}
+ TestParticle: {fileID: 0}
debugImg: {fileID: 2956664473313611620, guid: d4086517241a50e49aaca47484c61113,
type: 3}
- gridFreePos: 0.1
+ gridFreePos: 0.18
dimensions:
x: 5
y: 3
- gridSize: 1.12
+ gridSize: 1.1
--- !u!65 &1632078504
BoxCollider:
m_ObjectHideFlags: 2
@@ -14019,8 +14028,8 @@
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
- m_Size: {x: 5.6, y: 0, z: 3.3600001}
- m_Center: {x: 2.8, y: 0, z: 1.6800001}
+ m_Size: {x: 5.5, y: 0, z: 3.3000002}
+ m_Center: {x: 2.75, y: 0, z: 1.6500001}
--- !u!1 &1632287006
GameObject:
m_ObjectHideFlags: 0
--
Gitblit v1.9.1