Skip to content

Commit ba7c0b8

Browse files
Gadjungthmsndk
Gadjung
authored and
thmsndk
committed
Revert "Revert "Merge branch 'develop' of https://github.com/thmsndk/Screeps3D into develop""
This reverts commit 3b8b550.
1 parent 3b8b550 commit ba7c0b8

File tree

16 files changed

+716
-468
lines changed

16 files changed

+716
-468
lines changed

‎Assets/Misc/Selection/Projector/ProjectorMaterial.mat

+1-1
Original file line numberDiff line numberDiff line change
@@ -625,7 +625,7 @@ Material:
625625
- _ZTestTransparent: 4
626626
- _ZWrite: 1
627627
m_Colors:
628-
- _BaseColor: {r: 0, g: 0.5493819, b: 0.8018868, a: 1.000088}
628+
- _BaseColor: {r: 0, g: 0.5493819, b: 0.8018868, a: 1.043085}
629629
- _BaseColor0: {r: 1, g: 1, b: 1, a: 1}
630630
- _BaseColor1: {r: 1, g: 1, b: 1, a: 1}
631631
- _BaseColor2: {r: 1, g: 1, b: 1, a: 1}

‎Assets/Models/RoomObjects/Resource/resource.blend

18.9 KB
Binary file not shown.

‎Assets/Models/RoomObjects/SPlusGift.meta

+8
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Assets/Resources/Prefabs/RoomObjects/Ruins/ruin_InvaderCore.prefab

