7db9125c45
commit dbb026271fc709d07b36b271b11997919d15f3e0
Author: lspdC <961907320@qq.com>
Date: Tue Mar 15 20:26:46 2022 +0800
1、初步完成武器栏 树木交互
2、尝试用对象池实现手持武器切换（还未完成）
3、在一些简单的继承问题上对京力的部分代码进行修改（集中在Interactable类中）
commit c5cbe5ba76fcf20db855016ebfa33bb9ef79f390
Author: lspdC <961907320@qq.com>
Date: Tue Mar 15 10:39:58 2022 +0800
合并3.14分支
commit f3b7fd6631a3c3b87b17ac40b4542c2485103b46
Author: lspdC <961907320@qq.com>
Date: Tue Mar 15 10:37:34 2022 +0800
3.14进度（合并前）
# Conflicts:
# UserSettings/EditorUserSettings.asset
43 lines
1.5 KiB
Plaintext
43 lines
1.5 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!162 &1
|
|
EditorUserSettings:
|
|
m_ObjectHideFlags: 0
|
|
serializedVersion: 4
|
|
m_ConfigSettings:
|
|
RecentlyUsedScenePath-0:
|
|
value: 224247031146466b011b0b2b1e301034131a112d25292824620d3207f5e53136d2f539a9c2223e31290eea2f4b1a2e0be50f0c05d7050306101af4011fc0311707c416c61fcc5109c51008d7
|
|
flags: 0
|
|
RecentlyUsedScenePath-1:
|
|
value: 224247031146466b011b0b2b1e301034131a112d25292824620d3207f5e53136d2f539a9c2223e31290eea2f4b1a2e0be50f0c05c60a1e035f1bf30705e6
|
|
flags: 0
|
|
RecentlyUsedScenePath-2:
|
|
value: 224247031146466b011b0b2b1e301034131a112d25292824620d3207f5e53136d2f539a9c2223e31290eea2f4b1a2e0be50f0c05d7050306101af4011fc0321202cc1bd654dd1115df00
|
|
flags: 0
|
|
RecentlyUsedScenePath-3:
|
|
value: 22424703114646680e0b0227036c6c111b07142f1f2b233e2867083debf42d
|
|
flags: 0
|
|
RecentlyUsedScenePath-4:
|
|
value: 22424703114646680e0b0227036cdafbfb5831243c3d3204283a097df7ee3d2cfb
|
|
flags: 0
|
|
RecentlyUsedScenePath-5:
|
|
value: 22424703114646680e0b0227036cdafbfb583124382d34312e3d2936f1f47a2decee22f0
|
|
flags: 0
|
|
RecentlyUsedScenePath-6:
|
|
value: 22424703114646680e0b0227036cdbc9e6582b2b21382a357c67083debf42d
|
|
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
|