a26ce3a31c
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
97 lines
2.1 KiB
Plaintext
97 lines
2.1 KiB
Plaintext
fileFormatVersion: 2
|
|
guid: c0a0626de86a9ef4dbc8aa6f4ec78707
|
|
TextureImporter:
|
|
internalIDToNameTable: []
|
|
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: 1
|
|
maxTextureSize: 2048
|
|
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: 100
|
|
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: 0
|
|
platformSettings:
|
|
- serializedVersion: 3
|
|
buildTarget: DefaultTexturePlatform
|
|
maxTextureSize: 2048
|
|
resizeAlgorithm: 0
|
|
textureFormat: -1
|
|
textureCompression: 1
|
|
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: 0
|
|
pSDShowRemoveMatteOption: 0
|
|
userData:
|
|
assetBundleName:
|
|
assetBundleVariant:
|