This commit is contained in:
2026-06-18 15:15:34 +07:00
parent 040bdb12a5
commit 2915c0d2cc
13 changed files with 3017 additions and 1053 deletions

View File

@@ -6,14 +6,17 @@
<component name="ChangeListManager">
<list default="true" id="d308d1cb-09fc-4331-ba20-00f7b43d1576" name="Changes" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.BABA_YAGA/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Materials/Ground.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Materials/Ground.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Prefabs/Nolan/Nolan.prefab" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Prefabs/Nolan/Nolan.prefab" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/Main Scene.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Effects/BloodDecal.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Effects/BloodDecal.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Test site/prefab test site.unity" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Scenes/Test site/prefab test site.unity.meta" beforeDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/Embers.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/Embers.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/ShieldBubble.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Magic/ShieldBubble.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/AssaultRifle/MuzzleFlash.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood1.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood1.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood2.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood2.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood4.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Bullets/BulletDecalWood4.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Shotgun/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Items/Shooter/Shotgun/MuzzleFlash.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Nolan/FootprintSandLand.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Nolan/FootprintSandLand.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/vHierarchy/vHierarchy Data.asset" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/vHierarchy/vHierarchy Data.asset" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Turret/MuzzleFlash.mat" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Third Parties/Opsive/UltimateCharacterController/Demo/Materials/Scene/Turret/MuzzleFlash.mat" afterDir="false" />
<change beforePath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" beforeDir="false" afterPath="$PROJECT_DIR$/ProjectSettings/TagManager.asset" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -126,7 +129,7 @@
<workItem from="1781412609976" duration="4823000" />
<workItem from="1781578060019" duration="4632000" />
<workItem from="1781727437862" duration="1257000" />
<workItem from="1781765548760" duration="325000" />
<workItem from="1781765548760" duration="4839000" />
</task>
<servers />
</component>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: 15b191b4723c40b4997572cf095f7c8b
guid: 6ce1a7b936b2bf4449397ec54d9bbc05
DefaultImporter:
externalObjects: {}
userData:

View File

@@ -134,7 +134,7 @@ Material:
- _BaseColor: {r: 2.8284273, g: 2.8284273, b: 2.8284273, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _CameraFadeParams: {r: 0, g: Infinity, b: 0, a: 0}
- _Color: {r: 2.8284276, g: 2.8284276, b: 2.8284276, a: 1}
- _Color: {r: 2.8284273, g: 2.8284273, b: 2.8284273, a: 1}
- _ColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SoftParticleFadeParams: {r: 0, g: 0, b: 0, a: 0}

View File

@@ -2,23 +2,33 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: ShieldBubble
m_Shader: {fileID: 4800000, guid: 039b5d4c8881b9440a8aef57226d625d, type: 3}
m_ShaderKeywords:
m_Shader: {fileID: 4800000, guid: 650dd9526735d5b46b79224bc6e94025, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 0
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
stringTagMap:
RenderType: Opaque
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
@@ -75,15 +85,23 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _ASEOutlineWidth: 0
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendOp: 0
- _BumpScale: 1
- _ChromaticAberration: 0.1
- _Cull: 2
- _Cutoff: 0.5
- _DepthFade: 0.24
- _DetailNormalMapScale: 1
- _DistortionAmount: 0.274
- _DstBlend: 0
- _DstBlendAlpha: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
@@ -93,20 +111,41 @@ Material:
- _OcclusionStrength: 1
- _Opacity: 0.504
- _Parallax: 0.02
- _QueueOffset: 0
- _SampleGI: 0
- _Smoothness: 0.8
- _SmoothnessTextureChannel: 0
- _SoapAmount: 0
- _Specular: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _TimeScale: 0.2
- _UVSec: 0
- _XRMotionVectorsPass: 1
- _ZWrite: 1
- __dirty: 0
m_Colors:
- _ASEOutlineColor: {r: 0, g: 0, b: 0, a: 0}
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _DistortionColor: {r: 0.18396229, g: 1, b: 0.8230772, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _FadeColor: {r: 0, g: 1, b: 0.99215686, a: 0}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &8066768233931628516
MonoBehaviour:
m_ObjectHideFlags: 11
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier: Unity.RenderPipelines.Universal.Editor::UnityEditor.Rendering.Universal.AssetVersion
version: 10

View File

@@ -81,6 +81,6 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -40,6 +40,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -69,7 +70,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: bb83e3ae273511744a2b5cb1bc7ca57c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -138,7 +139,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.8897059, g: 0.7734045, b: 0.6280277, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.8897059, g: 0.7734045, b: 0.6280277, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -27,6 +27,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -56,7 +57,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 468bcfeb37305f048ac9317587dce1c0, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -125,7 +126,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -27,6 +27,7 @@ Material:
disabledShaderPasses:
- MOTIONVECTORS
- DepthOnly
- SHADOWCASTER
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
@@ -56,7 +57,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 045b9dc938541674092c4a69f4f50cb6, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
@@ -125,7 +126,7 @@ Material:
- _ZWrite: 0
m_Colors:
- _BaseColor: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.8901961, g: 0.77254903, b: 0.62745106, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: []

View File

@@ -82,6 +82,6 @@ Material:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmisColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -81,6 +81,6 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _TintColor: {r: 1, g: 1, b: 1, a: 0}
- _TintColor: {r: 0, g: 0, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1

View File

@@ -58,7 +58,7 @@ TagManager:
-
-
-
-
- Character
- Enemy
- MovingPlatform
- VisualEffect