Merge commit 'df10c3f4da8af587d55bf99a1b1faf479083ec29' into main_ZYT
This commit is contained in:
@@ -8,6 +8,11 @@
|
||||
<action android:name="android.intent.action.MAIN"/>
|
||||
<category android:name="android.intent.category.LAUNCHER"/>
|
||||
</intent-filter>
|
||||
<intent-filter>
|
||||
<data android:scheme="picoapp" android:host="launch" android:path="/com.pineappletech.defendnj.gongsi1lou"/>
|
||||
<action android:name="android.intent.action.VIEW"/>
|
||||
<category android:name="android.intent.category.DEFAULT"/>
|
||||
</intent-filter>
|
||||
<meta-data android:name="unityplayer.UnityActivity" android:value="true"/>
|
||||
</activity>
|
||||
</application>
|
||||
@@ -384,6 +384,7 @@ MonoBehaviour:
|
||||
originHealth: 0
|
||||
weakness: {fileID: 5850590570646086265}
|
||||
outline: {fileID: 1377580091773142238}
|
||||
isOutLine: 0
|
||||
id: 0
|
||||
type: 3
|
||||
state: 0
|
||||
@@ -1446,7 +1447,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
showPos: {fileID: 7226104817868627165}
|
||||
bulletPre: {fileID: 8963059409775886876, guid: f7fcf0e8799c0694ea5fb495bb6b352f,
|
||||
bulletPre: {fileID: 8963059409775886876, guid: ce01466c6bd352547be7621802ae5110,
|
||||
type: 3}
|
||||
firePre: {fileID: 1671084456144575652, guid: 4be0a6dc352e06541867d4cff8dc1502, type: 3}
|
||||
hpPercentage: 0.1
|
||||
|
||||
@@ -31,41 +31,6 @@ Transform:
|
||||
m_Children: []
|
||||
m_Father: {fileID: 673282139706232690}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &3639344109837476642
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 3013041966793261892, guid: 0ba3096288d2f75468b134930a1b3786,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1968624562204270694}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6324130832126456478}
|
||||
- component: {fileID: 6136554620798806896}
|
||||
m_Layer: 0
|
||||
m_Name: "\u6B65\u67AA\uFF08\u9B3C\u5B50\u5175\uFF09 (Missing Prefab with guid:
|
||||
0ba3096288d2f75468b134930a1b3786)"
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6324130832126456478
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 53489440533190419, guid: 0ba3096288d2f75468b134930a1b3786,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1968624562204270694}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3639344109837476642}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 673282139706232690}
|
||||
m_LocalEulerAnglesHint: {x: 28.940802, y: -3.0976577, z: -4.7616897}
|
||||
--- !u!1 &6485925508490133064
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -122,7 +87,7 @@ MonoBehaviour:
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
sceneId: 0
|
||||
_assetId: 2071038182
|
||||
_assetId: 4209217083
|
||||
serverOnly: 0
|
||||
visible: 0
|
||||
hasSpawned: 0
|
||||
@@ -388,6 +353,7 @@ MonoBehaviour:
|
||||
originHealth: 0
|
||||
weakness: {fileID: 5850590570646086265}
|
||||
outline: {fileID: 1377580091773142238}
|
||||
isOutLine: 0
|
||||
id: 0
|
||||
type: 3
|
||||
state: 0
|
||||
@@ -421,51 +387,7 @@ MonoBehaviour:
|
||||
complexMaskingMode: 0
|
||||
drawingMode: 1
|
||||
outlineLayer: 0
|
||||
outlineTargets:
|
||||
- CutoutMask: 8
|
||||
renderer: {fileID: 0}
|
||||
SubmeshIndex: 0
|
||||
BoundsMode: 0
|
||||
Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0.5, y: 0.5, z: 0.5}
|
||||
CutoutThreshold: 0.5
|
||||
CullMode: 2
|
||||
cutoutTextureName:
|
||||
cutoutTextureIndex: 0
|
||||
- CutoutMask: 8
|
||||
renderer: {fileID: 0}
|
||||
SubmeshIndex: 0
|
||||
BoundsMode: 0
|
||||
Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0.5, y: 0.5, z: 0.5}
|
||||
CutoutThreshold: 0.5
|
||||
CullMode: 2
|
||||
cutoutTextureName:
|
||||
cutoutTextureIndex: 0
|
||||
- CutoutMask: 8
|
||||
renderer: {fileID: 0}
|
||||
SubmeshIndex: 1
|
||||
BoundsMode: 0
|
||||
Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0.5, y: 0.5, z: 0.5}
|
||||
CutoutThreshold: 0.5
|
||||
CullMode: 2
|
||||
cutoutTextureName:
|
||||
cutoutTextureIndex: 0
|
||||
- CutoutMask: 8
|
||||
renderer: {fileID: 0}
|
||||
SubmeshIndex: 2
|
||||
BoundsMode: 0
|
||||
Bounds:
|
||||
m_Center: {x: 0, y: 0, z: 0}
|
||||
m_Extent: {x: 0.5, y: 0.5, z: 0.5}
|
||||
CutoutThreshold: 0.5
|
||||
CullMode: 2
|
||||
cutoutTextureName:
|
||||
cutoutTextureIndex: 0
|
||||
outlineTargets: []
|
||||
renderStyle: 2
|
||||
outlineParameters:
|
||||
enabled: 1
|
||||
@@ -1343,6 +1265,12 @@ PrefabInstance:
|
||||
insertIndex: -1
|
||||
addedObject: {fileID: 6136554620798806896}
|
||||
m_SourcePrefab: {fileID: 100100000, guid: 0ba3096288d2f75468b134930a1b3786, type: 3}
|
||||
--- !u!1 &3639344109837476642 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 3013041966793261892, guid: 0ba3096288d2f75468b134930a1b3786,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1968624562204270694}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!114 &6136554620798806896
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -1361,3 +1289,9 @@ MonoBehaviour:
|
||||
moveSound:
|
||||
attackSound:
|
||||
hitSound:
|
||||
--- !u!4 &6324130832126456478 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5517515270814782200, guid: 0ba3096288d2f75468b134930a1b3786,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1968624562204270694}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
|
||||
263
Assets/_DefendNJ/Prefabs/Bullets/EnemyBullet.prefab
Normal file
263
Assets/_DefendNJ/Prefabs/Bullets/EnemyBullet.prefab
Normal file
@@ -0,0 +1,263 @@
|
||||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &8963059409775886876
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 6793692404018766890}
|
||||
- component: {fileID: 6324058461413891745}
|
||||
- component: {fileID: 6370555395973974318}
|
||||
- component: {fileID: 3664035240967637835}
|
||||
- component: {fileID: -5162341300548503421}
|
||||
m_Layer: 0
|
||||
m_Name: EnemyBullet
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &6793692404018766890
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 4141549086169371605}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!54 &6324058461413891745
|
||||
Rigidbody:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
serializedVersion: 4
|
||||
m_Mass: 1
|
||||
m_Drag: 0
|
||||
m_AngularDrag: 0.05
|
||||
m_CenterOfMass: {x: 0, y: 0, z: 0}
|
||||
m_InertiaTensor: {x: 1, y: 1, z: 1}
|
||||
m_InertiaRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_IncludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ExcludeLayers:
|
||||
serializedVersion: 2
|
||||
m_Bits: 0
|
||||
m_ImplicitCom: 1
|
||||
m_ImplicitTensor: 1
|
||||
m_UseGravity: 0
|
||||
m_IsKinematic: 0
|
||||
m_Interpolate: 0
|
||||
m_Constraints: 0
|
||||
m_CollisionDetection: 0
|
||||
--- !u!114 &6370555395973974318
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 9b91ecbcc199f4492b9a91e820070131, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
sceneId: 0
|
||||
_assetId: 2489738438
|
||||
serverOnly: 0
|
||||
visible: 0
|
||||
hasSpawned: 0
|
||||
--- !u!114 &3664035240967637835
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: ad225009ad414e1428332cab226f38fd, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
syncDirection: 0
|
||||
syncMode: 0
|
||||
syncInterval: 0
|
||||
interpolationBackTime: 0.1
|
||||
extrapolationMode: 1
|
||||
useExtrapolationTimeLimit: 1
|
||||
extrapolationTimeLimit: 5
|
||||
useExtrapolationDistanceLimit: 0
|
||||
extrapolationDistanceLimit: 20
|
||||
sendPositionThreshold: 0
|
||||
sendRotationThreshold: 0
|
||||
sendScaleThreshold: 0
|
||||
sendVelocityThreshold: 0
|
||||
sendAngularVelocityThreshold: 0
|
||||
receivedPositionThreshold: 0
|
||||
receivedRotationThreshold: 0
|
||||
snapPositionThreshold: 0
|
||||
snapRotationThreshold: 0
|
||||
snapScaleThreshold: 0
|
||||
positionLerpSpeed: 0.85
|
||||
rotationLerpSpeed: 0.85
|
||||
scaleLerpSpeed: 0.85
|
||||
timeCorrectionSpeed: 0.1
|
||||
snapTimeThreshold: 0.3
|
||||
syncPosition: 0
|
||||
syncRotation: 0
|
||||
syncScale: 7
|
||||
syncVelocity: 7
|
||||
syncAngularVelocity: 7
|
||||
isPositionCompressed: 1
|
||||
isRotationCompressed: 1
|
||||
isScaleCompressed: 1
|
||||
isVelocityCompressed: 1
|
||||
isAngularVelocityCompressed: 1
|
||||
automaticallyResetTime: 1
|
||||
isSmoothingAuthorityChanges: 0
|
||||
transformSource: 1
|
||||
whenToUpdateTransform: 0
|
||||
sendRate: 30
|
||||
networkChannel: 1
|
||||
childObjectToSync: {fileID: 0}
|
||||
setVelocityInsteadOfPositionOnNonOwners: 0
|
||||
maxPositionDifferenceForVelocitySyncing: 10
|
||||
useLocalTransformOnly: 0
|
||||
ownerChangeIndicator: 1
|
||||
receivedStatesCounter: 0
|
||||
--- !u!114 &-5162341300548503421
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 79b0be868e90cbf49b71c099da48a427, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
syncDirection: 0
|
||||
syncMode: 0
|
||||
syncInterval: 0
|
||||
type: 0
|
||||
damage: 0
|
||||
deToughness: 0
|
||||
despawn_delay: 0.1
|
||||
auto_despawn_delay: 5
|
||||
impact_prefab: {fileID: 2619052377131353835, guid: 78c8cd4007ebc0d4ebb87a04496629b9,
|
||||
type: 3}
|
||||
impact_despawn_time: 1
|
||||
use_gravity: 0
|
||||
hit_trigger: 0
|
||||
HitLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 4168
|
||||
ownerIndex: 0
|
||||
--- !u!1001 &8419812689156673151
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Modification:
|
||||
serializedVersion: 3
|
||||
m_TransformParent: {fileID: 6793692404018766890}
|
||||
m_Modifications:
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.x
|
||||
value: 0.3
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.y
|
||||
value: -0.63675416
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalScale.z
|
||||
value: 0.23331834
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.y
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalPosition.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.w
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.y
|
||||
value: 0.7071068
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalRotation.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.x
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.y
|
||||
value: 90
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_LocalEulerAnglesHint.z
|
||||
value: 0
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_ConstrainProportionsScale
|
||||
value: 1
|
||||
objectReference: {fileID: 0}
|
||||
- target: {fileID: 8818129224814234099, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
propertyPath: m_Name
|
||||
value: "\u51B2\u950B\u67AA\u5B50\u5F39\u7279\u6548"
|
||||
objectReference: {fileID: 0}
|
||||
m_RemovedComponents: []
|
||||
m_RemovedGameObjects: []
|
||||
m_AddedGameObjects: []
|
||||
m_AddedComponents: []
|
||||
m_SourcePrefab: {fileID: 100100000, guid: ae641cada6d91fd43963cdb01f76ca07, type: 3}
|
||||
--- !u!4 &4141549086169371605 stripped
|
||||
Transform:
|
||||
m_CorrespondingSourceObject: {fileID: 5593633416202067370, guid: ae641cada6d91fd43963cdb01f76ca07,
|
||||
type: 3}
|
||||
m_PrefabInstance: {fileID: 8419812689156673151}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
7
Assets/_DefendNJ/Prefabs/Bullets/EnemyBullet.prefab.meta
Normal file
7
Assets/_DefendNJ/Prefabs/Bullets/EnemyBullet.prefab.meta
Normal file
@@ -0,0 +1,7 @@
|
||||
fileFormatVersion: 2
|
||||
guid: ce01466c6bd352547be7621802ae5110
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -4939,7 +4939,7 @@ GameObject:
|
||||
- component: {fileID: 6324058461413891745}
|
||||
- component: {fileID: 6370555395973974318}
|
||||
- component: {fileID: 3664035240967637835}
|
||||
- component: {fileID: -7713508598546882359}
|
||||
- component: {fileID: 6085299536853988318}
|
||||
m_Layer: 0
|
||||
m_Name: RiflemenBullet
|
||||
m_TagString: Untagged
|
||||
@@ -5065,7 +5065,7 @@ MonoBehaviour:
|
||||
useLocalTransformOnly: 0
|
||||
ownerChangeIndicator: 1
|
||||
receivedStatesCounter: 0
|
||||
--- !u!114 &-7713508598546882359
|
||||
--- !u!114 &6085299536853988318
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -5074,7 +5074,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2c344e1fcc30fd44bb67af3b13884dc7, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 79b0be868e90cbf49b71c099da48a427, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
syncDirection: 0
|
||||
@@ -5092,5 +5092,5 @@ MonoBehaviour:
|
||||
hit_trigger: 0
|
||||
HitLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 328
|
||||
m_Bits: 4168
|
||||
ownerIndex: 0
|
||||
|
||||
@@ -12,7 +12,7 @@ GameObject:
|
||||
- component: {fileID: 6324058461413891745}
|
||||
- component: {fileID: 6370555395973974318}
|
||||
- component: {fileID: 3664035240967637835}
|
||||
- component: {fileID: -7713508598546882359}
|
||||
- component: {fileID: 7341893586916701639}
|
||||
m_Layer: 0
|
||||
m_Name: SniperBullet
|
||||
m_TagString: Untagged
|
||||
@@ -138,7 +138,7 @@ MonoBehaviour:
|
||||
useLocalTransformOnly: 0
|
||||
ownerChangeIndicator: 1
|
||||
receivedStatesCounter: 0
|
||||
--- !u!114 &-7713508598546882359
|
||||
--- !u!114 &7341893586916701639
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
@@ -147,7 +147,7 @@ MonoBehaviour:
|
||||
m_GameObject: {fileID: 8963059409775886876}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 11500000, guid: 2c344e1fcc30fd44bb67af3b13884dc7, type: 3}
|
||||
m_Script: {fileID: 11500000, guid: 79b0be868e90cbf49b71c099da48a427, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
syncDirection: 0
|
||||
@@ -165,7 +165,7 @@ MonoBehaviour:
|
||||
hit_trigger: 0
|
||||
HitLayer:
|
||||
serializedVersion: 2
|
||||
m_Bits: 328
|
||||
m_Bits: 4168
|
||||
ownerIndex: 0
|
||||
--- !u!1001 &1514077745397990603
|
||||
PrefabInstance:
|
||||
|
||||
@@ -2979,6 +2979,37 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &269289164
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 269289165}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (1)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &269289165
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 269289164}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.4, y: 0, z: 2.8}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &278748253
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -3078,6 +3109,37 @@ MonoBehaviour:
|
||||
soundPlayedCustomEvent:
|
||||
willCleanUpDelegatesAfterStop: 1
|
||||
frames: 178
|
||||
--- !u!1 &288165565
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 288165566}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (6)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &288165566
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 288165565}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.39, y: 0, z: 9.82}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &303545512 stripped
|
||||
GameObject:
|
||||
m_CorrespondingSourceObject: {fileID: 6266095018705215562, guid: c5fa52ea1ed72de4599667fabbe4aaff,
|
||||
@@ -5528,7 +5590,7 @@ GameObject:
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &486593705
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -14837,6 +14899,37 @@ MeshCollider:
|
||||
m_Convex: 0
|
||||
m_CookingOptions: 30
|
||||
m_Mesh: {fileID: -7837725574553767475, guid: 32c26d1209602de4abe9cc668ff98466, type: 3}
|
||||
--- !u!1 &768465134
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 768465135}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (5)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &768465135
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 768465134}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.31, y: 0, z: 8.66}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &770704011
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -15264,6 +15357,37 @@ MonoBehaviour:
|
||||
soundPlayedCustomEvent:
|
||||
willCleanUpDelegatesAfterStop: 1
|
||||
frames: 178
|
||||
--- !u!1 &784813476
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 784813477}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (2)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &784813477
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 784813476}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.77, y: 0, z: 4.83}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!95 &788575984 stripped
|
||||
Animator:
|
||||
m_CorrespondingSourceObject: {fileID: 4480269568586102142, guid: c5fa52ea1ed72de4599667fabbe4aaff,
|
||||
@@ -15369,6 +15493,37 @@ MonoBehaviour:
|
||||
soundPlayedCustomEvent:
|
||||
willCleanUpDelegatesAfterStop: 1
|
||||
frames: 178
|
||||
--- !u!1 &808637571
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 808637572}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (3)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &808637572
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 808637571}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.03, y: 0, z: 6.16}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &843937988
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -16908,6 +17063,37 @@ MonoBehaviour:
|
||||
pivotPointRoot: {fileID: 0}
|
||||
spreadOutCount: 1
|
||||
showGraphs: 1
|
||||
--- !u!1 &981135079
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 981135080}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject (4)
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &981135080
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 981135079}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -1.99, y: 0, z: 7.58}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &991621837
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -21605,6 +21791,14 @@ MonoBehaviour:
|
||||
doorPos: {fileID: 1128989868}
|
||||
pkPos: {fileID: 107388154}
|
||||
gQPos: {fileID: 508421177}
|
||||
endPkPos:
|
||||
- {fileID: 2104348669}
|
||||
- {fileID: 269289165}
|
||||
- {fileID: 784813477}
|
||||
- {fileID: 808637572}
|
||||
- {fileID: 981135080}
|
||||
- {fileID: 768465135}
|
||||
- {fileID: 288165566}
|
||||
doorAnim: {fileID: 788575984}
|
||||
--- !u!1 &1318686166
|
||||
GameObject:
|
||||
@@ -24973,6 +25167,44 @@ AudioSource:
|
||||
m_PreInfinity: 2
|
||||
m_PostInfinity: 2
|
||||
m_RotationOrder: 4
|
||||
--- !u!1 &1639932167
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1639932168}
|
||||
m_Layer: 0
|
||||
m_Name: EndPkPos
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1639932168
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1639932167}
|
||||
serializedVersion: 2
|
||||
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_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 2104348669}
|
||||
- {fileID: 269289165}
|
||||
- {fileID: 784813477}
|
||||
- {fileID: 808637572}
|
||||
- {fileID: 981135080}
|
||||
- {fileID: 768465135}
|
||||
- {fileID: 288165566}
|
||||
m_Father: {fileID: 2071473052}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1655778615
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
@@ -30120,6 +30352,7 @@ Transform:
|
||||
- {fileID: 894118429}
|
||||
- {fileID: 107388154}
|
||||
- {fileID: 508421177}
|
||||
- {fileID: 1639932168}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2083177534
|
||||
@@ -30672,6 +30905,37 @@ MonoBehaviour:
|
||||
soundPlayedCustomEvent:
|
||||
willCleanUpDelegatesAfterStop: 1
|
||||
frames: 178
|
||||
--- !u!1 &2104348668
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 2104348669}
|
||||
m_Layer: 0
|
||||
m_Name: GameObject
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &2104348669
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2104348668}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: -2.87, y: 0, z: 1.01}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1639932168}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &2111750524
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
||||
@@ -204,6 +204,7 @@ public class Bullet : NetworkBehaviour
|
||||
OnApplyDamage(component);
|
||||
}
|
||||
|
||||
Debug.Log("受伤单位："+_handlingHit.collider.name);
|
||||
Player hitPlayer = _handlingHit.transform.GetComponentInParent<Player>();
|
||||
if (hitPlayer != null)
|
||||
{
|
||||
|
||||
23
Assets/_DefendNJ/Scripts/Bullets/EnemyBullet.cs
Normal file
23
Assets/_DefendNJ/Scripts/Bullets/EnemyBullet.cs
Normal file
@@ -0,0 +1,23 @@
|
||||
using System.Collections;
|
||||
using System.Collections.Generic;
|
||||
using DragonLi.Frame;
|
||||
using Mirror;
|
||||
using UnityEngine;
|
||||
|
||||
public class EnemyBullet : Bullet
|
||||
{
|
||||
[Server]
|
||||
public override void OnSpawn(int ownerIndex, Vector3 recoil, float recoilCount)
|
||||
{
|
||||
base.OnSpawn(ownerIndex, recoil, recoilCount);
|
||||
type = BulletType.Enemy;
|
||||
//BulletInfo bulletInfo = GameManager.Ins.BulletInfos[type];
|
||||
damage = 100;
|
||||
deToughness = 1;
|
||||
}
|
||||
|
||||
public override void OnApplyDamage(IDamagable damagable)
|
||||
{
|
||||
damagable.ApplyDamage(damage, ownerIndex, transform);
|
||||
}
|
||||
}
|
||||
11
Assets/_DefendNJ/Scripts/Bullets/EnemyBullet.cs.meta
Normal file
11
Assets/_DefendNJ/Scripts/Bullets/EnemyBullet.cs.meta
Normal file
@@ -0,0 +1,11 @@
|
||||
fileFormatVersion: 2
|
||||
guid: 79b0be868e90cbf49b71c099da48a427
|
||||
MonoImporter:
|
||||
externalObjects: {}
|
||||
serializedVersion: 2
|
||||
defaultReferences: []
|
||||
executionOrder: 0
|
||||
icon: {instanceID: 0}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
@@ -9,6 +9,7 @@ public enum BulletType
|
||||
BeamBullet = 4,
|
||||
GrenadeBullet = 5,
|
||||
PlayerAi=6,
|
||||
Enemy=7,
|
||||
}
|
||||
|
||||
public class BulletInfo
|
||||
|
||||
@@ -103,9 +103,12 @@ public class GameLocal : MonoBehaviour
|
||||
public Transform pkPos;
|
||||
|
||||
public Transform gQPos;
|
||||
|
||||
public Transform[] endPkPos;
|
||||
|
||||
public Animator doorAnim;
|
||||
|
||||
|
||||
void Start()
|
||||
{
|
||||
Ins = this;
|
||||
|
||||
@@ -109,7 +109,7 @@ public class GunAiComponent : MonoBehaviour
|
||||
return;
|
||||
|
||||
// 生成子弹
|
||||
GameObject bullet = Instantiate(bulletPre, showPos.position, Quaternion.identity);
|
||||
GameObject bullet = Instantiate(bulletPre, showPos.position, Quaternion.identity,transform);
|
||||
NetworkServer.Spawn(bullet);
|
||||
bullet.SetActive(true);
|
||||
if (bullet.GetComponent<Bullet>())
|
||||
|
||||
@@ -229,8 +229,8 @@ public class GameManager : NetworkBehaviour
|
||||
public void CreateNextRound()
|
||||
{
|
||||
roundIndex++;
|
||||
roundWaveTime = 5;
|
||||
curRoundWaveTime = 2;
|
||||
roundWaveTime = 3;
|
||||
curRoundWaveTime = 1;
|
||||
RpcMessageRound();
|
||||
}
|
||||
|
||||
|
||||
@@ -127,26 +127,26 @@ public class Player : NetworkRoomPlayer,IDamagable
|
||||
Vector3 directionFormHit=(transform.position-_sender.position).normalized;
|
||||
float angle = Vector3.Angle(forward, directionFormHit);
|
||||
int index = Random.Range(0, 4);
|
||||
//TrueGearEffectManager.Ins.OnHit(angle > 90,index,false);
|
||||
TrueGearEffectManager.Ins.OnHit(angle > 90,index,false);
|
||||
}
|
||||
#endif
|
||||
if (currentHp <= 0 && IsAlive)
|
||||
{
|
||||
IsAlive = false;
|
||||
isDie = true;
|
||||
GameLocal.Ins.DieUI.SetActive(true);
|
||||
GameManager.Ins.PlaySound2DRPC("1.35");
|
||||
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
|
||||
{
|
||||
IsAlive = true;
|
||||
isDie = false;
|
||||
GameLocal.Ins.DieUI.SetActive(false);
|
||||
currentHp = maxHp;
|
||||
EventDispatcher.TriggerEvent("HpChange", currentHp, maxHp);
|
||||
time = 0f;
|
||||
}, 5f, this);
|
||||
}
|
||||
else if (currentHp > 0)
|
||||
// if (currentHp <= 0 && IsAlive)
|
||||
// {
|
||||
// IsAlive = false;
|
||||
// isDie = true;
|
||||
// GameLocal.Ins.DieUI.SetActive(true);
|
||||
// GameManager.Ins.PlaySound2DRPC("1.35");
|
||||
// MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
|
||||
// {
|
||||
// IsAlive = true;
|
||||
// isDie = false;
|
||||
// GameLocal.Ins.DieUI.SetActive(false);
|
||||
// currentHp = maxHp;
|
||||
// EventDispatcher.TriggerEvent("HpChange", currentHp, maxHp);
|
||||
// time = 0f;
|
||||
// }, 5f, this);
|
||||
// }
|
||||
if (currentHp > 0)
|
||||
{
|
||||
GameLocal.Ins.HitUI.SetActive(true);
|
||||
MonoSingleton<CoroutineTaskManager>.Instance.WaitSecondTodo(() =>
|
||||
|
||||
@@ -5,7 +5,7 @@ EditorBuildSettings:
|
||||
m_ObjectHideFlags: 0
|
||||
serializedVersion: 2
|
||||
m_Scenes:
|
||||
- enabled: 0
|
||||
- enabled: 1
|
||||
path: Assets/_DefendNJ/Scenes/Company1Floor.unity
|
||||
guid: 386a8fdea01af8a4e8d4a9835407ddec
|
||||
- enabled: 0
|
||||
@@ -59,7 +59,7 @@ EditorBuildSettings:
|
||||
- enabled: 0
|
||||
path: Assets/_DefendNJ/Scenes/Gansu_Jinchang_Jinchuan_Shijiguangchang_Shiwai.unity
|
||||
guid: 8acc03c01fa495e46ab61cbd7b6f277f
|
||||
- enabled: 1
|
||||
- enabled: 0
|
||||
path: Assets/_DefendNJ/Scenes/Yangzhou_Hanjiang_TansuoZhongxin_Waidai.unity
|
||||
guid: 0fe651c1fb955904688361a328dc07f7
|
||||
m_configObjects:
|
||||
|
||||
@@ -13,7 +13,7 @@ PlayerSettings:
|
||||
useOnDemandResources: 0
|
||||
accelerometerFrequency: 60
|
||||
companyName: pineappletech
|
||||
productName: "\u4FDD\u536B\u91D1\u9675_\u5916\u5E26"
|
||||
productName: "\u4FDD\u536B\u91D1\u9675_\u4F53\u9A8C"
|
||||
defaultCursor: {fileID: 0}
|
||||
cursorHotspot: {x: 0, y: 0}
|
||||
m_SplashScreenBackgroundColor: {r: 0.13725491, g: 0.12156863, b: 0.1254902, a: 1}
|
||||
@@ -142,7 +142,9 @@ PlayerSettings:
|
||||
visionOSBundleVersion: 1.0
|
||||
tvOSBundleVersion: 1.0
|
||||
bundleVersion: 1.0.0
|
||||
preloadedAssets: []
|
||||
preloadedAssets:
|
||||
- {fileID: 1814176829808956018, guid: 58f40b12bbc864f3c96c6505a9a1e1e3, type: 2}
|
||||
- {fileID: 11400000, guid: d0f8149c48842b4488cf6fb974cff9a2, type: 2}
|
||||
metroInputSource: 0
|
||||
wsaTransparentSwapchain: 0
|
||||
m_HolographicPauseOnTrackingLoss: 1
|
||||
@@ -163,7 +165,7 @@ PlayerSettings:
|
||||
androidSupportedAspectRatio: 1
|
||||
androidMaxAspectRatio: 2.1
|
||||
applicationIdentifier:
|
||||
Android: com.pineappletech.defendjinling.yangzhouhanjiangtansuozhongxinwaidai
|
||||
Android: com.pineappletech.defendnj.gongsi1lou
|
||||
Standalone: com.DefaultCompany.com.unity.template.ar
|
||||
buildNumber:
|
||||
Standalone: 0
|
||||
@@ -254,7 +256,7 @@ PlayerSettings:
|
||||
clonedFromGUID: 513da609dad384f5694c9cb4841b1830
|
||||
templatePackageId: com.unity.template.ar@3.0.2
|
||||
templateDefaultScene:
|
||||
useCustomMainManifest: 0
|
||||
useCustomMainManifest: 1
|
||||
useCustomLauncherManifest: 0
|
||||
useCustomMainGradleTemplate: 0
|
||||
useCustomLauncherGradleManifest: 0
|
||||
|
||||
Reference in New Issue
Block a user