Commit b2763c4c authored by Nancy Wan's avatar Nancy Wan
Browse files

first commit

parent 4e8df52a
Pipeline #217 failed with stages
in 21 seconds
# ===========================
# Default Collab Ignore Rules
# ===========================
# OS Generated
# ============
.DS_Store
._*
.Spotlight-V100
.Trashes
Icon?
ehthumbs.db
[Tt]humbs.db
[Dd]esktop.ini
# Visual Studio / MonoDevelop generated
# =====================================
[Ee]xported[Oo]bj/
*.userprefs
*.csproj
*.pidb
*.suo
*.sln
*.user
*.unityproj
*.booproj
# Unity generated
# ===============
[Oo]bj/
[Bb]uild
sysinfo.txt
*.stackdump
# This .gitignore file should be placed at the root of your Unity project directory
#
# Get latest from https://github.com/github/gitignore/blob/master/Unity.gitignore
#
/[Ll]ibrary/
/[Tt]emp/
/[Oo]bj/
/[Bb]uild/
/[Bb]uilds/
/[Ll]ogs/
/[Uu]ser[Ss]ettings/
# MemoryCaptures can get excessive in size.
# They also could contain extremely sensitive data
/[Mm]emoryCaptures/
# Asset meta data should only be ignored when the corresponding asset is also ignored
!/[Aa]ssets/**/*.meta
# Uncomment this line if you wish to ignore the asset store tools plugin
# /[Aa]ssets/AssetStoreTools*
# Autogenerated Jetbrains Rider plugin
/[Aa]ssets/Plugins/Editor/JetBrains*
# Visual Studio cache directory
.vs/
# Gradle cache directory
.gradle/
# Autogenerated VS/MD/Consulo solution and project files
ExportedObj/
.consulo/
*.csproj
*.unityproj
*.sln
*.suo
*.tmp
*.user
*.userprefs
*.pidb
*.booproj
*.svd
*.pdb
*.mdb
*.opendb
*.VC.db
# Unity3D generated meta files
*.pidb.meta
*.pdb.meta
*.mdb.meta
# Unity3D generated file on crash reports
sysinfo.txt
# Builds
*.apk
*.aab
*.unitypackage
# Crashlytics generated file
crashlytics-build.properties
# Packed Addressables
/[Aa]ssets/[Aa]ddressable[Aa]ssets[Dd]ata/*/*.bin*
# Temporary auto-generated Android Assets
/[Aa]ssets/[Ss]treamingAssets/aa.meta
/[Aa]ssets/[Ss]treamingAssets/aa/*
\ No newline at end of file
<Properties StartupConfiguration="{216EC53D-DB2C-3701-E2B5-3044A55DBC70}|">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/GarbageController.cs">
<MonoDevelop.Ide.Workbench ActiveDocument="Assets/Scripts/BubbleBarController.cs">
<Files>
<File FileName="Assets/Scripts/Player.cs" Line="32" Column="69" />
<File FileName="Assets/Scripts/Singleton.cs" Line="25" Column="10" />
<File FileName="../../../UnityLearning/SimpleGame1/Assets/Scripts/PlayerController.cs" Line="23" Column="32" />
<File FileName="Assets/Scripts/BulletController.cs" Line="23" Column="64" />
<File FileName="Assets/Scripts/GunController.cs" Line="30" Column="79" />
<File FileName="Assets/Scripts/GarbageSpawner.cs" Line="20" Column="66" />
<File FileName="Assets/Scripts/GarbageController.cs" Line="1" Column="1" />
<File FileName="Assets/Scripts/Singleton.cs" Line="35" Column="38" />
<File FileName="../../../UnityLearning/SimpleGame1/Assets/Scripts/PlayerController.cs" />
<File FileName="Assets/Scripts/BulletController.cs" Line="40" Column="31" />
<File FileName="Assets/Scripts/GunController.cs" />
<File FileName="Assets/Scripts/GarbageSpawner.cs" Line="16" Column="22" />
<File FileName="Assets/Scripts/GarbageController.cs" Line="18" Column="12" />
<File FileName="Assets/Scripts/ShapeOptimizationHelper.cs" />
<File FileName="Assets/Scripts/PolygonColliderOptimizer.cs" />
<File FileName="Assets/Scripts/EnemyController.cs" Line="120" Column="51" />
<File FileName="Assets/Scripts/PlayerController.cs" Line="104" Column="34" />
<File FileName="Assets/Scripts/HelperSpawner.cs" />
<File FileName="Assets/Scripts/HelperController.cs" />
<File FileName="Assets/Scripts/HealthBarController.cs" Line="21" Column="28" />
<File FileName="Assets/Scripts/GameUIManager.cs" Line="29" Column="65" />
<File FileName="Assets/Scripts/Timer.cs" />
<File FileName="Assets/Scripts/Restart.cs" />
<File FileName="Assets/Scripts/OxygenController.cs" Line="80" Column="36" />
</Files>
<Pads>
<Pad Id="ProjectPad">
......@@ -15,7 +25,7 @@
<Node name="OceanNinja" expanded="True">
<Node name="Assets" expanded="True">
<Node name="Scripts" expanded="True">
<Node name="GarbageController.cs" selected="True" />
<Node name="BubbleBarController.cs" selected="True" />
</Node>
</Node>
</Node>
......@@ -25,7 +35,7 @@
</MonoDevelop.Ide.Workbench>
<MonoDevelop.Ide.DebuggingService.PinnedWatches />
<MonoDevelop.Ide.Workspace ActiveConfiguration="Debug" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="73355e22-a090-40f0-887d-4a11ea4c22ed" />
<MonoDevelop.Ide.ItemProperties.Assembly-CSharp PreferredExecutionTarget="a88dae99-8cd2-43f2-b5d7-04c1f5fc9317" />
<MonoDevelop.Ide.DebuggingService.Breakpoints>
<BreakpointStore />
</MonoDevelop.Ide.DebuggingService.Breakpoints>
......
This diff is collapsed.
fileFormatVersion: 2
guid: d1632c4b1fe994d32853852b0bec6d9b
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1107 &-4788115098956685482
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 8218592276306137328}
m_Position: {x: 200, y: 0, z: 0}
- serializedVersion: 1
m_State: {fileID: 6525237956543842303}
m_Position: {x: 220, y: 80, z: 0}
m_ChildStateMachines: []
m_AnyStateTransitions: []
m_EntryTransitions: []
m_StateMachineTransitions: {}
m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 50, y: 120, z: 0}
m_ExitPosition: {x: 800, y: 120, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 8218592276306137328}
--- !u!1101 &-1838902483521006914
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 4
m_ConditionEvent: Speed
m_EventTreshold: 0.51
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 8218592276306137328}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.2105264
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy
serializedVersion: 5
m_AnimatorParameters:
- m_Name: Speed
m_Type: 1
m_DefaultFloat: 0
m_DefaultInt: 0
m_DefaultBool: 0
m_Controller: {fileID: 0}
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: -4788115098956685482}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1101 &2290336704153085577
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions: []
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6525237956543842303}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0.25
m_TransitionOffset: 0
m_ExitTime: 0
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &6525237956543842303
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Attack
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: -1838902483521006914}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 049c7f445ae614e96bb4354cbb76e336, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1101 &6691239535056422676
AnimatorStateTransition:
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name:
m_Conditions:
- m_ConditionMode: 3
m_ConditionEvent: Speed
m_EventTreshold: 0.51
m_DstStateMachine: {fileID: 0}
m_DstState: {fileID: 6525237956543842303}
m_Solo: 0
m_Mute: 0
m_IsExit: 0
serializedVersion: 3
m_TransitionDuration: 0
m_TransitionOffset: 0
m_ExitTime: 0.0000000022414923
m_HasExitTime: 1
m_HasFixedDuration: 1
m_InterruptionSource: 0
m_OrderedInterruption: 1
m_CanTransitionToSelf: 1
--- !u!1102 &8218592276306137328
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Swim
m_Speed: 1
m_CycleOffset: 0
m_Transitions:
- {fileID: 6691239535056422676}
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 46b68686e5c804cc4bafc73b23cd875e, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
fileFormatVersion: 2
guid: 84ced50e03f5d4d2699fd654fdebedc5
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 9100000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Attack
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: 0a6db4275ba2240ab93a067f38174827, type: 3}
- time: 0.033333335
value: {fileID: 21300000, guid: 9de02e8da29774bb4a2b8f1f60841f2b, type: 3}
- time: 0.06666667
value: {fileID: 21300000, guid: fc29e55df58604945ac997f896113732, type: 3}
- time: 0.11666667
value: {fileID: 21300000, guid: 61f1f844e4876433296b9272ebd50538, type: 3}
- time: 0.16666667
value: {fileID: 21300000, guid: 755cc06f8c7294eb980d7a58da67a985, type: 3}
- time: 0.23333333
value: {fileID: 21300000, guid: 61f1f844e4876433296b9272ebd50538, type: 3}
- time: 0.3
value: {fileID: 21300000, guid: 0d12f1bfae76d4988a3a902dfe01aa84, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 60
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: 0a6db4275ba2240ab93a067f38174827, type: 3}
- {fileID: 21300000, guid: 9de02e8da29774bb4a2b8f1f60841f2b, type: 3}
- {fileID: 21300000, guid: fc29e55df58604945ac997f896113732, type: 3}
- {fileID: 21300000, guid: 61f1f844e4876433296b9272ebd50538, type: 3}
- {fileID: 21300000, guid: 755cc06f8c7294eb980d7a58da67a985, type: 3}
- {fileID: 21300000, guid: 61f1f844e4876433296b9272ebd50538, type: 3}
- {fileID: 21300000, guid: 0d12f1bfae76d4988a3a902dfe01aa84, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.3166667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 049c7f445ae614e96bb4354cbb76e336
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!74 &7400000
AnimationClip:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Enemy_Swim
serializedVersion: 6
m_Legacy: 0
m_Compressed: 0
m_UseHighQualityCurve: 1
m_RotationCurves: []
m_CompressedRotationCurves: []
m_EulerCurves: []
m_PositionCurves: []
m_ScaleCurves: []
m_FloatCurves: []
m_PPtrCurves:
- curve:
- time: 0
value: {fileID: 21300000, guid: bfd5bc0781308451ea2562037bee20fb, type: 3}
- time: 0.041666668
value: {fileID: 21300000, guid: ae4ab152201b945ab8966b0c88c7ac3d, type: 3}
- time: 0.083333336
value: {fileID: 21300000, guid: 6aa188edbfc604e8b939b17df6d3c8a1, type: 3}
- time: 0.125
value: {fileID: 21300000, guid: ecc5528d6671d443b898f8004c287094, type: 3}
attribute: m_Sprite
path:
classID: 212
script: {fileID: 0}
m_SampleRate: 24
m_WrapMode: 0
m_Bounds:
m_Center: {x: 0, y: 0, z: 0}
m_Extent: {x: 0, y: 0, z: 0}
m_ClipBindingConstant:
genericBindings:
- serializedVersion: 2
path: 0
attribute: 0
script: {fileID: 0}
typeID: 212
customType: 23
isPPtrCurve: 1
pptrCurveMapping:
- {fileID: 21300000, guid: bfd5bc0781308451ea2562037bee20fb, type: 3}
- {fileID: 21300000, guid: ae4ab152201b945ab8966b0c88c7ac3d, type: 3}
- {fileID: 21300000, guid: 6aa188edbfc604e8b939b17df6d3c8a1, type: 3}
- {fileID: 21300000, guid: ecc5528d6671d443b898f8004c287094, type: 3}
m_AnimationClipSettings:
serializedVersion: 2
m_AdditiveReferencePoseClip: {fileID: 0}
m_AdditiveReferencePoseTime: 0
m_StartTime: 0
m_StopTime: 0.16666667
m_OrientationOffsetY: 0
m_Level: 0
m_CycleOffset: 0
m_HasAdditiveReferencePose: 0
m_LoopTime: 1
m_LoopBlend: 0
m_LoopBlendOrientation: 0
m_LoopBlendPositionY: 0
m_LoopBlendPositionXZ: 0
m_KeepOriginalOrientation: 0
m_KeepOriginalPositionY: 1
m_KeepOriginalPositionXZ: 0
m_HeightFromFeet: 0
m_Mirror: 0
m_EditorCurves: []
m_EulerEditorCurves: []
m_HasGenericRootTransform: 0
m_HasMotionFloatCurves: 0
m_Events: []
fileFormatVersion: 2
guid: 46b68686e5c804cc4bafc73b23cd875e
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 7400000
userData:
assetBundleName:
assetBundleVariant:
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!91 &9100000
AnimatorController:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Helper
serializedVersion: 5
m_AnimatorParameters: []
m_AnimatorLayers:
- serializedVersion: 5
m_Name: Base Layer
m_StateMachine: {fileID: 2872253374274325672}
m_Mask: {fileID: 0}
m_Motions: []
m_Behaviours: []
m_BlendingMode: 0
m_SyncedLayerIndex: -1
m_DefaultWeight: 0
m_IKPass: 0
m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000}
--- !u!1102 &2193702029437145451
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Helper_Swim
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 9f4293301cb0b4deeb19a21a42e60fe6, type: 2}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &2872253374274325672
AnimatorStateMachine:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Base Layer
m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 2193702029437145451}
m_Position: {x: 250, y: 70, z: 0}
m_ChildStateMachines: []