【战斗】提交战斗结算动画修改
chenyuqi
parent
0ee62aab7c
commit
cbd1c8d06c
|
|
@ -132,19 +132,6 @@ TextureImporter:
|
|||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -132,19 +132,6 @@ TextureImporter:
|
|||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -132,19 +132,6 @@ TextureImporter:
|
|||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -132,19 +132,6 @@ TextureImporter:
|
|||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
- serializedVersion: 3
|
||||
buildTarget: WebGL
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
ignorePlatformSupport: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
forceMaximumCompressionQuality_BC6H_BC7: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
|
|
|
|||
|
|
@ -37,7 +37,7 @@ Material:
|
|||
- _Factor: 0.32
|
||||
- _Gloss: 2
|
||||
- _MinDiffuse: 0.1
|
||||
- _Outline: 0.01
|
||||
- _Outline: 0.015
|
||||
- _Smoothness: 0.5
|
||||
- _SpecialStrengh: 1
|
||||
- _shadowScale: 0.5
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24959031, g: 0.46529993, b: 0.5798435, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -542,6 +542,37 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 237743507}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &323234660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 323234661}
|
||||
m_Layer: 0
|
||||
m_Name: CPos5
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &323234661
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 323234660}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.9936257, z: -0, w: -0.11272966}
|
||||
m_LocalPosition: {x: -12.23, y: -15.97988, z: 27.41}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 192.945, z: 0}
|
||||
--- !u!1 &361297696
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2270,6 +2301,37 @@ Animator:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 364832472}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &373853440
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 373853441}
|
||||
m_Layer: 0
|
||||
m_Name: VPos1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &373853441
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 373853440}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0.5725129, z: -0, w: 0.8198957}
|
||||
m_LocalPosition: {x: 34.24, y: -15.45, z: -11.73}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -69.851, z: 0}
|
||||
--- !u!1 &390559107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2492,6 +2554,37 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 199.672, z: 0}
|
||||
--- !u!1 &551724194
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 551724195}
|
||||
m_Layer: 0
|
||||
m_Name: VPos2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &551724195
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 551724194}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0.5725129, z: -0, w: 0.8198957}
|
||||
m_LocalPosition: {x: 41.1, y: -15.45, z: -14.25}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -69.851, z: 0}
|
||||
--- !u!1 &551831724
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2557,7 +2650,11 @@ Transform:
|
|||
- {fileID: 524457357}
|
||||
- {fileID: 3864446}
|
||||
- {fileID: 87575002}
|
||||
- {fileID: 323234661}
|
||||
- {fileID: 876244950}
|
||||
- {fileID: 709946932}
|
||||
- {fileID: 373853441}
|
||||
- {fileID: 551724195}
|
||||
m_Father: {fileID: 1026040388}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &631203497
|
||||
|
|
@ -2631,7 +2728,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 709946932}
|
||||
m_Layer: 0
|
||||
m_Name: VPos
|
||||
m_Name: VPos0
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2783,6 +2880,37 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 206.166, z: 0}
|
||||
--- !u!1 &876244949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 876244950}
|
||||
m_Layer: 0
|
||||
m_Name: CPos6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &876244950
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 876244949}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.9936257, z: -0, w: -0.11272966}
|
||||
m_LocalPosition: {x: -2.7, y: -15.97988, z: 23.08}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 192.945, z: 0}
|
||||
--- !u!1001 &978166176
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -3562,7 +3690,7 @@ Transform:
|
|||
- {fileID: 1562842982}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -7.41, z: 0}
|
||||
--- !u!1 &1080394528
|
||||
--- !u!1 &1157749027
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
|
|
@ -3570,7 +3698,7 @@ GameObject:
|
|||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1080394529}
|
||||
- component: {fileID: 1157749028}
|
||||
m_Layer: 0
|
||||
m_Name: CombinedRoot
|
||||
m_TagString: Untagged
|
||||
|
|
@ -3578,20 +3706,20 @@ GameObject:
|
|||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1080394529
|
||||
--- !u!4 &1157749028
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1080394528}
|
||||
m_GameObject: {fileID: 1157749027}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: -5.8345394, y: -11.563389, z: 14.398914}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children:
|
||||
- {fileID: 1939788001}
|
||||
- {fileID: 1716208692}
|
||||
m_Father: {fileID: 1608564163}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1204365462
|
||||
|
|
@ -7969,9 +8097,92 @@ Transform:
|
|||
- {fileID: 38141451}
|
||||
- {fileID: 390915979}
|
||||
- {fileID: 118261261}
|
||||
- {fileID: 1080394529}
|
||||
- {fileID: 1157749028}
|
||||
m_Father: {fileID: 0}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &1716208691
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1716208692}
|
||||
- component: {fileID: 1716208694}
|
||||
- component: {fileID: 1716208693}
|
||||
m_Layer: 0
|
||||
m_Name: NLD_URP_NLD_Scene_Lambert
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1716208692
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1716208691}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1157749028}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1716208693
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1716208691}
|
||||
m_Mesh: {fileID: 4300000, guid: 33d02371d3b58d1479d389a434b2f708, type: 2}
|
||||
--- !u!23 &1716208694
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1716208691}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 215c972e36fc5d649967ea6afb6ac65f, 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: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1001 &1785852775
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -8908,89 +9119,6 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 1897184637}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &1939788000
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 1939788001}
|
||||
- component: {fileID: 1939788003}
|
||||
- component: {fileID: 1939788002}
|
||||
m_Layer: 0
|
||||
m_Name: NLD_URP_NLD_Scene_Lambert
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &1939788001
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1939788000}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 1080394529}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!33 &1939788002
|
||||
MeshFilter:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1939788000}
|
||||
m_Mesh: {fileID: 4300000, guid: 33d02371d3b58d1479d389a434b2f708, type: 2}
|
||||
--- !u!23 &1939788003
|
||||
MeshRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1939788000}
|
||||
m_Enabled: 1
|
||||
m_CastShadows: 1
|
||||
m_ReceiveShadows: 1
|
||||
m_DynamicOccludee: 1
|
||||
m_StaticShadowCaster: 0
|
||||
m_MotionVectors: 1
|
||||
m_LightProbeUsage: 1
|
||||
m_ReflectionProbeUsage: 1
|
||||
m_RayTracingMode: 2
|
||||
m_RayTraceProcedural: 0
|
||||
m_RenderingLayerMask: 1
|
||||
m_RendererPriority: 0
|
||||
m_Materials:
|
||||
- {fileID: 2100000, guid: 215c972e36fc5d649967ea6afb6ac65f, 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: 3
|
||||
m_MinimumChartSize: 4
|
||||
m_AutoUVMaxDistance: 0.5
|
||||
m_AutoUVMaxAngle: 89
|
||||
m_LightmapParameters: {fileID: 0}
|
||||
m_SortingLayerID: 0
|
||||
m_SortingLayer: 0
|
||||
m_SortingOrder: 0
|
||||
m_AdditionalVertexStreams: {fileID: 0}
|
||||
--- !u!1 &1971265568
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
|
|
@ -1,5 +1,5 @@
|
|||
fileFormatVersion: 2
|
||||
guid: de51f20281baf6e47a646c4d27c94716
|
||||
guid: bb3b15f7c0db47042bbc863d21fb4f38
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
|
|
|
|||
|
|
@ -89,7 +89,7 @@ namespace Gameplay.Area
|
|||
|
||||
public void CreateEndNotice(int unitIndex)
|
||||
{
|
||||
DebugUtil.Log("CreateEndNotice: " + unitIndex);
|
||||
DebugUtil.Log("CreateEndNotice: " + (++unitIndex));
|
||||
var loadPath = PathDefine.RoadLine.END_NOTICES[unitIndex];
|
||||
var sampleObj = AssetManager.Instance.GetPreLoadResult<GameObject>(loadPath);
|
||||
_endNoticeObj = Object.Instantiate(sampleObj);
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ public class FightWinComponent: MonoBehaviour
|
|||
{
|
||||
private Scene _scene;
|
||||
private List<uint> _characterIDs;
|
||||
private uint _vehicleID;
|
||||
private List<uint> _vehicleIDs;
|
||||
private GameObject _objRoot;
|
||||
private List<Transform> _posTransList;
|
||||
|
||||
|
|
@ -32,6 +32,7 @@ public class FightWinComponent: MonoBehaviour
|
|||
//test
|
||||
private List<GameObject> _testObjs = new List<GameObject>();
|
||||
|
||||
private readonly int vehicleStartIndex = 7; //第七位开始算，载具的位置起始点
|
||||
private readonly int Vehicle_Model_Index = 5;
|
||||
|
||||
#region Unity EventFunction
|
||||
|
|
@ -108,9 +109,9 @@ public class FightWinComponent: MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
if (_vehicleID != Constants.INVALID_UINT_ID)
|
||||
if (_vehicleIDs != null)
|
||||
{
|
||||
await _AddVehicleModel(_vehicleID);
|
||||
await _AddVehicleModel(_vehicleIDs);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -137,18 +138,23 @@ public class FightWinComponent: MonoBehaviour
|
|||
}
|
||||
}
|
||||
|
||||
private async UniTask _AddVehicleModel(uint uid)
|
||||
private async UniTask _AddVehicleModel(List<uint> vehicleIDs)
|
||||
{
|
||||
var modelPath = CommonUtils.GetVehicleShowModelPath(uid);
|
||||
if (modelPath != null)
|
||||
for (int i = 0; i < vehicleIDs.Count; i++)
|
||||
{
|
||||
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(modelPath);
|
||||
var model = Instantiate(prefab, _objRoot.transform);
|
||||
var posTrans = _posTransList[Vehicle_Model_Index];
|
||||
model.transform.SetPositionAndRotation(posTrans.position, posTrans.rotation);
|
||||
model.transform.localScale = posTrans.localScale;
|
||||
model.SetLayerEx(LayerDefine.TeamEdit);
|
||||
var vehicleID = vehicleIDs[i];
|
||||
var modelPath = CommonUtils.GetVehicleShowModelPath(vehicleID);
|
||||
if (modelPath != null)
|
||||
{
|
||||
var prefab = await AssetManager.Instance.LoadAssetAsync<GameObject>(modelPath);
|
||||
var model = Instantiate(prefab, _objRoot.transform);
|
||||
var posTrans = _posTransList[vehicleStartIndex + i];
|
||||
model.transform.SetPositionAndRotation(posTrans.position, posTrans.rotation);
|
||||
model.transform.localScale = posTrans.localScale;
|
||||
model.SetLayerEx(LayerDefine.TeamEdit);
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private async UniTask _LoadTimeline()
|
||||
|
|
@ -171,12 +177,12 @@ public class FightWinComponent: MonoBehaviour
|
|||
_timelinePlayable = timeline;
|
||||
|
||||
//新建轨道
|
||||
for (int i = 0; i < 5; i++)
|
||||
for (int i = 0; i < _characterIDs.Count; i++)
|
||||
{
|
||||
if (i >= _characterIDs.Count)
|
||||
{
|
||||
break;
|
||||
}
|
||||
// if (i >= _characterIDs.Count)
|
||||
// {
|
||||
// break;
|
||||
// }
|
||||
var child = _objRoot.transform.GetChild(i);
|
||||
if (!child)
|
||||
{
|
||||
|
|
@ -332,16 +338,11 @@ public class FightWinComponent: MonoBehaviour
|
|||
_characterIDs = charIDList;
|
||||
}
|
||||
|
||||
|
||||
public void SetData(uint vehicleID)
|
||||
{
|
||||
_vehicleID = vehicleID;
|
||||
}
|
||||
|
||||
public void SetData(List<uint> charIDList, uint vehicleID)
|
||||
public void SetData(List<uint> charIDList, List<uint> vehicleIDs)
|
||||
{
|
||||
_characterIDs = charIDList;
|
||||
_vehicleID = vehicleID;
|
||||
_vehicleIDs = vehicleIDs;
|
||||
}
|
||||
|
||||
public void StartPlay()
|
||||
|
|
|
|||
|
|
@ -23,12 +23,12 @@ namespace Gameplay.Level
|
|||
public PVPSettleData PvpSettleData;
|
||||
|
||||
private List<uint> _showCharIDs; //结算动画展示角色
|
||||
private uint _showVehicleID; //结算动画展示载具
|
||||
private List<uint> _showVehicleIDs; //结算动画展示载具
|
||||
|
||||
private readonly string _testScenePath = "Assets/Scenes/FightWinSceneLocal.unity";
|
||||
|
||||
public List<uint> ShowCharIDs => _showCharIDs;
|
||||
public uint ShowVehicleID => _showVehicleID;
|
||||
public List<uint> ShowVehicleID => _showVehicleIDs;
|
||||
|
||||
#region API
|
||||
public async UniTask SettleSceneProcess(ItemList itemList, bool isSweep)
|
||||
|
|
@ -125,17 +125,24 @@ namespace Gameplay.Level
|
|||
{
|
||||
_showCharIDs.Clear();
|
||||
}
|
||||
|
||||
_showVehicleID = Constants.INVALID_UINT_ID;
|
||||
|
||||
if (_showVehicleIDs == null)
|
||||
{
|
||||
_showVehicleIDs = new List<uint>();
|
||||
}
|
||||
else
|
||||
{
|
||||
_showVehicleIDs.Clear();
|
||||
}
|
||||
|
||||
var team = TeamEditManagerNew.Instance.GetSelectTeam();
|
||||
var charIDs = team.GetAllCharacters();
|
||||
for (int i = 0; i < charIDs.Count; i++)
|
||||
{
|
||||
if (_showCharIDs.Count >= 5)
|
||||
{
|
||||
break;
|
||||
}
|
||||
// if (_showCharIDs.Count >= 5)
|
||||
// {
|
||||
// break;
|
||||
// }
|
||||
if (charIDs[i] > 0)
|
||||
{
|
||||
_showCharIDs.Add(charIDs[i]);
|
||||
|
|
@ -144,8 +151,7 @@ namespace Gameplay.Level
|
|||
|
||||
// TODO 修改为可以 多个载具展示
|
||||
var vehicleIDs = team.GetVehicleIDs();
|
||||
if(vehicleIDs.Count>0)
|
||||
_showVehicleID = vehicleIDs[0];
|
||||
_showVehicleIDs = vehicleIDs;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -54,6 +54,7 @@ namespace Gameplay.Net
|
|||
{
|
||||
m_Characters.Clear();
|
||||
m_Vehicles.Clear();
|
||||
m_Buildings.Clear();
|
||||
}
|
||||
|
||||
public void AddCharacter(uint nID)
|
||||
|
|
|
|||
|
|
@ -28,7 +28,7 @@ public class LevelUIManager
|
|||
|
||||
public static string GetNumberImgPath(int index)
|
||||
{
|
||||
return string.Format(Constants.UI_TEAM_UNIT_INDEX_PATH, index);
|
||||
return string.Format(Constants.UI_TEAM_UNIT_INDEX_PATH, index + 1);
|
||||
}
|
||||
|
||||
public static string GetMoralePic(bool isDanger)
|
||||
|
|
|
|||
|
|
@ -217,7 +217,7 @@ public partial class TeamManager
|
|||
continue;
|
||||
}
|
||||
singleInfo = new SingleTeamCharacterInfo(CharacterDataInfoManager.Instance.DataDic[id], unit.GetID());
|
||||
unit.unitUIData.uiIndex = workUIIndex;
|
||||
unit.unitUIData.uiIndex = defaultTeam.GetAllCharacterIdx(id);
|
||||
workUIIndex++;
|
||||
selectList.Add(singleInfo);
|
||||
}
|
||||
|
|
@ -231,7 +231,7 @@ public partial class TeamManager
|
|||
SingleTeamCharacterInfo singleInfo;
|
||||
var unit = await GameUnitManager.instance.PrepareVehicle(vInfos[i], ETroopsId.Self);
|
||||
singleInfo = new SingleTeamCharacterInfo(unit.GetID(), vInfos[i]);
|
||||
unit.unitUIData.uiIndex = workUIIndex;
|
||||
unit.unitUIData.uiIndex = defaultTeam.GetVehicleIdx(vInfos[i].nID);
|
||||
workUIIndex++;
|
||||
selectList.Add(singleInfo);
|
||||
}
|
||||
|
|
@ -467,7 +467,7 @@ public partial class TeamManager
|
|||
{
|
||||
AssetManager.Instance.PostPreload<Sprite>(LevelUIManager.GetNumberImage(i));
|
||||
}
|
||||
for (int i = 1; i <= 7; i++)
|
||||
for (int i = 0; i <= 7; i++)
|
||||
{
|
||||
AssetManager.Instance.PostPreload<Sprite>(LevelUIManager.GetNumberImgPath(i));
|
||||
}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ RenderSettings:
|
|||
m_ReflectionIntensity: 1
|
||||
m_CustomReflection: {fileID: 0}
|
||||
m_Sun: {fileID: 0}
|
||||
m_IndirectSpecularColor: {r: 0.24959031, g: 0.46529993, b: 0.5798435, a: 1}
|
||||
m_IndirectSpecularColor: {r: 0.24895254, g: 0.46394107, b: 0.57838154, a: 1}
|
||||
m_UseRadianceAmbientProbe: 0
|
||||
--- !u!157 &3
|
||||
LightmapSettings:
|
||||
|
|
@ -542,6 +542,37 @@ Transform:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 237743507}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &323234660
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 323234661}
|
||||
m_Layer: 0
|
||||
m_Name: CPos5
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &323234661
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 323234660}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.9936257, z: -0, w: -0.11272966}
|
||||
m_LocalPosition: {x: -12.23, y: -15.97988, z: 27.41}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 192.945, z: 0}
|
||||
--- !u!1 &361297696
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2270,6 +2301,37 @@ Animator:
|
|||
type: 3}
|
||||
m_PrefabInstance: {fileID: 364832472}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
--- !u!1 &373853440
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 373853441}
|
||||
m_Layer: 0
|
||||
m_Name: VPos1
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &373853441
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 373853440}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0.5725129, z: -0, w: 0.8198957}
|
||||
m_LocalPosition: {x: 34.24, y: -15.45, z: -11.73}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -69.851, z: 0}
|
||||
--- !u!1 &390559107
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2492,6 +2554,37 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 199.672, z: 0}
|
||||
--- !u!1 &551724194
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 551724195}
|
||||
m_Layer: 0
|
||||
m_Name: VPos2
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &551724195
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 551724194}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: -0.5725129, z: -0, w: 0.8198957}
|
||||
m_LocalPosition: {x: 41.1, y: -15.45, z: -14.25}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: -69.851, z: 0}
|
||||
--- !u!1 &551831724
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2557,7 +2650,11 @@ Transform:
|
|||
- {fileID: 524457357}
|
||||
- {fileID: 3864446}
|
||||
- {fileID: 87575002}
|
||||
- {fileID: 323234661}
|
||||
- {fileID: 876244950}
|
||||
- {fileID: 709946932}
|
||||
- {fileID: 373853441}
|
||||
- {fileID: 551724195}
|
||||
m_Father: {fileID: 1026040388}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
--- !u!1 &631203497
|
||||
|
|
@ -2631,7 +2728,7 @@ GameObject:
|
|||
m_Component:
|
||||
- component: {fileID: 709946932}
|
||||
m_Layer: 0
|
||||
m_Name: VPos
|
||||
m_Name: VPos0
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
|
|
@ -2783,6 +2880,37 @@ Transform:
|
|||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 206.166, z: 0}
|
||||
--- !u!1 &876244949
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 876244950}
|
||||
m_Layer: 0
|
||||
m_Name: CPos6
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!4 &876244950
|
||||
Transform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 876244949}
|
||||
serializedVersion: 2
|
||||
m_LocalRotation: {x: -0, y: 0.9936257, z: -0, w: -0.11272966}
|
||||
m_LocalPosition: {x: -2.7, y: -15.97988, z: 23.08}
|
||||
m_LocalScale: {x: 8, y: 8, z: 8}
|
||||
m_ConstrainProportionsScale: 0
|
||||
m_Children: []
|
||||
m_Father: {fileID: 581542126}
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 192.945, z: 0}
|
||||
--- !u!1001 &978166176
|
||||
PrefabInstance:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue