Skip to content

GitLab

T
Turtle Takeover Reloaded
Commit 48f6df14 authored by RaptorTwitch's avatar RaptorTwitch
Browse files
Options

no message

parent 46c70aed
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1713 additions and 6 deletions
Assets/_Game/Graphics/PlayerModel/PlayerModel.fbx.meta
View file @ 48f6df14
......@@ -72,7 +72,7 @@ ModelImporter:
isReadable: 0
meshes:
lODScreenPercentages: []
globalScale: 1
globalScale: 0.5
meshCompression: 0
addColliders: 0
useSRGBMaterialColor: 1
......@@ -119,7 +119,7 @@ ModelImporter:
armStretch: 0.05
legStretch: 0.05
feetSpacing: 0
globalScale: 1
globalScale: 0.005
rootMotionBoneName:
hasTranslationDoF: 0
hasExtraRoot: 0
......
Assets/_Game/Graphics/PlayerModel/textures/PlayerModel_Material_MetallicSmoothness.tif.meta
View file @ 48f6df14
......@@ -7,7 +7,7 @@ TextureImporter:
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
sRGBTexture: 0
linearTexture: 0
fadeOut: 0
borderMipMap: 0
......@@ -49,7 +49,7 @@ TextureImporter:
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 0
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
......@@ -70,6 +70,18 @@ TextureImporter:
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
......
Assets/_Game/Prefabs/Player.prefab 0 → 100644
View file @ 48f6df14
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &1838075967204177853
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1838075967204177857}
- component: {fileID: 1838075967204177856}
- component: {fileID: 1838075967204177859}
- component: {fileID: 1838075967204177858}
- component: {fileID: 1838075967204177862}
- component: {fileID: 1838075967204177863}
- component: {fileID: 1838075967204177860}
m_Layer: 0
m_Name: Player
m_TagString: Player
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1838075967204177857
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
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:
- {fileID: 6699276605682576204}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &1838075967204177856
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!23 &1838075967204177859
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
m_Enabled: 0
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10303, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!65 &1838075967204177858
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 1, y: 1, z: 1}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &1838075967204177862
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 49a43d31339cabe429cfc681a7d5609f, type: 3}
m_Name:
m_EditorClassIdentifier:
accel: 90
rot: 0
attkSpeed: 40
damage: 1
hp: 3
maxhp: 0
PlayerModel: {fileID: 7684202323498604895}
--- !u!54 &1838075967204177863
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
serializedVersion: 2
m_Mass: 1
m_Drag: 9
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 0
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &1838075967204177860
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1838075967204177853}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 6249cfc2dc61cb64582ee3de38f25652, type: 3}
m_Name:
m_EditorClassIdentifier:
pf_bulletCluster: {fileID: 8619152150821977904, guid: e8677d7e3f737654881c72a0c0d88c3d,
type: 3}
pf_bullet: {fileID: 8778073330423009085, guid: 42a1d25853eebe342b168b7069ec815c,
type: 3}
--- !u!1001 &1838075967555420246
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1838075967204177857}
m_Modifications:
- target: {fileID: -927199367670048503, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Name
value: PlayerModel
objectReference: {fileID: 0}
- target: {fileID: -6057140222963153312, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Controller
value:
objectReference: {fileID: 9100000, guid: b57a7d6008401884681f587f48d37a71, type: 2}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalPosition.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalPosition.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalPosition.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalRotation.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalRotation.y
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalRotation.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalRotation.w
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 180
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalScale.x
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalScale.y
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_LocalScale.z
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 5715126579143232267, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
propertyPath: m_Materials.Array.data[0]
value:
objectReference: {fileID: 2100000, guid: f467f017358729d418bf38c40e7b984c, type: 2}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 2ddf822bc9c1563449d56162810bc54b, type: 3}
--- !u!1 &7684202323498604895 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: -927199367670048503, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
--- !u!4 &6699276605682576204 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 2ddf822bc9c1563449d56162810bc54b,
type: 3}
m_PrefabInstance: {fileID: 1838075967555420246}
m_PrefabAsset: {fileID: 0}
Assets/_Game/Prefabs/Player.prefab.meta 0 → 100644
View file @ 48f6df14
fileFormatVersion: 2
guid: 5f85ce20b216cb94898ce436b394cc70
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scenes/PlayerTestScene.unity
View file @ 48f6df14
......@@ -504,7 +504,7 @@ Camera:
near clip plane: 0.3
far clip plane: 1000
field of view: 60
orthographic: 0
orthographic: 1
orthographic size: 5
m_Depth: -1
m_CullingMask:
......
Assets/_Game/Scenes/StaticScene.unity 0 → 100644
View file @ 48f6df14
This diff is collapsed.
Assets/_Game/Scenes/StaticScene.unity.meta 0 → 100644
View file @ 48f6df14
fileFormatVersion: 2
guid: 78c0aafb6982c0f499727ecfd916764f
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/_Game/Scripts/PrimaryWeaponLogic.cs
View file @ 48f6df14
......@@ -23,7 +23,7 @@ public class PrimaryWeaponLogic : MonoBehaviour
{
for(int i = 0; i < bulletPool.Length; i++)
{
GameObject cluster = Instantiate(pf_bulletCluster, new Vector3(0, 100, 0), Quaternion.identity);
GameObject cluster = Instantiate(pf_bulletCluster, new Vector3(0, -100, 0), Quaternion.identity);
bulletPool[i] = cluster;
}
foreach (GameObject cluster in bulletPool)
......
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