Compare commits
2 Commits
main
...
no_multipl
Author | SHA1 | Date | |
---|---|---|---|
1872f09868 | |||
e552c3453d |
7
.gitignore
vendored
7
.gitignore
vendored
@ -69,9 +69,4 @@ crashlytics-build.properties
|
|||||||
|
|
||||||
# Temporary auto-generated Android Assets
|
# Temporary auto-generated Android Assets
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
/[Aa]ssets/[Ss]treamingAssets/aa.meta
|
||||||
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
/[Aa]ssets/[Ss]treamingAssets/aa/*
|
||||||
omnisharp.json
|
|
||||||
/microsoft.unity.analyzers
|
|
||||||
|
|
||||||
.vscode
|
|
||||||
.idea
|
|
@ -9,9 +9,7 @@
|
|||||||
</component>
|
</component>
|
||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
|
<list default="true" id="8e9b3697-c9b4-441a-aeed-4ea7b4488600" name="Changes" comment="">
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/DefaultPrefabObjects.asset" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Items/PowerCore.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Items/PowerCore.prefab" afterDir="false" />
|
|
||||||
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Experimentation/MultiplayerScenes/StylizedLobbyScene.unity" afterDir="false" />
|
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -19,8 +17,10 @@
|
|||||||
<option name="LAST_RESOLUTION" value="IGNORE" />
|
<option name="LAST_RESOLUTION" value="IGNORE" />
|
||||||
</component>
|
</component>
|
||||||
<component name="HighlightingSettingsPerFile">
|
<component name="HighlightingSettingsPerFile">
|
||||||
<setting file="file://$PROJECT_DIR$/Assets/Packages/FishNet/Runtime/Object/EmptyNetworkBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/FriendObject.cs" root0="FORCE_HIGHLIGHTING" />
|
||||||
<setting file="file://$PROJECT_DIR$/Library/PackageCache/com.heathen.steamworksfoundation@3fc1f33a48/Runtime/SteamworksBehaviour.cs" root0="SKIP_HIGHLIGHTING" />
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamFriendsManager.cs" root0="SKIP_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamLobbyWithPlayer.cs" root0="FORCE_HIGHLIGHTING" />
|
||||||
|
<setting file="file://$PROJECT_DIR$/Assets/Scripts/Steam/SteamManager.cs" root0="FORCE_HIGHLIGHTING" />
|
||||||
</component>
|
</component>
|
||||||
<component name="MarkdownSettingsMigration">
|
<component name="MarkdownSettingsMigration">
|
||||||
<option name="stateVersion" value="1" />
|
<option name="stateVersion" value="1" />
|
||||||
@ -56,14 +56,6 @@
|
|||||||
}
|
}
|
||||||
}</component>
|
}</component>
|
||||||
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
<component name="RunManager" selected="Attach to Unity Editor.Attach to Unity Editor">
|
||||||
<configuration name="Standalone Player" type="RunUnityExe" factoryName="Unity Executable">
|
|
||||||
<option name="EXE_PATH" value="$PROJECT_DIR$/Build/StationObscurum.exe" />
|
|
||||||
<option name="PROGRAM_PARAMETERS" value="" />
|
|
||||||
<option name="WORKING_DIRECTORY" value="C:\Users\madha\Documents\station_obscurum_temp\Build" />
|
|
||||||
<option name="PASS_PARENT_ENVS" value="1" />
|
|
||||||
<option name="USE_EXTERNAL_CONSOLE" value="0" />
|
|
||||||
<method v="2" />
|
|
||||||
</configuration>
|
|
||||||
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
|
<configuration name="Start Unity" type="RunUnityExe" factoryName="Unity Executable">
|
||||||
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.18f1\Editor\Unity.exe" />
|
<option name="EXE_PATH" value="C:\Program Files\Unity\Hub\Editor\2021.3.18f1\Editor\Unity.exe" />
|
||||||
<option name="PROGRAM_PARAMETERS" value="-projectPath C:\Users\madha\Documents\station_obscurum_temp -debugCodeOptimization" />
|
<option name="PROGRAM_PARAMETERS" value="-projectPath C:\Users\madha\Documents\station_obscurum_temp -debugCodeOptimization" />
|
||||||
@ -116,9 +108,7 @@
|
|||||||
<workItem from="1685636572156" duration="4819000" />
|
<workItem from="1685636572156" duration="4819000" />
|
||||||
<workItem from="1685617055026" duration="83000" />
|
<workItem from="1685617055026" duration="83000" />
|
||||||
<workItem from="1685617157524" duration="2799000" />
|
<workItem from="1685617157524" duration="2799000" />
|
||||||
<workItem from="1685632962650" duration="5878000" />
|
<workItem from="1685632962650" duration="2245000" />
|
||||||
<workItem from="1686678780511" duration="1269000" />
|
|
||||||
<workItem from="1686815200830" duration="57000" />
|
|
||||||
</task>
|
</task>
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
|
@ -1,72 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!1102 &-4167230709170051545
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: StaticScroll
|
|
||||||
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: 3fb29439d80b48f4cbd6faf5bd035bf9, type: 2}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!91 &9100000
|
|
||||||
AnimatorController:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: Filter
|
|
||||||
serializedVersion: 5
|
|
||||||
m_AnimatorParameters: []
|
|
||||||
m_AnimatorLayers:
|
|
||||||
- serializedVersion: 5
|
|
||||||
m_Name: Base Layer
|
|
||||||
m_StateMachine: {fileID: 8616650005341249597}
|
|
||||||
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!1107 &8616650005341249597
|
|
||||||
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: -4167230709170051545}
|
|
||||||
m_Position: {x: 200, y: 0, 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: -4167230709170051545}
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 0f55286e56086944ebc3cd0b4c39373b
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 9100000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,179 +0,0 @@
|
|||||||
%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: StaticScroll
|
|
||||||
serializedVersion: 6
|
|
||||||
m_Legacy: 0
|
|
||||||
m_Compressed: 0
|
|
||||||
m_UseHighQualityCurve: 1
|
|
||||||
m_RotationCurves: []
|
|
||||||
m_CompressedRotationCurves: []
|
|
||||||
m_EulerCurves: []
|
|
||||||
m_PositionCurves: []
|
|
||||||
m_ScaleCurves: []
|
|
||||||
m_FloatCurves:
|
|
||||||
- curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: -384
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 4.016667
|
|
||||||
value: 378
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_AnchoredPosition.x
|
|
||||||
path:
|
|
||||||
classID: 224
|
|
||||||
script: {fileID: 0}
|
|
||||||
- curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: -11
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 4.016667
|
|
||||||
value: -11
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_AnchoredPosition.y
|
|
||||||
path:
|
|
||||||
classID: 224
|
|
||||||
script: {fileID: 0}
|
|
||||||
m_PPtrCurves: []
|
|
||||||
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: 1460864421
|
|
||||||
script: {fileID: 0}
|
|
||||||
typeID: 224
|
|
||||||
customType: 28
|
|
||||||
isPPtrCurve: 0
|
|
||||||
- serializedVersion: 2
|
|
||||||
path: 0
|
|
||||||
attribute: 538195251
|
|
||||||
script: {fileID: 0}
|
|
||||||
typeID: 224
|
|
||||||
customType: 28
|
|
||||||
isPPtrCurve: 0
|
|
||||||
pptrCurveMapping: []
|
|
||||||
m_AnimationClipSettings:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_AdditiveReferencePoseClip: {fileID: 0}
|
|
||||||
m_AdditiveReferencePoseTime: 0
|
|
||||||
m_StartTime: 0
|
|
||||||
m_StopTime: 4.016667
|
|
||||||
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:
|
|
||||||
- curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: -384
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 4.016667
|
|
||||||
value: 378
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_AnchoredPosition.x
|
|
||||||
path:
|
|
||||||
classID: 224
|
|
||||||
script: {fileID: 0}
|
|
||||||
- curve:
|
|
||||||
serializedVersion: 2
|
|
||||||
m_Curve:
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 0
|
|
||||||
value: -11
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
- serializedVersion: 3
|
|
||||||
time: 4.016667
|
|
||||||
value: -11
|
|
||||||
inSlope: 0
|
|
||||||
outSlope: 0
|
|
||||||
tangentMode: 136
|
|
||||||
weightedMode: 0
|
|
||||||
inWeight: 0.33333334
|
|
||||||
outWeight: 0.33333334
|
|
||||||
m_PreInfinity: 2
|
|
||||||
m_PostInfinity: 2
|
|
||||||
m_RotationOrder: 4
|
|
||||||
attribute: m_AnchoredPosition.y
|
|
||||||
path:
|
|
||||||
classID: 224
|
|
||||||
script: {fileID: 0}
|
|
||||||
m_EulerEditorCurves: []
|
|
||||||
m_HasGenericRootTransform: 0
|
|
||||||
m_HasMotionFloatCurves: 0
|
|
||||||
m_Events: []
|
|
@ -1,8 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 3fb29439d80b48f4cbd6faf5bd035bf9
|
|
||||||
NativeFormatImporter:
|
|
||||||
externalObjects: {}
|
|
||||||
mainObjectFileID: 7400000
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/Animations/PlayerAnimations/Emotes/Cheering.fbx
(Stored with Git LFS)
BIN
Assets/Animations/PlayerAnimations/Emotes/Cheering.fbx
(Stored with Git LFS)
Binary file not shown.
@ -1,135 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: f748a09121f8e114c88cc799ef014e39
|
|
||||||
ModelImporter:
|
|
||||||
serializedVersion: 21300
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
materials:
|
|
||||||
materialImportMode: 2
|
|
||||||
materialName: 0
|
|
||||||
materialSearch: 1
|
|
||||||
materialLocation: 1
|
|
||||||
animations:
|
|
||||||
legacyGenerateAnimations: 4
|
|
||||||
bakeSimulation: 0
|
|
||||||
resampleCurves: 1
|
|
||||||
optimizeGameObjects: 0
|
|
||||||
removeConstantScaleCurves: 1
|
|
||||||
motionNodeName:
|
|
||||||
rigImportErrors:
|
|
||||||
rigImportWarnings:
|
|
||||||
animationImportErrors:
|
|
||||||
animationImportWarnings:
|
|
||||||
animationRetargetingWarnings:
|
|
||||||
animationDoRetargetingWarnings: 0
|
|
||||||
importAnimatedCustomProperties: 0
|
|
||||||
importConstraints: 0
|
|
||||||
animationCompression: 1
|
|
||||||
animationRotationError: 0.5
|
|
||||||
animationPositionError: 0.5
|
|
||||||
animationScaleError: 0.5
|
|
||||||
animationWrapMode: 0
|
|
||||||
extraExposedTransformPaths: []
|
|
||||||
extraUserProperties: []
|
|
||||||
clipAnimations:
|
|
||||||
- serializedVersion: 16
|
|
||||||
name: CheeringEmote
|
|
||||||
takeName: mixamo.com
|
|
||||||
internalID: -203655887218126122
|
|
||||||
firstFrame: 0
|
|
||||||
lastFrame: 87
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 1
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
|
||||||
meshes:
|
|
||||||
lODScreenPercentages: []
|
|
||||||
globalScale: 1
|
|
||||||
meshCompression: 0
|
|
||||||
addColliders: 0
|
|
||||||
useSRGBMaterialColor: 1
|
|
||||||
sortHierarchyByName: 1
|
|
||||||
importVisibility: 1
|
|
||||||
importBlendShapes: 1
|
|
||||||
importCameras: 1
|
|
||||||
importLights: 1
|
|
||||||
nodeNameCollisionStrategy: 1
|
|
||||||
fileIdsGeneration: 2
|
|
||||||
swapUVChannels: 0
|
|
||||||
generateSecondaryUV: 0
|
|
||||||
useFileUnits: 1
|
|
||||||
keepQuads: 0
|
|
||||||
weldVertices: 1
|
|
||||||
bakeAxisConversion: 0
|
|
||||||
preserveHierarchy: 0
|
|
||||||
skinWeightsMode: 0
|
|
||||||
maxBonesPerVertex: 4
|
|
||||||
minBoneWeight: 0.001
|
|
||||||
optimizeBones: 1
|
|
||||||
meshOptimizationFlags: -1
|
|
||||||
indexFormat: 0
|
|
||||||
secondaryUVAngleDistortion: 8
|
|
||||||
secondaryUVAreaDistortion: 15.000001
|
|
||||||
secondaryUVHardAngle: 88
|
|
||||||
secondaryUVMarginMethod: 1
|
|
||||||
secondaryUVMinLightmapResolution: 40
|
|
||||||
secondaryUVMinObjectScale: 1
|
|
||||||
secondaryUVPackMargin: 4
|
|
||||||
useFileScale: 1
|
|
||||||
tangentSpace:
|
|
||||||
normalSmoothAngle: 60
|
|
||||||
normalImportMode: 0
|
|
||||||
tangentImportMode: 3
|
|
||||||
normalCalculationMode: 4
|
|
||||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
|
||||||
blendShapeNormalImportMode: 1
|
|
||||||
normalSmoothingSource: 0
|
|
||||||
referencedClips: []
|
|
||||||
importAnimation: 1
|
|
||||||
humanDescription:
|
|
||||||
serializedVersion: 3
|
|
||||||
human: []
|
|
||||||
skeleton: []
|
|
||||||
armTwist: 0.5
|
|
||||||
foreArmTwist: 0.5
|
|
||||||
upperLegTwist: 0.5
|
|
||||||
legTwist: 0.5
|
|
||||||
armStretch: 0.05
|
|
||||||
legStretch: 0.05
|
|
||||||
feetSpacing: 0
|
|
||||||
globalScale: 1
|
|
||||||
rootMotionBoneName:
|
|
||||||
hasTranslationDoF: 0
|
|
||||||
hasExtraRoot: 0
|
|
||||||
skeletonHasParents: 1
|
|
||||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
|
||||||
autoGenerateAvatarMappingIfUnspecified: 1
|
|
||||||
animationType: 2
|
|
||||||
humanoidOversampling: 1
|
|
||||||
avatarSetup: 0
|
|
||||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
|
||||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
|
||||||
additionalBone: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/Animations/PlayerAnimations/Emotes/Shaking Head No.fbx
(Stored with Git LFS)
BIN
Assets/Animations/PlayerAnimations/Emotes/Shaking Head No.fbx
(Stored with Git LFS)
Binary file not shown.
@ -1,135 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 63b548b25a8a87742b9e5624246d7946
|
|
||||||
ModelImporter:
|
|
||||||
serializedVersion: 21300
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
materials:
|
|
||||||
materialImportMode: 2
|
|
||||||
materialName: 0
|
|
||||||
materialSearch: 1
|
|
||||||
materialLocation: 1
|
|
||||||
animations:
|
|
||||||
legacyGenerateAnimations: 4
|
|
||||||
bakeSimulation: 0
|
|
||||||
resampleCurves: 1
|
|
||||||
optimizeGameObjects: 0
|
|
||||||
removeConstantScaleCurves: 1
|
|
||||||
motionNodeName:
|
|
||||||
rigImportErrors:
|
|
||||||
rigImportWarnings:
|
|
||||||
animationImportErrors:
|
|
||||||
animationImportWarnings:
|
|
||||||
animationRetargetingWarnings:
|
|
||||||
animationDoRetargetingWarnings: 0
|
|
||||||
importAnimatedCustomProperties: 0
|
|
||||||
importConstraints: 0
|
|
||||||
animationCompression: 1
|
|
||||||
animationRotationError: 0.5
|
|
||||||
animationPositionError: 0.5
|
|
||||||
animationScaleError: 0.5
|
|
||||||
animationWrapMode: 0
|
|
||||||
extraExposedTransformPaths: []
|
|
||||||
extraUserProperties: []
|
|
||||||
clipAnimations:
|
|
||||||
- serializedVersion: 16
|
|
||||||
name: ShakingHeadNo
|
|
||||||
takeName: mixamo.com
|
|
||||||
internalID: -203655887218126122
|
|
||||||
firstFrame: 0
|
|
||||||
lastFrame: 54
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 1
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
|
||||||
meshes:
|
|
||||||
lODScreenPercentages: []
|
|
||||||
globalScale: 1
|
|
||||||
meshCompression: 0
|
|
||||||
addColliders: 0
|
|
||||||
useSRGBMaterialColor: 1
|
|
||||||
sortHierarchyByName: 1
|
|
||||||
importVisibility: 1
|
|
||||||
importBlendShapes: 1
|
|
||||||
importCameras: 1
|
|
||||||
importLights: 1
|
|
||||||
nodeNameCollisionStrategy: 1
|
|
||||||
fileIdsGeneration: 2
|
|
||||||
swapUVChannels: 0
|
|
||||||
generateSecondaryUV: 0
|
|
||||||
useFileUnits: 1
|
|
||||||
keepQuads: 0
|
|
||||||
weldVertices: 1
|
|
||||||
bakeAxisConversion: 0
|
|
||||||
preserveHierarchy: 0
|
|
||||||
skinWeightsMode: 0
|
|
||||||
maxBonesPerVertex: 4
|
|
||||||
minBoneWeight: 0.001
|
|
||||||
optimizeBones: 1
|
|
||||||
meshOptimizationFlags: -1
|
|
||||||
indexFormat: 0
|
|
||||||
secondaryUVAngleDistortion: 8
|
|
||||||
secondaryUVAreaDistortion: 15.000001
|
|
||||||
secondaryUVHardAngle: 88
|
|
||||||
secondaryUVMarginMethod: 1
|
|
||||||
secondaryUVMinLightmapResolution: 40
|
|
||||||
secondaryUVMinObjectScale: 1
|
|
||||||
secondaryUVPackMargin: 4
|
|
||||||
useFileScale: 1
|
|
||||||
tangentSpace:
|
|
||||||
normalSmoothAngle: 60
|
|
||||||
normalImportMode: 0
|
|
||||||
tangentImportMode: 3
|
|
||||||
normalCalculationMode: 4
|
|
||||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
|
||||||
blendShapeNormalImportMode: 1
|
|
||||||
normalSmoothingSource: 0
|
|
||||||
referencedClips: []
|
|
||||||
importAnimation: 1
|
|
||||||
humanDescription:
|
|
||||||
serializedVersion: 3
|
|
||||||
human: []
|
|
||||||
skeleton: []
|
|
||||||
armTwist: 0.5
|
|
||||||
foreArmTwist: 0.5
|
|
||||||
upperLegTwist: 0.5
|
|
||||||
legTwist: 0.5
|
|
||||||
armStretch: 0.05
|
|
||||||
legStretch: 0.05
|
|
||||||
feetSpacing: 0
|
|
||||||
globalScale: 1
|
|
||||||
rootMotionBoneName:
|
|
||||||
hasTranslationDoF: 0
|
|
||||||
hasExtraRoot: 0
|
|
||||||
skeletonHasParents: 1
|
|
||||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
|
||||||
autoGenerateAvatarMappingIfUnspecified: 1
|
|
||||||
animationType: 2
|
|
||||||
humanoidOversampling: 1
|
|
||||||
avatarSetup: 0
|
|
||||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
|
||||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
|
||||||
additionalBone: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
BIN
Assets/Animations/PlayerAnimations/Emotes/Waving.fbx
(Stored with Git LFS)
BIN
Assets/Animations/PlayerAnimations/Emotes/Waving.fbx
(Stored with Git LFS)
Binary file not shown.
BIN
Assets/Animations/PlayerAnimations/Idle/CryopodIdle.fbx
(Stored with Git LFS)
BIN
Assets/Animations/PlayerAnimations/Idle/CryopodIdle.fbx
(Stored with Git LFS)
Binary file not shown.
@ -1,135 +0,0 @@
|
|||||||
fileFormatVersion: 2
|
|
||||||
guid: 7f30302e95a206b43a6ef9cef631aa94
|
|
||||||
ModelImporter:
|
|
||||||
serializedVersion: 21300
|
|
||||||
internalIDToNameTable: []
|
|
||||||
externalObjects: {}
|
|
||||||
materials:
|
|
||||||
materialImportMode: 2
|
|
||||||
materialName: 0
|
|
||||||
materialSearch: 1
|
|
||||||
materialLocation: 1
|
|
||||||
animations:
|
|
||||||
legacyGenerateAnimations: 4
|
|
||||||
bakeSimulation: 0
|
|
||||||
resampleCurves: 1
|
|
||||||
optimizeGameObjects: 0
|
|
||||||
removeConstantScaleCurves: 1
|
|
||||||
motionNodeName:
|
|
||||||
rigImportErrors:
|
|
||||||
rigImportWarnings:
|
|
||||||
animationImportErrors:
|
|
||||||
animationImportWarnings:
|
|
||||||
animationRetargetingWarnings:
|
|
||||||
animationDoRetargetingWarnings: 0
|
|
||||||
importAnimatedCustomProperties: 0
|
|
||||||
importConstraints: 0
|
|
||||||
animationCompression: 1
|
|
||||||
animationRotationError: 0.5
|
|
||||||
animationPositionError: 0.5
|
|
||||||
animationScaleError: 0.5
|
|
||||||
animationWrapMode: 0
|
|
||||||
extraExposedTransformPaths: []
|
|
||||||
extraUserProperties: []
|
|
||||||
clipAnimations:
|
|
||||||
- serializedVersion: 16
|
|
||||||
name: mixamo.com
|
|
||||||
takeName: mixamo.com
|
|
||||||
internalID: -203655887218126122
|
|
||||||
firstFrame: 0
|
|
||||||
lastFrame: 304
|
|
||||||
wrapMode: 0
|
|
||||||
orientationOffsetY: 0
|
|
||||||
level: 0
|
|
||||||
cycleOffset: 0
|
|
||||||
loop: 0
|
|
||||||
hasAdditiveReferencePose: 0
|
|
||||||
loopTime: 1
|
|
||||||
loopBlend: 0
|
|
||||||
loopBlendOrientation: 0
|
|
||||||
loopBlendPositionY: 0
|
|
||||||
loopBlendPositionXZ: 0
|
|
||||||
keepOriginalOrientation: 0
|
|
||||||
keepOriginalPositionY: 1
|
|
||||||
keepOriginalPositionXZ: 0
|
|
||||||
heightFromFeet: 0
|
|
||||||
mirror: 0
|
|
||||||
bodyMask: 01000000010000000100000001000000010000000100000001000000010000000100000001000000010000000100000001000000
|
|
||||||
curves: []
|
|
||||||
events: []
|
|
||||||
transformMask: []
|
|
||||||
maskType: 3
|
|
||||||
maskSource: {instanceID: 0}
|
|
||||||
additiveReferencePoseFrame: 0
|
|
||||||
isReadable: 0
|
|
||||||
meshes:
|
|
||||||
lODScreenPercentages: []
|
|
||||||
globalScale: 1
|
|
||||||
meshCompression: 0
|
|
||||||
addColliders: 0
|
|
||||||
useSRGBMaterialColor: 1
|
|
||||||
sortHierarchyByName: 1
|
|
||||||
importVisibility: 1
|
|
||||||
importBlendShapes: 1
|
|
||||||
importCameras: 1
|
|
||||||
importLights: 1
|
|
||||||
nodeNameCollisionStrategy: 1
|
|
||||||
fileIdsGeneration: 2
|
|
||||||
swapUVChannels: 0
|
|
||||||
generateSecondaryUV: 0
|
|
||||||
useFileUnits: 1
|
|
||||||
keepQuads: 0
|
|
||||||
weldVertices: 1
|
|
||||||
bakeAxisConversion: 0
|
|
||||||
preserveHierarchy: 0
|
|
||||||
skinWeightsMode: 0
|
|
||||||
maxBonesPerVertex: 4
|
|
||||||
minBoneWeight: 0.001
|
|
||||||
optimizeBones: 1
|
|
||||||
meshOptimizationFlags: -1
|
|
||||||
indexFormat: 0
|
|
||||||
secondaryUVAngleDistortion: 8
|
|
||||||
secondaryUVAreaDistortion: 15.000001
|
|
||||||
secondaryUVHardAngle: 88
|
|
||||||
secondaryUVMarginMethod: 1
|
|
||||||
secondaryUVMinLightmapResolution: 40
|
|
||||||
secondaryUVMinObjectScale: 1
|
|
||||||
secondaryUVPackMargin: 4
|
|
||||||
useFileScale: 1
|
|
||||||
tangentSpace:
|
|
||||||
normalSmoothAngle: 60
|
|
||||||
normalImportMode: 0
|
|
||||||
tangentImportMode: 3
|
|
||||||
normalCalculationMode: 4
|
|
||||||
legacyComputeAllNormalsFromSmoothingGroupsWhenMeshHasBlendShapes: 0
|
|
||||||
blendShapeNormalImportMode: 1
|
|
||||||
normalSmoothingSource: 0
|
|
||||||
referencedClips: []
|
|
||||||
importAnimation: 1
|
|
||||||
humanDescription:
|
|
||||||
serializedVersion: 3
|
|
||||||
human: []
|
|
||||||
skeleton: []
|
|
||||||
armTwist: 0.5
|
|
||||||
foreArmTwist: 0.5
|
|
||||||
upperLegTwist: 0.5
|
|
||||||
legTwist: 0.5
|
|
||||||
armStretch: 0.05
|
|
||||||
legStretch: 0.05
|
|
||||||
feetSpacing: 0
|
|
||||||
globalScale: 1
|
|
||||||
rootMotionBoneName:
|
|
||||||
hasTranslationDoF: 0
|
|
||||||
hasExtraRoot: 0
|
|
||||||
skeletonHasParents: 1
|
|
||||||
lastHumanDescriptionAvatarSource: {instanceID: 0}
|
|
||||||
autoGenerateAvatarMappingIfUnspecified: 1
|
|
||||||
animationType: 2
|
|
||||||
humanoidOversampling: 1
|
|
||||||
avatarSetup: 0
|
|
||||||
addHumanoidExtraRootOnlyWhenUsingAvatar: 1
|
|
||||||
remapMaterialsIfMaterialImportModeIsNone: 0
|
|
||||||
additionalBone: 0
|
|
||||||
userData:
|
|
||||||
assetBundleName:
|
|
||||||
assetBundleVariant:
|
|
@ -1,31 +1,5 @@
|
|||||||
%YAML 1.1
|
%YAML 1.1
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
%TAG !u! tag:unity3d.com,2011:
|
||||||
--- !u!1102 &-9118139884578132761
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: CryopodIdle
|
|
||||||
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: -203655887218126122, guid: 7f30302e95a206b43a6ef9cef631aa94, type: 3}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1102 &-9042336647299626999
|
--- !u!1102 &-9042336647299626999
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@ -131,32 +105,6 @@ AnimatorStateTransition:
|
|||||||
m_InterruptionSource: 1
|
m_InterruptionSource: 1
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &-8714511953370191016
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: CheeringEmote
|
|
||||||
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: -203655887218126122, guid: f748a09121f8e114c88cc799ef014e39, type: 3}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1101 &-8547102803249779465
|
--- !u!1101 &-8547102803249779465
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -1302,7 +1250,7 @@ AnimatorController:
|
|||||||
m_Type: 4
|
m_Type: 4
|
||||||
m_DefaultFloat: 0
|
m_DefaultFloat: 0
|
||||||
m_DefaultInt: 0
|
m_DefaultInt: 0
|
||||||
m_DefaultBool: 0
|
m_DefaultBool: 1
|
||||||
m_Controller: {fileID: 0}
|
m_Controller: {fileID: 0}
|
||||||
- m_Name: RunningSpeed
|
- m_Name: RunningSpeed
|
||||||
m_Type: 1
|
m_Type: 1
|
||||||
@ -1453,32 +1401,6 @@ AnimatorStateTransition:
|
|||||||
m_InterruptionSource: 1
|
m_InterruptionSource: 1
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &234580325284277981
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: Waving
|
|
||||||
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: -203655887218126122, guid: 93a156c1c77b96d48bd06c0f22e61d51, type: 3}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1101 &261867820848477991
|
--- !u!1101 &261867820848477991
|
||||||
AnimatorStateTransition:
|
AnimatorStateTransition:
|
||||||
m_ObjectHideFlags: 1
|
m_ObjectHideFlags: 1
|
||||||
@ -1529,32 +1451,6 @@ AnimatorStateTransition:
|
|||||||
m_InterruptionSource: 1
|
m_InterruptionSource: 1
|
||||||
m_OrderedInterruption: 1
|
m_OrderedInterruption: 1
|
||||||
m_CanTransitionToSelf: 1
|
m_CanTransitionToSelf: 1
|
||||||
--- !u!1102 &461510846652278345
|
|
||||||
AnimatorState:
|
|
||||||
serializedVersion: 6
|
|
||||||
m_ObjectHideFlags: 1
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: ShakingHeadNo
|
|
||||||
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: -203655887218126122, guid: 63b548b25a8a87742b9e5624246d7946, type: 3}
|
|
||||||
m_Tag:
|
|
||||||
m_SpeedParameter:
|
|
||||||
m_MirrorParameter:
|
|
||||||
m_CycleOffsetParameter:
|
|
||||||
m_TimeParameter:
|
|
||||||
--- !u!1102 &583101868980985703
|
--- !u!1102 &583101868980985703
|
||||||
AnimatorState:
|
AnimatorState:
|
||||||
serializedVersion: 6
|
serializedVersion: 6
|
||||||
@ -2647,18 +2543,6 @@ AnimatorStateMachine:
|
|||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_State: {fileID: -7663569941003565567}
|
m_State: {fileID: -7663569941003565567}
|
||||||
m_Position: {x: 760, y: 510, z: 0}
|
m_Position: {x: 760, y: 510, z: 0}
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: -9118139884578132761}
|
|
||||||
m_Position: {x: 440, y: 580, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: -8714511953370191016}
|
|
||||||
m_Position: {x: -163.01251, y: 677.14557, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: 461510846652278345}
|
|
||||||
m_Position: {x: -160, y: 720, z: 0}
|
|
||||||
- serializedVersion: 1
|
|
||||||
m_State: {fileID: 234580325284277981}
|
|
||||||
m_Position: {x: -160, y: 760, z: 0}
|
|
||||||
m_ChildStateMachines:
|
m_ChildStateMachines:
|
||||||
- serializedVersion: 1
|
- serializedVersion: 1
|
||||||
m_StateMachine: {fileID: -6935279036761329183}
|
m_StateMachine: {fileID: -6935279036761329183}
|
||||||
|
@ -1,225 +0,0 @@
|
|||||||
%YAML 1.1
|
|
||||||
%TAG !u! tag:unity3d.com,2011:
|
|
||||||
--- !u!200 &20000000
|
|
||||||
ShaderVariantCollection:
|
|
||||||
m_ObjectHideFlags: 0
|
|
||||||
m_CorrespondingSourceObject: {fileID: 0}
|
|
||||||
m_PrefabInstance: {fileID: 0}
|
|
||||||
m_PrefabAsset: {fileID: 0}
|
|
||||||
m_Name: QuickBuild
|
|
||||||
m_Shaders:
|
|
||||||
- first: {fileID: 10770, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: UNITY_UI_ALPHACLIP
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 66, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9000, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9001, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9002, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9003, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9004, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9007, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9101, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 9103, guid: 0000000000000000f000000000000000, type: 0}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 6e4ae4064600d784cac1e41a9e6f2e59, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: _DETAIL_MAP _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
|
|
||||||
_NORMALMAP _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
|
||||||
_SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP
|
|
||||||
_NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 8
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
|
||||||
SHADOW_MEDIUM USE_CLUSTERED_LIGHTLIST _DETAIL_MAP _DISABLE_SSR_TRANSPARENT
|
|
||||||
_ENABLE_FOG_ON_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
|
||||||
SHADOW_MEDIUM USE_CLUSTERED_LIGHTLIST _DISABLE_SSR_TRANSPARENT _ENABLE_FOG_ON_TRANSPARENT
|
|
||||||
_NORMALMAP_TANGENT_SPACE _SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
|
||||||
_DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
|
||||||
_MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
|
||||||
_MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
|
||||||
_NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF _DISABLE_SSR_TRANSPARENT
|
|
||||||
_NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _MASKMAP _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _MATERIAL_FEATURE_CLEAR_COAT _NORMALMAP
|
|
||||||
_NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT _NORMALMAP_TANGENT_SPACE
|
|
||||||
passType: 13
|
|
||||||
- first: {fileID: 4800000, guid: 2fcfb8d92f45e4549b3f0bad5d0654bf, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 02ae56f4306413c4a96dcf005cde1971, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 2e37131331fbdca449b1a2bc47a639ca, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 035941b63024d1943af48811c1db20d9, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 8ea49ef16606acd489439e676ab84040, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 42dfcc8fe803ece4096c58630689982f, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: e22fc1942c664490980b8793dd4a163d, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 67d6171b0acc6554aad48c845ec7e67f, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: CHECKERBOARD_DOWNSAMPLE
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 2ad7ce40f0dbaf64dadef1f58d8524d3, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: NEAREST_DEPTH
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 32f724728cf19904291226f239ec16f0, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 9bd32a6ece529fd4f9408b8d7e00c10d, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: SHADOW_MEDIUM USE_FPTL_LIGHTLIST
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: fd532bf1795188c4daaa66ea798b8b0a, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: DECAL_SURFACE_GRADIENT
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: 5ac9ef0c50282754b93c7692488e7ee7, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: APPLY_AFTER_POST
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: -6465566751694194690, guid: d2ddc79091f86244b9e41d99a956f4b5, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: _ALPHATEST_ON _DISABLE_SSR_TRANSPARENT _DOUBLESIDED_ON
|
|
||||||
passType: 13
|
|
||||||
- first: {fileID: -6465566751694194690, guid: c28bb37ced75c094faa86ea19e772801, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: INSTANCING_ON _DISABLE_SSR_TRANSPARENT
|
|
||||||
passType: 8
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT
|
|
||||||
passType: 8
|
|
||||||
- keywords: DECALS_3RT DECAL_SURFACE_GRADIENT PROBE_VOLUMES_OFF SCREEN_SPACE_SHADOWS_OFF
|
|
||||||
SHADOW_MEDIUM USE_FPTL_LIGHTLIST _DISABLE_SSR_TRANSPARENT
|
|
||||||
passType: 13
|
|
||||||
- keywords: _DISABLE_SSR_TRANSPARENT
|
|
||||||
passType: 13
|
|
||||||
- first: {fileID: 4800000, guid: c4edd00ff2db5b24391a4fcb1762e459, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 8
|
|
||||||
- keywords:
|
|
||||||
passType: 13
|
|
||||||
- first: {fileID: 4800000, guid: 68e6db2ebdc24f95958faec2be5558d6, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: -6465566751694194690, guid: f63d574838ccfb44f84acc05fed0af48, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords: _ALPHATEST_ON _SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 8
|
|
||||||
- keywords: _ALPHATEST_ON _SURFACE_TYPE_TRANSPARENT
|
|
||||||
passType: 13
|
|
||||||
- first: {fileID: 4800000, guid: 36e335017ad71d54fbb10842863188ae, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
||||||
- first: {fileID: 4800000, guid: c195329559c73c3468a698f0ef005558, type: 3}
|
|
||||||
second:
|
|
||||||
variants:
|
|
||||||
- keywords:
|
|
||||||
passType: 0
|
|
@ -13,12 +13,7 @@ MonoBehaviour:
|
|||||||
m_Name: DefaultPrefabObjects
|
m_Name: DefaultPrefabObjects
|
||||||
m_EditorClassIdentifier:
|
m_EditorClassIdentifier:
|
||||||
_prefabs:
|
_prefabs:
|
||||||
- {fileID: 5498159848629933595, guid: 10110e55c50520d42a4601f2a7d6542f, type: 3}
|
- {fileID: 3680155643994880520, guid: 502609875cf67524391bcf30129c195b, type: 3}
|
||||||
- {fileID: 2567458756038211005, guid: 6e7c21afe51065e4aae8fa80f880f1e5, type: 3}
|
|
||||||
- {fileID: 1069525110278255243, guid: 5e611af8f39b09a4f9b479a29f3460ff, type: 3}
|
|
||||||
- {fileID: 6649839674135743142, guid: 396e7ba93ef9d4147a6a6c09b1abe39d, type: 3}
|
|
||||||
- {fileID: -5190615940012992767, guid: 52ba61e86784ff5458c6685514d6d6c8, type: 3}
|
|
||||||
- {fileID: -3690528308152583234, guid: 148456ca1eee0994eb0165cb943e8322, type: 3}
|
|
||||||
- {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3}
|
- {fileID: 4512293259955182956, guid: 300370bdf7819da41937e0beac65b32c, type: 3}
|
||||||
- {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3}
|
- {fileID: 233110740096973419, guid: e05b94df3e7783a48ac1ed2d12a71774, type: 3}
|
||||||
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
|
- {fileID: 611616139817875448, guid: bf5f023b4017a5e41a9815ec5745df3d, type: 3}
|
||||||
|
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user