gav/real-shooter
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

map done

Browse Source
This commit is contained in:
Enikeevtimur
2022-05-17 23:03:46 +07:00
parent 0fa07350c0
commit 8147dfc4a9
40 changed files with 9297 additions and 801 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f432554f564e69242897607d34218939
guid: b5fb1bd0142cc35409b28c4e8c4833dd
PrefabImporter:
externalObjects: {}
userData:

2
Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta generated
View File

@ -1,5 +1,5 @@
fileFormatVersion: 2
guid: f432554f564e69242897607d34218939
guid: c05a5a4779d404d4b9d86069080d5702
PrefabImporter:
externalObjects: {}
userData:

2
Assets/ML-Agents/Timers/Primitive scene_timers.json
View File

@ -1 +1 @@
{"count":1,"self":64.109779199999991,"total":64.4342179,"children":{"InitializeActuators":{"count":1,"self":0.0010299999999999999,"total":0.0010299999999999999,"children":null},"AgentSendState":{"count":2920,"self":0.044633599999999996,"total":0.044633599999999996,"children":null},"DecideAction":{"count":2920,"self":0.2757475,"total":0.2757475,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1650277425","unity_version":"2019.4.36f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2019.4.36f1\\Editor\\Unity.exe -projectpath D:\\real-shooter-git -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-0gxjnU2tE3R1JAgVcOu84 -hubSessionId 617c85c0-beed-11ec-9737-adc452e9defe -accessToken jGHX5jX1yB9hRz2Om-mndr4yVItZwtReMKF_pNdib-I012f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Primitive scene","end_time_seconds":"1650277489"}}
{"count":1,"self":100.7198976,"total":100.7787803,"children":{"AgentSendState":{"count":4782,"self":0.0449284,"total":0.0449284,"children":null},"DecideAction":{"count":4782,"self":0.008969,"total":0.008969,"children":null},"AgentAct":{"count":4782,"self":0.0039859,"total":0.0039859,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1652796222","unity_version":"2019.4.36f1","command_line_arguments":"C:\/Program Files\/Unity 2019.4.36f1\/Editor\/Unity.exe -projectpath C:\\Users\\15tim\\real-shooter-git -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-dqNpRRxm6LdOHroVQgGrd -hubSessionId adbe2090-d5dd-11ec-b736-7d2d76fc4553 -accessToken pkCL5jEZsQ9u3W7Zkd7KhbxPbqvtkAKczSdvMMH-esE009f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"Primitive scene","end_time_seconds":"1652796322"}}

5
Assets/Scenes/tyt player/Player.prefab.meta → Assets/Materials.meta generated
View File

@ -1,6 +1,7 @@
fileFormatVersion: 2
guid: 80f6c1c85e5daed4c96c70205ed5503d
PrefabImporter:
guid: 06cfb2e837ca72e49aab7adc46addfb6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:

77
Assets/Materials/Stone.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Stone
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6650570c33a12de429865e9e4b722d94, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Materials/Stone.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4e0ee7c42632c1d409f62326a3e07d07
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Materials/bricks.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: bricks
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 856722cfbc1af6745881f211d076324c, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Materials/bricks.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 3bcc441c931a20c4b8d41c8b9333c7a8
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

8676
Assets/Scenes/Primitive scene/Primitive scene.unity generated
View File

File diff suppressed because it is too large Load Diff

89
Assets/Scripts/Character/scr_Models.cs Normal file
View File

@ -0,0 +1,89 @@
// using System;
// using UnityEngine;
// public static class scr_Models
// {
// #region Player
// public enum PlayerStance
// {
// Stand,
// Crouch,
// Prone
// }
// [Serializable]
// public class PlayerSettingsModel
// {
// [Header("View Settings")]
// public float ViewXSensetivity;
// public float ViewYSensetivity;
// public bool ViewXInverted;
// public bool ViewYInverted;
// [Header("Movement Settings")]
// public bool SprintingHold;
// public float MovementSmoothing;
// [Header("Movement - Running")]
// public float RunningForwardSpeed;
// public float RunningStrafeSpeed;
// [Header("Movement - Walking")]
// public float WalkingForwardSpeed;
// public float WalkingBackwardSpeed;
// public float WalkingStrafeSpeed;
// [Header("Jumping")]
// public float JumpingHeight;
// public float JumpingFalloff;
// public float FallingSmoothing;
// }
// [Serializable]
// public class WeaponSettingsModel
// {
// [Header("Weapon Sway")]
// public float SwayAmount;
// public bool SwayYInverted;
// public bool SwayXInverted;
// public float SwaySmoothing;
// public float SwayResetSmoothing;
// public float SwayClampX;
// public float SwayClampY;
// [Header("Weapon Movement Sway")]
// public float MovementSwayX;
// public float MovementSwayY;
// public bool MovementSwayYInverted;
// public bool MovementSwayXInverted;
// public float MovementSwaySmoothing;
// }
// [Serializable]
// public class CharacterStance
// {
// public float CameraHeight;
// public CapsuleCollider StanceCollider;
// }
// #endregion
// #region - Weapons -
// [Serializable]
// public class WeaponSettingsModel
// {
// [Header("Sway")]
// public float SwayAmount;
// public bool SwayYInverted;
// public bool SwayXInverted;
// public float SwaySmoothing;
// public float SwayResetSmoothing;
// public float SwayClampX;
// public float SwayClampY;
// }
// #endregion
// }

11
Assets/Scripts/Character/scr_Models.cs.meta generated Normal file
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: f67163350bd014f40a277862f1a675af
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

124
Assets/Scripts/Weapons/scr_FullCharacterController.cs
View File

@ -1,81 +1,81 @@
using System;
using UnityEditor;
using UnityEngine;
using UnityEngine.InputSystem;
using static scr_Models;
// using System;
// using UnityEditor;
// using UnityEngine;
// using UnityEngine.InputSystem;
// using static scr_Models;
public class scr_FullCharacterController : MonoBehaviour
{
private scr_CharacterController characterController;
[Header("Settings")]
public WeaponSettingsModel settings;
// public class scr_FullCharacterController : MonoBehaviour
// {
// private scr_CharacterController characterController;
// [Header("Settings")]
// public WeaponSettingsModel settings;
[Header("References")]
public Animator SciFiWarriorOur;
// [Header("References")]
// public Animator SciFiWarriorOur;
private bool isInitialised;
// private bool isInitialised;
Vector3 newWeaponRotation;
Vector3 newWeaponRotationVelocity;
// Vector3 newWeaponRotation;
// Vector3 newWeaponRotationVelocity;
Vector3 targetWeaponRotation;
Vector3 targetWeaponRotationVelocity;
// Vector3 targetWeaponRotation;
// Vector3 targetWeaponRotationVelocity;
Vector3 newWeaponMovementRotation;
Vector3 newWeaponRotationMovementVelocity;
// Vector3 newWeaponMovementRotation;
// Vector3 newWeaponRotationMovementVelocity;
Vector3 targetWeaponMovementRotation;
Vector3 targetWeaponMovementRotationVelocity;
private void Start()
{
newWeaponRotation = transform.localRotation.eulerAngles;
}
// Vector3 targetWeaponMovementRotation;
// Vector3 targetWeaponMovementRotationVelocity;
// private void Start()
// {
// newWeaponRotation = transform.localRotation.eulerAngles;
// }
public void Initialise(scr_CharacterController CharacterController)
{
characterController = CharacterController;
isInitialised = true;
}
// public void Initialise(scr_CharacterController CharacterController)
// {
// characterController = CharacterController;
// isInitialised = true;
// }
public void Update()
{
if (!isInitialised)
{
return;
}
// public void Update()
// {
// if (!isInitialised)
// {
// return;
// }
CalculateWeaponRotation();
SetWeaponAnimation();
}
private void CalculateWeaponRotation()
{
SciFiWarriorOur.speed = characterController.weaponAnimationSpeed;
// CalculateWeaponRotation();
// SetWeaponAnimation();
// }
// private void CalculateWeaponRotation()
// {
// SciFiWarriorOur.speed = characterController.weaponAnimationSpeed;
targetWeaponRotation.y += settings.SwayAmount * (settings.SwayXInverted ? -characterController.input_View.x : characterController.input_View.x) * Time.deltaTime;
targetWeaponRotation.x += settings.SwayAmount * (settings.SwayYInverted ? characterController.input_View.y : -characterController.input_View.y) * Time.deltaTime;
//newWeaponRotation.x = Mathf.Clamp(newWeaponRotation.x, ViewClampYMin, ViewClampYMax);
// targetWeaponRotation.y += settings.SwayAmount * (settings.SwayXInverted ? -characterController.input_View.x : characterController.input_View.x) * Time.deltaTime;
// targetWeaponRotation.x += settings.SwayAmount * (settings.SwayYInverted ? characterController.input_View.y : -characterController.input_View.y) * Time.deltaTime;
// //newWeaponRotation.x = Mathf.Clamp(newWeaponRotation.x, ViewClampYMin, ViewClampYMax);
targetWeaponRotation.x = Mathf.Clamp(targetWeaponRotation.x, -settings.SwayClampX, settings.SwayClampX);
targetWeaponRotation.y = Mathf.Clamp(targetWeaponRotation.y, -settings.SwayClampY, settings.SwayClampY);
// targetWeaponRotation.x = Mathf.Clamp(targetWeaponRotation.x, -settings.SwayClampX, settings.SwayClampX);
// targetWeaponRotation.y = Mathf.Clamp(targetWeaponRotation.y, -settings.SwayClampY, settings.SwayClampY);
targetWeaponRotation.z = targetWeaponRotation.y;
// targetWeaponRotation.z = targetWeaponRotation.y;
targetWeaponRotation = Vector3.SmoothDamp(targetWeaponRotation, Vector3.zero, ref targetWeaponRotationVelocity, settings.SwayResetSmoothing);
newWeaponRotation = Vector3.SmoothDamp(newWeaponRotation, targetWeaponRotation, ref newWeaponRotationVelocity, settings.SwaySmoothing);
// targetWeaponRotation = Vector3.SmoothDamp(targetWeaponRotation, Vector3.zero, ref targetWeaponRotationVelocity, settings.SwayResetSmoothing);
// newWeaponRotation = Vector3.SmoothDamp(newWeaponRotation, targetWeaponRotation, ref newWeaponRotationVelocity, settings.SwaySmoothing);
targetWeaponMovementRotation.z = settings.MovementSwayX * (settings.MovementSwayXInverted ? -characterController.input_Movement.x : characterController.input_Movement.x);
targetWeaponMovementRotation.x = settings.MovementSwayY * (settings.MovementSwayYInverted ? -characterController.input_Movement.y : characterController.input_Movement.y);
// targetWeaponMovementRotation.z = settings.MovementSwayX * (settings.MovementSwayXInverted ? -characterController.input_Movement.x : characterController.input_Movement.x);
// targetWeaponMovementRotation.x = settings.MovementSwayY * (settings.MovementSwayYInverted ? -characterController.input_Movement.y : characterController.input_Movement.y);
targetWeaponMovementRotation = Vector3.SmoothDamp(targetWeaponMovementRotation, Vector3.zero, ref targetWeaponMovementRotationVelocity, settings.SwayResetSmoothing);
newWeaponMovementRotation = Vector3.SmoothDamp(newWeaponRotation, targetWeaponMovementRotation, ref newWeaponRotationVelocity, settings.SwaySmoothing);
// targetWeaponMovementRotation = Vector3.SmoothDamp(targetWeaponMovementRotation, Vector3.zero, ref targetWeaponMovementRotationVelocity, settings.SwayResetSmoothing);
// newWeaponMovementRotation = Vector3.SmoothDamp(newWeaponRotation, targetWeaponMovementRotation, ref newWeaponRotationVelocity, settings.SwaySmoothing);
transform.localRotation = Quaternion.Euler(newWeaponRotation);
}
// transform.localRotation = Quaternion.Euler(newWeaponRotation);
// }
private void SetWeaponAnimation()
{
SciFiWarriorOur.SetBool("isSprinting", characterController.isSprinting);
SciFiWarriorOur.SetBool("isWalking", characterController.isWalking);
}
}
// private void SetWeaponAnimation()
// {
// SciFiWarriorOur.SetBool("isSprinting", characterController.isSprinting);
// SciFiWarriorOur.SetBool("isWalking", characterController.isWalking);
// }
// }

3
Assets/Standard Assets.meta generated
View File

@ -1,9 +1,8 @@
fileFormatVersion: 2
guid: c6195a43a0187a34e9c6be23520d3766
folderAsset: yes
timeCreated: 1436977287
licenseType: Store
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

8
Assets/Textures.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 737c3600d56348a438f029aba9e5223a
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Textures/New Material 10.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material 10
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 100, y: 100}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6650570c33a12de429865e9e4b722d94, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Textures/New Material 10.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 31a9f96e18d5bc14397c34801c218147
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Textures/New Material 8.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material 8
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 09647bb262db2f64a967e30f88ead013, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Textures/New Material 8.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: d7c445590f0e05f40bf1983f8a8bb807
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Textures/New Material 9.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: New Material 9
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 8a87aae45930bbd469163a33e299fc3a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Textures/New Material 9.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 62b26dc2f38a46f4b9330bed73f80771
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Textures/Stone.jpg (Stored with Git LFS) Normal file
View File

Binary file not shown.

92
Assets/Textures/Stone.jpg.meta generated Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 6650570c33a12de429865e9e4b722d94
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Textures/quartz.jpeg (Stored with Git LFS) Normal file
View File

Binary file not shown.

92
Assets/Textures/quartz.jpeg.meta generated Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 8a87aae45930bbd469163a33e299fc3a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

BIN
Assets/Textures/sneg.jpg (Stored with Git LFS) Normal file
View File

Binary file not shown.

92
Assets/Textures/sneg.jpg.meta generated Normal file
View File

@ -0,0 +1,92 @@
fileFormatVersion: 2
guid: 09647bb262db2f64a967e30f88ead013
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 11
mipmaps:
mipMapMode: 0
enableMipMap: 1
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
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 0
wrapV: 0
wrapW: 0
nPOTScale: 1
lightmap: 0
compressionQuality: 50
spriteMode: 0
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: 0
spriteTessellationDetail: -1
textureType: 0
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 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:
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

77
Assets/Textures/stone.mat generated Normal file
View File

@ -0,0 +1,77 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: stone
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_LightmapFlags: 6
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: 6650570c33a12de429865e9e4b722d94, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.1
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}

8
Assets/Textures/stone.mat.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 22c5f04d780d72448a5a02e12d5da37d
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

8
Assets/_TerrainAutoUpgrade.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 8ad0f4f0abaea774eb9592f3a9622bbc
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

22
Assets/_TerrainAutoUpgrade/layer_GrassUV01GrassUV01_Nd668f1e20ece139b.terrainlayer Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1953259897 &8574412962073106934
TerrainLayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: layer_GrassUV01GrassUV01_Nd668f1e20ece139b
m_DiffuseTexture: {fileID: 2800000, guid: 94e5dd2784ae3a44a930dba86cba9f6e, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: 77f758ad16f6580469ca8f42205f7b78, type: 3}
m_MaskMapTexture: {fileID: 0}
m_TileSize: {x: 10, y: 10}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0.15
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

8
Assets/_TerrainAutoUpgrade/layer_GrassUV01GrassUV01_Nd668f1e20ece139b.terrainlayer.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: bc6da504c6aef2d4c82d7a0726494350
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8574412962073106934
userData:
assetBundleName:
assetBundleVariant:

22
Assets/_TerrainAutoUpgrade/layer_GrassUV02GrassUV02_N3d1cca0d6d0e9938.terrainlayer Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1953259897 &8574412962073106934
TerrainLayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: layer_GrassUV02GrassUV02_N3d1cca0d6d0e9938
m_DiffuseTexture: {fileID: 2800000, guid: bafadcf258df85b4686863cbaa688fba, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: db6b5112f8b3bcf478707e82ef048e88, type: 3}
m_MaskMapTexture: {fileID: 0}
m_TileSize: {x: 10, y: 10}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

8
Assets/_TerrainAutoUpgrade/layer_GrassUV02GrassUV02_N3d1cca0d6d0e9938.terrainlayer.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6e308e95c51fa1c4985e1f509280e20c
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8574412962073106934
userData:
assetBundleName:
assetBundleVariant:

22
Assets/_TerrainAutoUpgrade/layer_GroundCracked01GroundCracked01_N793646612c42751.terrainlayer Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1953259897 &8574412962073106934
TerrainLayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: layer_GroundCracked01GroundCracked01_N793646612c42751
m_DiffuseTexture: {fileID: 2800000, guid: a87cbf62329d56d4681d92302095915c, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: 9511ab33cd5f6724f8c31c380a4814af, type: 3}
m_MaskMapTexture: {fileID: 0}
m_TileSize: {x: 4, y: 4}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

8
Assets/_TerrainAutoUpgrade/layer_GroundCracked01GroundCracked01_N793646612c42751.terrainlayer.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: e729a4cfe02167f49b4233742a1bf1cd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8574412962073106934
userData:
assetBundleName:
assetBundleVariant:

22
Assets/_TerrainAutoUpgrade/layer_GroundDryLeaves01GroundDryLeaves01_N793646612c42751.terrainlayer Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1953259897 &8574412962073106934
TerrainLayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: layer_GroundDryLeaves01GroundDryLeaves01_N793646612c42751
m_DiffuseTexture: {fileID: 2800000, guid: 3f893818068c13c498261af150bea6f3, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: e39dfb80d9815f14da82c65960519b23, type: 3}
m_MaskMapTexture: {fileID: 0}
m_TileSize: {x: 4, y: 4}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

8
Assets/_TerrainAutoUpgrade/layer_GroundDryLeaves01GroundDryLeaves01_N793646612c42751.terrainlayer.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 4d362c0a19a60ce499d6ee4904b515bd
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8574412962073106934
userData:
assetBundleName:
assetBundleVariant:

22
Assets/_TerrainAutoUpgrade/layer_GroundStones01GroundStones01_N2023054508611406.terrainlayer Normal file
View File

@ -0,0 +1,22 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1953259897 &8574412962073106934
TerrainLayer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: layer_GroundStones01GroundStones01_N2023054508611406
m_DiffuseTexture: {fileID: 2800000, guid: 17405fba9d20b47408239b3e82d60232, type: 3}
m_NormalMapTexture: {fileID: 2800000, guid: 63312008529ed1d4bab4d57c204bae7a, type: 3}
m_MaskMapTexture: {fileID: 0}
m_TileSize: {x: 5, y: 5}
m_TileOffset: {x: 0, y: 0}
m_Specular: {r: 0, g: 0, b: 0, a: 0}
m_Metallic: 0
m_Smoothness: 0
m_NormalScale: 1
m_DiffuseRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_DiffuseRemapMax: {x: 1, y: 1, z: 1, w: 1}
m_MaskMapRemapMin: {x: 0, y: 0, z: 0, w: 0}
m_MaskMapRemapMax: {x: 1, y: 1, z: 1, w: 1}

8
Assets/_TerrainAutoUpgrade/layer_GroundStones01GroundStones01_N2023054508611406.terrainlayer.meta generated Normal file
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: da2465b5e312dc54ebfd6720295e4cf6
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 8574412962073106934
userData:
assetBundleName:
assetBundleVariant:

223
wq Normal file
View File

@ -0,0 +1,223 @@
Merge branch 'krazerleo/core/1' into enikeev/dev/2
# Conflicts:
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim
# Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat
# Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta
# Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab
# Assets/Resources.meta
# Assets/Resources/BillingMode.json.meta
# Assets/Scenes/dont touch me plz.unity
# Assets/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab
# Assets/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta
# Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs
# Assets/Scripts/Character/scr_Models.cs
# Assets/Scripts/Weapons/WeaponController.cs
#
# It looks like you may be committing a merge.
# If this is not correct, please run
# git update-ref -d MERGE_HEAD
# and try again.
# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
#
# On branch enikeev/dev/2
# Your branch is ahead of 'origin/enikeev/dev/2' by 37 commits.
# (use "git push" to publish your local commits)
#
# All conflicts fixed but you are still merging.
#
# Changes to be committed:
# renamed: Assets/Defaults.meta -> Assets/Arts.meta
# renamed: Assets/Materials.meta -> Assets/Arts/Materials.meta
# renamed: Assets/Materials/New Material.mat -> Assets/Arts/Materials/New Material.mat
# renamed: Assets/Materials/New Material.mat.meta -> Assets/Arts/Materials/New Material.mat.meta
# renamed: Assets/Models.meta -> Assets/Arts/Models.meta
# renamed: Assets/Models/Flag model.fbx -> Assets/Arts/Models/Flag model.fbx
# renamed: Assets/Models/Flag model.fbx.meta -> Assets/Arts/Models/Flag model.fbx.meta
# renamed: Assets/Models/Textures.meta -> Assets/Arts/Models/Textures.meta
# renamed: Assets/Models/Textures/Flag.jpg -> Assets/Arts/Models/Textures/Flag.jpg
# renamed: Assets/Models/Textures/Flag.jpg.meta -> Assets/Arts/Models/Textures/Flag.jpg.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/AvatarMask.mask.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Die.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Die.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Die.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Die.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_AR.anim.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Ducking_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Guard_AR.anim.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_Shoot_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_guard_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_AR.anim.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Idle_gunMiddle_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Jump.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Reload.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.anim.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_guard_AR.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Run_gunMiddle_AR.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_AutoShot_AR.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_BurstShot_AR.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/Shoot_SingleShot_AR.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkBack_Shoot_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_AR.anim.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkFront_Shoot_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkLeft_Shoot_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animations/WalkRight_Shoot_ar.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animators.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators.meta
# new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Animators/SciFiWarriorOur.controller.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/HP.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/HP.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/HP.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/HP.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/PBR.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/PBR.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/PBR.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/PBR.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Polyart.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Skybox_Mat.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Stage.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Stage.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/Stage.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/Stage.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/promotion.mat -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat
# renamed: Assets/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Materials/promotion.mat.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/PBR_HP_Mesh.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Polyart_Mesh.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx
# renamed: Assets/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Mesh/Stage.fbx.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/Character without weapon/PBRCharacter.prefab.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/HPCharacter.prefab.meta
# new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab
# new file: Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PBRCharacter.prefab.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab
# renamed: Assets/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Prefabs/PolyartCharacter.prefab.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Scene.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity
# renamed: Assets/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Scene/DemoScene01.unity.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/HP_Albedo.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Albedo.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_AO.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_EM.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_MS.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PBR_Free_NM.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/Polyart.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/Polyart.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/Polyart.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/Polyart.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png
# renamed: Assets/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/Textures/PolyartEmission.png.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/promotion.jpg -> Assets/Arts/SciFiWarriorPBRHPPolyart/promotion.jpg
# renamed: Assets/SciFiWarriorPBRHPPolyart/promotion.jpg.meta -> Assets/Arts/SciFiWarriorPBRHPPolyart/promotion.jpg.meta
# deleted: Assets/Defaults/mat_proBuilder.mat
# new file: Assets/Inputs/InputSystem.inputsettings.asset
# new file: Assets/Inputs/InputSystem.inputsettings.asset.meta
# new file: Assets/Inputs/ThirdPersonViewInput.cs
# new file: Assets/Inputs/ThirdPersonViewInput.cs.meta
# new file: Assets/Inputs/ThirdPersonViewInput.inputactions
# new file: Assets/Inputs/ThirdPersonViewInput.inputactions.meta
# new file: Assets/Prefabs/CharacterPrefabs.meta
# renamed: Assets/Prefabs/Bot.prefab -> Assets/Prefabs/CharacterPrefabs/Bot.prefab
# renamed: Assets/Prefabs/Bot.prefab.meta -> Assets/Prefabs/CharacterPrefabs/Bot.prefab.meta
# new file: Assets/Prefabs/CharacterPrefabs/Character.prefab
# new file: Assets/Prefabs/CharacterPrefabs/Character.prefab.meta
# renamed: Assets/Prefabs/Player.prefab -> Assets/Prefabs/CharacterPrefabs/Player.prefab
# renamed: Assets/Prefabs/Player.prefab.meta -> Assets/Prefabs/CharacterPrefabs/Player.prefab.meta
# new file: Assets/Prefabs/EntityPrefabs.meta
# renamed: Assets/Prefabs/Flag zone.prefab -> Assets/Prefabs/EntityPrefabs/Flag zone.prefab
# renamed: Assets/Prefabs/Flag zone.prefab.meta -> Assets/Prefabs/EntityPrefabs/Flag zone.prefab.meta
# new file: Assets/Prefabs/EntityPrefabs/navPointPrefab.prefab
# new file: Assets/Prefabs/EntityPrefabs/navPointPrefab.prefab.meta
# new file: Assets/Prefabs/PickupPrefabs.meta
# renamed: Assets/Prefabs/ammo.prefab -> Assets/Prefabs/PickupPrefabs/ammo.prefab
# renamed: Assets/Prefabs/ammo.prefab.meta -> Assets/Prefabs/PickupPrefabs/ammo.prefab.meta
# renamed: Assets/Prefabs/armour.prefab -> Assets/Prefabs/PickupPrefabs/armour.prefab
# renamed: Assets/Prefabs/armour.prefab.meta -> Assets/Prefabs/PickupPrefabs/armour.prefab.meta
# renamed: Assets/Prefabs/health.prefab -> Assets/Prefabs/PickupPrefabs/health.prefab
# renamed: Assets/Prefabs/health.prefab.meta -> Assets/Prefabs/PickupPrefabs/health.prefab.meta
# modified: Assets/Resources.meta
# modified: Assets/Resources/BillingMode.json.meta
# new file: Assets/Scenes/AnimationTestScene.unity
# renamed: Assets/Scenes/dont touch me plz.unity.meta -> Assets/Scenes/AnimationTestScene.unity.meta
# modified: Assets/Scenes/Greatest_map_ever/Greatest_map_ever.unity
# renamed: Assets/Scenes/First try.unity -> Assets/Scenes/Map#1.unity
# renamed: Assets/Scenes/First try.unity.meta -> Assets/Scenes/Map#1.unity.meta
# deleted: Assets/Scenes/dont touch me plz.unity
# new file: Assets/Scripts/Animators.meta
# new file: Assets/Scripts/Animators/Kirill Animator.meta
# renamed: Assets/Scripts/Character/scr_CharacterController.cs -> Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs
# renamed: Assets/Scripts/Character/scr_CharacterController.cs.meta -> Assets/Scripts/Animators/Kirill Animator/CustomCharacterController.cs.meta
# new file: Assets/Scripts/Animators/Kirill Animator/Models.cs
# renamed: Assets/Scripts/Character/scr_Models.cs.meta -> Assets/Scripts/Animators/Kirill Animator/Models.cs.meta
# new file: Assets/Scripts/Animators/Leonid Animator.meta
# new file: Assets/Scripts/Animators/Leonid Animator/AnimatorHandler.cs
# new file: Assets/Scripts/Animators/Leonid Animator/AnimatorHandler.cs.meta
# renamed: Assets/SciFiWarriorPBRHPPolyart/Animators/SciFiWarrior.controller -> Assets/Scripts/Animators/Leonid Animator/CharacterAnimator.controller
# renamed: Assets/Defaults/mat_proBuilder.mat.meta -> Assets/Scripts/Animators/Leonid Animator/CharacterAnimator.controller.meta
# new file: Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs
# new file: Assets/Scripts/Animators/Leonid Animator/CharacterLocomotion.cs.meta
# new file: Assets/Scripts/Animators/Leonid Animator/InputHandler.cs
# new file: Assets/Scripts/Animators/Leonid Animator/InputHandler.cs.meta
# new file: Assets/Scripts/Animators/Leonid Animator/LowerBody.mask
# new file: Assets/Scripts/Animators/Leonid Animator/LowerBody.mask.meta
# new file: Assets/Scripts/Animators/Leonid Animator/UpperBody.mask
# new file: Assets/Scripts/Animators/Leonid Animator/UpperBody.mask.meta
# new file: Assets/Scripts/CameraScripts.meta
# new file: Assets/Scripts/CameraScripts/CameraHandler.cs
# new file: Assets/Scripts/CameraScripts/CameraHandler.cs.meta
# modified: Assets/Scripts/Character/NPC.cs
# deleted: Assets/Scripts/Character/scr_Models.cs
# modified: Assets/Scripts/Misc/NavPoint.cs
# renamed: Assets/Scripts/Weapons/scr_WeaponController.cs -> Assets/Scripts/Weapons/WeaponController.cs
# renamed: Assets/Scripts/Weapons/scr_WeaponController.cs.meta -> Assets/Scripts/Weapons/WeaponController.cs.meta
# modified: ProjectSettings/EditorBuildSettings.asset
# modified: ProjectSettings/TagManager.asset
#