+158-36
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ ParticleSystem:
9595
m_PrefabInstance: {fileID: 0}
9696
m_PrefabAsset: {fileID: 0}
9797
m_GameObject: {fileID: 7693688993970048212}
98-
serializedVersion: 6
98+
serializedVersion: 7
9999
lengthInSec: 5
100100
simulationSpeed: 1
101101
stopAction: 0
@@ -2190,6 +2190,62 @@ ParticleSystem:
21902190
m_PreInfinity: 2
21912191
m_PostInfinity: 2
21922192
m_RotationOrder: 4
2193+
LifetimeByEmitterSpeedModule:
2194+
enabled: 0
2195+
m_Curve:
2196+
serializedVersion: 2
2197+
minMaxState: 1
2198+
scalar: 1
2199+
minScalar: 1
2200+
maxCurve:
2201+
serializedVersion: 2
2202+
m_Curve:
2203+
- serializedVersion: 3
2204+
time: 0
2205+
value: 1
2206+
inSlope: 0
2207+
outSlope: -0.8
2208+
tangentMode: 0
2209+
weightedMode: 0
2210+
inWeight: 0.33333334
2211+
outWeight: 0.33333334
2212+
- serializedVersion: 3
2213+
time: 1
2214+
value: 0.2
2215+
inSlope: -0.8
2216+
outSlope: 0
2217+
tangentMode: 0
2218+
weightedMode: 0
2219+
inWeight: 0.33333334
2220+
outWeight: 0.33333334
2221+
m_PreInfinity: 2
2222+
m_PostInfinity: 2
2223+
m_RotationOrder: 4
2224+
minCurve:
2225+
serializedVersion: 2
2226+
m_Curve:
2227+
- serializedVersion: 3
2228+
time: 0
2229+
value: 1
2230+
inSlope: 0
2231+
outSlope: 0
2232+
tangentMode: 0
2233+
weightedMode: 0
2234+
inWeight: 0.33333334
2235+
outWeight: 0.33333334
2236+
- serializedVersion: 3
2237+
time: 1
2238+
value: 1
2239+
inSlope: 0
2240+
outSlope: 0
2241+
tangentMode: 0
2242+
weightedMode: 0
2243+
inWeight: 0.33333334
2244+
outWeight: 0.33333334
2245+
m_PreInfinity: 2
2246+
m_PostInfinity: 2
2247+
m_RotationOrder: 4
2248+
m_Range: {x: 0, y: 1}
21932249
ForceModule:
21942250
enabled: 0
21952251
x:
@@ -3620,19 +3676,20 @@ ParticleSystem:
36203676
range: {x: 0, y: 1}
36213677
CollisionModule:
36223678
enabled: 0
3623-
serializedVersion: 3
3679+
serializedVersion: 4
36243680
type: 0
36253681
collisionMode: 0
36263682
colliderForce: 0
36273683
multiplyColliderForceByParticleSize: 0
36283684
multiplyColliderForceByParticleSpeed: 0
36293685
multiplyColliderForceByCollisionAngle: 1
3630-
plane0: {fileID: 0}
3631-
plane1: {fileID: 0}
3632-
plane2: {fileID: 0}
3633-
plane3: {fileID: 0}
3634-
plane4: {fileID: 0}
3635-
plane5: {fileID: 0}
3686+
m_Planes:
3687+
- {fileID: 0}
3688+
- {fileID: 0}
3689+
- {fileID: 0}
3690+
- {fileID: 0}
3691+
- {fileID: 0}
3692+
- {fileID: 0}
36363693
m_Dampen:
36373694
serializedVersion: 2
36383695
minMaxState: 0
@@ -3806,17 +3863,20 @@ ParticleSystem:
38063863
interiorCollisions: 0
38073864
TriggerModule:
38083865
enabled: 0
3809-
collisionShape0: {fileID: 0}
3810-
collisionShape1: {fileID: 0}
3811-
collisionShape2: {fileID: 0}
3812-
collisionShape3: {fileID: 0}
3813-
collisionShape4: {fileID: 0}
3814-
collisionShape5: {fileID: 0}
3866+
serializedVersion: 2
38153867
inside: 1
38163868
outside: 0
38173869
enter: 0
38183870
exit: 0
3871+
colliderQueryMode: 0
38193872
radiusScale: 1
3873+
primitives:
3874+
- {fileID: 0}
3875+
- {fileID: 0}
3876+
- {fileID: 0}
3877+
- {fileID: 0}
3878+
- {fileID: 0}
3879+
- {fileID: 0}
38203880
SubModule:
38213881
serializedVersion: 2
38223882
enabled: 0
@@ -4771,11 +4831,11 @@ ParticleSystemRenderer:
47714831
m_LightProbeUsage: 0
47724832
m_ReflectionProbeUsage: 0
47734833
m_RayTracingMode: 0
4834+
m_RayTraceProcedural: 0
47744835
m_RenderingLayerMask: 1
47754836
m_RendererPriority: 0
47764837
m_Materials:
47774838
- {fileID: 2100000, guid: 420f73b3cd1def843b7c2cf1569cc0d3, type: 2}
4778-
- {fileID: 0}
47794839
m_StaticBatchInfo:
47804840
firstSubMesh: 0
47814841
subMeshCount: 0
@@ -4813,6 +4873,8 @@ ParticleSystemRenderer:
48134873
m_EnableGPUInstancing: 1
48144874
m_ApplyActiveColorSpace: 1
48154875
m_AllowRoll: 1
4876+
m_FreeformStretching: 0
4877+
m_RotateWithStretchDirection: 1
48164878
m_VertexStreams: 00010304
48174879
m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
48184880
m_Mesh1: {fileID: 0}
@@ -4831,23 +4893,46 @@ PrefabInstance:
48314893
propertyPath: m_IsActive
48324894
value: 0
48334895
objectReference: {fileID: 0}
4834-
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4896+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
48354897
type: 3}
4836-
propertyPath: m_Animations.Array.size
4837-
value: 3
4898+
propertyPath: m_LocalRotation.w
4899+
value: 0.7071068
48384900
objectReference: {fileID: 0}
4839-
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4901+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
48404902
type: 3}
4841-
propertyPath: m_Animations.Array.data[0]
4842-
value:
4843-
objectReference: {fileID: -623603649343465320, guid: 8c9340eb322efbe469c43cdca81c38e6,
4903+
propertyPath: m_LocalRotation.x
4904+
value: -0.7071068
4905+
objectReference: {fileID: 0}
4906+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
48444907
type: 3}
4845-
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4908+
propertyPath: m_LocalRotation.y
4909+
value: 0
4910+
objectReference: {fileID: 0}
4911+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
48464912
type: 3}
4847-
propertyPath: m_Animations.Array.data[1]
4848-
value:
4849-
objectReference: {fileID: -8769514890835876719, guid: 8c9340eb322efbe469c43cdca81c38e6,
4913+
propertyPath: m_LocalRotation.z
4914+
value: 0
4915+
objectReference: {fileID: 0}
4916+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
4917+
type: 3}
4918+
propertyPath: m_LocalEulerAnglesHint.x
4919+
value: -90
4920+
objectReference: {fileID: 0}
4921+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
4922+
type: 3}
4923+
propertyPath: m_LocalEulerAnglesHint.y
4924+
value: 0
4925+
objectReference: {fileID: 0}
4926+
- target: {fileID: -8807263909233487560, guid: 8c9340eb322efbe469c43cdca81c38e6,
48504927
type: 3}
4928+
propertyPath: m_LocalEulerAnglesHint.z
4929+
value: 0
4930+
objectReference: {fileID: 0}
4931+
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4932+
type: 3}
4933+
propertyPath: m_Enabled
4934+
value: 1
4935+
objectReference: {fileID: 0}
48514936
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
48524937
type: 3}
48534938
propertyPath: m_Animation
@@ -4859,49 +4944,66 @@ PrefabInstance:
48594944
propertyPath: m_PlayAutomatically
48604945
value: 0
48614946
objectReference: {fileID: 0}
4947+
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4948+
type: 3}
4949+
propertyPath: m_Animations.Array.size
4950+
value: 3
4951+
objectReference: {fileID: 0}
4952+
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4953+
type: 3}
4954+
propertyPath: m_Animations.Array.data[0]
4955+
value:
4956+
objectReference: {fileID: -623603649343465320, guid: 8c9340eb322efbe469c43cdca81c38e6,
4957+
type: 3}
4958+
- target: {fileID: -5716681864270162303, guid: 8c9340eb322efbe469c43cdca81c38e6,
4959+
type: 3}
4960+
propertyPath: m_Animations.Array.data[1]
4961+
value:
4962+
objectReference: {fileID: -8769514890835876719, guid: 8c9340eb322efbe469c43cdca81c38e6,
4963+
type: 3}
48624964
- target: {fileID: -4321035728150297163, guid: 8c9340eb322efbe469c43cdca81c38e6,
48634965
type: 3}
48644966
propertyPath: m_Materials.Array.data[0]
48654967
value:
48664968
objectReference: {fileID: 2100000, guid: f08ac3dfe7dd3494c9c64f655d37b48e, type: 2}
48674969
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48684970
type: 3}
4869-
propertyPath: m_LocalPosition.x
4971+
propertyPath: m_RootOrder
48704972
value: 0
48714973
objectReference: {fileID: 0}
48724974
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48734975
type: 3}
4874-
propertyPath: m_LocalPosition.y
4976+
propertyPath: m_LocalPosition.x
48754977
value: 0
48764978
objectReference: {fileID: 0}
48774979
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48784980
type: 3}
4879-
propertyPath: m_LocalPosition.z
4981+
propertyPath: m_LocalPosition.y
48804982
value: 0
48814983
objectReference: {fileID: 0}
48824984
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48834985
type: 3}
4884-
propertyPath: m_LocalRotation.x
4986+
propertyPath: m_LocalPosition.z
48854987
value: 0
48864988
objectReference: {fileID: 0}
48874989
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48884990
type: 3}
4889-
propertyPath: m_LocalRotation.y
4890-
value: 0
4991+
propertyPath: m_LocalRotation.w
4992+
value: 1
48914993
objectReference: {fileID: 0}
48924994
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48934995
type: 3}
4894-
propertyPath: m_LocalRotation.z
4996+
propertyPath: m_LocalRotation.x
48954997
value: 0
48964998
objectReference: {fileID: 0}
48974999
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
48985000
type: 3}
4899-
propertyPath: m_LocalRotation.w
4900-
value: 1
5001+
propertyPath: m_LocalRotation.y
5002+
value: 0
49015003
objectReference: {fileID: 0}
49025004
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
49035005
type: 3}
4904-
propertyPath: m_RootOrder
5006+
propertyPath: m_LocalRotation.z
49055007
value: 0
49065008
objectReference: {fileID: 0}
49075009
- target: {fileID: -4216859302048453862, guid: 8c9340eb322efbe469c43cdca81c38e6,
@@ -4929,6 +5031,26 @@ PrefabInstance:
49295031
propertyPath: m_Materials.Array.data[0]
49305032
value:
49315033
objectReference: {fileID: 2100000, guid: f08ac3dfe7dd3494c9c64f655d37b48e, type: 2}
5034+
- target: {fileID: 3790740219211191083, guid: 8c9340eb322efbe469c43cdca81c38e6,
5035+
type: 3}
5036+
propertyPath: m_LocalRotation.w
5037+
value: 0.7071068
5038+
objectReference: {fileID: 0}
5039+
- target: {fileID: 3790740219211191083, guid: 8c9340eb322efbe469c43cdca81c38e6,
5040+
type: 3}
5041+
propertyPath: m_LocalRotation.x
5042+
value: -0.7071068
5043+
objectReference: {fileID: 0}
5044+
- target: {fileID: 3790740219211191083, guid: 8c9340eb322efbe469c43cdca81c38e6,
5045+
type: 3}
5046+
propertyPath: m_LocalRotation.z
5047+
value: 0
5048+
objectReference: {fileID: 0}
5049+
- target: {fileID: 3790740219211191083, guid: 8c9340eb322efbe469c43cdca81c38e6,
5050+
type: 3}
5051+
propertyPath: m_LocalEulerAnglesHint.x
5052+
value: -90
5053+
objectReference: {fileID: 0}
49325054
- target: {fileID: 5444882003891556943, guid: 8c9340eb322efbe469c43cdca81c38e6,
49335055
type: 3}
49345056
propertyPath: m_IsActive

0 commit comments

Comments
 (0)