SAIPO
dac3a2a444
commit 2781f7f874d8b595397c9bc5108186d845fe6bb0
Merge: 2faf844 b262e57
Author: Roman <1325980292@qq.com>
Date: Mon Aug 9 23:15:43 2021 +0800
详情见最新RomanVers
Merge Request: ？
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/74
commit b262e579b24c8ffba6f08a5b79b9577b6d850d8b
Author: Roman <1325980292@qq.com>
Date: Mon Aug 9 23:14:55 2021 +0800
任务：以动画实现移动
*：实验场景：【各种系统测试与陈列】
1.创建测试小孩游戏物体
2.创建新的AC
3.编写步行动画逻辑
*：遇到问题，动画似乎不行，移动方式暂时换回原来的。
*：其余场景没有受到影响
commit 2faf844f461da8740a63e25413657b264e4eec22
Merge: 7749e35 0bc1c97
Author: Roman <1325980292@qq.com>
Date: Mon Aug 9 21:24:20 2021 +0800
合并了麒哥的动画包2
Merge Request: ？？
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/73
commit 0bc1c970e5ec4d993a0c81c7149901408664df76
Author: Roman <1325980292@qq.com>
Date: Mon Aug 9 21:23:33 2021 +0800
合并了麒哥的动画包2
commit 7749e35c85f697a28234892cef01b369ef1b8c9c
Merge: a4d3c53 9b7dbdf
Author: Roman <1325980292@qq.com>
Date: Sat Aug 7 01:32:57 2021 +0800
详情见RomanVersion最新提交
commit 9b7dbdf941327c1c891d19e82dc0460abfdb39c4
Author: Roman <1325980292@qq.com>
Date: Sat Aug 7 01:31:29 2021 +0800
任务：搭建“序章-战场”的整体流程框架
1.创建可交互电报机这个逻辑物体
*.在所有脚本首行添加说明方便查看
2.编写假电报机类，因为这个电报机没有电报机功能，而是一个类似事件的物体。
3.使假电报机可以分清场景中电话线断裂和修复的情况，并对其做出不同反应。
4.没修完电报机的反馈等待策划，修完了的等待我明天编写场景的多态系统
5.均通过了程序简单测试，请各位尽快拉取寻找问题
下班，别摸了，兄弟们
commit a4d3c53f64887ad36dd7cdfce6ca8dda59471e8f
Merge: 2dd6b3a b1dc321
Author: Roman <1325980292@qq.com>
Date: Mon Jul 26 19:31:18 2021 +0800
傻逼coding，草你妈
Merge Request: 傻逼coding，草你妈
Created By: @Roman
Accepted By: @Roman
URL: https://gensokyogroup.coding.net/p/RedGame/d/Warcorrespondents/git/merge/52
commit b1dc32196aedf51326078a004361078fde8589ca
Author: Roman <1325980292@qq.com>
Date: Mon Jul 26 19:30:24 2021 +0800
傻逼coding
commit d816886a9d13de83ff96d0e96358433b95dbcc17
Author: Roman <1325980292@qq.com>
Date: Mon Jul 26 19:28:51 2021 +0800
？
commit 86f446eb05a5150a3933f47f77c28099179a7291
Author: Roman <1325980292@qq.com>
Date: Mon Jul 26 19:26:14 2021 +0800
测试
# Conflicts:
# UserSettings/EditorUserSettings.asset
160 lines
4.2 KiB
Plaintext
160 lines
4.2 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1102 &-9181802701414636654
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: "\u8D70"
|
|
m_Speed: 1
|
|
m_CycleOffset: 0
|
|
m_Transitions:
|
|
- {fileID: 7883594159301626064}
|
|
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: cffd8edf6b210da46b5d57ee7c61f5c8, type: 2}
|
|
m_Tag:
|
|
m_SpeedParameter:
|
|
m_MirrorParameter:
|
|
m_CycleOffsetParameter:
|
|
m_TimeParameter:
|
|
--- !u!1102 &-8200817034425736061
|
|
AnimatorState:
|
|
serializedVersion: 6
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name: "\u5F85\u673A"
|
|
m_Speed: 1
|
|
m_CycleOffset: 0
|
|
m_Transitions:
|
|
- {fileID: 6955327852232728186}
|
|
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: c5193ce48c865f54d82ed80f602df605, 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: "\u5C0F\u5B69\uFF08\u5E8F\u7AE0\uFF09"
|
|
serializedVersion: 5
|
|
m_AnimatorParameters:
|
|
- m_Name: IsWalking
|
|
m_Type: 4
|
|
m_DefaultFloat: 0
|
|
m_DefaultInt: 0
|
|
m_DefaultBool: 0
|
|
m_Controller: {fileID: 0}
|
|
m_AnimatorLayers:
|
|
- serializedVersion: 5
|
|
m_Name: Base Layer
|
|
m_StateMachine: {fileID: 7854166707549671423}
|
|
m_Mask: {fileID: 0}
|
|
m_Motions: []
|
|
m_Behaviours: []
|
|
m_BlendingMode: 0
|
|
m_SyncedLayerIndex: -1
|
|
m_DefaultWeight: 0
|
|
m_IKPass: 0
|
|
m_SyncedLayerAffectsTiming: 0
|
|
m_Controller: {fileID: 9100000}
|
|
--- !u!1101 &6955327852232728186
|
|
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: IsWalking
|
|
m_EventTreshold: 0
|
|
m_DstStateMachine: {fileID: 0}
|
|
m_DstState: {fileID: -9181802701414636654}
|
|
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!1107 &7854166707549671423
|
|
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: -8200817034425736061}
|
|
m_Position: {x: 340, y: 110, z: 0}
|
|
- serializedVersion: 1
|
|
m_State: {fileID: -9181802701414636654}
|
|
m_Position: {x: 465.57388, y: -24.151016, 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: -8200817034425736061}
|
|
--- !u!1101 &7883594159301626064
|
|
AnimatorStateTransition:
|
|
m_ObjectHideFlags: 1
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_Name:
|
|
m_Conditions:
|
|
- m_ConditionMode: 2
|
|
m_ConditionEvent: IsWalking
|
|
m_EventTreshold: 0
|
|
m_DstStateMachine: {fileID: 0}
|
|
m_DstState: {fileID: -8200817034425736061}
|
|
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
|