a26ce3a31c
commit 6154ddfbb4db880c270f650d090b47263e388cfd
Author: lspdC <961907320@qq.com>
Date: Thu Mar 31 00:17:09 2022 +0800
3.30
更新落雷动画，修复手持武器位置
明天整合摄像头并最后校对第一关场景和元素的大小比例
commit 28b3246896099b84afc84a05e39b581facfacce2
Author: lspdC <961907320@qq.com>
Date: Mon Mar 28 11:24:23 2022 +0800
3.28（修改了京力酱场景内的player 不会报错）
commit 399d8d91d968ef2e4538fc22acf2e5c9089f95cf
Author: lspdC <961907320@qq.com>
Date: Sun Mar 27 19:27:24 2022 +0800
3.27
整合了移动，受伤，与树、火交互的动画
物体绑定位置和部分动画衔接还有待进一步调整。
commit 76c1cf529eee651619a9542b85a90bdfe8d0bed1
Author: lspdC <961907320@qq.com>
Date: Sat Mar 26 19:18:13 2022 +0800
3.26
下载美术动画素材
进一步整合中（预计还要整合一段时间，houdini还没做喵）
commit 3771f6a9c19e37e50f62e5e054f2aefd94af9965
Author: lspdC <961907320@qq.com>
Date: Fri Mar 25 23:39:57 2022 +0800
3.25 合并分支
commit c9c9ab412170ffd32a12b0660858625856aa3244
Author: lspdC <961907320@qq.com>
Date: Thu Mar 24 22:11:29 2022 +0800
3.24
完成除boss战以外交互，逐步整合美术素材
commit 2a2a11e8514ab67008c85b25b6703888f1ed8824
Author: lspdC <961907320@qq.com>
Date: Tue Mar 22 22:15:12 2022 +0800
3.22
完成了跟踪雷击与玩家的碰撞判定，玩家的受击反馈
击碎石头那边还有bug，明天再改
commit db3134349aaabb0ba0aaa64e43851ee0d6812fa0
Author: lspdC <961907320@qq.com>
Date: Mon Mar 21 19:51:46 2022 +0800
3.21(和霄酱搅在一起了喵)
commit d5836fec13668bd6a00ab8e9377f3959d86ab037
Author: lspdC <961907320@qq.com>
Date: Mon Mar 21 19:49:15 2022 +0800
3.21(未合并)
完成火焰，碎石交互，武器升级替换。
设置好打雷演出框架，自动追击的雷击框架，尚未加入碰撞判定。
commit 698339a63c5ad608945a2e5702b7b216c97245c3
Author: lspdC <961907320@qq.com>
Date: Sun Mar 20 23:28:11 2022 +0800
3.20 和京力交融之后的版本
commit 44c4946a717cd915dae1c92cb536031abf2f9343
Author: lspdC <961907320@qq.com>
Date: Sun Mar 20 23:24:29 2022 +0800
3.20
整理了树木交互，写了个具体互动物品的基类。
创建了火类，实现火焰交互示意（拿上木棍才能成功交互）。
commit 1b5d15c2d2c98a71d12a79c9443d9cf4c89c7f40
Author: lspdC <961907320@qq.com>
Date: Sun Mar 20 14:43:08 2022 +0800
sb coding
# Conflicts:
# Assets/Animate/Thunder/LightAttack.anim
# Assets/Animate/Tree/Tree.controller
# Assets/Animate/Tree/TreeByFrame.anim
# Assets/Prefabs/着火.prefab
# Assets/Prefabs/石斧.prefab
# Assets/Prefabs/雷电将军.prefab
# Assets/Scenes/乐/Sample1.unity
# Assets/Scenes/勍/InteractTest.unity
# Assets/Scenes/勍/场景3.unity
# Assets/Scripts/乐/Fire.cs
# Assets/Scripts/乐/Player.cs
# Assets/Scripts/乐/Shu.cs
# Assets/Scripts/乐/Stone.cs
# Assets/Scripts/乐/Thunder.cs
# Logs/ApiUpdaterCheck.txt
# UserSettings/EditorUserSettings.asset
224 lines
5.8 KiB
Plaintext
224 lines
5.8 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1107 &-7882301587831338161
|
|
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: -7198673788992821918}
|
|
m_Position: {x: 190, y: 520, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: -6611441686942547392}
|
|
m_Position: {x: 240, y: 400, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 8020492566475511360}
|
|
m_Position: {x: 240, y: 620, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: 992017425945827329}
|
|
m_Position: {x: 250, y: 710, z: 0}
|
|
m_ChildStateMachines: []
|
|
m_AnyStateTransitions:
|
|
- {fileID: 3038297982892717297}
|
|
- {fileID: -6562973274863131744}
|
|
m_EntryTransitions: []
|
|
m_StateMachineTransitions: {}
|
|
m_StateMachineBehaviours: []
|
|
m_AnyStatePosition: {x: -100, y: 590, 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: -6611441686942547392}
|
|
--- !u!1102 &-7198673788992821918
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Shake
|
|
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: 338039c598435fe47b36e3faa8a39be5, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1102 &-6611441686942547392
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Empty
|
|
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: 4f71d41a86ce8a04a8f7659c3b6ba649, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1101 &-6562973274863131744
|
|
AnimatorStateTransition:
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name:
|
|
m_Conditions:
|
|
- m_ConditionMode: 1
|
|
m_ConditionEvent: Fall
|
|
m_EventTreshold: 0
|
|
m_DstStateMachine: {fileID: 0}
|
|
m_DstState: {fileID: 992017425945827329}
|
|
m_Solo: 0
|
|
m_Mute: 0
|
|
m_IsExit: 0
|
|
serializedVersion: 3
|
|
m_TransitionDuration: 0
|
|
m_TransitionOffset: 0
|
|
m_ExitTime: 0
|
|
m_HasExitTime: 0
|
|
m_HasFixedDuration: 0
|
|
m_InterruptionSource: 0
|
|
m_OrderedInterruption: 1
|
|
m_CanTransitionToSelf: 1
|
|
--- !u!91 &9100000
|
|
AnimatorController:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Tree
|
|
serializedVersion: 5
|
|
m_AnimatorParameters:
|
|
- m_Name: Shake
|
|
m_Type: 9
|
|
m_DefaultFloat: 0
|
|
m_DefaultInt: 0
|
|
m_DefaultBool: 0
|
|
m_Controller: {fileID: 9100000}
|
|
- m_Name: Fall
|
|
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: -7882301587831338161}
|
|
m_Mask: {fileID: 0}
|
|
m_Motions: []
|
|
m_Behaviours: []
|
|
m_BlendingMode: 0
|
|
m_SyncedLayerIndex: -1
|
|
m_DefaultWeight: 0
|
|
m_IKPass: 0
|
|
m_SyncedLayerAffectsTiming: 0
|
|
m_Controller: {fileID: 9100000}
|
|
--- !u!1102 &992017425945827329
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: TreeByFrame
|
|
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: f9b3047ef959a3b48bbaf91566153586, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1101 &3038297982892717297
|
|
AnimatorStateTransition:
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name:
|
|
m_Conditions:
|
|
- m_ConditionMode: 1
|
|
m_ConditionEvent: Shake
|
|
m_EventTreshold: 0
|
|
m_DstStateMachine: {fileID: 0}
|
|
m_DstState: {fileID: -7198673788992821918}
|
|
m_Solo: 0
|
|
m_Mute: 0
|
|
m_IsExit: 0
|
|
serializedVersion: 3
|
|
m_TransitionDuration: 0
|
|
m_TransitionOffset: 0
|
|
m_ExitTime: 0.75
|
|
m_HasExitTime: 0
|
|
m_HasFixedDuration: 0
|
|
m_InterruptionSource: 0
|
|
m_OrderedInterruption: 1
|
|
m_CanTransitionToSelf: 1
|
|
--- !u!1102 &8020492566475511360
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: Fall
|
|
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: 951184307496ffd478344c57c3da83a4, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|