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
12 lines
243 B
Plaintext
12 lines
243 B
Plaintext
fileFormatVersion: 2
|
|
guid: 037f21dc1592db342a165700917f287f
|
|
MonoImporter:
|
|
externalObjects: {}
|
|
serializedVersion: 2
|
|
defaultReferences: []
|
|
executionOrder: 0
|
|
icon: {instanceID: 0}
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|