Commit d42fcd90 authored by Ruidong's avatar Ruidong

修改场景,人物模型

parent 33b48487
...@@ -2,8 +2,6 @@ ...@@ -2,8 +2,6 @@
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup> <PropertyGroup>
<LangVersion>latest</LangVersion> <LangVersion>latest</LangVersion>
<CscToolPath>D:\unity2019\Editor\Data\Tools\RoslynScripts</CscToolPath>
<CscToolExe>unity_csc.bat</CscToolExe>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
...@@ -11,7 +9,7 @@ ...@@ -11,7 +9,7 @@
<ProductVersion>10.0.20506</ProductVersion> <ProductVersion>10.0.20506</ProductVersion>
<SchemaVersion>2.0</SchemaVersion> <SchemaVersion>2.0</SchemaVersion>
<RootNamespace></RootNamespace> <RootNamespace></RootNamespace>
<ProjectGuid>{243048A2-A6E1-3156-AD46-FFD0667CD947}</ProjectGuid> <ProjectGuid>{a2483024-e1a6-5631-ad46-ffd0667cd947}</ProjectGuid>
<OutputType>Library</OutputType> <OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder> <AppDesignerFolder>Properties</AppDesignerFolder>
<AssemblyName>Assembly-CSharp</AssemblyName> <AssemblyName>Assembly-CSharp</AssemblyName>
...@@ -30,15 +28,6 @@ ...@@ -30,15 +28,6 @@
<NoWarn>0169</NoWarn> <NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks> <AllowUnsafeBlocks>False</AllowUnsafeBlocks>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>Temp\bin\Release\</OutputPath>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<NoWarn>0169</NoWarn>
<AllowUnsafeBlocks>False</AllowUnsafeBlocks>
</PropertyGroup>
<PropertyGroup> <PropertyGroup>
<NoConfig>true</NoConfig> <NoConfig>true</NoConfig>
<NoStdLib>true</NoStdLib> <NoStdLib>true</NoStdLib>
...@@ -46,14 +35,6 @@ ...@@ -46,14 +35,6 @@
<ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades> <ImplicitlyExpandNETStandardFacades>false</ImplicitlyExpandNETStandardFacades>
<ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades> <ImplicitlyExpandDesignTimeFacades>false</ImplicitlyExpandDesignTimeFacades>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Reference Include="UnityEngine">
<HintPath>D:\unity2019\Editor\Data\Managed/UnityEngine/UnityEngine.dll</HintPath>
</Reference>
<Reference Include="UnityEditor">
<HintPath>D:\unity2019\Editor\Data\Managed/UnityEditor.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="Assets\#A2_Scripts\Battle\BattleCtrl.cs" /> <Compile Include="Assets\#A2_Scripts\Battle\BattleCtrl.cs" />
<Compile Include="Assets\#A2_Scripts\Battle\Collision\GroundCollision.cs" /> <Compile Include="Assets\#A2_Scripts\Battle\Collision\GroundCollision.cs" />
...@@ -306,6 +287,7 @@ ...@@ -306,6 +287,7 @@
<Compile Include="Assets\Gold_shader\Script\AutoRotate.cs" /> <Compile Include="Assets\Gold_shader\Script\AutoRotate.cs" />
<Compile Include="Assets\My\Scripts\AI\AIMove.cs" /> <Compile Include="Assets\My\Scripts\AI\AIMove.cs" />
<Compile Include="Assets\My\Scripts\ConfigurationFile.cs" /> <Compile Include="Assets\My\Scripts\ConfigurationFile.cs" />
<Compile Include="Assets\My\Scripts\DestroyMySel.cs" />
<Compile Include="Assets\My\Scripts\DoRanking.cs" /> <Compile Include="Assets\My\Scripts\DoRanking.cs" />
<Compile Include="Assets\My\Scripts\EndPoint.cs" /> <Compile Include="Assets\My\Scripts\EndPoint.cs" />
<Compile Include="Assets\My\Scripts\FloorBoard.cs" /> <Compile Include="Assets\My\Scripts\FloorBoard.cs" />
...@@ -318,8 +300,10 @@ ...@@ -318,8 +300,10 @@
<Compile Include="Assets\My\Scripts\RandomEnvironment.cs" /> <Compile Include="Assets\My\Scripts\RandomEnvironment.cs" />
<Compile Include="Assets\My\Scripts\TriggerTurnDir.cs" /> <Compile Include="Assets\My\Scripts\TriggerTurnDir.cs" />
<Compile Include="Assets\My\Scripts\Wall.cs" /> <Compile Include="Assets\My\Scripts\Wall.cs" />
<Compile Include="Assets\My\Test\TestChinarForece.cs" />
<Compile Include="Assets\My\Test\TestEtc.cs" /> <Compile Include="Assets\My\Test\TestEtc.cs" />
<Compile Include="Assets\My\Test\TestOnDrag.cs" /> <Compile Include="Assets\My\Test\TestOnDrag.cs" />
<Compile Include="Assets\My\Test\TestTrigger.cs" />
<Compile Include="Assets\Ultimate Game Tools\AutomaticLOD\Scripts\AutomaticLOD.cs" /> <Compile Include="Assets\Ultimate Game Tools\AutomaticLOD\Scripts\AutomaticLOD.cs" />
<Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshSimplify.cs" /> <Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshSimplify.cs" />
<Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshUniqueVertices.cs" /> <Compile Include="Assets\Ultimate Game Tools\MeshSimplify\Scripts\MeshUniqueVertices.cs" />
...@@ -992,24 +976,29 @@ ...@@ -992,24 +976,29 @@
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="Assembly-CSharp-firstpass.csproj"> <ProjectReference Include="Assembly-CSharp-firstpass.csproj">
<Project>{77A2A415-8E80-59FD-67BD-3FBFEF19D174}</Project> <Project>{15a4a277-808e-fd59-67bd-3fbfef19d174}</Project>
<Name>Assembly-CSharp-firstpass</Name> <Name>Assembly-CSharp-firstpass</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="NonConvexCollider.csproj"> <ProjectReference Include="NonConvexCollider.csproj">
<Project>{5BEBB145-9BC6-D831-C7C4-717F41219B95}</Project> <Project>{45b1eb5b-c69b-31d8-c7c4-717f41219b95}</Project>
<Name>NonConvexCollider</Name> <Name>NonConvexCollider</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="RuntimeTestAssembly.csproj"> <ProjectReference Include="RuntimeTestAssembly.csproj">
<Project>{8413C11E-E056-0084-BFEB-5BAB77B89350}</Project> <Project>{1ec11384-56e0-8400-bfeb-5bab77b89350}</Project>
<Name>RuntimeTestAssembly</Name> <Name>RuntimeTestAssembly</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="NonConvexEditor.csproj"> <ProjectReference Include="NonConvexEditor.csproj">
<Project>{FB3A037E-DD7E-C0A8-411D-03E28ADD4D7F}</Project> <Project>{7e033afb-7edd-a8c0-411d-03e28add4d7f}</Project>
<Name>NonConvexEditor</Name> <Name>NonConvexEditor</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
<ProjectReference Include="NonConvexColliderRuntimeAPI.csproj"> <ProjectReference Include="NonConvexColliderRuntimeAPI.csproj">
<Project>{8CCAA966-AB14-8CBB-1578-B05CBF49F407}</Project> <Project>{66a9ca8c-14ab-bb8c-1578-b05cbf49f407}</Project>
<Name>NonConvexColliderRuntimeAPI</Name> <Name>NonConvexColliderRuntimeAPI</Name>
<ReferenceOutputAssembly>false</ReferenceOutputAssembly>
</ProjectReference> </ProjectReference>
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: 317d19313d1d7204e9bbc37122116e7f guid: 0a7a0ffdefc66794caf76af7e9292b34
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
fileFormatVersion: 2
guid: 2e117c0bfc6741e4ebc4a8c8aebc0b8a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 55c4962f2a6593c4b9c1bb6003b1ff08
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -4,13 +4,15 @@ ...@@ -4,13 +4,15 @@
Material: Material:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_PrefabParentObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: PolygonPrototype_Texture_01_Vehicle m_Name: PolygonPrototype_Texture_01_Vehicle
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP m_ShaderKeywords: _EMISSION _METALLICGLOSSMAP
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: -1
stringTagMap: {} stringTagMap: {}
disabledShaderPasses: [] disabledShaderPasses: []
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: ca40beb7fc6998f40a6e15a59c6ab599 guid: 07bc4aa2b407c40499b42787f745effa
folderAsset: yes folderAsset: yes
DefaultImporter: DefaultImporter:
externalObjects: {} externalObjects: {}
......
...@@ -4,7 +4,8 @@ ...@@ -4,7 +4,8 @@
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6 serializedVersion: 6
m_Component: m_Component:
- component: {fileID: 499110} - component: {fileID: 499110}
...@@ -19,9 +20,10 @@ GameObject: ...@@ -19,9 +20,10 @@ GameObject:
m_IsActive: 1 m_IsActive: 1
--- !u!4 &499110 --- !u!4 &499110
Transform: Transform:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 166404} m_GameObject: {fileID: 166404}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalPosition: {x: 0, y: 0, z: 0}
...@@ -32,14 +34,18 @@ Transform: ...@@ -32,14 +34,18 @@ Transform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!198 &19808544 --- !u!198 &19808544
ParticleSystem: ParticleSystem:
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 166404} m_GameObject: {fileID: 166404}
serializedVersion: 5 serializedVersion: 6
lengthInSec: 1 lengthInSec: 1
simulationSpeed: 1 simulationSpeed: 1
stopAction: 0 stopAction: 0
cullingMode: 3
ringBufferMode: 0
ringBufferLoopRange: {x: 0, y: 1}
looping: 0 looping: 0
prewarm: 0 prewarm: 0
playOnAwake: 1 playOnAwake: 1
...@@ -276,7 +282,7 @@ ParticleSystem: ...@@ -276,7 +282,7 @@ ParticleSystem:
m_RotationOrder: 4 m_RotationOrder: 4
startSizeY: startSizeY:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 3
scalar: 1 scalar: 1
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
...@@ -329,7 +335,7 @@ ParticleSystem: ...@@ -329,7 +335,7 @@ ParticleSystem:
m_RotationOrder: 4 m_RotationOrder: 4
startSizeZ: startSizeZ:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 3
scalar: 1 scalar: 1
minScalar: 1 minScalar: 1
maxCurve: maxCurve:
...@@ -597,7 +603,7 @@ ParticleSystem: ...@@ -597,7 +603,7 @@ ParticleSystem:
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
ShapeModule: ShapeModule:
serializedVersion: 5 serializedVersion: 6
enabled: 1 enabled: 1
type: 4 type: 4
angle: 11.79 angle: 11.79
...@@ -611,6 +617,62 @@ ParticleSystem: ...@@ -611,6 +617,62 @@ ParticleSystem:
placementMode: 0 placementMode: 0
m_MeshMaterialIndex: 0 m_MeshMaterialIndex: 0
m_MeshNormalOffset: 0 m_MeshNormalOffset: 0
m_MeshSpawn:
mode: 0
spread: 0
speed:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
m_Mesh: {fileID: 0} m_Mesh: {fileID: 0}
m_MeshRenderer: {fileID: 0} m_MeshRenderer: {fileID: 0}
m_SkinnedMeshRenderer: {fileID: 0} m_SkinnedMeshRenderer: {fileID: 0}
...@@ -1244,8 +1306,11 @@ ParticleSystem: ...@@ -1244,8 +1306,11 @@ ParticleSystem:
m_NumColorKeys: 2 m_NumColorKeys: 2
m_NumAlphaKeys: 2 m_NumAlphaKeys: 2
UVModule: UVModule:
serializedVersion: 2
enabled: 0 enabled: 0
mode: 0 mode: 0
timeMode: 0
fps: 30
frameOverTime: frameOverTime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 1 minMaxState: 1
...@@ -1352,17 +1417,18 @@ ParticleSystem: ...@@ -1352,17 +1417,18 @@ ParticleSystem:
m_PreInfinity: 2 m_PreInfinity: 2
m_PostInfinity: 2 m_PostInfinity: 2
m_RotationOrder: 4 m_RotationOrder: 4
speedRange: {x: 0, y: 1}
tilesX: 1 tilesX: 1
tilesY: 1 tilesY: 1
animationType: 0 animationType: 0
rowIndex: 0 rowIndex: 0
cycles: 1 cycles: 1
uvChannelMask: -1 uvChannelMask: -1
flipU: 0 rowMode: 1
flipV: 0
randomRow: 1
sprites: sprites:
- sprite: {fileID: 0} - sprite: {fileID: 0}
flipU: 0
flipV: 0
VelocityModule: VelocityModule:
enabled: 1 enabled: 1
x: x:
...@@ -2061,8 +2127,66 @@ ParticleSystem: ...@@ -2061,8 +2127,66 @@ ParticleSystem:
inWorldSpace: 0 inWorldSpace: 0
randomizePerFrame: 0 randomizePerFrame: 0
ExternalForcesModule: ExternalForcesModule:
serializedVersion: 2
enabled: 0 enabled: 0
multiplier: 1 multiplierCurve:
serializedVersion: 2
minMaxState: 0
scalar: 1
minScalar: 1
maxCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
minCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
- serializedVersion: 3
time: 1
value: 1
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
influenceFilter: 0
influenceMask:
serializedVersion: 2
m_Bits: 4294967295
influenceList: []
ClampVelocityModule: ClampVelocityModule:
enabled: 1 enabled: 1
x: x:
...@@ -3470,10 +3594,11 @@ ParticleSystem: ...@@ -3470,10 +3594,11 @@ ParticleSystem:
serializedVersion: 2 serializedVersion: 2
enabled: 0 enabled: 0
subEmitters: subEmitters:
- serializedVersion: 2 - serializedVersion: 3
emitter: {fileID: 0} emitter: {fileID: 0}
type: 0 type: 0
properties: 0 properties: 0
emitProbability: 1
LightsModule: LightsModule:
enabled: 0 enabled: 0
ratio: 0 ratio: 0
...@@ -3649,6 +3774,7 @@ ParticleSystem: ...@@ -3649,6 +3774,7 @@ ParticleSystem:
minVertexDistance: 0.2 minVertexDistance: 0.2
textureMode: 0 textureMode: 0
ribbonCount: 1 ribbonCount: 1
shadowBias: 0.5
worldSpace: 0 worldSpace: 0
dieWithParticles: 1 dieWithParticles: 1
sizeAffectsWidth: 1 sizeAffectsWidth: 1
...@@ -3656,6 +3782,7 @@ ParticleSystem: ...@@ -3656,6 +3782,7 @@ ParticleSystem:
inheritParticleColor: 1 inheritParticleColor: 1
generateLightingData: 0 generateLightingData: 0
splitSubEmitterRibbons: 0 splitSubEmitterRibbons: 0
attachRibbonsToTransform: 0
colorOverLifetime: colorOverLifetime:
serializedVersion: 2 serializedVersion: 2
minMaxState: 0 minMaxState: 0
...@@ -4404,9 +4531,10 @@ ParticleSystem: ...@@ -4404,9 +4531,10 @@ ParticleSystem:
--- !u!199 &19951176 --- !u!199 &19951176
ParticleSystemRenderer: ParticleSystemRenderer:
serializedVersion: 6 serializedVersion: 6
m_ObjectHideFlags: 1 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 166404} m_GameObject: {fileID: 166404}
m_Enabled: 1 m_Enabled: 1
m_CastShadows: 0 m_CastShadows: 0
...@@ -4415,7 +4543,9 @@ ParticleSystemRenderer: ...@@ -4415,7 +4543,9 @@ ParticleSystemRenderer:
m_MotionVectors: 1 m_MotionVectors: 1
m_LightProbeUsage: 0 m_LightProbeUsage: 0
m_ReflectionProbeUsage: 1 m_ReflectionProbeUsage: 1
m_RayTracingMode: 0
m_RenderingLayerMask: 4294967295 m_RenderingLayerMask: 4294967295
m_RendererPriority: 0
m_Materials: m_Materials:
- {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0} - {fileID: 10754, guid: 0000000000000000f000000000000000, type: 0}
- {fileID: 0} - {fileID: 0}
...@@ -4426,6 +4556,7 @@ ParticleSystemRenderer: ...@@ -4426,6 +4556,7 @@ ParticleSystemRenderer:
m_ProbeAnchor: {fileID: 0} m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0} m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1 m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0 m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0 m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0 m_ImportantGI: 0
...@@ -4447,25 +4578,17 @@ ParticleSystemRenderer: ...@@ -4447,25 +4578,17 @@ ParticleSystemRenderer:
m_LengthScale: 2 m_LengthScale: 2
m_SortingFudge: 0 m_SortingFudge: 0
m_NormalDirection: 1 m_NormalDirection: 1
m_ShadowBias: 0
m_RenderAlignment: 0 m_RenderAlignment: 0
m_Pivot: {x: 0, y: 0, z: 0} m_Pivot: {x: 0, y: 0, z: 0}
m_Flip: {x: 0, y: 0, z: 0}
m_UseCustomVertexStreams: 0 m_UseCustomVertexStreams: 0
m_EnableGPUInstancing: 0 m_EnableGPUInstancing: 0
m_ApplyActiveColorSpace: 0 m_ApplyActiveColorSpace: 0
m_AllowRoll: 1
m_VertexStreams: 0001030405 m_VertexStreams: 0001030405
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0} m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
m_Mesh1: {fileID: 0} m_Mesh1: {fileID: 0}
m_Mesh2: {fileID: 0} m_Mesh2: {fileID: 0}
m_Mesh3: {fileID: 0} m_Mesh3: {fileID: 0}
m_MaskInteraction: 0 m_MaskInteraction: 0
--- !u!1001 &100100000
Prefab:
m_ObjectHideFlags: 1
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 0}
m_Modifications: []
m_RemovedComponents: []
m_SourcePrefab: {fileID: 0}
m_RootGameObject: {fileID: 166404}
m_IsPrefabAsset: 1
fileFormatVersion: 2 fileFormatVersion: 2
guid: 325c11e064841204bbd6de7c85bebef6 guid: 25a7d6838bc0da041b170630fce33a7a
folderAsset: yes PrefabImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
fileFormatVersion: 2 fileFormatVersion: 2
guid: aa43ce62596b0784081ec9bd0abc8516 guid: 26a0f905c02bc784ca1643a83323bcf7
folderAsset: yes PrefabImporter:
DefaultImporter:
externalObjects: {} externalObjects: {}
userData: userData:
assetBundleName: assetBundleName:
......
fileFormatVersion: 2
guid: 7ca40077e3001ff47baa43c776766293
PrefabImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:
...@@ -33,6 +33,7 @@ Transform: ...@@ -33,6 +33,7 @@ Transform:
- {fileID: 5517056588204721497} - {fileID: 5517056588204721497}
- {fileID: 6572687271982276234} - {fileID: 6572687271982276234}
- {fileID: 6072744422056044393} - {fileID: 6072744422056044393}
- {fileID: 4034050514059895705}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -367,6 +368,69 @@ Transform: ...@@ -367,6 +368,69 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 4004674578049377472} m_PrefabInstance: {fileID: 4004674578049377472}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &4034050514059710437
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 4004674577979274084}
m_Modifications:
- target: {fileID: 171218, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_Name
value: SM_Prop_Money_Stack_02 (3)
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.x
value: -0.783
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.y
value: 9.279
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.z
value: -13.938
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_RootOrder
value: 6
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
--- !u!4 &4034050514059895705 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824,
type: 3}
m_PrefabInstance: {fileID: 4034050514059710437}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5517056588204779813 --- !u!1001 &5517056588204779813
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
...@@ -32,6 +32,7 @@ Transform: ...@@ -32,6 +32,7 @@ Transform:
- {fileID: 7350363875095892632} - {fileID: 7350363875095892632}
- {fileID: 5142244395747344326} - {fileID: 5142244395747344326}
- {fileID: 1713136556777942241} - {fileID: 1713136556777942241}
- {fileID: 8063240344570286853}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -526,3 +527,66 @@ Transform: ...@@ -526,3 +527,66 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 7350363875095822052} m_PrefabInstance: {fileID: 7350363875095822052}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &8063240344570085241
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1036397493097108775}
m_Modifications:
- target: {fileID: 171218, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_Name
value: SM_Prop_Money_Stack_02 (3)
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.x
value: -0.12100005
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.y
value: 0.666
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.z
value: -0.944
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
--- !u!4 &8063240344570286853 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824,
type: 3}
m_PrefabInstance: {fileID: 8063240344570085241}
m_PrefabAsset: {fileID: 0}
...@@ -32,6 +32,7 @@ Transform: ...@@ -32,6 +32,7 @@ Transform:
- {fileID: 1933366850776836603} - {fileID: 1933366850776836603}
- {fileID: 1525630034214077453} - {fileID: 1525630034214077453}
- {fileID: 7531289148939187586} - {fileID: 7531289148939187586}
- {fileID: 2293497139656249586}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
...@@ -161,6 +162,69 @@ Transform: ...@@ -161,6 +162,69 @@ Transform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1933366850777171335} m_PrefabInstance: {fileID: 1933366850777171335}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1001 &2293497139656047758
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 6883136219505496396}
m_Modifications:
- target: {fileID: 171218, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_Name
value: SM_Prop_Money_Stack_02 (3)
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.x
value: -0.359
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.y
value: 0.474
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalPosition.z
value: -0.41
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_RootOrder
value: 5
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1524a2bacc5b19d40a7ea897564db824, type: 3}
--- !u!4 &2293497139656249586 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 486524, guid: 1524a2bacc5b19d40a7ea897564db824,
type: 3}
m_PrefabInstance: {fileID: 2293497139656047758}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6883136218680486300 --- !u!1001 &6883136218680486300
PrefabInstance: PrefabInstance:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment