Skip to content

P
Project_AVE

软件工程实践2022年春W班 / 麦丽素鸽 / Project_AVE
上一次同步 1 年多

通知 1
Star 0
Fork 0
P
Project_AVE

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 dfe3bf2e 编写于 作者: 3 3523663010@qq.com
浏览文件
操作

checkin

上级 501a7576 5dc14f58
隐藏空白更改
内联 并排
Showing with 198 addition and 319 deletion
Assets/Resources/Prefabs/Enemys/Enemy02.prefab
浏览文件 @ dfe3bf2e
......@@ -289,8 +289,8 @@ MonoBehaviour:
byteData:
byteDataArray: 4265686176696f7244657369676e65722e52756e74696d652e53686172656447616d654f626a656374746172676574014265686176696f7244657369676e65722e52756e74696d652e536861726564496e747461726765744e756d01000000004265686176696f7244657369676e65722e52756e74696d652e5368617265644f626a656374656e656d790100000000456e747279010000008643000064c2000000000000000000000100000053656c6563746f7201000000000000000c43000000000000000000000100000002000000e6adbbe4baa1e588a4e5ae9a0100000002c30000dc4200000000000000000000010000000000000000000000000300000053656c6563746f72010000000c430000dc42000000000000000000000100000004000000e79da1e79ca0e594a4e9869201000000a0c20000dc42000000000000000000000100000001000000000000000005000000e8bf9ce7a88be694bbe587bb01000000b4420000dc420000000000000000000001000000020000000000000000
Version: 1.7.2
gizmoViewMode: 2
showBehaviorDesignerGizmo: 1
gizmoViewMode: 0
showBehaviorDesignerGizmo: 0
--- !u!114 &971563055
MonoBehaviour:
m_ObjectHideFlags: 0
......@@ -304,16 +304,16 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
battleUnitData: {fileID: 11400000, guid: 93c295cef62c755478e75fd8ac373065, type: 2}
maxHP: 100
maxHP: 0
maxMP: 0
maxSpeed: 1
currentHP: 100
maxSpeed: 0
currentHP: 0
currentMP: 0
threatTransTime: 10
touchTime: 1
touchTimer: 0
idleTime: 1
sleepDetectRange: 5
idleTime: 2
sleepDetectRange: 7
animator: {fileID: 0}
isSleeping: 1
sleeping: 0
......@@ -466,6 +466,10 @@ PrefabInstance:
propertyPath: m_Name
value: gun_enemy_01
objectReference: {fileID: 0}
- target: {fileID: 7531109879182752566, guid: 50fc2a193c9846c448f741cd54fdf4f8, type: 3}
propertyPath: bulletAngle
value: 30
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 50fc2a193c9846c448f741cd54fdf4f8, type: 3}
--- !u!4 &8677196680437509402 stripped
......
Assets/Resources/Prefabs/UI/ESCpanel.prefab
浏览文件 @ dfe3bf2e
......@@ -110,6 +110,7 @@ RectTransform:
m_LocalScale: {x: 0.4791567, y: 0.4791567, z: 0.4791567}
m_Children:
- {fileID: 2290520137832830468}
- {fileID: 6510195335747387027}
- {fileID: 2290520136886573037}
- {fileID: 2290520136962102293}
- {fileID: 2245353215868521668}
......@@ -207,7 +208,7 @@ RectTransform:
m_Children:
- {fileID: 2152458885540247619}
m_Father: {fileID: 4277727978802878724}
m_RootOrder: 5
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}
......@@ -285,6 +286,112 @@ MonoBehaviour:
m_EditorClassIdentifier:
cdtext: {fileID: 5832018931002283119}
anim: {fileID: 7499823897739993267}
--- !u!1001 &3275939065290558658
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4277727978802878724}
m_Modifications:
- target: {fileID: 956115667615939766, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_Name
value: BackToBaseBtn
objectReference: {fileID: 0}
- target: {fileID: 2264532331409041512, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_Text
value: "\u8FD4\u56DE\u57FA\u5730"
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMin.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMin.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_SizeDelta.x
value: 298.661
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_SizeDelta.y
value: 96.191
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalPosition.z
value: 0.09069824
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -3.8760195
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 145.83301
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
--- !u!224 &6510195335747387027 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
m_PrefabInstance: {fileID: 3275939065290558658}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &7496168775948402325
PrefabInstance:
m_ObjectHideFlags: 0
......@@ -314,7 +421,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_RootOrder
value: 3
value: 4
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.x
......@@ -370,11 +477,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -48
value: -2
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -65.463
value: -143
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -452,11 +559,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_SizeDelta.x
value: 302.413
value: 298.661
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_SizeDelta.y
value: 100.042
value: 96.191
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalPosition.x
......@@ -488,11 +595,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -49.873917
value: -3.8760614
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 225.303
value: 242.02298
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -542,7 +649,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_RootOrder
value: 4
value: 5
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.x
......@@ -598,11 +705,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -47.999916
value: -1.9999361
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: -161.65408
value: -239.19107
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -652,7 +759,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_RootOrder
value: 1
value: 2
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.x
......@@ -708,11 +815,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -47.999916
value: -1.9999361
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 127.177
value: 49.640007
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......@@ -762,7 +869,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_RootOrder
value: 2
value: 3
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchorMax.x
......@@ -818,11 +925,11 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.x
value: -47.999916
value: -1.9999361
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_AnchoredPosition.y
value: 30.986
value: -46.550995
objectReference: {fileID: 0}
- target: {fileID: 8587983042375103057, guid: d8ea3a58398060a45b325d887da360d2, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
......
Assets/Resources/Prefabs/UI/SkillPanel.prefab
浏览文件 @ dfe3bf2e
......@@ -350,7 +350,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &7351047679837723735
RectTransform:
m_ObjectHideFlags: 0
......
Assets/Resources/SOData/Vehicle_Normal_SO.asset
浏览文件 @ dfe3bf2e
......@@ -15,7 +15,7 @@ MonoBehaviour:
maxHP: 500
speed: 1
maxMP: 0
playerDetectRange: 0
playerDetectRange: 4
maxBarricade: 500
barricadeRecoveryRate: 5
maxTurretNum: 5
......
Assets/Scenes/SampleScene_k.unity
浏览文件 @ dfe3bf2e
......@@ -294,143 +294,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: ac0b09e7857660247b1477e93731de29, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1001 &197035528
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1750523148}
m_Modifications:
- target: {fileID: 2661469240565809975, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_Value
value: 1
objectReference: {fileID: 0}
- target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 3703635699288633025, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.48791504
objectReference: {fileID: 0}
- target: {fileID: 5498746623913090029, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_Value
value: 1
objectReference: {fileID: 0}
- target: {fileID: 5954056124943457219, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5954056124943457219, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 6467590583663223159, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.7053833
objectReference: {fileID: 0}
- target: {fileID: 7567430611629406064, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_Name
value: BattlePanel
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_Pivot.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_Pivot.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.x
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMax.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_SizeDelta.x
value: 0.00012207031
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchoredPosition.x
value: -0.000061035156
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8402943828183286182, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a188b49e3b7304a4e836a96b60daed08, type: 3}
--- !u!1 &751788417
GameObject:
m_ObjectHideFlags: 0
......@@ -797,105 +660,3 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 9845de5ae41f49b489a6eacf5296e564, type: 3}
--- !u!1001 &1750523147
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications:
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_Pivot.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_Pivot.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchorMax.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchorMax.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchorMin.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchorMin.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_SizeDelta.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_SizeDelta.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalRotation.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchoredPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_AnchoredPosition.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2424457004934279683, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 4035117218401293311, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
propertyPath: m_Name
value: Canvas
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
--- !u!224 &1750523148 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 486615778616002635, guid: 4c1f96bf78f0c574dac2e80cfe7d1bf1, type: 3}
m_PrefabInstance: {fileID: 1750523147}
m_PrefabAsset: {fileID: 0}
Assets/Scripts/GameManagers/BuildingManager.cs
浏览文件 @ dfe3bf2e
......@@ -60,11 +60,11 @@ public class BuildingManager : SingletonAutoMono<BuildingManager>
inBuild = false;
mouseVisualTransfrom.gameObject.SetActive(false);
//禁用技能面板
UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").isActive = false;
UIManager.Instance.HidePanel("SkillPanel");
}
void PutTurret()
{
if (turretList[index].GetComponent<Turret>().MSRequirement > GameManager.Instance.magicStone)
if (turretList[index].GetComponent<Turret>().turretData.MSRequirement > GameManager.Instance.magicStone)
return;
foreach (Collider2D c in Physics2D.OverlapCircleAll(mouseVisualTransfrom.position, 1f))
{
......
Assets/Scripts/GameManagers/GameManager.cs
浏览文件 @ dfe3bf2e
......@@ -125,12 +125,14 @@ public class GameManager : SingletonAutoMono<GameManager>
//关闭所有UI
UIManager.Instance.HidePanel("ESCpanel");
UIManager.Instance.HidePanel("BattlePanel");
Destroy(Instance.player.gameObject);
Destroy(Instance.vehicle.gameObject);
if(Instance.player)
Destroy(Instance.player.gameObject);
if(Instance.vehicle)
Destroy(Instance.vehicle.gameObject);
GameManager.Instance.magicStone = 0;
RoomGenerator.Instance.DestroyMap();
if(RoomGenerator.Instance)
RoomGenerator.Instance.DestroyMap();
}
//游戏通关结束
public void GameEnd()
......
Assets/Scripts/Map/DoorControllTrigger.cs
浏览文件 @ dfe3bf2e
......@@ -34,7 +34,7 @@ public class DoorControllTrigger : MonoBehaviour
}
if (player != null && other.name == player.name && isVehicleUpdated)
{
Debug.Log(other.name + " " + player.name);
//Debug.Log(other.name + " " + player.name);
if (!isPlayerUpdated)
{
isPlayerUpdated = true;
......
Assets/Scripts/Player/PlayerController.cs
浏览文件 @ dfe3bf2e
......@@ -105,7 +105,7 @@ public class PlayerController : MonoBehaviour {
if (Input.GetKeyDown(KeyCode.B)&& UIManager.Instance.panelStack.Count == 0)
{
UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").isActive = true;
//UIManager.Instance.ShowPanel<BuildPanelCtrl>("BuildPanel", E_UI_Layer.System, null);
UIManager.Instance.ShowPanel<SkillPanelCtrl>("SkillPanel",E_UI_Layer.System);
}
}
......
Assets/Scripts/ProjectBase/Base/SingletonMono.cs
浏览文件 @ dfe3bf2e
......@@ -13,6 +13,8 @@ public class SingletonMono<T> : MonoBehaviour where T: MonoBehaviour
{
get
{
if (instance == null)
return null;
//继承了Mono的脚本 不能够直接new
//只能通过拖动到对象上 或者 通过 加脚本的api AddComponent去加脚本
//U3D内部帮助我们实例化它
......
Assets/Scripts/Turrets/NormalTurret.cs
浏览文件 @ dfe3bf2e
......@@ -13,10 +13,6 @@ public class NormalTurret : Turret
sprite = GetComponent<SpriteRenderer>();
sprite.sprite = FindSrpite();
}
private void Start()
{
Init();
}
protected override void Update()
{
base.Update();
......
Assets/Scripts/Turrets/Turret.cs
浏览文件 @ dfe3bf2e
......@@ -33,7 +33,7 @@ public abstract class Turret : BattleUnit, Interactable
public int MSRequirement;
private int baseMSRequirement;
protected int destoryReturnMS;
protected List<BattleUnit> enemyList = new List<BattleUnit>();
public List<BattleUnit> enemyList = new List<BattleUnit>();
protected float timer;
private int layer;
private bool canShoot = false;
......@@ -68,7 +68,7 @@ public abstract class Turret : BattleUnit, Interactable
{
data = new UpgradeData();
data.type = UpgradeType.Turret;
layer = LayerMask.GetMask("Door", "Wall", "Room", "Enemy");
layer = LayerMask.GetMask("Door", "Wall", "Enemy");
currentCD = 0;
level = 1;
BattleUnitData_SO battleUnitData = turretData.battleUnitData;
......
Assets/Scripts/UI/BattlePanel.cs
浏览文件 @ dfe3bf2e
......@@ -47,6 +47,7 @@ public class BattlePanel : BasePanel
{
gameObject.SetActive(true);
UIManager.Instance.ShowPanel<SkillPanelCtrl>("SkillPanel", E_UI_Layer.System, null, false);
UIManager.Instance.GetPanel<SkillPanelCtrl>("SkillPanel").gameObject.SetActive(false);
}
/// <summary>
......@@ -68,7 +69,7 @@ public class BattlePanel : BasePanel
Slider slider = GetControl<Slider>("HP");
float nowHP = (float)currentHP / maxHP;
slider.value = nowHP;
Debug.Log(slider.value);
//Debug.Log(slider.value);
//修改动画currentHP参数
animator.SetFloat("currentHP", (float)currentHP / maxHP);
......@@ -137,10 +138,10 @@ public class BattlePanel : BasePanel
{
//空格是为了换行
case UpgradeType.Weapon:
statetext.text = "等级：" + d.level + " " + "攻击力：" + d.damage + " " + "攻击范围：" + d.attackRange + " " + "攻击速度：" + d.attackSpeed + " " + "升级魔石消耗：" + d.cost;
statetext.text = "等级：" + d.level + " " + "攻击力：" + d.damage + " " + "攻击范围：" + Convert.ToInt32(d.attackRange) + " " + "攻击速度：" + Convert.ToInt32(d.attackSpeed )+ " " + "升级魔石消耗：" + d.cost;
break;
case UpgradeType.Turret:
statetext.text = "等级：" + d.level + " " + "攻击力：" + d.damage + " " + "攻击范围：" + d.attackRange + " " + "攻击速度：" + d.attackSpeed + " " + "升级魔石消耗：" + d.cost;
statetext.text = "等级：" + d.level + " " + "攻击力：" + d.damage + " " + "攻击范围：" + Convert.ToInt32(d.attackRange) + " " + "攻击速度：" + Convert.ToInt32(d.attackSpeed) + " " + "升级魔石消耗：" + d.cost;
break;
case UpgradeType.Treasure:
statetext.text = "打开这个宝箱" + " " + "需要消耗魔石:" + d.cost;
......@@ -167,7 +168,7 @@ public class BattlePanel : BasePanel
{
image.color = background;
Debug.Log("state:building turret.");
statetext.text = "等级：1" + " " + "攻击力：" + data.GetComponent<Turret>().turretData.damage.ToString() + " " + "攻击范围：" + data.GetComponent<Turret>().turretData.weaponData.bulletRange.ToString() + " " + "攻击速度：" + (1 / data.GetComponent<Turret>().turretData.weaponData.attackCD).ToString() + " " + "升级魔石消耗：" + data.GetComponent<Turret>().turretData.weaponData.MSRequirement.ToString();
statetext.text = "等级：1" + " " + "攻击力：" + data.GetComponent<Turret>().turretData.damage.ToString() + " " + "攻击范围：" + Convert.ToInt32(data.GetComponent<Turret>().turretData.weaponData.bulletRange).ToString() + " " + "攻击速度：" + Convert.ToInt32(1 / data.GetComponent<Turret>().turretData.weaponData.attackCD).ToString() + " " + "升级魔石消耗：" + data.GetComponent<Turret>().turretData.weaponData.MSRequirement.ToString();
}
}
}
Assets/Scripts/UI/ESCpanelCtrl.cs
浏览文件 @ dfe3bf2e
......@@ -37,7 +37,9 @@ public class ESCpanelCtrl : BasePanel
}
else
{
// GameManager.Instance.GameResume();
if (!(UIManager.Instance.panelStack.Count > 0)) {
GameManager.Instance.GameResume();
}
gameObject.SetActive(false);
}
}
......@@ -52,6 +54,9 @@ public class ESCpanelCtrl : BasePanel
UIManager.Instance.ShowPanel<RemindPanelCtrl>("RemindPanel", E_UI_Layer.System, null);
toMenu = true;
break;
case "BackToBaseBtn":
GameManager.Instance.GameOver();
break;
case "HelpBtn":
UIManager.Instance.ShowPanel<HelpPanelCtrl>("HelpPanel", E_UI_Layer.System, null);
break;
......@@ -64,7 +69,6 @@ public class ESCpanelCtrl : BasePanel
case "ReadingBtn":
UIManager.Instance.ShowPanel<ReadingPanelCtrl>("ReadingPanel", E_UI_Layer.System, null);
break;
default:
break;
}
......
Assets/Scripts/UI/RemindPanelCtrl.cs
浏览文件 @ dfe3bf2e
......@@ -5,7 +5,7 @@ using UnityEngine;
public class RemindPanelCtrl : BasePanel
{
/// <summary>
/// ʾԼ
/// 显示自己
/// </summary>
public override void ShowMe()
{
......@@ -14,7 +14,7 @@ public class RemindPanelCtrl : BasePanel
}
/// <summary>
/// Լ
/// 隐藏自己
/// </summary>
public override void HideMe()
{
......
Assets/Scripts/UI/SettingsPanelCtrl.cs
浏览文件 @ dfe3bf2e
......@@ -12,7 +12,7 @@ public class SettingsPanelCtrl : BasePanel
private Text volumetext;
private Text speedtext;
/// <summary>
/// 显示自己
/// 显示自己
/// </summary>
public override void ShowMe()
{
......@@ -21,30 +21,30 @@ public class SettingsPanelCtrl : BasePanel
vbtext = GetControl<Text>("VibrationText");
bgmtext = GetControl<Text>("BGMtext");
gameObject.SetActive(true);
bgmtext.text = ((int)GameManager.Instance.bgmVolume * 100).ToString() + "%";
volumetext.text = ((int)GameManager.Instance.effectVolume * 100).ToString() + "%";
bgmtext.text = ((int)(GameManager.Instance.bgmVolume * 100)).ToString() + "%";
volumetext.text = ((int)(GameManager.Instance.effectVolume * 100)).ToString() + "%";
if (GameManager.Instance.openCameraShake)
{
vbtext.text = "震动开关（ON）";
vbtext.text = "震动开关（ON）";
}
else
{
vbtext.text = "震动开关（OFF）";
vbtext.text = "震动开关（OFF）";
}
if (PlayerPrefs.GetFloat("dashRate") == 1.2f)
{
speedtext.text = "移动加速（ 慢 ）";
speedtext.text = "移动加速（ 慢 ）";
}
else
{
speedtext.text = "移动加速（ 快 ）";
speedtext.text = "移动加速（ 快 ）";
}
Debug.Log("展示了设置面板");
Debug.Log("展示了设置面板");
}
/// <summary>
/// 隐藏自己
/// 隐藏自己
/// </summary>
public override void HideMe()
{
......@@ -64,14 +64,14 @@ public class SettingsPanelCtrl : BasePanel
case "VibrationBtn":
vbtext.text = VibrationControl(vbtext.text);
break;
//背景音乐的调节其实是两个按钮
//背景音乐的调节其实是两个按钮
case "BGMupBtn":
bgmtext.text = BGMControl(btnName, bgmtext.text);
break;
case "BGMdownBtn":
bgmtext.text = BGMControl(btnName, bgmtext.text);
break;
//音效的调节也是两个按钮
//音效的调节也是两个按钮
case "VolumeUpBtn":
volumetext.text = VolumeControl(btnName, volumetext.text);
break;
......@@ -87,21 +87,21 @@ public class SettingsPanelCtrl : BasePanel
}
}
/// <summary>
/// 控制震动开关的函数
/// 控制震动开关的函数
/// </summary>
/// <param name="text"></param>
/// <returns></returns>
public string VibrationControl(string text)
{
if (text == "震动开关（ON）")
if (text == "震动开关（ON）")
{
text = "震动开关（OFF）";
text = "震动开关（OFF）";
GameManager.Instance.openCameraShake = false;
}
else
{
text = "震动开关（ON）";
text = "震动开关（ON）";
GameManager.Instance.openCameraShake = true;
}
return text;
......@@ -109,38 +109,38 @@ public class SettingsPanelCtrl : BasePanel
}
/// <summary>
/// 控制移动加速按钮的函数
/// 控制移动加速按钮的函数
/// </summary>
/// <param name="text"></param>
/// <returns></returns>
public string SpeedControl(string text)
{
if (text == "移动加速（ 快 ）")
if (text == "移动加速（ 快 ）")
{
text = "移动加速（ 慢 ）";
text = "移动加速（ 慢 ）";
GameManager.Instance.DashRate = (float)1.2;
}
else
{
text = "移动加速（ 快 ）";
text = "移动加速（ 快 ）";
GameManager.Instance.DashRate = (float)1.5;
}
return text;
}
/// <summary>
/// BGM调节函数
/// BGM调节函数
/// </summary>
/// <param name="bgmbtnName"></param>
/// <param name="text"></param>
/// <returns></returns>
public string BGMControl(string bgmbtnName, string text)
{
Debug.Log("bgm函数");
Debug.Log("bgm函数");
if (bgmbtnName == "BGMupBtn")
{
Debug.Log("bgm函数up if");
Debug.Log("bgm函数up if");
string str = text.Substring(0, text.Length - 1);
Debug.Log(str);
int bgm = Convert.ToInt32(str);
......@@ -170,7 +170,7 @@ public class SettingsPanelCtrl : BasePanel
return null;
}
/// <summary>
/// 音效控制函数
/// 音效控制函数
/// </summary>
/// <param name="bgmbtnName"></param>
/// <param name="text"></param>
......
Assets/Scripts/UI/SkillPanelCtrl.cs
浏览文件 @ dfe3bf2e
......@@ -47,6 +47,7 @@ public class SkillPanelCtrl : BasePanel
Init();
Debug.Log("SkillPanel is showing!");
gameObject.SetActive(true);
isActive = true;
}
/// <summary>
......@@ -55,6 +56,7 @@ public class SkillPanelCtrl : BasePanel
public override void HideMe()
{
gameObject.SetActive(false);
isActive = false;
}
/// <summary>
......@@ -62,8 +64,6 @@ public class SkillPanelCtrl : BasePanel
/// </summary>
public void Init()
{
isActive = false;
DeleteOldImage();
BuildingManager.Instance.Init();
turretList = BuildingManager.Instance.turretList;
......@@ -83,7 +83,7 @@ public class SkillPanelCtrl : BasePanel
turretIsClicked = turretList[index];
//Debug.Log("TurretX is clicked!");
BuildingManager.Instance.build(index);
CountX.text = (System.Convert.ToInt32(CountX.text) - 1).ToString();
//CountX.text = (System.Convert.ToInt32(CountX.text) - 1).ToString();
//switch (System.Convert.ToInt32(CountX.text))
//{
// case 0:
......
Assets/Scripts/UI/StartPanel.cs
浏览文件 @ dfe3bf2e
......@@ -10,6 +10,7 @@ public class StartPanel : BasePanel
/// </summary>
public override void ShowMe()
{
SaveManager.Instance.LoadSettings();
MusicMgr.Instance.PlayBkMusic("主题");
gameObject.SetActive(true);
}
......
Assets/Scripts/Utility/MathValue.cs
浏览文件 @ dfe3bf2e
......@@ -6,7 +6,7 @@ using System.Threading.Tasks;
public class MathValue : BaseManager<MathValue>
{
public static double upgradeLimit = 4;
public static double upgradeLimit = 0.25;
public static double upgradeBase = 2.1479;
public static double dropBase = 2;
public static double treasureBase = 3;
......
Assets/Scripts/Vehicles/NormalVehicle.cs
浏览文件 @ dfe3bf2e
......@@ -62,7 +62,7 @@ public class NormalVehicle : Vehicle
{
//获取下一个房间中心点 寻路
destinationSetter.target = target;
speed = vehicleData.highSpeed;
speed = maxSpeed;
}
public override void Stop(Transform target)
......
Assets/Scripts/Vehicles/Vehicle.cs
浏览文件 @ dfe3bf2e
......@@ -161,7 +161,8 @@ public abstract class Vehicle : BattleUnit
else
{
Debug.Log("玩家远离载具，载具缓慢移动");
Stop(RoomGenerator.Instance.vehicleNextRoom.transform);
if(RoomGenerator.Instance?.vehicleNextRoom)
Stop(RoomGenerator.Instance.vehicleNextRoom.transform);
}
playerDetectTimer = 0;
}
......
Assets/Scripts/Weapons/Bullets/Bullet.cs
浏览文件 @ dfe3bf2e
......@@ -40,7 +40,7 @@ public abstract class Bullet : MonoBehaviour
}
}
Vector3 hitPos = collision.bounds.ClosestPoint(transform.position);
Debug.Log("撞击到" + collision.name);
//Debug.Log("撞击到" + collision.name);
//调用特效
PlayeEffect(hitPos);
PoolMgr.Instance.PushObj(gameObject.name, gameObject);
......
Assets/Scripts/Weapons/Bullets/NormalBullet.cs
浏览文件 @ dfe3bf2e
......@@ -22,7 +22,7 @@ public class NormalBullet : Bullet
if (MoveDistance > BulletRange)
{
//回收
Debug.Log("超过距离回收");
//Debug.Log("超过距离回收");
PoolMgr.Instance.PushObj(gameObject.name, gameObject);
}
}
......
Assets/Scripts/Weapons/ShotGun.cs
浏览文件 @ dfe3bf2e
......@@ -41,7 +41,7 @@ public class ShotGun : Weapon
shootDirection = transform.rotation * Quaternion.AngleAxis(bulletAngle * (i - median) + bulletAngle / 2, Vector3.forward);
}
PoolMgr.Instance.GetObj("Prefabs/Bullets/" + weaponData.bullet.name, false, PassData);
Debug.Log($"第{i+1}个子弹 射击角度{shootDirection.eulerAngles}");
//Debug.Log($"第{i+1}个子弹 射击角度{shootDirection.eulerAngles}");
}
currentCD = 0;
}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或