From f4b2230e6456f4e5c05e8535834a693a55fce0a2 Mon Sep 17 00:00:00 2001
From: chenxin <chenxin6991@163.com>
Date: Fri, 11 Dec 2020 17:13:31 +0800
Subject: [PATCH] Merge branch 'master' of http://172.16.1.52:8090/r/GemBattle into master
---
Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs | 2
Assets/Animations/Endless/Tower/Water/NormalStand.anim | 49 ++++++++-
Assets/Scripts/TowerDefense/Economy/LootDrop.cs | 20 ++--
Assets/Scripts/Guide/GuidePanelNew.cs | 2
Assets/Prefabs/UI/Endless/Energy.prefab | 16 +++
Assets/Animations/Endless/Tower/Water/Normal.controller | 62 ++++++++++++
Assets/Animations/Endless/Tower/Fire/Normal.controller | 64 ++++++++++++
Assets/Animations/Endless/Tower/Fire/NormalStand.anim | 56 ++++++++++
8 files changed, 247 insertions(+), 24 deletions(-)
diff --git a/Assets/Animations/Endless/Tower/Fire/Normal.controller b/Assets/Animations/Endless/Tower/Fire/Normal.controller
index 391b083..e16f334 100644
--- a/Assets/Animations/Endless/Tower/Fire/Normal.controller
+++ b/Assets/Animations/Endless/Tower/Fire/Normal.controller
@@ -1,12 +1,72 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1107 &-1742689672674426131
+AnimatorStateMachine:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: 6288307997807733425}
+ m_Position: {x: 300, y: 230, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: 6288307997807733425}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
- m_Name: Normal 1
+ m_Name: Normal
serializedVersion: 5
m_AnimatorParameters: []
- m_AnimatorLayers: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -1742689672674426131}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
+--- !u!1102 &6288307997807733425
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: NormalStand
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 6ac0dbd98ce170946b918fc17b3f806d, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
diff --git a/Assets/Animations/Endless/Tower/Fire/NormalStand.anim b/Assets/Animations/Endless/Tower/Fire/NormalStand.anim
index 5bd9d4d..131774c 100644
--- a/Assets/Animations/Endless/Tower/Fire/NormalStand.anim
+++ b/Assets/Animations/Endless/Tower/Fire/NormalStand.anim
@@ -17,15 +17,63 @@
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
- m_SampleRate: 60
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 21300000, guid: 82a8c95c67f7b5247adc7e415ef1439a, type: 3}
+ - time: 0.083333336
+ value: {fileID: 21300000, guid: 32561c34ffcd32a4e87c7245d7ab07fe, type: 3}
+ - time: 0.16666667
+ value: {fileID: 21300000, guid: b56d060cc9f67d449aa83e1cfa31fb1c, type: 3}
+ - time: 0.25
+ value: {fileID: 21300000, guid: 7456c462cc49c5f4a9f866b4a8892905, type: 3}
+ - time: 0.33333334
+ value: {fileID: 21300000, guid: fbe8c824398786d4686f1efb3babde0e, type: 3}
+ - time: 0.41666666
+ value: {fileID: 21300000, guid: 8150ef6696da05946aa9fd2be93e06aa, type: 3}
+ - time: 0.5
+ value: {fileID: 21300000, guid: e23d14329b52b6541adfdc6de1f5ec4e, type: 3}
+ - time: 0.5833333
+ value: {fileID: 21300000, guid: 6e8a8fb199a51a54b9ce4bd25610777d, type: 3}
+ - time: 0.6666667
+ value: {fileID: 21300000, guid: 26c236c593c6be94baf55478c87b8a71, type: 3}
+ - time: 0.75
+ value: {fileID: 21300000, guid: 0a32e5e790eac5a479557fc896db3146, type: 3}
+ - time: 0.8333333
+ value: {fileID: 21300000, guid: fc9bdba9ba3d7c147a3e06b9cc011485, type: 3}
+ - time: 0.9166667
+ value: {fileID: 21300000, guid: 0ad4a2401c48a8e499092e72cca7988d, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 12
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 21300000, guid: 82a8c95c67f7b5247adc7e415ef1439a, type: 3}
+ - {fileID: 21300000, guid: 32561c34ffcd32a4e87c7245d7ab07fe, type: 3}
+ - {fileID: 21300000, guid: b56d060cc9f67d449aa83e1cfa31fb1c, type: 3}
+ - {fileID: 21300000, guid: 7456c462cc49c5f4a9f866b4a8892905, type: 3}
+ - {fileID: 21300000, guid: fbe8c824398786d4686f1efb3babde0e, type: 3}
+ - {fileID: 21300000, guid: 8150ef6696da05946aa9fd2be93e06aa, type: 3}
+ - {fileID: 21300000, guid: e23d14329b52b6541adfdc6de1f5ec4e, type: 3}
+ - {fileID: 21300000, guid: 6e8a8fb199a51a54b9ce4bd25610777d, type: 3}
+ - {fileID: 21300000, guid: 26c236c593c6be94baf55478c87b8a71, type: 3}
+ - {fileID: 21300000, guid: 0a32e5e790eac5a479557fc896db3146, type: 3}
+ - {fileID: 21300000, guid: fc9bdba9ba3d7c147a3e06b9cc011485, type: 3}
+ - {fileID: 21300000, guid: 0ad4a2401c48a8e499092e72cca7988d, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
diff --git a/Assets/Animations/Endless/Tower/Water/Normal.controller b/Assets/Animations/Endless/Tower/Water/Normal.controller
index 1254264..a32062e 100644
--- a/Assets/Animations/Endless/Tower/Water/Normal.controller
+++ b/Assets/Animations/Endless/Tower/Water/Normal.controller
@@ -1,5 +1,53 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
+--- !u!1102 &-4888652071536797827
+AnimatorState:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: NormalStand
+ m_Speed: 1
+ m_CycleOffset: 0
+ m_Transitions: []
+ m_StateMachineBehaviours: []
+ m_Position: {x: 50, y: 50, z: 0}
+ m_IKOnFeet: 0
+ m_WriteDefaultValues: 1
+ m_Mirror: 0
+ m_SpeedParameterActive: 0
+ m_MirrorParameterActive: 0
+ m_CycleOffsetParameterActive: 0
+ m_TimeParameterActive: 0
+ m_Motion: {fileID: 7400000, guid: 3d75029279fc1644ea276bf5d87c18e4, type: 2}
+ m_Tag:
+ m_SpeedParameter:
+ m_MirrorParameter:
+ m_CycleOffsetParameter:
+ m_TimeParameter:
+--- !u!1107 &-4495578050417142753
+AnimatorStateMachine:
+ serializedVersion: 5
+ m_ObjectHideFlags: 1
+ m_CorrespondingSourceObject: {fileID: 0}
+ m_PrefabInstance: {fileID: 0}
+ m_PrefabAsset: {fileID: 0}
+ m_Name: Base Layer
+ m_ChildStates:
+ - serializedVersion: 1
+ m_State: {fileID: -4888652071536797827}
+ m_Position: {x: 389.60107, y: 184.77536, z: 0}
+ m_ChildStateMachines: []
+ m_AnyStateTransitions: []
+ m_EntryTransitions: []
+ m_StateMachineTransitions: {}
+ m_StateMachineBehaviours: []
+ m_AnyStatePosition: {x: 50, y: 20, z: 0}
+ m_EntryPosition: {x: 50, y: 120, z: 0}
+ m_ExitPosition: {x: 800, y: 120, z: 0}
+ m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
+ m_DefaultState: {fileID: -4888652071536797827}
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
@@ -9,4 +57,16 @@
m_Name: Normal
serializedVersion: 5
m_AnimatorParameters: []
- m_AnimatorLayers: []
+ m_AnimatorLayers:
+ - serializedVersion: 5
+ m_Name: Base Layer
+ m_StateMachine: {fileID: -4495578050417142753}
+ m_Mask: {fileID: 0}
+ m_Motions: []
+ m_Behaviours: []
+ m_BlendingMode: 0
+ m_SyncedLayerIndex: -1
+ m_DefaultWeight: 0
+ m_IKPass: 0
+ m_SyncedLayerAffectsTiming: 0
+ m_Controller: {fileID: 9100000}
diff --git a/Assets/Animations/Endless/Tower/Water/NormalStand.anim b/Assets/Animations/Endless/Tower/Water/NormalStand.anim
index 5bd9d4d..4cbd4e1 100644
--- a/Assets/Animations/Endless/Tower/Water/NormalStand.anim
+++ b/Assets/Animations/Endless/Tower/Water/NormalStand.anim
@@ -17,21 +17,60 @@
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
- m_PPtrCurves: []
- m_SampleRate: 60
+ m_PPtrCurves:
+ - curve:
+ - time: 0
+ value: {fileID: 21300000, guid: 56c2854a9b83a884b8da5c9ed733e8cc, type: 3}
+ - time: 0.125
+ value: {fileID: 21300000, guid: 56c2854a9b83a884b8da5c9ed733e8cc, type: 3}
+ - time: 0.25
+ value: {fileID: 21300000, guid: b15b92b9fdb40bb46828bde9b12a2c05, type: 3}
+ - time: 0.375
+ value: {fileID: 21300000, guid: 5f8b0479430f3e645991a4eeba2f13bb, type: 3}
+ - time: 0.5
+ value: {fileID: 21300000, guid: 442ae463d54b4f047a8beff8892e80e3, type: 3}
+ - time: 0.625
+ value: {fileID: 21300000, guid: 97b2ac764206be0498862772bc999960, type: 3}
+ - time: 0.75
+ value: {fileID: 21300000, guid: 4d6bd6145277ee74c800bc6fbe94dc59, type: 3}
+ - time: 0.875
+ value: {fileID: 21300000, guid: fd8ce35f613ab68429c4f32df231f082, type: 3}
+ - time: 1
+ value: {fileID: 21300000, guid: 380ee9c7c7e64d7418799fbff8b26c66, type: 3}
+ attribute: m_Sprite
+ path:
+ classID: 212
+ script: {fileID: 0}
+ m_SampleRate: 8
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
- genericBindings: []
- pptrCurveMapping: []
+ genericBindings:
+ - serializedVersion: 2
+ path: 0
+ attribute: 0
+ script: {fileID: 0}
+ typeID: 212
+ customType: 23
+ isPPtrCurve: 1
+ pptrCurveMapping:
+ - {fileID: 21300000, guid: 56c2854a9b83a884b8da5c9ed733e8cc, type: 3}
+ - {fileID: 21300000, guid: 56c2854a9b83a884b8da5c9ed733e8cc, type: 3}
+ - {fileID: 21300000, guid: b15b92b9fdb40bb46828bde9b12a2c05, type: 3}
+ - {fileID: 21300000, guid: 5f8b0479430f3e645991a4eeba2f13bb, type: 3}
+ - {fileID: 21300000, guid: 442ae463d54b4f047a8beff8892e80e3, type: 3}
+ - {fileID: 21300000, guid: 97b2ac764206be0498862772bc999960, type: 3}
+ - {fileID: 21300000, guid: 4d6bd6145277ee74c800bc6fbe94dc59, type: 3}
+ - {fileID: 21300000, guid: fd8ce35f613ab68429c4f32df231f082, type: 3}
+ - {fileID: 21300000, guid: 380ee9c7c7e64d7418799fbff8b26c66, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
- m_StopTime: 1
+ m_StopTime: 1.125
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
diff --git a/Assets/Prefabs/UI/Endless/Energy.prefab b/Assets/Prefabs/UI/Endless/Energy.prefab
index 6b1f3f7..c26d293 100644
--- a/Assets/Prefabs/UI/Endless/Energy.prefab
+++ b/Assets/Prefabs/UI/Endless/Energy.prefab
@@ -745,6 +745,22 @@
m_Modification:
m_TransformParent: {fileID: 2245660995521503250}
m_Modifications:
+ - target: {fileID: 815652112, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 955858840, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1545029220, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
+ - target: {fileID: 1927661716, guid: 5591b24d709da864d8fa54fb582b837f, type: 3}
+ propertyPath: m_Layer
+ value: 5
+ objectReference: {fileID: 0}
- target: {fileID: 2017506190226396013, guid: 5591b24d709da864d8fa54fb582b837f,
type: 3}
propertyPath: m_Name
diff --git a/Assets/Scripts/Guide/GuidePanelNew.cs b/Assets/Scripts/Guide/GuidePanelNew.cs
index 91d8be3..5e595ac 100644
--- a/Assets/Scripts/Guide/GuidePanelNew.cs
+++ b/Assets/Scripts/Guide/GuidePanelNew.cs
@@ -25,7 +25,7 @@
Vector2 rimOffset = new Vector2(30, 30);//边框要比按钮大一些
Vector2 towerBuyBtnPos;//动态生成按钮抠图位置
- Vector2 skillBtnPos = new Vector2(459, 44.6f);
+ Vector2 skillBtnPos = new Vector2(459, 121f);
private Image warningImg;//大波敌人来袭提示
diff --git a/Assets/Scripts/TowerDefense/Economy/LootDrop.cs b/Assets/Scripts/TowerDefense/Economy/LootDrop.cs
index 072e318..56f5cfb 100644
--- a/Assets/Scripts/TowerDefense/Economy/LootDrop.cs
+++ b/Assets/Scripts/TowerDefense/Economy/LootDrop.cs
@@ -98,16 +98,16 @@
if (agent != null)
{
- if (EndlessLevelManager.instance.DropRate > 0)
- {
- //查询
- float rate = Random.Range(0, 100) * 0.01f;
- //Debug.Log($"需要处理掉落特效 rate:{rate} EndlessLevelManager.instance.DropRate:{EndlessLevelManager.instance.DropRate}");
- if (rate <= EndlessLevelManager.instance.DropRate)
- {
- PlayDropCoinPS(agent.position);
- }
- }
+ // if (EndlessLevelManager.instance.DropRate > 0)
+ // {
+ // //查询
+ // float rate = Random.Range(0, 100) * 0.01f;
+ // //Debug.Log($"需要处理掉落特效 rate:{rate} EndlessLevelManager.instance.DropRate:{EndlessLevelManager.instance.DropRate}");
+ // if (rate <= EndlessLevelManager.instance.DropRate)
+ // {
+ // PlayDropCoinPS(agent.position);
+ // }
+ // }
EndlessLevelManager.instance.Currency.AddCurrency(lootDropped);
PlayDropGold(lootDropped, agent.position);
diff --git a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
index 8b7a035..ab83de9 100644
--- a/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
+++ b/Assets/Scripts/TowerDefense/Level/EndlessWaveManager.cs
@@ -303,7 +303,7 @@
EndlessBossHPManager.instance.UpdateWave(TotalWaves - CurrentWaveIndex);
EndlessBossHPManager.instance.ShowHP();
EndlessScoreManager.instance.ShowScore();
- EndlessLevelManager.instance.DropRate = EndlessPortData.GetDropRate(Level, CurrentWaveIndex);
+ //EndlessLevelManager.instance.DropRate = EndlessPortData.GetDropRate(Level, CurrentWaveIndex);
reward tmpData = EndlessPortData.GetDropReward(Level, CurrentWaveIndex);
if (tmpData != null)
--
Gitblit v1.9.1