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
98 lines
2.7 KiB
Plaintext
98 lines
2.7 KiB
Plaintext
%YAML 1.1
|
|
%TAG !u! tag:unity3d.com,2011:
|
|
--- !u!1 &6620016358095660858
|
|
GameObject:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
serializedVersion: 6
|
|
m_Component:
|
|
- component: {fileID: 6620016358095660856}
|
|
- component: {fileID: 6620016358095660859}
|
|
- component: {fileID: 8773829515005846407}
|
|
m_Layer: 0
|
|
m_Name: "\u77F3\u5200"
|
|
m_TagString: Untagged
|
|
m_Icon: {fileID: 0}
|
|
m_NavMeshLayer: 0
|
|
m_StaticEditorFlags: 0
|
|
m_IsActive: 1
|
|
--- !u!4 &6620016358095660856
|
|
Transform:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 6620016358095660858}
|
|
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
|
m_LocalPosition: {x: 0, y: 0, z: 0}
|
|
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
|
|
m_Children: []
|
|
m_Father: {fileID: 0}
|
|
m_RootOrder: 0
|
|
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
|
--- !u!212 &6620016358095660859
|
|
SpriteRenderer:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 6620016358095660858}
|
|
m_Enabled: 1
|
|
m_CastShadows: 0
|
|
m_ReceiveShadows: 0
|
|
m_DynamicOccludee: 1
|
|
m_MotionVectors: 1
|
|
m_LightProbeUsage: 1
|
|
m_ReflectionProbeUsage: 1
|
|
m_RayTracingMode: 0
|
|
m_RayTraceProcedural: 0
|
|
m_RenderingLayerMask: 1
|
|
m_RendererPriority: 0
|
|
m_Materials:
|
|
- {fileID: 2100000, guid: a97c105638bdf8b4a8650670310a4cd3, type: 2}
|
|
m_StaticBatchInfo:
|
|
firstSubMesh: 0
|
|
subMeshCount: 0
|
|
m_StaticBatchRoot: {fileID: 0}
|
|
m_ProbeAnchor: {fileID: 0}
|
|
m_LightProbeVolumeOverride: {fileID: 0}
|
|
m_ScaleInLightmap: 1
|
|
m_ReceiveGI: 1
|
|
m_PreserveUVs: 0
|
|
m_IgnoreNormalsForChartDetection: 0
|
|
m_ImportantGI: 0
|
|
m_StitchLightmapSeams: 1
|
|
m_SelectedEditorRenderState: 0
|
|
m_MinimumChartSize: 4
|
|
m_AutoUVMaxDistance: 0.5
|
|
m_AutoUVMaxAngle: 89
|
|
m_LightmapParameters: {fileID: 0}
|
|
m_SortingLayerID: 0
|
|
m_SortingLayer: 0
|
|
m_SortingOrder: 0
|
|
m_Sprite: {fileID: 21300000, guid: dc56fb8ee3fd2f140af2c2f5b46474ca, type: 3}
|
|
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
|
m_FlipX: 0
|
|
m_FlipY: 0
|
|
m_DrawMode: 0
|
|
m_Size: {x: 2.41, y: 5.57}
|
|
m_AdaptiveModeThreshold: 0.5
|
|
m_SpriteTileMode: 0
|
|
m_WasSpriteAssigned: 1
|
|
m_MaskInteraction: 0
|
|
m_SpriteSortPoint: 0
|
|
--- !u!114 &8773829515005846407
|
|
MonoBehaviour:
|
|
m_ObjectHideFlags: 0
|
|
m_CorrespondingSourceObject: {fileID: 0}
|
|
m_PrefabInstance: {fileID: 0}
|
|
m_PrefabAsset: {fileID: 0}
|
|
m_GameObject: {fileID: 6620016358095660858}
|
|
m_Enabled: 1
|
|
m_EditorHideFlags: 0
|
|
m_Script: {fileID: 11500000, guid: 38942215688709940aa75b20394fe4f5, type: 3}
|
|
m_Name:
|
|
m_EditorClassIdentifier:
|