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
65 lines
2.8 KiB
Plaintext
65 lines
2.8 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!162 &1
|
|
EditorUserSettings:
|
|
m_ObjectHideFlags: 0
|
|
serializedVersion: 4
|
|
m_ConfigSettings:
|
|
RecentlyUsedScenePath-0:
|
|
<<<<<<< HEAD
|
|
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
|
|
=======
|
|
value: 22424703114646680e0b0227036c721f04041d09232c2304283a097df7ee3d2cfb
|
|
>>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
|
|
flags: 0
|
|
RecentlyUsedScenePath-1:
|
|
value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb7df7ee3d2cfb
|
|
flags: 0
|
|
RecentlyUsedScenePath-2:
|
|
value: 22424703114646680e0b0227036cdacaf990d3ea61adddcea8f6fb73663ffabe163e78fce9332b25
|
|
flags: 0
|
|
RecentlyUsedScenePath-3:
|
|
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
|
flags: 0
|
|
RecentlyUsedScenePath-4:
|
|
value: 22424703114646680e0b0227036cdafade90ecf1aafdcdb8e2dc99eb0c69f6dc6a20dea7f234362820
|
|
flags: 0
|
|
RecentlyUsedScenePath-5:
|
|
value: 22424703114646680e0b0227036cdacaf990d3ea61ade8e6a9f1d07df7ee3d2cfb
|
|
flags: 0
|
|
<<<<<<< HEAD
|
|
RecentlyUsedScenePath-2:
|
|
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
|
|
flags: 0
|
|
=======
|
|
RecentlyUsedScenePath-6:
|
|
value: 22424703114646680e0b0227036cdacaf990d3ea61aecec8a8d5c77df7ee3d2cfb
|
|
flags: 0
|
|
RecentlyUsedScenePath-7:
|
|
value: 22424703114646680e0b0227036cdae0f290dfc7abfbfdb7f6d69be60968fbcd663fd8601ed2bad4ce4cfa320d2a18
|
|
flags: 0
|
|
UnityEditor.ShaderGraph.Blackboard:
|
|
value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4ba85e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b0968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7
|
|
flags: 0
|
|
UnityEditor.ShaderGraph.FloatingWindowsLayout2:
|
|
value: 181344140043005e1a220d3b1f364b524c0c5a27130c293326201334cee5322ca0bd30e8eb293a707b0fd0180b3d0a36fc0d3d04e649500d1002ee0b5dbd1d2c27c00ad113cb1e10e41f1addc80993b98d9884a69ae6d8f0d1cda9e8fbfefaf9f9dea3fdb9ade882f0f7b0e1e380cafbf2c3adc18e9cd285a2908b82ec869c8395949c9483d68a8e97ddbd90bf
|
|
flags: 0
|
|
UnityEditor.ShaderGraph.InspectorWindow:
|
|
value: 18135939215a0a5004000b0e15254b524c1119263f2d6a722016393ce1eb3d36e5d339f9a5602b2e2c07a37e0901373ae01e0008f707250d171df81a53a5485d41895ac825e0100ec20313c0d91cddccd3d0c7efcca9bd80908fecb0f9cfddf1eff4e7a1b1eae482f0fcaee1e1928b86d888ed969b938797a7cf
|
|
flags: 0
|
|
>>>>>>> 2781f7f874d8b595397c9bc5108186d845fe6bb0
|
|
vcSharedLogLevel:
|
|
value: 0d5e400f0650
|
|
flags: 0
|
|
m_VCAutomaticAdd: 1
|
|
m_VCDebugCom: 0
|
|
m_VCDebugCmd: 0
|
|
m_VCDebugOut: 0
|
|
m_SemanticMergeMode: 2
|
|
m_VCShowFailedCheckout: 1
|
|
m_VCOverwriteFailedCheckoutAssets: 1
|
|
m_VCProjectOverlayIcons: 1
|
|
m_VCHierarchyOverlayIcons: 1
|
|
m_VCOtherOverlayIcons: 1
|
|
m_VCAllowAsyncUpdate: 1
|