CangJie/UserSettings/EditorUserSettings.asset

49 lines
1.6 KiB
Plaintext
Raw Normal View History

%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!162 &1
EditorUserSettings:
m_ObjectHideFlags: 0
serializedVersion: 4
m_ConfigSettings:
RecentlyUsedScenePath-0:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
flags: 0
RecentlyUsedScenePath-1:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
flags: 0
RecentlyUsedScenePath-2:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
flags: 0
RecentlyUsedScenePath-3:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafade90ecf1a9f9d3b7e9f35326ece92021
flags: 0
RecentlyUsedScenePath-4:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
flags: 0
RecentlyUsedScenePath-5:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
flags: 0
RecentlyUsedScenePath-6:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
任务:编写序章场景逻辑 1.编写交互操作逻辑,我会用脚本给玩家物体添加一个子物体,子物体有一个触发器,当玩家按下交互键,通过回调看是否有Catch到的可交互物体,若有,我会触发可交互物体的OnCall,若没有,则不做反应。 2.编写可交互物体基类,可交互物体继承自Event,Start时检查碰撞盒状态。当检查到玩家进入触发器,把自己交给玩家的Catch。当检查到玩家离开触发器,看目前的Catch是否和自己一样,若一样则清除Catch,若不一样说明已经Catch了其他东西,不做反应。 3.编写绳结类,继承自可交互物体。当交互,给中介者发送信息,让中介者更改记录的当前记录的绳结是哪一个 (1.内含一个来自中介者的枚举类型的变量,记录自己属于哪一种绳结 (2.当OnCall,把自己的类型发给中介者 4.编写绳结中介者,负责玩家、皇帝和绳结的信息交流。 (1.有一个枚举类型,内含三种绳结种类 (2.有一个枚举类型的变量,记录当前记录的是哪一个绳结 (3.当绳结发来信息,更新记录的当前绳结 5.添加新的按键监听,并增加PlayerControl的虚函数 6.编写黄帝类 (1.继承自可交互物体 (2.内含一个来自中介者的枚举类型,记录皇帝对哪一种绳结提出要求 (3.当OnCall,检查中介者中记录的绳结和要求的是不是同一种,若是则触发后续流程,若不是,则触发摇头等动作,目前不做反应 (4.内含函数与后期外界对接,用来指定皇帝需要的绳结类型 *记得给Player类的Interact函数加上Base 我是每天上班提醒小助手,今天你上班了吗?😺
2022-03-13 21:40:55 +08:00
flags: 0
RecentlyUsedScenePath-7:
Squashed commit of the following: 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
2022-04-01 20:10:20 +08:00
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
flags: 0
RecentlyUsedScenePath-8:
value: 22424703114646680e0b0227036cdafbfb589dd6f6aedfff7e67083debf42d
flags: 0
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