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
115 lines
2.5 KiB
Plaintext
115 lines
2.5 KiB
Plaintext
fileFormatVersion: 2
|
|
guid: c784f0adc2ce544be915fc26a2b4b510
|
|
TextureImporter:
|
|
internalIDToNameTable:
|
|
- first:
|
|
213: 21300000
|
|
second: UrchinGirl
|
|
- first:
|
|
213: 21300002
|
|
second: Ciara
|
|
externalObjects: {}
|
|
serializedVersion: 11
|
|
mipmaps:
|
|
mipMapMode: 0
|
|
enableMipMap: 0
|
|
sRGBTexture: 1
|
|
linearTexture: 0
|
|
fadeOut: 0
|
|
borderMipMap: 0
|
|
mipMapsPreserveCoverage: 0
|
|
alphaTestReferenceValue: 0.5
|
|
mipMapFadeDistanceStart: 1
|
|
mipMapFadeDistanceEnd: 3
|
|
bumpmap:
|
|
convertToNormalMap: 0
|
|
externalNormalMap: 0
|
|
heightScale: 0.25
|
|
normalMapFilter: 0
|
|
isReadable: 0
|
|
streamingMipmaps: 0
|
|
streamingMipmapsPriority: 0
|
|
vTOnly: 0
|
|
grayScaleToAlpha: 0
|
|
generateCubemap: 6
|
|
cubemapConvolution: 0
|
|
seamlessCubemap: 0
|
|
textureFormat: -3
|
|
maxTextureSize: 1024
|
|
textureSettings:
|
|
serializedVersion: 2
|
|
filterMode: 1
|
|
aniso: 1
|
|
mipBias: 0
|
|
wrapU: 1
|
|
wrapV: 1
|
|
wrapW: 1
|
|
nPOTScale: 0
|
|
lightmap: 0
|
|
compressionQuality: 50
|
|
spriteMode: 1
|
|
spriteExtrude: 1
|
|
spriteMeshType: 1
|
|
alignment: 0
|
|
spritePivot: {x: 0.5, y: 0.5}
|
|
spritePixelsToUnits: 580
|
|
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
|
spriteGenerateFallbackPhysicsShape: 1
|
|
alphaUsage: 1
|
|
alphaIsTransparency: 1
|
|
spriteTessellationDetail: -1
|
|
textureType: 8
|
|
textureShape: 1
|
|
singleChannelComponent: 0
|
|
flipbookRows: 1
|
|
flipbookColumns: 1
|
|
maxTextureSizeSet: 0
|
|
compressionQualitySet: 0
|
|
textureFormatSet: 0
|
|
ignorePngGamma: 0
|
|
applyGammaDecoding: 1
|
|
platformSettings:
|
|
- serializedVersion: 3
|
|
buildTarget: DefaultTexturePlatform
|
|
maxTextureSize: 1024
|
|
resizeAlgorithm: 0
|
|
textureFormat: -1
|
|
textureCompression: 0
|
|
compressionQuality: 50
|
|
crunchedCompression: 0
|
|
allowsAlphaSplitting: 0
|
|
overridden: 0
|
|
androidETC2FallbackOverride: 0
|
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
- serializedVersion: 3
|
|
buildTarget: Standalone
|
|
maxTextureSize: 1024
|
|
resizeAlgorithm: 0
|
|
textureFormat: -1
|
|
textureCompression: 0
|
|
compressionQuality: 50
|
|
crunchedCompression: 0
|
|
allowsAlphaSplitting: 0
|
|
overridden: 0
|
|
androidETC2FallbackOverride: 0
|
|
forceMaximumCompressionQuality_BC6H_BC7: 0
|
|
spriteSheet:
|
|
serializedVersion: 2
|
|
sprites: []
|
|
outline: []
|
|
physicsShape: []
|
|
bones: []
|
|
spriteID: 5e97eb03825dee720800000000000000
|
|
internalID: 0
|
|
vertices: []
|
|
indices:
|
|
edges: []
|
|
weights: []
|
|
secondaryTextures: []
|
|
spritePackingTag:
|
|
pSDRemoveMatte: 1
|
|
pSDShowRemoveMatteOption: 1
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|