Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
G
GalaxySmash
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Hà Trung (NEGAXY)
GalaxySmash
Commits
4551ba16
Commit
4551ba16
authored
Dec 08, 2021
by
Hà Trung (NEGAXY)
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
no message
parent
27192a82
Changes
11
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
1979 additions
and
1136 deletions
+1979
-1136
Show.anim
Assets/Game Resources/Animations/Show.anim
+452
-92
Skills.meta
Assets/Game Resources/Prefabs/Skills.meta
+8
-0
Dragon.prefab
Assets/Game Resources/Prefabs/Skills/Dragon.prefab
+392
-0
Dragon.prefab.meta
Assets/Game Resources/Prefabs/Skills/Dragon.prefab.meta
+7
-0
Naruto_Skill.prefab
Assets/Game Resources/Prefabs/Skills/Naruto_Skill.prefab
+125
-20
Naruto_Skill.prefab.meta
...ts/Game Resources/Prefabs/Skills/Naruto_Skill.prefab.meta
+0
-0
Squid_Skill.prefab
Assets/Game Resources/Prefabs/Skills/Squid_Skill.prefab
+275
-0
Squid_Skill.prefab.meta
Assets/Game Resources/Prefabs/Skills/Squid_Skill.prefab.meta
+7
-0
Controller.cs
...ts/OSG Infinity Square Space/Player/Scripts/Controller.cs
+17
-1
main.unity
Assets/OSG Infinity Square Space/Scenes/main.unity
+679
-1023
NewSkillSystemGUI.cs
Assets/Scripts/UI/NewSkillSystemGUI.cs
+17
-0
No files found.
Assets/Game Resources/Animations/Show.anim
View file @
4551ba16
This diff is collapsed.
Click to expand it.
Assets/Game Resources/Prefabs/Skills.meta
0 → 100644
View file @
4551ba16
fileFormatVersion: 2
guid: acc4b4f34f68acf498e5cbe11ce1a291
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Prefabs/Skills/Dragon.prefab
0 → 100644
View file @
4551ba16
This diff is collapsed.
Click to expand it.
Assets/Game Resources/Prefabs/Skills/Dragon.prefab.meta
0 → 100644
View file @
4551ba16
fileFormatVersion: 2
guid: 4293ef2ddf655d54e9d94ab20de00374
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/Game Resources/Prefabs/Naruto_Skill.prefab
→
Assets/Game Resources/Prefabs/
Skills/
Naruto_Skill.prefab
View file @
4551ba16
...
...
@@ -9,6 +9,7 @@ GameObject:
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
1147355751034001059
}
-
component
:
{
fileID
:
1026549548
}
m_Layer
:
0
m_Name
:
Naruto_Skill
m_TagString
:
Untagged
...
...
@@ -35,6 +36,25 @@ Transform:
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!95
&1026549548
Animator
:
serializedVersion
:
3
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751034001058
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
cb996aa7a0f62794d82ba180fbdf4342
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!1
&1147355751241795380
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -47,9 +67,10 @@ GameObject:
-
component
:
{
fileID
:
1147355751241795384
}
-
component
:
{
fileID
:
1147355751241795387
}
-
component
:
{
fileID
:
1147355751241795386
}
m_Layer
:
0
-
component
:
{
fileID
:
1026549553
}
m_Layer
:
12
m_Name
:
Cylinder
m_TagString
:
Untagged
m_TagString
:
Bullet Eraser
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -63,7 +84,7 @@ Transform:
m_GameObject
:
{
fileID
:
1147355751241795380
}
m_LocalRotation
:
{
x
:
0.07821518
,
y
:
-0
,
z
:
-0
,
w
:
0.99693656
}
m_LocalPosition
:
{
x
:
-1.6
,
y
:
2.2
,
z
:
-0.7
}
m_LocalScale
:
{
x
:
5
,
y
:
50
,
z
:
5
}
m_LocalScale
:
{
x
:
4
,
y
:
50
,
z
:
4
}
m_Children
:
[]
m_Father
:
{
fileID
:
1147355751034001059
}
m_RootOrder
:
0
...
...
@@ -125,12 +146,28 @@ CapsuleCollider:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751241795380
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_IsTrigger
:
1
m_Enabled
:
1
m_Radius
:
0.5000001
m_Height
:
2
m_Direction
:
1
m_Center
:
{
x
:
0.000000059604645
,
y
:
0
,
z
:
-0.00000008940697
}
---
!u!54
&1026549553
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751241795380
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
---
!u!1
&1147355751244044903
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -143,9 +180,10 @@ GameObject:
-
component
:
{
fileID
:
1147355751244044907
}
-
component
:
{
fileID
:
1147355751244044906
}
-
component
:
{
fileID
:
1147355751244044901
}
m_Layer
:
0
-
component
:
{
fileID
:
1026549549
}
m_Layer
:
12
m_Name
:
Cylinder (4)
m_TagString
:
Untagged
m_TagString
:
Bullet Eraser
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -159,7 +197,7 @@ Transform:
m_GameObject
:
{
fileID
:
1147355751244044903
}
m_LocalRotation
:
{
x
:
-0.19885284
,
y
:
-0
,
z
:
-0
,
w
:
0.9800294
}
m_LocalPosition
:
{
x
:
-4.7
,
y
:
-5.5
,
z
:
-18.3
}
m_LocalScale
:
{
x
:
5
,
y
:
50
,
z
:
5
}
m_LocalScale
:
{
x
:
4
,
y
:
50
,
z
:
4
}
m_Children
:
[]
m_Father
:
{
fileID
:
1147355751034001059
}
m_RootOrder
:
4
...
...
@@ -221,12 +259,28 @@ CapsuleCollider:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751244044903
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_IsTrigger
:
1
m_Enabled
:
1
m_Radius
:
0.5000001
m_Height
:
2
m_Direction
:
1
m_Center
:
{
x
:
0.000000059604645
,
y
:
0
,
z
:
-0.00000008940697
}
---
!u!54
&1026549549
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751244044903
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
---
!u!1
&1147355751954179708
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -239,9 +293,10 @@ GameObject:
-
component
:
{
fileID
:
1147355751954179648
}
-
component
:
{
fileID
:
1147355751954179651
}
-
component
:
{
fileID
:
1147355751954179650
}
m_Layer
:
0
-
component
:
{
fileID
:
1026549550
}
m_Layer
:
12
m_Name
:
Cylinder (3)
m_TagString
:
Untagged
m_TagString
:
Bullet Eraser
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -255,7 +310,7 @@ Transform:
m_GameObject
:
{
fileID
:
1147355751954179708
}
m_LocalRotation
:
{
x
:
-0.21304369
,
y
:
-0.055857334
,
z
:
0.24738747
,
w
:
0.9435528
}
m_LocalPosition
:
{
x
:
-9.9
,
y
:
-3.2
,
z
:
3.3
}
m_LocalScale
:
{
x
:
5
,
y
:
50
,
z
:
5
}
m_LocalScale
:
{
x
:
4
,
y
:
50
,
z
:
4
}
m_Children
:
[]
m_Father
:
{
fileID
:
1147355751034001059
}
m_RootOrder
:
3
...
...
@@ -317,12 +372,28 @@ CapsuleCollider:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751954179708
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_IsTrigger
:
1
m_Enabled
:
1
m_Radius
:
0.5000001
m_Height
:
2
m_Direction
:
1
m_Center
:
{
x
:
0.000000059604645
,
y
:
0
,
z
:
-0.00000008940697
}
---
!u!54
&1026549550
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355751954179708
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
---
!u!1
&1147355752418068416
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -335,9 +406,10 @@ GameObject:
-
component
:
{
fileID
:
1147355752418068420
}
-
component
:
{
fileID
:
1147355752418068423
}
-
component
:
{
fileID
:
1147355752418068422
}
m_Layer
:
0
-
component
:
{
fileID
:
1026549551
}
m_Layer
:
12
m_Name
:
Cylinder (2)
m_TagString
:
Untagged
m_TagString
:
Bullet Eraser
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -351,7 +423,7 @@ Transform:
m_GameObject
:
{
fileID
:
1147355752418068416
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
0.13690253
,
w
:
0.9905846
}
m_LocalPosition
:
{
x
:
1.6
,
y
:
6.2
,
z
:
-16.2
}
m_LocalScale
:
{
x
:
5
,
y
:
50
,
z
:
5
}
m_LocalScale
:
{
x
:
4
,
y
:
50
,
z
:
4
}
m_Children
:
[]
m_Father
:
{
fileID
:
1147355751034001059
}
m_RootOrder
:
2
...
...
@@ -413,12 +485,28 @@ CapsuleCollider:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355752418068416
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_IsTrigger
:
1
m_Enabled
:
1
m_Radius
:
0.5000001
m_Height
:
2
m_Direction
:
1
m_Center
:
{
x
:
0.000000059604645
,
y
:
0
,
z
:
-0.00000008940697
}
---
!u!54
&1026549551
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355752418068416
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
---
!u!1
&1147355752608854408
GameObject
:
m_ObjectHideFlags
:
0
...
...
@@ -431,9 +519,10 @@ GameObject:
-
component
:
{
fileID
:
1147355752608854412
}
-
component
:
{
fileID
:
1147355752608854415
}
-
component
:
{
fileID
:
1147355752608854414
}
m_Layer
:
0
-
component
:
{
fileID
:
1026549552
}
m_Layer
:
12
m_Name
:
Cylinder (1)
m_TagString
:
Untagged
m_TagString
:
Bullet Eraser
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
...
...
@@ -447,7 +536,7 @@ Transform:
m_GameObject
:
{
fileID
:
1147355752608854408
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0
,
z
:
-0.25004116
,
w
:
0.96823525
}
m_LocalPosition
:
{
x
:
1
,
y
:
2.7
,
z
:
-22.8
}
m_LocalScale
:
{
x
:
5
,
y
:
50
,
z
:
5
}
m_LocalScale
:
{
x
:
4
,
y
:
50
,
z
:
4
}
m_Children
:
[]
m_Father
:
{
fileID
:
1147355751034001059
}
m_RootOrder
:
1
...
...
@@ -509,9 +598,25 @@ CapsuleCollider:
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355752608854408
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
0
m_IsTrigger
:
1
m_Enabled
:
1
m_Radius
:
0.5000001
m_Height
:
2
m_Direction
:
1
m_Center
:
{
x
:
0.000000059604645
,
y
:
0
,
z
:
-0.00000008940697
}
---
!u!54
&1026549552
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
1147355752608854408
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
Assets/Game Resources/Prefabs/Naruto_Skill.prefab.meta
→
Assets/Game Resources/Prefabs/
Skills/
Naruto_Skill.prefab.meta
View file @
4551ba16
File moved
Assets/Game Resources/Prefabs/Skills/Squid_Skill.prefab
0 → 100644
View file @
4551ba16
%YAML
1.1
%TAG
!u!
tag:unity3d.com,2011:
---
!u!54
&8870708488908276062
Rigidbody
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6824280678861745240
}
serializedVersion
:
2
m_Mass
:
1
m_Drag
:
0
m_AngularDrag
:
0.05
m_UseGravity
:
1
m_IsKinematic
:
1
m_Interpolate
:
0
m_Constraints
:
0
m_CollisionDetection
:
0
---
!u!135
&8870708488908276061
SphereCollider
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
6824280678861745240
}
m_Material
:
{
fileID
:
0
}
m_IsTrigger
:
1
m_Enabled
:
1
serializedVersion
:
2
m_Radius
:
1.2
m_Center
:
{
x
:
0
,
y
:
0.5
,
z
:
0
}
---
!u!1
&8870708489402470124
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
8870708489402470115
}
m_Layer
:
0
m_Name
:
Root
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&8870708489402470115
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
8870708489402470124
}
m_LocalRotation
:
{
x
:
-0
,
y
:
-0.71613884
,
z
:
-0
,
w
:
0.6979579
}
m_LocalPosition
:
{
x
:
103.6
,
y
:
-115.2
,
z
:
-10.8
}
m_LocalScale
:
{
x
:
1
,
y
:
1
,
z
:
1
}
m_Children
:
-
{
fileID
:
8976148094464222898
}
m_Father
:
{
fileID
:
8870708489745385139
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
-91.473
,
z
:
0
}
---
!u!1
&8870708489745385148
GameObject
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
serializedVersion
:
6
m_Component
:
-
component
:
{
fileID
:
8870708489745385139
}
-
component
:
{
fileID
:
8870708489745385137
}
-
component
:
{
fileID
:
8870708489745385138
}
m_Layer
:
0
m_Name
:
Squid_Skill
m_TagString
:
Untagged
m_Icon
:
{
fileID
:
0
}
m_NavMeshLayer
:
0
m_StaticEditorFlags
:
0
m_IsActive
:
1
---
!u!4
&8870708489745385139
Transform
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
8870708489745385148
}
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
:
8870708489402470115
}
m_Father
:
{
fileID
:
0
}
m_RootOrder
:
0
m_LocalEulerAnglesHint
:
{
x
:
0
,
y
:
0
,
z
:
0
}
---
!u!95
&8870708489745385137
Animator
:
serializedVersion
:
3
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
8870708489745385148
}
m_Enabled
:
1
m_Avatar
:
{
fileID
:
0
}
m_Controller
:
{
fileID
:
9100000
,
guid
:
538f94ec069fb534490682bbae7e101a
,
type
:
2
}
m_CullingMode
:
0
m_UpdateMode
:
0
m_ApplyRootMotion
:
0
m_LinearVelocityBlending
:
0
m_WarningMessage
:
m_HasTransformHierarchy
:
1
m_AllowConstantClipSamplingOptimization
:
1
m_KeepAnimatorControllerStateOnDisable
:
0
---
!u!114
&8870708489745385138
MonoBehaviour
:
m_ObjectHideFlags
:
0
m_CorrespondingSourceObject
:
{
fileID
:
0
}
m_PrefabInstance
:
{
fileID
:
0
}
m_PrefabAsset
:
{
fileID
:
0
}
m_GameObject
:
{
fileID
:
8870708489745385148
}
m_Enabled
:
1
m_EditorHideFlags
:
0
m_Script
:
{
fileID
:
11500000
,
guid
:
0ee19756f3942754da7ad3020baf5ce5
,
type
:
3
}
m_Name
:
m_EditorClassIdentifier
:
rootAnim
:
{
fileID
:
8870708489745385137
}
xukaAnim
:
{
fileID
:
3058370718181571784
}
---
!u!1001
&8870708488908276057
PrefabInstance
:
m_ObjectHideFlags
:
0
serializedVersion
:
2
m_Modification
:
m_TransformParent
:
{
fileID
:
8870708489402470115
}
m_Modifications
:
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_RootOrder
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalScale.x
value
:
10
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalScale.y
value
:
10
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalScale.z
value
:
10
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalPosition.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalPosition.y
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalPosition.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalRotation.w
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalRotation.x
value
:
-0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalRotation.y
value
:
-0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalRotation.z
value
:
-0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.x
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.y
value
:
-91.473
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_LocalEulerAnglesHint.z
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
919132149155446097
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Name
value
:
Annabelle
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
919132149155446097
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_IsActive
value
:
1
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2715566404302941441
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Layer
value
:
12
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
2715566404302941441
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_TagString
value
:
Bullet Eraser
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
5866666021909216657
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Controller
value
:
objectReference
:
{
fileID
:
9100000
,
guid
:
7954bb53b5b6f9e43b91feb11e50377a
,
type
:
2
}
-
target
:
{
fileID
:
5866666021909216657
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_ApplyRootMotion
value
:
0
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
8313072737626592052
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Materials.Array.size
value
:
2
objectReference
:
{
fileID
:
0
}
-
target
:
{
fileID
:
8313072737626592052
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[0]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
b5d36b93cee758d4aab4f6498058ddb4
,
type
:
2
}
-
target
:
{
fileID
:
8313072737626592052
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[1]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
b5d36b93cee758d4aab4f6498058ddb4
,
type
:
2
}
-
target
:
{
fileID
:
8313072737626592052
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
propertyPath
:
m_Materials.Array.data[2]
value
:
objectReference
:
{
fileID
:
2100000
,
guid
:
b5d36b93cee758d4aab4f6498058ddb4
,
type
:
2
}
m_RemovedComponents
:
[]
m_SourcePrefab
:
{
fileID
:
100100000
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
---
!u!4
&8976148094464222898
stripped
Transform
:
m_CorrespondingSourceObject
:
{
fileID
:
-8679921383154817045
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
8870708488908276057
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!95
&3058370718181571784
stripped
Animator
:
m_CorrespondingSourceObject
:
{
fileID
:
5866666021909216657
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
8870708488908276057
}
m_PrefabAsset
:
{
fileID
:
0
}
---
!u!1
&6824280678861745240
stripped
GameObject
:
m_CorrespondingSourceObject
:
{
fileID
:
2715566404302941441
,
guid
:
2d7faf558f55da74ca4da8cfc4e15d51
,
type
:
3
}
m_PrefabInstance
:
{
fileID
:
8870708488908276057
}
m_PrefabAsset
:
{
fileID
:
0
}
Assets/Game Resources/Prefabs/Skills/Squid_Skill.prefab.meta
0 → 100644
View file @
4551ba16
fileFormatVersion: 2
guid: daad9d41923237941820b5a299ff9afd
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
Assets/OSG Infinity Square Space/Player/Scripts/Controller.cs
View file @
4551ba16
...
...
@@ -325,8 +325,10 @@ public class Controller : MonoBehaviour
if
(
attacking
)
{
if
(
Interface
.
instance
.
newSkillGUI
.
selectedSkillID
>=
0
)
{
StartCoroutine
(
ie_skill_7
());
return
;
}
if
(
Class_Interface
.
powerEnabled
==
true
)
Power_Weapon
();
if
(
Class_Interface
.
missleEnabled
==
true
)
StartCoroutine
(
Missle_Weapon
());
if
(
Class_Interface
.
laserEnabled
==
true
)
StartCoroutine
(
Laser_Weapon
());
...
...
@@ -1019,4 +1021,18 @@ public class Controller : MonoBehaviour
//-----------
}
private
IEnumerator
ie_skill_7
()
{
if
(
Interface
.
instance
.
newSkillGUI
.
skills
[
0
].
CanUse
())
{
GameObject
skill
=
WeaponsPool
.
GiveWeapons
(
13
);
skill
.
transform
.
position
=
new
Vector3
(
0.14f
,
25.6f
,
-
1898.7f
);
skill
.
gameObject
.
SetActive
(
true
);
Interface
.
instance
.
newSkillGUI
.
skills
[
0
].
CountDown
(
5f
);
yield
return
new
WaitForSeconds
(
5f
);
skill
.
gameObject
.
SetActive
(
false
);
WeaponsPool
.
TakeWeapons
(
skill
);
}
}
}
\ No newline at end of file
Assets/OSG Infinity Square Space/Scenes/main.unity
View file @
4551ba16
This diff is collapsed.
Click to expand it.
Assets/Scripts/UI/NewSkillSystemGUI.cs
View file @
4551ba16
...
...
@@ -107,6 +107,7 @@ public class NewSkillSystemGUI : MonoBehaviour
public
Image
skillSelection
;
public
Image
skillCountdown
;
public
Text
skillCounter
;
private
float
countdownValue
=
0f
;
public
void
LoadSkill
(
int
skillID
)
{
SkillID
=
skillID
;
...
...
@@ -124,5 +125,21 @@ public class NewSkillSystemGUI : MonoBehaviour
{
skillSelection
.
gameObject
.
SetActive
(
false
);
}
public
bool
CanUse
()
{
return
countdownValue
==
0f
;
}
public
void
CountDown
(
float
timer
)
{
if
(
CanUse
())
{
countdownValue
=
timer
;
DOTween
.
To
(()
=>
{
return
countdownValue
;
},
(
a
)
=>
{
skillCountdown
.
fillAmount
=
countdownValue
/
timer
;
countdownValue
=
a
;
},
0f
,
timer
);
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment