Skip to content

S
Storage
Commit 14ac44e6 authored by wanqing's avatar wanqing
Browse files
Options

修改场景预制体

parent e5f8231b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 10654 additions and 60 deletions
Storage/Assets/#A2_Scripts/Services/GlobalConfig.cs
View file @ 14ac44e6
...@@ -84,8 +84,6 @@ public class GlobalConfig ...@@ -84,8 +84,6 @@ public class GlobalConfig
int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex; int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
string varName = "成功动画"; string varName = "成功动画";
if (varLevel == LevelEnum.levelOneIndex) if (varLevel == LevelEnum.levelOneIndex)
//|| varLevel == LevelEnum.levelFourIndex || varLevel == LevelEnum.levelFiveIndex
//|| varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{ {
varName = "成功_N1"; varName = "成功_N1";
} }
...@@ -93,6 +91,14 @@ public class GlobalConfig ...@@ -93,6 +91,14 @@ public class GlobalConfig
{ {
varName = "成功_L1&2"; varName = "成功_L1&2";
} }
else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{
varName = "成功_L6-7";
}
else if (varLevel == LevelEnum.levelEightIndex || varLevel == LevelEnum.levelNineIndex)
{
varName = "成功_L8-9";
}
return varName; return varName;
} }
//通过当前关卡返回失败动画名称 //通过当前关卡返回失败动画名称
...@@ -101,8 +107,6 @@ public class GlobalConfig ...@@ -101,8 +107,6 @@ public class GlobalConfig
int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex; int varLevel = BattleCtrl.instance.levelManager.CurLevelIndex;
string varName = "失败"; string varName = "失败";
if (varLevel == LevelEnum.levelOneIndex) if (varLevel == LevelEnum.levelOneIndex)
//|| varLevel == LevelEnum.levelFourIndex || varLevel == LevelEnum.levelFiveIndex
//|| varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{ {
varName = "失败_N1"; varName = "失败_N1";
} }
...@@ -110,6 +114,14 @@ public class GlobalConfig ...@@ -110,6 +114,14 @@ public class GlobalConfig
{ {
varName = "失败_L1&2"; varName = "失败_L1&2";
} }
else if (varLevel == LevelEnum.levelSixIndex || varLevel == LevelEnum.levelSevenIndex)
{
varName = "失败_L6-7";
}
else if (varLevel == LevelEnum.levelEightIndex || varLevel == LevelEnum.levelNineIndex)
{
varName = "失败_L8-9";
}
return varName; return varName;
} }
} }
......
Storage/Assets/Res/Levels/Level6.prefab
View file @ 14ac44e6
...@@ -19360,6 +19360,7 @@ GameObject: ...@@ -19360,6 +19360,7 @@ GameObject:
- component: {fileID: 4927796728217265376} - component: {fileID: 4927796728217265376}
- component: {fileID: 8703156966850793954} - component: {fileID: 8703156966850793954}
- component: {fileID: 8703156966850793955} - component: {fileID: 8703156966850793955}
- component: {fileID: 5835227736206743960}
m_Layer: 0 m_Layer: 0
m_Name: Case01_Top m_Name: Case01_Top
m_TagString: Untagged m_TagString: Untagged
...@@ -24004,14 +24005,14 @@ MonoBehaviour: ...@@ -24004,14 +24005,14 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
corners: corners:
- {x: -2.1, y: -0.16787899, z: -2} - {x: -1.8384345, y: -0.36959803, z: -1.8105047}
- {x: -2.1, y: 0.16787899, z: -2} - {x: -1.8384345, y: 1.692926, z: -1.8105047}
- {x: 2.1, y: 0.16787899, z: -2} - {x: 1.8384345, y: 1.692926, z: -1.8105047}
- {x: 2.1, y: -0.16787899, z: -2} - {x: 1.8384345, y: -0.36959803, z: -1.8105047}
- {x: -2.1, y: -0.16787899, z: 2} - {x: -1.8384345, y: -0.36959803, z: 1.8105047}
- {x: -2.1, y: 0.16787899, z: 2} - {x: -1.8384345, y: 1.692926, z: 1.8105047}
- {x: 2.1, y: 0.16787899, z: 2} - {x: 1.8384345, y: 1.692926, z: 1.8105047}
- {x: 2.1, y: -0.16787899, z: 2} - {x: 1.8384345, y: -0.36959803, z: 1.8105047}
steps: 50 steps: 50
verts: verts:
- {x: -0.16055153, y: 1.0322028, z: -0.09269447} - {x: -0.16055153, y: 1.0322028, z: -0.09269447}
...@@ -25444,6 +25445,20 @@ MonoBehaviour: ...@@ -25444,6 +25445,20 @@ MonoBehaviour:
MaxLOD: 0 MaxLOD: 0
percent: 0 percent: 0
FallOff: 0 FallOff: 0
--- !u!64 &5835227736206743960
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1348015993830517936}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -7011429734207973542, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
--- !u!1 &1404443218250846472 --- !u!1 &1404443218250846472
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -92900,7 +92915,7 @@ MeshCollider: ...@@ -92900,7 +92915,7 @@ MeshCollider:
serializedVersion: 4 serializedVersion: 4
m_Convex: 1 m_Convex: 1
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 2540817853737639666, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3} m_Mesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
--- !u!114 &3837531511738556191 --- !u!114 &3837531511738556191
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -92921,7 +92936,7 @@ MonoBehaviour: ...@@ -92921,7 +92936,7 @@ MonoBehaviour:
m_fixedTrans: {fileID: 0} m_fixedTrans: {fileID: 0}
m_rotateSpeed: 1.5 m_rotateSpeed: 1.5
m_parent: {fileID: 6823741327319139769} m_parent: {fileID: 6823741327319139769}
m_animator: {fileID: 0} m_animator: {fileID: 8710598915273231866}
--- !u!1 &7443755736953841485 --- !u!1 &7443755736953841485
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -93035,6 +93050,7 @@ GameObject: ...@@ -93035,6 +93050,7 @@ GameObject:
- component: {fileID: 8150845946283321957} - component: {fileID: 8150845946283321957}
- component: {fileID: 47010074862378470} - component: {fileID: 47010074862378470}
- component: {fileID: 47010074862378471} - component: {fileID: 47010074862378471}
- component: {fileID: 3485686530674789714}
m_Layer: 0 m_Layer: 0
m_Name: Case01_Bottom m_Name: Case01_Bottom
m_TagString: Untagged m_TagString: Untagged
...@@ -96444,14 +96460,14 @@ MonoBehaviour: ...@@ -96444,14 +96460,14 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
corners: corners:
- {x: -2.1, y: -0.6231413, z: -2.4652233} - {x: -0.9999998, y: -0.00000059604645, z: -0.99999976}
- {x: -2.1, y: 0.6231413, z: -2.4652233} - {x: -0.9999998, y: 0.5118465, z: -0.99999976}
- {x: 2.1, y: 0.6231413, z: -2.4652233} - {x: 0.9999998, y: 0.5118465, z: -0.99999976}
- {x: 2.1, y: -0.6231413, z: -2.4652233} - {x: 0.9999998, y: -0.00000059604645, z: -0.99999976}
- {x: -2.1, y: -0.6231413, z: 2.4652233} - {x: -0.9999998, y: -0.00000059604645, z: 0.99999976}
- {x: -2.1, y: 0.6231413, z: 2.4652233} - {x: -0.9999998, y: 0.5118465, z: 0.99999976}
- {x: 2.1, y: 0.6231413, z: 2.4652233} - {x: 0.9999998, y: 0.5118465, z: 0.99999976}
- {x: 2.1, y: -0.6231413, z: 2.4652233} - {x: 0.9999998, y: -0.00000059604645, z: 0.99999976}
steps: 50 steps: 50
verts: verts:
- {x: -0.17891291, y: 0.088327564, z: -0.17891277} - {x: -0.17891291, y: 0.088327564, z: -0.17891277}
...@@ -97552,6 +97568,20 @@ MonoBehaviour: ...@@ -97552,6 +97568,20 @@ MonoBehaviour:
MaxLOD: 0 MaxLOD: 0
percent: 0 percent: 0
FallOff: 0 FallOff: 0
--- !u!64 &3485686530674789714
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7698284713689145516}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
--- !u!1 &7818303108620205133 --- !u!1 &7818303108620205133
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
Storage/Assets/Res/Levels/Level7.prefab
View file @ 14ac44e6
...@@ -69,6 +69,7 @@ GameObject: ...@@ -69,6 +69,7 @@ GameObject:
- component: {fileID: 2227090818149443178} - component: {fileID: 2227090818149443178}
- component: {fileID: 4160006159148553564} - component: {fileID: 4160006159148553564}
- component: {fileID: 4160006159148553539} - component: {fileID: 4160006159148553539}
- component: {fileID: 1725170549366210400}
m_Layer: 0 m_Layer: 0
m_Name: Case01_Bottom m_Name: Case01_Bottom
m_TagString: Untagged m_TagString: Untagged
...@@ -3478,14 +3479,14 @@ MonoBehaviour: ...@@ -3478,14 +3479,14 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
corners: corners:
- {x: -2.1, y: -0.6231413, z: -2.4652233} - {x: -0.9999998, y: -0.00000059604645, z: -0.99999976}
- {x: -2.1, y: 0.6231413, z: -2.4652233} - {x: -0.9999998, y: 0.5118465, z: -0.99999976}
- {x: 2.1, y: 0.6231413, z: -2.4652233} - {x: 0.9999998, y: 0.5118465, z: -0.99999976}
- {x: 2.1, y: -0.6231413, z: -2.4652233} - {x: 0.9999998, y: -0.00000059604645, z: -0.99999976}
- {x: -2.1, y: -0.6231413, z: 2.4652233} - {x: -0.9999998, y: -0.00000059604645, z: 0.99999976}
- {x: -2.1, y: 0.6231413, z: 2.4652233} - {x: -0.9999998, y: 0.5118465, z: 0.99999976}
- {x: 2.1, y: 0.6231413, z: 2.4652233} - {x: 0.9999998, y: 0.5118465, z: 0.99999976}
- {x: 2.1, y: -0.6231413, z: 2.4652233} - {x: 0.9999998, y: -0.00000059604645, z: 0.99999976}
steps: 50 steps: 50
verts: verts:
- {x: -0.17891291, y: 0.088327564, z: -0.17891277} - {x: -0.17891291, y: 0.088327564, z: -0.17891277}
...@@ -4586,6 +4587,20 @@ MonoBehaviour: ...@@ -4586,6 +4587,20 @@ MonoBehaviour:
MaxLOD: 0 MaxLOD: 0
percent: 0 percent: 0
FallOff: 0 FallOff: 0
--- !u!64 &1725170549366210400
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 369406596971785379}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
--- !u!1 &406135593087208780 --- !u!1 &406135593087208780
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -5159,6 +5174,73 @@ MeshCollider: ...@@ -5159,6 +5174,73 @@ MeshCollider:
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10209, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1 &2011506685235896794
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 8737948214725737074}
- component: {fileID: 5020047381470573281}
- component: {fileID: 7125654252451737870}
m_Layer: 0
m_Name: "\u78B0\u649E\u7F51\u683C"
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &8737948214725737074
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2011506685235896794}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.009932265, y: -0.2291194, z: -0.57}
m_LocalScale: {x: 2.37533, y: 2.37533, z: 2.37533}
m_Children: []
m_Father: {fileID: 52484745759382598}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!64 &5020047381470573281
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2011506685235896794}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 4
m_Convex: 1
m_CookingOptions: 30
m_Mesh: {fileID: 1044666760486720641, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
--- !u!114 &7125654252451737870
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2011506685235896794}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 4de63a6add2120742b127d4aad5f7f85, type: 3}
m_Name:
m_EditorClassIdentifier:
m_targetParentTrans: {fileID: 1432609735324047039}
m_triggerBox: {fileID: 3429166680139590964}
m_triggerTopBox: {fileID: 7101565722648026552}
m_redMat: {fileID: 2100000, guid: 3a9c306a971cce143bc26043250f12a1, type: 2}
m_planeObj: {fileID: 1768367168502344155}
m_fixedTrans: {fileID: 392698519036016668}
m_rotateSpeed: 1.5
m_parent: {fileID: 4160006159637857422}
m_animator: {fileID: 4160006160181235149}
--- !u!1 &2017754977799998250 --- !u!1 &2017754977799998250
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -10085,6 +10167,7 @@ Transform: ...@@ -10085,6 +10167,7 @@ Transform:
- {fileID: 4160006159637857422} - {fileID: 4160006159637857422}
- {fileID: 7427560434232025364} - {fileID: 7427560434232025364}
- {fileID: 392698519036016668} - {fileID: 392698519036016668}
- {fileID: 8737948214725737074}
m_Father: {fileID: 7591557306564037294} m_Father: {fileID: 7591557306564037294}
m_RootOrder: 1 m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -87009,7 +87092,7 @@ MonoBehaviour: ...@@ -87009,7 +87092,7 @@ MonoBehaviour:
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
m_camera: {fileID: 7591557307783868099} m_camera: {fileID: 7591557307783868099}
m_storageView: {fileID: 0} m_storageView: {fileID: 7125654252451737870}
curLevelIndex: 6 curLevelIndex: 6
--- !u!1 &7591557307334781500 --- !u!1 &7591557307334781500
GameObject: GameObject:
...@@ -106574,6 +106657,7 @@ GameObject: ...@@ -106574,6 +106657,7 @@ GameObject:
- component: {fileID: 3140879739242834159} - component: {fileID: 3140879739242834159}
- component: {fileID: 4160006160338906344} - component: {fileID: 4160006160338906344}
- component: {fileID: 4160006160338906351} - component: {fileID: 4160006160338906351}
- component: {fileID: 1409697603450067938}
m_Layer: 0 m_Layer: 0
m_Name: Case01_Top m_Name: Case01_Top
m_TagString: Untagged m_TagString: Untagged
...@@ -111218,14 +111302,14 @@ MonoBehaviour: ...@@ -111218,14 +111302,14 @@ MonoBehaviour:
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0} - {x: 0, y: 0, z: 0}
corners: corners:
- {x: -2.1, y: -0.16787899, z: -2} - {x: -1.8384345, y: -0.36959803, z: -1.8105047}
- {x: -2.1, y: 0.16787899, z: -2} - {x: -1.8384345, y: 1.692926, z: -1.8105047}
- {x: 2.1, y: 0.16787899, z: -2} - {x: 1.8384345, y: 1.692926, z: -1.8105047}
- {x: 2.1, y: -0.16787899, z: -2} - {x: 1.8384345, y: -0.36959803, z: -1.8105047}
- {x: -2.1, y: -0.16787899, z: 2} - {x: -1.8384345, y: -0.36959803, z: 1.8105047}
- {x: -2.1, y: 0.16787899, z: 2} - {x: -1.8384345, y: 1.692926, z: 1.8105047}
- {x: 2.1, y: 0.16787899, z: 2} - {x: 1.8384345, y: 1.692926, z: 1.8105047}
- {x: 2.1, y: -0.16787899, z: 2} - {x: 1.8384345, y: -0.36959803, z: 1.8105047}
steps: 50 steps: 50
verts: verts:
- {x: -0.16055153, y: 1.0322028, z: -0.09269447} - {x: -0.16055153, y: 1.0322028, z: -0.09269447}
...@@ -112658,3 +112742,17 @@ MonoBehaviour: ...@@ -112658,3 +112742,17 @@ MonoBehaviour:
MaxLOD: 0 MaxLOD: 0
percent: 0 percent: 0
FallOff: 0 FallOff: 0
--- !u!64 &1409697603450067938
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 9025412768649617599}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 4
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -7011429734207973542, guid: 974688b4bf34a4e4fa5b4833b749d3d7, type: 3}
Storage/Assets/Res/Levels/Level8.prefab
View file @ 14ac44e6
This diff is collapsed.
Storage/Assets/Res/Levels/Level9.prefab
View file @ 14ac44e6
This diff is collapsed.
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