Commit 40ed9fe8 authored by wanqing's avatar wanqing

修改预制体

parent 5bc60002
......@@ -82,14 +82,14 @@ public class GlobalConfig
public static string WinAnimatorName()
{
int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
string varName = "成功动画";
string varName = "成功_L4-5";
if (varLevel == LevelEnum.levelOneIndex)
{
varName = "成功_N1";
varName = "成功_L1";
}
else if (varLevel == LevelEnum.levelTwoIndex || varLevel == LevelEnum.levelThreeIndex)
{
varName = "成功_L1&2";
varName = "成功_L2-3";
}
else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{
......@@ -105,14 +105,14 @@ public class GlobalConfig
public static string FailAnimatorName()
{
int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
string varName = "失败";
string varName = "失败_L4-5";
if (varLevel == LevelEnum.levelOneIndex)
{
varName = "失败_N1";
varName = "失败_L1";
}
else if (varLevel == LevelEnum.levelTwoIndex || varLevel == LevelEnum.levelThreeIndex)
{
varName = "失败_L1&2";
varName = "失败_L2-3";
}
else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{
......
......@@ -11,37 +11,43 @@ AnimatorStateMachine:
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 4360613730991412054}
m_Position: {x: 290, y: 450, z: 0}
m_Position: {x: 280, y: 430, z: 0}
- serializedVersion: 1
m_State: {fileID: 7978185253963228048}
m_Position: {x: 10, y: 290, z: 0}
- serializedVersion: 1
m_State: {fileID: 2201674354850670455}
m_Position: {x: 70, y: 450, z: 0}
- serializedVersion: 1
m_State: {fileID: 7628862289235177890}
m_Position: {x: 270, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: -959709006924450708}
m_Position: {x: 210, y: 250, z: 0}
- serializedVersion: 1
m_State: {fileID: 7925062277600887740}
m_Position: {x: 245, y: 315, z: 0}
- serializedVersion: 1
m_State: {fileID: 6593050344606417344}
m_Position: {x: 280, y: 380, z: 0}
m_Position: {x: 290, y: 500, z: 0}
- serializedVersion: 1
m_State: {fileID: -3970153869563729595}
m_Position: {x: 280, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: -7323559627919587499}
m_Position: {x: 336.84418, y: 572.9816, z: 0}
m_Position: {x: -40, y: 390, z: 0}
- serializedVersion: 1
m_State: {fileID: 2785825963081061473}
m_Position: {x: 371.84418, y: 637.9816, z: 0}
m_Position: {x: 0, y: 670, z: 0}
- serializedVersion: 1
m_State: {fileID: -209971773949638536}
m_Position: {x: 406.84418, y: 702.9816, z: 0}
m_Position: {x: 320, y: 310, z: 0}
- serializedVersion: 1
m_State: {fileID: 259270318653689887}
m_Position: {x: -60, y: 530, z: 0}
- serializedVersion: 1
m_State: {fileID: -5010882115005830280}
m_Position: {x: 280, y: 180, z: 0}
- serializedVersion: 1
m_State: {fileID: 1348902217639426097}
m_Position: {x: -100, y: 600, z: 0}
- serializedVersion: 1
m_State: {fileID: 2592138255180599620}
m_Position: {x: 330, y: 370, z: 0}
- serializedVersion: 1
m_State: {fileID: -6436351347918601280}
m_Position: {x: -40, y: 450, z: 0}
- serializedVersion: 1
m_State: {fileID: -3849481280628348766}
m_Position: {x: 280, y: 250, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
......@@ -78,6 +84,58 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-6436351347918601280
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6210\u529F_L1"
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: fa32c82cf161d254299414bdfc9b585e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-5010882115005830280
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5931\u8D25_L2-3"
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: ff1de2782fc10ba4fac0c2d629753fc6, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-3970153869563729595
AnimatorState:
serializedVersion: 5
......@@ -104,14 +162,14 @@ AnimatorState:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &-959709006924450708
--- !u!1102 &-3849481280628348766
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5931\u8D25_N1"
m_Name: "\u5931\u8D25_L1"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -124,7 +182,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 4940c6521809e424cacc2f13ed839b8e, type: 2}
m_Motion: {fileID: 7400000, guid: 6d7e7fb1afbec2b499c53b3c2d01e29c, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......@@ -178,14 +236,14 @@ AnimatorController:
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2201674354850670455
--- !u!1102 &259270318653689887
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5931\u8D25"
m_Name: "\u6210\u529F_L4-5"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -198,20 +256,20 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 4940c6521809e424cacc2f13ed839b8e, type: 2}
m_Motion: {fileID: 7400000, guid: 8e0b3cef32006c84fa3f06d6fcb5d558, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &2785825963081061473
--- !u!1102 &1348902217639426097
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6210\u529F_L8-9"
m_Name: "\u6210\u529F_L2-3"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -224,20 +282,20 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 2765bf61f9e193548b7444bc1c2a1408, type: 2}
m_Motion: {fileID: 7400000, guid: a44a6f5b264decb4b9495dfe9f07085d, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &4360613730991412054
--- !u!1102 &2201674354850670455
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6210\u529F\u52A8\u753B"
m_Name: "\u5931\u8D25"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -250,20 +308,20 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8e0b3cef32006c84fa3f06d6fcb5d558, type: 2}
m_Motion: {fileID: 7400000, guid: 4940c6521809e424cacc2f13ed839b8e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &6593050344606417344
--- !u!1102 &2592138255180599620
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u5931\u8D25_L1&2"
m_Name: "\u5931\u8D25_L4-5"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -276,20 +334,20 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 6d7e7fb1afbec2b499c53b3c2d01e29c, type: 2}
m_Motion: {fileID: 7400000, guid: 4940c6521809e424cacc2f13ed839b8e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7628862289235177890
--- !u!1102 &2785825963081061473
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6210\u529F_N1"
m_Name: "\u6210\u529F_L8-9"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -302,20 +360,20 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8e0b3cef32006c84fa3f06d6fcb5d558, type: 2}
m_Motion: {fileID: 7400000, guid: 2765bf61f9e193548b7444bc1c2a1408, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &7925062277600887740
--- !u!1102 &4360613730991412054
AnimatorState:
serializedVersion: 5
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: "\u6210\u529F_L1&2"
m_Name: "\u6210\u529F\u52A8\u753B"
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
......@@ -328,7 +386,7 @@ AnimatorState:
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: fa32c82cf161d254299414bdfc9b585e, type: 2}
m_Motion: {fileID: 7400000, guid: 8e0b3cef32006c84fa3f06d6fcb5d558, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
......
......@@ -4971,7 +4971,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 321379586807723316}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.118, z: -1.35}
m_LocalPosition: {x: 0, y: 1.118, z: -2.71}
m_LocalScale: {x: 3.5, y: 1.5, z: 2}
m_Children: []
m_Father: {fileID: 3814884056241606628}
......@@ -86119,7 +86119,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7327935069137335909}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.02, z: -1.35}
m_LocalPosition: {x: 0, y: 2.02, z: -2.71}
m_LocalScale: {x: 3.5, y: 0.01, z: 2}
m_Children: []
m_Father: {fileID: 3814884056241606628}
......@@ -87,7 +87,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 317185318651186262}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 2.02, z: -1.35}
m_LocalPosition: {x: 0, y: 2.02, z: -1.44}
m_LocalScale: {x: 3.5, y: 0.01, z: 2}
m_Children: []
m_Father: {fileID: 6135556999740896727}
......@@ -9917,7 +9917,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1410727530619213027}
m_LocalRotation: {x: 0.2588191, y: 0, z: 0, w: 0.9659258}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
......@@ -9926,7 +9926,7 @@ Transform:
- {fileID: 1674453072239206021}
m_Father: {fileID: 3159638510092659114}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 30, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &7505024598058359350
Animator:
serializedVersion: 3
......@@ -156628,7 +156628,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7323157881595809543}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 1.118, z: -1.35}
m_LocalPosition: {x: 0, y: 1.118, z: -1.44}
m_LocalScale: {x: 3.5, y: 1.5, z: 2}
m_Children: []
m_Father: {fileID: 6135556999740896727}
......@@ -81688,7 +81688,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.18, y: 1.18, z: 3.49}
m_Center: {x: -1.93, y: 0.44, z: 0}
m_Center: {x: -1.93, y: 0, z: 0}
--- !u!65 &8897509476657725313
BoxCollider:
m_ObjectHideFlags: 0
......@@ -81701,7 +81701,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 3.49, y: 1.18, z: 0.18}
m_Center: {x: 0, y: 0.44, z: -1.89}
m_Center: {x: 0, y: 0, z: -1.89}
--- !u!65 &6354998724600023539
BoxCollider:
m_ObjectHideFlags: 0
......@@ -81714,7 +81714,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.36, y: 1.18, z: 0.4}
m_Center: {x: 0, y: 0.44, z: -2.38}
m_Center: {x: 0, y: 0, z: -2.38}
--- !u!65 &6553506764687324876
BoxCollider:
m_ObjectHideFlags: 0
......@@ -81727,7 +81727,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.18, y: 1.18, z: 3.49}
m_Center: {x: 1.93, y: 0.44, z: 0}
m_Center: {x: 1.93, y: 0, z: 0}
--- !u!65 &6339277644239472058
BoxCollider:
m_ObjectHideFlags: 0
......@@ -81740,7 +81740,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 3.49, y: 1.18, z: 0.18}
m_Center: {x: 0, y: 0.44, z: 1.89}
m_Center: {x: 0, y: 0, z: 1.89}
--- !u!95 &7975887301430865361
Animator:
serializedVersion: 3
......@@ -19848,7 +19848,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.18, y: 1.18, z: 3.49}
m_Center: {x: -1.93, y: 0.44, z: 0}
m_Center: {x: -1.93, y: 0, z: 0}
--- !u!65 &1320528460250553132
BoxCollider:
m_ObjectHideFlags: 0
......@@ -19861,7 +19861,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 3.49, y: 1.18, z: 0.18}
m_Center: {x: 0, y: 0.44, z: -1.89}
m_Center: {x: 0, y: 0, z: -1.89}
--- !u!65 &3537654140102880606
BoxCollider:
m_ObjectHideFlags: 0
......@@ -19874,7 +19874,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1.36, y: 1.18, z: 0.4}
m_Center: {x: 0, y: 0.44, z: -2.38}
m_Center: {x: 0, y: 0, z: -2.38}
--- !u!65 &3736725138751836769
BoxCollider:
m_ObjectHideFlags: 0
......@@ -19887,7 +19887,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.18, y: 1.18, z: 3.49}
m_Center: {x: 1.93, y: 0.44, z: 0}
m_Center: {x: 1.93, y: 0, z: 0}
--- !u!65 &4526288561810825495
BoxCollider:
m_ObjectHideFlags: 0
......@@ -19900,7 +19900,7 @@ BoxCollider:
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 3.49, y: 1.18, z: 0.18}
m_Center: {x: 0, y: 0.44, z: 1.89}
m_Center: {x: 0, y: 0, z: 1.89}
--- !u!95 &5743554439668515166
Animator:
serializedVersion: 3
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment