浏览代码
Merge branch 'develop' into feature/pathfinding
Merge branch 'develop' into feature/pathfinding
# Conflicts: # Assets/BossRoom/Scenes/DungeonTest.unity # Assets/BossRoom/Scripts/Client/ClientInputSender.cs # Assets/BossRoom/Scripts/Server/Game/Action/ChaseAction.cs # Assets/BossRoom/Scripts/Server/ServerCharacterMovement.cs # ProjectSettings/DynamicsManager.asset # ProjectSettings/NavMeshAreas.asset # ProjectSettings/TagManager.asset/main
Luke Stampfli
4 年前
当前提交
aaf62377
共有 73 个文件被更改，包括 5450 次插入 和 1116 次删除
-
116Assets/BossRoom/Models/CharacterSet.fbx.meta
-
478Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
-
89Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab
-
103Assets/BossRoom/Prefabs/Enemy.prefab
-
18Assets/BossRoom/Prefabs/Imp.prefab
-
23Assets/BossRoom/Prefabs/NetworkingManager.prefab
-
4Assets/BossRoom/Prefabs/State/BossRoomState.prefab
-
869Assets/BossRoom/Scenes/DungeonTest.unity
-
49Assets/BossRoom/Scenes/MainMenu.unity
-
32Assets/BossRoom/Scripts/Client/ClientCharacterVisualization.cs
-
11Assets/BossRoom/Scripts/Client/ClientInputSender.cs
-
2Assets/BossRoom/Scripts/Client/Game/Character/ModelSwap.cs
-
10Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs
-
8Assets/BossRoom/Scripts/Client/UI/MainMenuUI.cs
-
9Assets/BossRoom/Scripts/Server/Game/Action/ActionPlayer.cs
-
22Assets/BossRoom/Scripts/Server/Game/Action/ChaseAction.cs
-
2Assets/BossRoom/Scripts/Server/Game/Action/MeleeAction.cs
-
15Assets/BossRoom/Scripts/Server/Game/State/ServerBossRoomState.cs
-
19Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs
-
20Assets/BossRoom/Scripts/Server/ServerCharacterMovement.cs
-
69Assets/BossRoom/Scripts/Shared/Game/Action/ActionRequestData.cs
-
2Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs
-
78Assets/BossRoom/Scripts/Shared/NetworkCharacterState.cs
-
8Packages/packages-lock.json
-
44ProjectSettings/DynamicsManager.asset
-
59ProjectSettings/GraphicsSettings.asset
-
12ProjectSettings/ProjectSettings.asset
-
79Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat
-
8Assets/BossRoom/Material/Characters/Enemy_Eyes_sheet.mat.meta
-
84Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat
-
8Assets/BossRoom/Material/Characters/Enemy_Mouth_sheet.mat.meta
-
83Assets/BossRoom/Material/Characters/ToonTest/Head_Imp.mat
-
8Assets/BossRoom/Material/Characters/ToonTest/Head_Imp.mat.meta
-
83Assets/BossRoom/Material/Characters/ToonTest/Torso_Imp.mat
-
8Assets/BossRoom/Material/Characters/ToonTest/Torso_Imp.mat.meta
-
408Assets/BossRoom/Models/BossSetController.controller
-
8Assets/BossRoom/Models/BossSetController.controller.meta
-
1001Assets/BossRoom/Prefabs/Character/Boss.prefab
-
7Assets/BossRoom/Prefabs/Character/Boss.prefab.meta
-
1001Assets/BossRoom/Prefabs/Character/Imp.prefab
-
7Assets/BossRoom/Prefabs/Character/Imp.prefab.meta
-
1Assets/BossRoom/Textures/Characters/Imp_Head_CLR.tga
-
96Assets/BossRoom/Textures/Characters/Imp_Head_CLR.tga.meta
-
1001Assets/BossRoom/Textures/Characters/Imp_Torso_CLR.tga
-
96Assets/BossRoom/Textures/Characters/Imp_Torso_CLR.tga.meta
-
29Assets/BossRoom/Scripts/Development/dgtest/Animate_Walk.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/Animate_Walk.cs.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/GameManager.cs.meta
-
27Assets/BossRoom/Scripts/Development/dgtest/GroundDiscManager.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/GroundDiscManager.cs.meta
-
40Assets/BossRoom/Scripts/Development/dgtest/MainMenuFX.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/MainMenuFX.cs.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/MainMenuManager.cs.meta
-
8Assets/BossRoom/Scripts/Development/dgtest/Movement.meta
-
11Assets/BossRoom/Scripts/Development/dgtest/ProgramState.cs.meta
-
2Assets/BossRoom/Scripts/Development/dgtest/README.txt
-
7Assets/BossRoom/Scripts/Development/dgtest/README.txt.meta
-
125Assets/BossRoom/Scripts/Development/dgtest/SimpleInputMover.cs
-
11Assets/BossRoom/Scripts/Development/dgtest/SimpleInputMover.cs.meta
-
23Assets/BossRoom/Scripts/Development/dgtest/GameManager.cs
-
36Assets/BossRoom/Scripts/Development/dgtest/MainMenuManager.cs
-
34Assets/BossRoom/Scripts/Development/dgtest/ProgramState.cs
-
0/Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab.meta
-
0/Assets/BossRoom/Prefabs/Character/Boss_deprecated.prefab
-
0/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Client/Net/ClientGameNetPortal.cs
-
0/Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Server/Net/ServerGameNetPortal.cs
-
0/Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs.meta
-
0/Assets/BossRoom/Scripts/Shared/Net/GameNetPortal.cs
478
Assets/BossRoom/Prefabs/Character/CharacterSet.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
869
Assets/BossRoom/Scenes/DungeonTest.unity
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!55 &1 |
|||
PhysicsManager: |
|||
m_ObjectHideFlags: 0 |
|||
serializedVersion: 13 |
|||
m_Gravity: {x: 0, y: -9.81, z: 0} |
|||
m_DefaultMaterial: {fileID: 0} |
|||
m_BounceThreshold: 2 |
|||
m_DefaultMaxDepenetrationVelocity: 10 |
|||
m_SleepThreshold: 0.005 |
|||
m_DefaultContactOffset: 0.01 |
|||
m_DefaultSolverIterations: 6 |
|||
m_DefaultSolverVelocityIterations: 1 |
|||
m_QueriesHitBackfaces: 0 |
|||
m_QueriesHitTriggers: 1 |
|||
m_EnableAdaptiveForce: 0 |
|||
m_ClothInterCollisionDistance: 0 |
|||
m_ClothInterCollisionStiffness: 0 |
|||
m_ContactsGeneration: 1 |
|||
m_LayerCollisionMatrix: ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff |
|||
m_AutoSimulation: 1 |
|||
m_AutoSyncTransforms: 0 |
|||
m_ReuseCollisionCallbacks: 1 |
|||
m_ClothInterCollisionSettingsToggle: 0 |
|||
m_ClothGravity: {x: 0, y: -9.81, z: 0} |
|||
m_ContactPairsMode: 0 |
|||
m_BroadphaseType: 0 |
|||
m_WorldBounds: |
|||
m_Center: {x: 0, y: 0, z: 0} |
|||
m_Extent: {x: 250, y: 250, z: 250} |
|||
m_WorldSubdivisions: 8 |
|||
m_FrictionType: 0 |
|||
m_EnableEnhancedDeterminism: 0 |
|||
m_EnableUnifiedHeightmaps: 1 |
|||
m_SolverType: 0 |
|||
m_DefaultMaxAngularSpeed: 7 |
|||
version https://git-lfs.github.com/spec/v1 |
|||
<<<<<<< HEAD |
|||
oid sha256:6b038dff54fe753d292312952df32e7849e935c974d81371c11dfef9f1b2fa99 |
|||
======= |
|||
oid sha256:55c4895b2ce23c046b46cbcfb73397df74d08a4c3cc974fc60c408080cfc2ebd |
|||
>>>>>>> develop |
|||
size 1289 |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Enemy_Eyes_sheet |
|||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} |
|||
m_ShaderKeywords: _ALPHATEST_ON _EMISSION |
|||
m_LightmapFlags: 2 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: 2450 |
|||
stringTagMap: |
|||
RenderType: TransparentCutout |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 2800000, guid: 13af2bcf110ace445a889edec9e5ac9b, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 2800000, guid: 13af2bcf110ace445a889edec9e5ac9b, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _BumpScale: 1 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: 0 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0 |
|||
- _Mode: 1 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _UVSec: 0 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|||
- _EmissionColor: {r: 0.27450982, g: 0.27450982, b: 0.27450982, a: 1} |
|||
m_BuildTextureStacks: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 6ad0d134720fa434484b249c9074eeb0 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Enemy_Mouth_sheet |
|||
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} |
|||
m_ShaderKeywords: _ALPHATEST_ON |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: 2450 |
|||
stringTagMap: |
|||
RenderType: TransparentCutout |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 2800000, guid: da41a6d3ad30372479c481f8bfff7071, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _BumpScale: 1 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: 0 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0 |
|||
- _Mode: 1 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _RimAmount: 0.716 |
|||
- _RimThreshold: 0.1 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _UVSec: 0 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _AmbientColor: {r: 0.4, g: 0.4, b: 0.4, a: 1} |
|||
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _RimColor: {r: 1, g: 1, b: 1, a: 1} |
|||
- _SpecularColor: {r: 0.9, g: 0.9, b: 0.9, a: 1} |
|||
m_BuildTextureStacks: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: a9b71f18744318a4896a6260c48c6aa0 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Head_Imp |
|||
m_Shader: {fileID: 4800000, guid: 41c49b64d906a384cab2d953a43231e3, type: 3} |
|||
m_ShaderKeywords: _NORMALMAP |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 2800000, guid: 6241db63cd35e7a47bdbc327c5058789, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 2800000, guid: 1ecd26af9e83eea43bc1e405b211c328, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _BumpScale: 1 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: 2.89 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0 |
|||
- _Mode: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _RimAmount: 0.667 |
|||
- _RimThreshold: 0.23 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _UVSec: 0 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _AmbientColor: {r: 0.4528302, g: 0.4528302, b: 0.4528302, a: 1} |
|||
- _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _RimColor: {r: 0.4245283, g: 0.4245283, b: 0.4245283, a: 1} |
|||
- _SpecularColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} |
|||
m_BuildTextureStacks: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: a45d29b968f5fdb4ba2ecc2663c4b196 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!21 &2100000 |
|||
Material: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Torso_Imp |
|||
m_Shader: {fileID: 4800000, guid: 41c49b64d906a384cab2d953a43231e3, type: 3} |
|||
m_ShaderKeywords: _NORMALMAP |
|||
m_LightmapFlags: 4 |
|||
m_EnableInstancingVariants: 0 |
|||
m_DoubleSidedGI: 0 |
|||
m_CustomRenderQueue: -1 |
|||
stringTagMap: {} |
|||
disabledShaderPasses: [] |
|||
m_SavedProperties: |
|||
serializedVersion: 3 |
|||
m_TexEnvs: |
|||
- _BumpMap: |
|||
m_Texture: {fileID: 2800000, guid: 2fa499f9cfde15e4599f73e73c1e9fb5, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailAlbedoMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailMask: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _DetailNormalMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _EmissionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MainTex: |
|||
m_Texture: {fileID: 2800000, guid: ece5e2f831fb60748a74628c3252373d, type: 3} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _MetallicGlossMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _OcclusionMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
- _ParallaxMap: |
|||
m_Texture: {fileID: 0} |
|||
m_Scale: {x: 1, y: 1} |
|||
m_Offset: {x: 0, y: 0} |
|||
m_Floats: |
|||
- _BumpScale: 1 |
|||
- _Cutoff: 0.5 |
|||
- _DetailNormalMapScale: 1 |
|||
- _DstBlend: 0 |
|||
- _GlossMapScale: 1 |
|||
- _Glossiness: -2.86 |
|||
- _GlossyReflections: 1 |
|||
- _Metallic: 0.57 |
|||
- _Mode: 0 |
|||
- _OcclusionStrength: 1 |
|||
- _Parallax: 0.02 |
|||
- _RimAmount: 0.208 |
|||
- _RimThreshold: 0.595 |
|||
- _SmoothnessTextureChannel: 0 |
|||
- _SpecularHighlights: 1 |
|||
- _SrcBlend: 1 |
|||
- _UVSec: 0 |
|||
- _ZWrite: 1 |
|||
m_Colors: |
|||
- _AmbientColor: {r: 0.16981131, g: 0.16981131, b: 0.16981131, a: 1} |
|||
- _Color: {r: 0.20754719, g: 0.20754719, b: 0.20754719, a: 1} |
|||
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} |
|||
- _RimColor: {r: 1, g: 1, b: 1, a: 1} |
|||
- _SpecularColor: {r: 3.137255, g: 3.137255, b: 3.137255, a: 1} |
|||
m_BuildTextureStacks: [] |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 96b9bdf113bb571429304e360eb36f7b |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
%YAML 1.1 |
|||
%TAG !u! tag:unity3d.com,2011: |
|||
--- !u!206 &-8988982740543935465 |
|||
BlendTree: |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Blend Tree |
|||
m_Childs: |
|||
- serializedVersion: 2 |
|||
m_Motion: {fileID: -7893011869332588236, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} |
|||
m_Threshold: 0 |
|||
m_Position: {x: 0, y: 0} |
|||
m_TimeScale: 1 |
|||
m_CycleOffset: 0 |
|||
m_DirectBlendParameter: Blend |
|||
m_Mirror: 0 |
|||
- serializedVersion: 2 |
|||
m_Motion: {fileID: -3419257869308726280, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} |
|||
m_Threshold: 0.5 |
|||
m_Position: {x: 0, y: 0} |
|||
m_TimeScale: 1 |
|||
m_CycleOffset: 0 |
|||
m_DirectBlendParameter: Blend |
|||
m_Mirror: 0 |
|||
- serializedVersion: 2 |
|||
m_Motion: {fileID: 6200578666267062213, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} |
|||
m_Threshold: 1 |
|||
m_Position: {x: 0, y: 0} |
|||
m_TimeScale: 1 |
|||
m_CycleOffset: 0 |
|||
m_DirectBlendParameter: Blend |
|||
m_Mirror: 0 |
|||
m_BlendParameter: Speed |
|||
m_BlendParameterY: Blend |
|||
m_MinThreshold: 0 |
|||
m_MaxThreshold: 1 |
|||
m_UseAutomaticThresholds: 1 |
|||
m_NormalizedBlendValues: 0 |
|||
m_BlendType: 0 |
|||
--- !u!206 &-8142562342497625493 |
|||
BlendTree: |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: BlendTree |
|||
m_Childs: [] |
|||
m_BlendParameter: Blend |
|||
m_BlendParameterY: Blend |
|||
m_MinThreshold: 0 |
|||
m_MaxThreshold: 1 |
|||
m_UseAutomaticThresholds: 1 |
|||
m_NormalizedBlendValues: 0 |
|||
m_BlendType: 0 |
|||
--- !u!1101 &-5603320215398779609 |
|||
AnimatorStateTransition: |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: |
|||
m_Conditions: |
|||
- m_ConditionMode: 6 |
|||
m_ConditionEvent: AttackID |
|||
m_EventTreshold: 1 |
|||
- m_ConditionMode: 1 |
|||
m_ConditionEvent: BeginAttack |
|||
m_EventTreshold: 0 |
|||
m_DstStateMachine: {fileID: 0} |
|||
m_DstState: {fileID: 6299315480180736668} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 0 |
|||
serializedVersion: 3 |
|||
m_TransitionDuration: 0.25 |
|||
m_TransitionOffset: 0 |
|||
m_ExitTime: 0.75 |
|||
m_HasExitTime: 0 |
|||
m_HasFixedDuration: 1 |
|||
m_InterruptionSource: 0 |
|||
m_OrderedInterruption: 1 |
|||
m_CanTransitionToSelf: 1 |
|||
--- !u!1101 &-3576141394984483750 |
|||
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: -1068572555509609370} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 0 |
|||
serializedVersion: 3 |
|||
m_TransitionDuration: 0.25 |
|||
m_TransitionOffset: 0 |
|||
m_ExitTime: 0.75 |
|||
m_HasExitTime: 1 |
|||
m_HasFixedDuration: 1 |
|||
m_InterruptionSource: 0 |
|||
m_OrderedInterruption: 1 |
|||
m_CanTransitionToSelf: 1 |
|||
--- !u!1102 &-3516404760485336223 |
|||
AnimatorState: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: WalkRun |
|||
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: -8988982740543935465} |
|||
m_Tag: |
|||
m_SpeedParameter: |
|||
m_MirrorParameter: |
|||
m_CycleOffsetParameter: |
|||
m_TimeParameter: |
|||
--- !u!206 &-2485547222415692489 |
|||
BlendTree: |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: BlendTree |
|||
m_Childs: [] |
|||
m_BlendParameter: Blend |
|||
m_BlendParameterY: Blend |
|||
m_MinThreshold: 0 |
|||
m_MaxThreshold: 1 |
|||
m_UseAutomaticThresholds: 1 |
|||
m_NormalizedBlendValues: 0 |
|||
m_BlendType: 0 |
|||
--- !u!1101 &-2134875305200649429 |
|||
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: 0} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 1 |
|||
serializedVersion: 3 |
|||
m_TransitionDuration: 0.25 |
|||
m_TransitionOffset: 0 |
|||
m_ExitTime: 0.8125 |
|||
m_HasExitTime: 1 |
|||
m_HasFixedDuration: 1 |
|||
m_InterruptionSource: 0 |
|||
m_OrderedInterruption: 1 |
|||
m_CanTransitionToSelf: 1 |
|||
--- !u!1102 &-1068572555509609370 |
|||
AnimatorState: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: NoAttack |
|||
m_Speed: 1 |
|||
m_CycleOffset: 0 |
|||
m_Transitions: |
|||
- {fileID: -5603320215398779609} |
|||
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: 0} |
|||
m_Tag: |
|||
m_SpeedParameter: |
|||
m_MirrorParameter: |
|||
m_CycleOffsetParameter: |
|||
m_TimeParameter: |
|||
--- !u!1107 &-881976854541045011 |
|||
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: -3516404760485336223} |
|||
m_Position: {x: 180, y: 150, z: 0} |
|||
m_ChildStateMachines: [] |
|||
m_AnyStateTransitions: [] |
|||
m_EntryTransitions: [] |
|||
m_StateMachineTransitions: {} |
|||
m_StateMachineBehaviours: [] |
|||
m_AnyStatePosition: {x: 400, y: 20, z: 0} |
|||
m_EntryPosition: {x: 120, y: 20, z: 0} |
|||
m_ExitPosition: {x: 490, y: 390, z: 0} |
|||
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} |
|||
m_DefaultState: {fileID: -3516404760485336223} |
|||
--- !u!91 &9100000 |
|||
AnimatorController: |
|||
m_ObjectHideFlags: 0 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: BossSetController |
|||
serializedVersion: 5 |
|||
m_AnimatorParameters: |
|||
- m_Name: ForwardMovement |
|||
m_Type: 3 |
|||
m_DefaultFloat: 0 |
|||
m_DefaultInt: 0 |
|||
m_DefaultBool: 0 |
|||
m_Controller: {fileID: 9100000} |
|||
- m_Name: Speed |
|||
m_Type: 1 |
|||
m_DefaultFloat: 0 |
|||
m_DefaultInt: 0 |
|||
m_DefaultBool: 0 |
|||
m_Controller: {fileID: 9100000} |
|||
- m_Name: AttackID |
|||
m_Type: 3 |
|||
m_DefaultFloat: 0 |
|||
m_DefaultInt: 0 |
|||
m_DefaultBool: 0 |
|||
m_Controller: {fileID: 9100000} |
|||
- m_Name: BeginAttack |
|||
m_Type: 9 |
|||
m_DefaultFloat: 0 |
|||
m_DefaultInt: 0 |
|||
m_DefaultBool: 0 |
|||
m_Controller: {fileID: 9100000} |
|||
m_AnimatorLayers: |
|||
- serializedVersion: 5 |
|||
m_Name: Base Layer |
|||
m_StateMachine: {fileID: -881976854541045011} |
|||
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} |
|||
- serializedVersion: 5 |
|||
m_Name: Attacks |
|||
m_StateMachine: {fileID: 8124319401456280373} |
|||
m_Mask: {fileID: 31900000, guid: ecd32f7d18cc2ad4a9cdc919451abce5, type: 2} |
|||
m_Motions: [] |
|||
m_Behaviours: [] |
|||
m_BlendingMode: 0 |
|||
m_SyncedLayerIndex: -1 |
|||
m_DefaultWeight: 1 |
|||
m_IKPass: 0 |
|||
m_SyncedLayerAffectsTiming: 0 |
|||
m_Controller: {fileID: 9100000} |
|||
--- !u!1107 &2782526268344220699 |
|||
AnimatorStateMachine: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: New Layer |
|||
m_ChildStates: [] |
|||
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: 0} |
|||
--- !u!1101 &3218047883308753838 |
|||
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: 0} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 1 |
|||
serializedVersion: 3 |
|||
m_TransitionDuration: 0.25 |
|||
m_TransitionOffset: 0 |
|||
m_ExitTime: 0.8125 |
|||
m_HasExitTime: 1 |
|||
m_HasFixedDuration: 1 |
|||
m_InterruptionSource: 0 |
|||
m_OrderedInterruption: 1 |
|||
m_CanTransitionToSelf: 1 |
|||
--- !u!1101 &5593412509193387231 |
|||
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: ForwardMovement |
|||
m_EventTreshold: 1 |
|||
m_DstStateMachine: {fileID: 0} |
|||
m_DstState: {fileID: 0} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 0 |
|||
serializedVersion: 3 |
|||
m_TransitionDuration: 0.25 |
|||
m_TransitionOffset: 0 |
|||
m_ExitTime: 0.8125 |
|||
m_HasExitTime: 0 |
|||
m_HasFixedDuration: 1 |
|||
m_InterruptionSource: 0 |
|||
m_OrderedInterruption: 1 |
|||
m_CanTransitionToSelf: 1 |
|||
--- !u!1109 &6002482201662273439 |
|||
AnimatorTransition: |
|||
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: 0} |
|||
m_Solo: 0 |
|||
m_Mute: 0 |
|||
m_IsExit: 0 |
|||
serializedVersion: 1 |
|||
--- !u!1102 &6299315480180736668 |
|||
AnimatorState: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Attack1 |
|||
m_Speed: 1 |
|||
m_CycleOffset: 0 |
|||
m_Transitions: |
|||
- {fileID: -3576141394984483750} |
|||
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: 3193645972815305343, guid: 2115c4661f55eff45a5a0f91fc0a12f0, type: 3} |
|||
m_Tag: |
|||
m_SpeedParameter: |
|||
m_MirrorParameter: |
|||
m_CycleOffsetParameter: |
|||
m_TimeParameter: |
|||
--- !u!1107 &8124319401456280373 |
|||
AnimatorStateMachine: |
|||
serializedVersion: 6 |
|||
m_ObjectHideFlags: 1 |
|||
m_CorrespondingSourceObject: {fileID: 0} |
|||
m_PrefabInstance: {fileID: 0} |
|||
m_PrefabAsset: {fileID: 0} |
|||
m_Name: Attacks |
|||
m_ChildStates: |
|||
- serializedVersion: 1 |
|||
m_State: {fileID: -1068572555509609370} |
|||
m_Position: {x: 240, y: 90, z: 0} |
|||
- serializedVersion: 1 |
|||
m_State: {fileID: 6299315480180736668} |
|||
m_Position: {x: 40, y: 220, 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: -1068572555509609370} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 259c0c92d6badb54bb032df749609d27 |
|||
NativeFormatImporter: |
|||
externalObjects: {} |
|||
mainObjectFileID: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
1001
Assets/BossRoom/Prefabs/Character/Boss.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: 1e8ae28d24c5683478548d7e96e5ba55 |
|||
PrefabImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
1001
Assets/BossRoom/Prefabs/Character/Imp.prefab
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: 1ffde884792e9a44a9fbe049ebb79c9f |
|||
PrefabImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
1
Assets/BossRoom/Textures/Characters/Imp_Head_CLR.tga
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: 1ecd26af9e83eea43bc1e405b211c328 |
|||
TextureImporter: |
|||
internalIDToNameTable: [] |
|||
externalObjects: {} |
|||
serializedVersion: 11 |
|||
mipmaps: |
|||
mipMapMode: 0 |
|||
enableMipMap: 1 |
|||
sRGBTexture: 1 |
|||
linearTexture: 0 |
|||
fadeOut: 0 |
|||
borderMipMap: 0 |
|||
mipMapsPreserveCoverage: 0 |
|||
alphaTestReferenceValue: 0.5 |
|||
mipMapFadeDistanceStart: 1 |
|||
mipMapFadeDistanceEnd: 3 |
|||
bumpmap: |
|||
convertToNormalMap: 0 |
|||
externalNormalMap: 0 |
|||
heightScale: 0.25 |
|||
normalMapFilter: 0 |
|||
isReadable: 0 |
|||
streamingMipmaps: 0 |
|||
streamingMipmapsPriority: 0 |
|||
vTOnly: 0 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: -1 |
|||
aniso: -1 |
|||
mipBias: -100 |
|||
wrapU: -1 |
|||
wrapV: -1 |
|||
wrapW: -1 |
|||
nPOTScale: 1 |
|||
lightmap: 0 |
|||
compressionQuality: 50 |
|||
spriteMode: 0 |
|||
spriteExtrude: 1 |
|||
spriteMeshType: 1 |
|||
alignment: 0 |
|||
spritePivot: {x: 0.5, y: 0.5} |
|||
spritePixelsToUnits: 100 |
|||
spriteBorder: {x: 0, y: 0, z: 0, w: 0} |
|||
spriteGenerateFallbackPhysicsShape: 1 |
|||
alphaUsage: 1 |
|||
alphaIsTransparency: 0 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 0 |
|||
textureShape: 1 |
|||
singleChannelComponent: 0 |
|||
flipbookRows: 1 |
|||
flipbookColumns: 1 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
ignorePngGamma: 0 |
|||
applyGammaDecoding: 0 |
|||
platformSettings: |
|||
- serializedVersion: 3 |
|||
buildTarget: DefaultTexturePlatform |
|||
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: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
bones: [] |
|||
spriteID: |
|||
internalID: 0 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
secondaryTextures: [] |
|||
spritePackingTag: |
|||
pSDRemoveMatte: 0 |
|||
pSDShowRemoveMatteOption: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
1001
Assets/BossRoom/Textures/Characters/Imp_Torso_CLR.tga
文件差异内容过多而无法显示
查看文件
文件差异内容过多而无法显示
查看文件
|
|||
fileFormatVersion: 2 |
|||
guid: ece5e2f831fb60748a74628c3252373d |
|||
TextureImporter: |
|||
internalIDToNameTable: [] |
|||
externalObjects: {} |
|||
serializedVersion: 11 |
|||
mipmaps: |
|||
mipMapMode: 0 |
|||
enableMipMap: 1 |
|||
sRGBTexture: 1 |
|||
linearTexture: 0 |
|||
fadeOut: 0 |
|||
borderMipMap: 0 |
|||
mipMapsPreserveCoverage: 0 |
|||
alphaTestReferenceValue: 0.5 |
|||
mipMapFadeDistanceStart: 1 |
|||
mipMapFadeDistanceEnd: 3 |
|||
bumpmap: |
|||
convertToNormalMap: 0 |
|||
externalNormalMap: 0 |
|||
heightScale: 0.25 |
|||
normalMapFilter: 0 |
|||
isReadable: 0 |
|||
streamingMipmaps: 0 |
|||
streamingMipmapsPriority: 0 |
|||
vTOnly: 0 |
|||
grayScaleToAlpha: 0 |
|||
generateCubemap: 6 |
|||
cubemapConvolution: 0 |
|||
seamlessCubemap: 0 |
|||
textureFormat: 1 |
|||
maxTextureSize: 2048 |
|||
textureSettings: |
|||
serializedVersion: 2 |
|||
filterMode: -1 |
|||
aniso: -1 |
|||
mipBias: -100 |
|||
wrapU: -1 |
|||
wrapV: -1 |
|||
wrapW: -1 |
|||
nPOTScale: 1 |
|||
lightmap: 0 |
|||
compressionQuality: 50 |
|||
spriteMode: 0 |
|||
spriteExtrude: 1 |
|||
spriteMeshType: 1 |
|||
alignment: 0 |
|||
spritePivot: {x: 0.5, y: 0.5} |
|||
spritePixelsToUnits: 100 |
|||
spriteBorder: {x: 0, y: 0, z: 0, w: 0} |
|||
spriteGenerateFallbackPhysicsShape: 1 |
|||
alphaUsage: 1 |
|||
alphaIsTransparency: 0 |
|||
spriteTessellationDetail: -1 |
|||
textureType: 0 |
|||
textureShape: 1 |
|||
singleChannelComponent: 0 |
|||
flipbookRows: 1 |
|||
flipbookColumns: 1 |
|||
maxTextureSizeSet: 0 |
|||
compressionQualitySet: 0 |
|||
textureFormatSet: 0 |
|||
ignorePngGamma: 0 |
|||
applyGammaDecoding: 0 |
|||
platformSettings: |
|||
- serializedVersion: 3 |
|||
buildTarget: DefaultTexturePlatform |
|||
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: [] |
|||
outline: [] |
|||
physicsShape: [] |
|||
bones: [] |
|||
spriteID: |
|||
internalID: 0 |
|||
vertices: [] |
|||
indices: |
|||
edges: [] |
|||
weights: [] |
|||
secondaryTextures: [] |
|||
spritePackingTag: |
|||
pSDRemoveMatte: 0 |
|||
pSDShowRemoveMatteOption: 0 |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
public class Animate_Walk : MonoBehaviour |
|||
{ |
|||
Animator anim; |
|||
|
|||
// Start is called before the first frame update
|
|||
void Start() |
|||
{ |
|||
anim = GetComponent<Animator>(); |
|||
} |
|||
|
|||
// Update is called once per frame
|
|||
void Update() |
|||
{ |
|||
if (Input.GetKeyDown(KeyCode.Space)) |
|||
{ |
|||
//anim.enabled = false;
|
|||
toggleAnimation(); |
|||
//anim.enabled = true;
|
|||
} |
|||
|
|||
} |
|||
public void toggleAnimation() |
|||
{ anim.SetTrigger("Toggle"); } |
|||
|
|||
} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 00e279cdb451120428f0add9ca0cd769 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 4c360cb54a0c27f41b0bb4d88fdb4003 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
public class GroundDiscManager : MonoBehaviour |
|||
{ |
|||
public GameObject normalDisc; |
|||
public GameObject seeThroughDisc; |
|||
|
|||
// Update is called once per frame
|
|||
void Update() |
|||
{ |
|||
int layer = LayerMask.NameToLayer("Wall"); |
|||
int mask = 1 << layer; |
|||
if (Physics.Raycast(transform.position, transform.TransformDirection(Vector3.forward), 40, mask)) |
|||
{ |
|||
normalDisc.SetActive(false); |
|||
seeThroughDisc.SetActive(true); |
|||
} |
|||
else |
|||
{ |
|||
normalDisc.SetActive(true); |
|||
seeThroughDisc.SetActive(false); |
|||
|
|||
} |
|||
} |
|||
} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 0382c339af9e0884a9a173c89e898cd4 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
public class MainMenuFX : MonoBehaviour |
|||
{ |
|||
private GameObject m_backdrop; |
|||
private float m_xbase; |
|||
private float m_start; |
|||
|
|||
|
|||
// Start is called before the first frame update
|
|||
void Start() |
|||
{ |
|||
m_backdrop = GameObject.Find("MainMenuBackdrop"); |
|||
m_xbase = ((RectTransform)m_backdrop.transform).anchoredPosition.x; |
|||
m_start = UnityEngine.Time.time; |
|||
} |
|||
|
|||
// Update is called once per frame
|
|||
void Update() |
|||
{ |
|||
//do a little sway on the backdrop.
|
|||
float elapsed = UnityEngine.Time.time - m_start; |
|||
float offset = 15*Mathf.Sin(0.4f * elapsed); |
|||
|
|||
RectTransform t = (RectTransform)m_backdrop.transform; |
|||
|
|||
var pos = t.anchoredPosition; |
|||
pos.x = m_xbase + offset; |
|||
|
|||
t.anchoredPosition = pos; |
|||
|
|||
//t.anchoredPosition.Set(m_xbase + offset, t.anchoredPosition.y);
|
|||
|
|||
//t.ForceUpdateRectTransforms();
|
|||
|
|||
//m_backdrop.transform.position.Set(m_start + offset, m_backdrop.transform.position.y, m_backdrop.transform.position.z);
|
|||
} |
|||
} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: d2e6fc04c9e0f7041aaf6735bd5913e9 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 83806e67e25160a4fb0432b5352f640e |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 42e68b1b83b2dcf4a857d11e57c64394 |
|||
folderAsset: yes |
|||
DefaultImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: 67d8cda0e4ca65f4f94a76f0259b62d0 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
These are script files pulled over from the Storm Flag art repo. |
|||
They will either need to be deleted or moved to their proper place in the tree as part of a subsequent cleanup pass. |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: e06d4bfbc665e474dad02fecb555ed4f |
|||
TextScriptImporter: |
|||
externalObjects: {} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
using Cinemachine; |
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
public class SimpleInputMover : MonoBehaviour |
|||
{ |
|||
public float TurnSpeed = 80; // degrees per second
|
|||
public float WalkSpeed = 2.0f; // meters per second
|
|||
public float RunSpeed = 4.0f; // meters per second
|
|||
public float StrafeSpeed = 1.0f; // meters per second
|
|||
|
|||
public float MinZoomDistance = 3; |
|||
public float MaxZoomDistance = 10; |
|||
public float ZoomSpeed = 3; |
|||
public CinemachineVirtualCamera VirtualCam; |
|||
|
|||
private CharacterController controller; |
|||
private Animator animator; |
|||
|
|||
private void Awake() |
|||
{ |
|||
controller = GetComponent<CharacterController>(); |
|||
animator = GetComponentInChildren<Animator>(); |
|||
} |
|||
|
|||
// Update is called once per frame
|
|||
private void Update() |
|||
{ |
|||
bool isRunning = !Input.GetKey(KeyCode.LeftShift) && !Input.GetKey(KeyCode.RightShift); |
|||
|
|||
float horizontalMove = 0; |
|||
float verticalMove = 0; |
|||
float rotateSpeed = 0; |
|||
float animateMovement = 0; |
|||
|
|||
if (Input.GetKey(KeyCode.W) || Input.GetKey(KeyCode.UpArrow)) |
|||
{ |
|||
if (isRunning) |
|||
{ |
|||
verticalMove = -RunSpeed; |
|||
animateMovement = 1; |
|||
} |
|||
else |
|||
{ |
|||
verticalMove = -WalkSpeed; |
|||
animateMovement = 0.5f; |
|||
} |
|||
} |
|||
else if (Input.GetKey(KeyCode.S) || Input.GetKey(KeyCode.DownArrow)) |
|||
{ |
|||
if (isRunning) |
|||
{ |
|||
verticalMove = RunSpeed; |
|||
animateMovement = 1f; |
|||
} |
|||
else |
|||
{ |
|||
verticalMove = WalkSpeed; |
|||
animateMovement = 0.5f; |
|||
} |
|||
} |
|||
|
|||
if (Input.GetKey(KeyCode.Q)) |
|||
{ |
|||
horizontalMove = StrafeSpeed; |
|||
} |
|||
else if (Input.GetKey(KeyCode.E)) |
|||
{ |
|||
horizontalMove = -StrafeSpeed; |
|||
} |
|||
|
|||
if (Input.GetKey(KeyCode.A) || Input.GetKey(KeyCode.LeftArrow)) |
|||
{ |
|||
rotateSpeed = -TurnSpeed; |
|||
} |
|||
|
|||
if (Input.GetKey(KeyCode.D) || Input.GetKey(KeyCode.RightArrow)) |
|||
{ |
|||
rotateSpeed = TurnSpeed; |
|||
} |
|||
|
|||
controller.transform.Rotate(0, rotateSpeed * Time.deltaTime, 0); |
|||
controller.SimpleMove(transform.TransformDirection(new Vector3(horizontalMove, 0, verticalMove))); |
|||
UpdateMoveAnimation(animateMovement); |
|||
|
|||
if (Input.GetKeyDown(KeyCode.Space)) |
|||
{ |
|||
BeginAttackAnimation(1); |
|||
} |
|||
|
|||
float scroll = Input.GetAxis("Mouse ScrollWheel"); |
|||
if (scroll != 0 && VirtualCam) |
|||
ZoomCamera(scroll); |
|||
} |
|||
|
|||
|
|||
private void UpdateMoveAnimation(float movementSpeed) |
|||
{ |
|||
animator.SetFloat("Speed", movementSpeed); |
|||
} |
|||
|
|||
private void BeginAttackAnimation(int attackAnimationID) |
|||
{ |
|||
animator.SetInteger("AttackID", attackAnimationID); |
|||
animator.SetTrigger("BeginAttack"); |
|||
} |
|||
|
|||
private void ZoomCamera(float scroll) |
|||
{ |
|||
CinemachineComponentBase[] components = VirtualCam.GetComponentPipeline(); |
|||
foreach (CinemachineComponentBase component in components) |
|||
{ |
|||
if (component is CinemachineFramingTransposer) |
|||
{ |
|||
CinemachineFramingTransposer c = (CinemachineFramingTransposer)component; |
|||
c.m_CameraDistance += -scroll * ZoomSpeed; |
|||
if (c.m_CameraDistance < MinZoomDistance) |
|||
c.m_CameraDistance = MinZoomDistance; |
|||
if (c.m_CameraDistance > MaxZoomDistance) |
|||
c.m_CameraDistance = MaxZoomDistance; |
|||
} |
|||
} |
|||
} |
|||
} |
|||
|
|||
fileFormatVersion: 2 |
|||
guid: cffed25df0931424cbdf62ca740aded2 |
|||
MonoImporter: |
|||
externalObjects: {} |
|||
serializedVersion: 2 |
|||
defaultReferences: [] |
|||
executionOrder: 0 |
|||
icon: {instanceID: 0} |
|||
userData: |
|||
assetBundleName: |
|||
assetBundleVariant: |
|||
|
|||
using MLAPI; |
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
public class GameManager : MonoBehaviour |
|||
{ |
|||
private GameObject m_playerSpawn; |
|||
|
|||
private List<GameObject> m_players = new List<GameObject>(10); |
|||
|
|||
public GameObject PlayerPrefab; |
|||
|
|||
// Start is called before the first frame update
|
|||
void Start() |
|||
{ |
|||
m_playerSpawn = GameObject.Find("SpawnPoint"); |
|||
|
|||
GameObject main_player = Instantiate(PlayerPrefab); |
|||
main_player.transform.position = m_playerSpawn.transform.position; |
|||
main_player.GetComponent<NetworkedObject>().Spawn(); |
|||
} |
|||
} |
|||
|
|||
using MLAPI; |
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
using UnityEngine.SceneManagement; |
|||
|
|||
public class MainMenuManager : MonoBehaviour |
|||
{ |
|||
private NetworkingManager m_netManager; |
|||
|
|||
// Start is called before the first frame update
|
|||
void Start() |
|||
{ |
|||
m_netManager = GameObject.Find("NetworkHost").GetComponent<NetworkingManager>(); |
|||
if(!m_netManager) |
|||
{ |
|||
throw new System.Exception("MainMenuManager requires the presence of a NetworkHost"); |
|||
} |
|||
|
|||
//and mark the NetworkHost as persistent.
|
|||
GameObject.DontDestroyOnLoad(m_netManager.gameObject); |
|||
Application.targetFrameRate = 60; |
|||
} |
|||
|
|||
public void OnHostButton() |
|||
{ |
|||
m_netManager.StartServer(); |
|||
ProgramState.Instance.IsHost = true; |
|||
SceneManager.LoadScene("unitychan_test", LoadSceneMode.Single); |
|||
} |
|||
|
|||
public void OnConnectButton() |
|||
{ |
|||
|
|||
} |
|||
} |
|||
|
|||
using MLAPI; |
|||
using System.Collections; |
|||
using System.Collections.Generic; |
|||
using UnityEngine; |
|||
|
|||
/// <summary>
|
|||
/// ProgramState is a persistent class and GameObject that lives across all scenes. It is used to pass state across scene transition boundaries.
|
|||
/// </summary>
|
|||
public class ProgramState : MonoBehaviour |
|||
{ |
|||
public bool IsHost = false; |
|||
|
|||
//NetworkingManager is contained on the NetworkHost, which is also a persistent GameObject.
|
|||
private NetworkingManager m_netManager; |
|||
|
|||
public static ProgramState Instance; |
|||
|
|||
public NetworkingManager NetManager { get { return m_netManager; } } |
|||
|
|||
/// <summary>
|
|||
/// The synchronized network time (in seconds, since the server started).
|
|||
/// </summary>
|
|||
public float NetTime { get { return m_netManager.NetworkTime; } } |
|||
|
|||
// Start is called before the first frame update
|
|||
void Start() |
|||
{ |
|||
GameObject.DontDestroyOnLoad(this.gameObject); |
|||
Instance = this; |
|||
|
|||
m_netManager = GameObject.Find("NetworkHost").GetComponent<NetworkingManager>(); |
|||
} |
|||
|
|||
} |
|||
部分文件因为文件数量过多而无法显示
撰写
预览
正在加载...
取消
保存
Reference in new issue