diff --git a/Assets/Prefabs/Art3D/ShieldBar.prefab b/Assets/Prefabs/Art3D/ShieldBar.prefab index 940cddc..dfd87c4 100644 --- a/Assets/Prefabs/Art3D/ShieldBar.prefab +++ b/Assets/Prefabs/Art3D/ShieldBar.prefab @@ -25,14 +25,14 @@ Transform: m_GameObject: {fileID: 228621501325938318} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 1, y: 1, z: 1} - m_ConstrainProportionsScale: 0 + m_LocalPosition: {x: 0, y: 0, z: 3} + m_LocalScale: {x: 0.050000004, y: 0.050000004, z: 0.05} + m_ConstrainProportionsScale: 1 m_Children: - - {fileID: 7157999321033704968} + - {fileID: 7207716708273798845} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &7267942319571001827 +--- !u!1001 &7173193334112115030 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -40,69 +40,69 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 4417313079524746681} m_Modifications: - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: f4616bcaca9d2874293fcf283b53dc9a, + - target: {fileID: 919132149155446097, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} propertyPath: m_Name - value: Shield_Bar_V001 + value: Shield_Bar_V002 objectReference: {fileID: 0} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: f4616bcaca9d2874293fcf283b53dc9a, type: 3} ---- !u!4 &7157999321033704968 stripped + m_SourcePrefab: {fileID: 100100000, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} +--- !u!4 &7207716708273798845 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: f4616bcaca9d2874293fcf283b53dc9a, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 7bc83d134a74a2a468929a7200cba18e, type: 3} - m_PrefabInstance: {fileID: 7267942319571001827} + m_PrefabInstance: {fileID: 7173193334112115030} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/Art3D/WeaponStats.prefab b/Assets/Prefabs/Art3D/WeaponStats.prefab index 5a72c50..7141d1c 100644 --- a/Assets/Prefabs/Art3D/WeaponStats.prefab +++ b/Assets/Prefabs/Art3D/WeaponStats.prefab @@ -29,10 +29,10 @@ Transform: m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: - - {fileID: 3999490423349189397} + - {fileID: 958187019283342279} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} ---- !u!1001 &3462056610295414014 +--- !u!1001 &776470133911274540 PrefabInstance: m_ObjectHideFlags: 0 serializedVersion: 2 @@ -40,69 +40,134 @@ PrefabInstance: serializedVersion: 3 m_TransformParent: {fileID: 1044419668733226994} m_Modifications: - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8743708241877161412, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalPosition.z value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.w value: 1 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.x value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.y value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalRotation.z value: -0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.x value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.y value: 0 objectReference: {fileID: 0} - - target: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_LocalEulerAnglesHint.z value: 0 objectReference: {fileID: 0} - - target: {fileID: 919132149155446097, guid: 9cc6a53237ebbed4c86848f2af1141fd, + - target: {fileID: -8411208151607889731, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -5082775208107051557, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4494622481652884282, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -4006721073217672483, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -3113411552344121775, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -2773002617504296819, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: -540276461574901224, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 34571417957489200, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 919132149155446097, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} propertyPath: m_Name - value: Weapon_Stats_V002 + value: Weapon_Stats_V003 objectReference: {fileID: 0} + - target: {fileID: 1397318277702805348, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 58e9cc7346ee7d140bfe90df87afcf1c, type: 2} + - target: {fileID: 3630336498685884014, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 4938214463636535541, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} + - target: {fileID: 6913809767001870300, guid: 703cd189b868d4c42a8be20b38d92906, + type: 3} + propertyPath: m_Materials.Array.data[0] + value: + objectReference: {fileID: 2100000, guid: 0559d680961420b4283f6c41b038e1c8, type: 2} m_RemovedComponents: [] m_RemovedGameObjects: [] m_AddedGameObjects: [] m_AddedComponents: [] - m_SourcePrefab: {fileID: 100100000, guid: 9cc6a53237ebbed4c86848f2af1141fd, type: 3} ---- !u!4 &3999490423349189397 stripped + m_SourcePrefab: {fileID: 100100000, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} +--- !u!4 &958187019283342279 stripped Transform: - m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 9cc6a53237ebbed4c86848f2af1141fd, + m_CorrespondingSourceObject: {fileID: -8679921383154817045, guid: 703cd189b868d4c42a8be20b38d92906, type: 3} - m_PrefabInstance: {fileID: 3462056610295414014} + m_PrefabInstance: {fileID: 776470133911274540} m_PrefabAsset: {fileID: 0} diff --git a/Assets/Prefabs/PlayerReplayer.prefab b/Assets/Prefabs/PlayerReplayer.prefab index e2c187d..fc4333a 100644 --- a/Assets/Prefabs/PlayerReplayer.prefab +++ b/Assets/Prefabs/PlayerReplayer.prefab @@ -97,6 +97,7 @@ Transform: - {fileID: 7845453783053460798} - {fileID: 5020301824866751461} - {fileID: 8852994287323472227} + - {fileID: 8969276565425859046} m_Father: {fileID: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!114 &1013965729963872153 @@ -117,6 +118,7 @@ MonoBehaviour: BulletTracerEnd: {fileID: 8852994287323472227} k__BackingField: 0 DeathIndices: be000000f8000000eb0100005a0200008f020000 + ShieldBarTransform: {fileID: 0} --- !u!20 &7220179918976106526 Camera: m_ObjectHideFlags: 0 @@ -148,7 +150,7 @@ Camera: y: 0 width: 1 height: 1 - near clip plane: 0.3 + near clip plane: 0.01 far clip plane: 1000 field of view: 60 orthographic: 0 @@ -286,9 +288,7 @@ LineRenderer: m_SortingLayerID: 0 m_SortingLayer: 0 m_SortingOrder: 0 - m_Positions: - - {x: 0, y: 0, z: 0} - - {x: 0, y: 0, z: 100} + m_Positions: [] m_Parameters: serializedVersion: 3 widthMultiplier: 1 @@ -348,3 +348,97 @@ LineRenderer: m_UseWorldSpace: 1 m_Loop: 0 m_ApplyActiveColorSpace: 1 +--- !u!1001 &2518478724410866651 +PrefabInstance: + m_ObjectHideFlags: 0 + serializedVersion: 2 + m_Modification: + serializedVersion: 3 + m_TransformParent: {fileID: 1807660236798938897} + m_Modifications: + - target: {fileID: 371116989439902891, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_Name + value: Character + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.x + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.y + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalScale.z + value: 0.5 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.y + value: -0.804 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalPosition.z + value: -0.016 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.w + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.x + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.y + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalRotation.z + value: -0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.x + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.y + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_LocalEulerAnglesHint.z + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + propertyPath: m_ConstrainProportionsScale + value: 1 + objectReference: {fileID: 0} + m_RemovedComponents: [] + m_RemovedGameObjects: [] + m_AddedGameObjects: [] + m_AddedComponents: [] + m_SourcePrefab: {fileID: 100100000, guid: 16ff033aae936014092803accad2be58, type: 3} +--- !u!4 &8969276565425859046 stripped +Transform: + m_CorrespondingSourceObject: {fileID: 6812304174526681661, guid: 16ff033aae936014092803accad2be58, + type: 3} + m_PrefabInstance: {fileID: 2518478724410866651} + m_PrefabAsset: {fileID: 0} diff --git a/Assets/Scripts/PlayerController.cs b/Assets/Scripts/PlayerController.cs index d78cd50..cc638c4 100644 --- a/Assets/Scripts/PlayerController.cs +++ b/Assets/Scripts/PlayerController.cs @@ -16,6 +16,8 @@ namespace InterfaceOff.WorldScene [field: SerializeField] public int FrameIndex { get; private set; } [SerializeField] private int[] DeathIndices; + private const int MAX_WINDOWS = 20; + private bool PlayerAlive = true; private float LerpValue; @@ -33,7 +35,7 @@ namespace InterfaceOff.WorldScene /* Iterates the frame index */ FrameIndex = (FrameIndex + 1) % (Frames.Length - 2); - if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > 20) + if (DeathIndices.Contains(FrameIndex) && ActiveWindowSpawner.SpawnedWindowCount > MAX_WINDOWS) { ActiveWindowSpawner.StartEndSequence(); PlayerAlive = false; diff --git a/Assets/Scripts/Windows/TriviaWindow.cs b/Assets/Scripts/Windows/TriviaWindow.cs index 3aa47bb..0d3c615 100644 --- a/Assets/Scripts/Windows/TriviaWindow.cs +++ b/Assets/Scripts/Windows/TriviaWindow.cs @@ -1,6 +1,5 @@ using UnityEngine; using UnityEngine.UI; -using System.IO; namespace InterfaceOff { diff --git a/Assets/Tmp/Character/Character_V001.controller b/Assets/Tmp/Character/Character_V001.controller new file mode 100644 index 0000000..bb19e54 --- /dev/null +++ b/Assets/Tmp/Character/Character_V001.controller @@ -0,0 +1,43 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!91 &9100000 +AnimatorController: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Character_V001 + serializedVersion: 5 + m_AnimatorParameters: [] + m_AnimatorLayers: + - serializedVersion: 5 + m_Name: Base Layer + m_StateMachine: {fileID: 593256987451643658} + m_Mask: {fileID: 0} + m_Motions: [] + m_Behaviours: [] + m_BlendingMode: 0 + m_SyncedLayerIndex: -1 + m_DefaultWeight: 0 + m_IKPass: 0 + m_SyncedLayerAffectsTiming: 0 + m_Controller: {fileID: 9100000} +--- !u!1107 &593256987451643658 +AnimatorStateMachine: + serializedVersion: 6 + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Base Layer + m_ChildStates: [] + m_ChildStateMachines: [] + m_AnyStateTransitions: [] + m_EntryTransitions: [] + m_StateMachineTransitions: {} + m_StateMachineBehaviours: [] + m_AnyStatePosition: {x: 50, y: 20, z: 0} + m_EntryPosition: {x: 50, y: 120, z: 0} + m_ExitPosition: {x: 800, y: 120, z: 0} + m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} + m_DefaultState: {fileID: 0} diff --git a/Assets/Tmp/Character/Character_V001.controller.meta b/Assets/Tmp/Character/Character_V001.controller.meta new file mode 100644 index 0000000..cc64214 --- /dev/null +++ b/Assets/Tmp/Character/Character_V001.controller.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: c901c9a361bf7ea46af244b1fd21dc33 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 9100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tmp/Map/Materials/Mat1.mat b/Assets/Tmp/Map/Materials/Mat1.mat index e9bdf11..4276be0 100644 --- a/Assets/Tmp/Map/Materials/Mat1.mat +++ b/Assets/Tmp/Map/Materials/Mat1.mat @@ -11,7 +11,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -25,11 +28,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e0683699358dd9147bebf3d484588b68, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c69dddd0702caf24d86a1f6acb1a37f7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -49,11 +52,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: e0683699358dd9147bebf3d484588b68, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: ec165470d52a6604eaa2a01f6ffa01f6, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -61,7 +64,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: c11f7f7cfc3e0bb41a2a7ae1fadc46e1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/Map/Materials/Mat2.mat b/Assets/Tmp/Map/Materials/Mat2.mat index e26f3d5..2292686 100644 --- a/Assets/Tmp/Map/Materials/Mat2.mat +++ b/Assets/Tmp/Map/Materials/Mat2.mat @@ -24,7 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -38,11 +41,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0201ab0ded07b894eade1681e98a6905, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 118d86b7052be054494e74b9ec0c1e0b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -62,11 +65,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0201ab0ded07b894eade1681e98a6905, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d006e7eaa040d3f44b94109572a7fbf0, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -74,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 103b11e80cc75864db55577d69cecd7c, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/Map/Materials/Mat3.mat b/Assets/Tmp/Map/Materials/Mat3.mat index f23c346..d1bbead 100644 --- a/Assets/Tmp/Map/Materials/Mat3.mat +++ b/Assets/Tmp/Map/Materials/Mat3.mat @@ -24,7 +24,10 @@ Material: m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} m_Parent: {fileID: 0} m_ModifiedSerializedProperties: 0 - m_ValidKeywords: [] + m_ValidKeywords: + - _METALLICSPECGLOSSMAP + - _NORMALMAP + - _PARALLAXMAP m_InvalidKeywords: [] m_LightmapFlags: 4 m_EnableInstancingVariants: 0 @@ -38,11 +41,11 @@ Material: serializedVersion: 3 m_TexEnvs: - _BaseMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fc6f6fcba0b2c0d4a8cc1d0ce809d69f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _BumpMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: d2e95338f00177e4abcee738a7f983a7, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _DetailAlbedoMap: @@ -62,11 +65,11 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MainTex: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: fc6f6fcba0b2c0d4a8cc1d0ce809d69f, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _MetallicGlossMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: bae07b92a178cc7418451b2e12c7daf1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _OcclusionMap: @@ -74,7 +77,7 @@ Material: m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _ParallaxMap: - m_Texture: {fileID: 0} + m_Texture: {fileID: 2800000, guid: 0c465f52abd25ce41ad298fed390167b, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} - _SpecGlossMap: diff --git a/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx b/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx deleted file mode 100644 index b833829..0000000 Binary files a/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx and /dev/null differ diff --git a/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx b/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx new file mode 100644 index 0000000..f4e4d62 Binary files /dev/null and b/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx differ diff --git a/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx.meta b/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx.meta similarity index 98% rename from Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx.meta rename to Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx.meta index 9504e43..1680618 100644 --- a/Assets/Tmp/ShieldBar/Shield_Bar_V001.fbx.meta +++ b/Assets/Tmp/ShieldBar/Shield_Bar_V002.fbx.meta @@ -1,5 +1,5 @@ fileFormatVersion: 2 -guid: f4616bcaca9d2874293fcf283b53dc9a +guid: 7bc83d134a74a2a468929a7200cba18e ModelImporter: serializedVersion: 22200 internalIDToNameTable: [] diff --git a/Assets/Tmp/WeaponStats/Mat1.mat b/Assets/Tmp/WeaponStats/Mat1.mat new file mode 100644 index 0000000..88975f3 --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat1.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat1 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: b33f01f7fe7791945ad6c970ec100b66, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: b33f01f7fe7791945ad6c970ec100b66, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] +--- !u!114 &389027120164341326 +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: + version: 7 diff --git a/Assets/Tmp/WeaponStats/Mat1.mat.meta b/Assets/Tmp/WeaponStats/Mat1.mat.meta new file mode 100644 index 0000000..fa32d74 --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat1.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 0559d680961420b4283f6c41b038e1c8 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tmp/WeaponStats/Mat2.mat b/Assets/Tmp/WeaponStats/Mat2.mat new file mode 100644 index 0000000..45a28f6 --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat2.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!114 &-7908440900715772914 +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: + version: 7 +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat2 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: bdba9aae5b013e24e8a787da88ede956, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: bdba9aae5b013e24e8a787da88ede956, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] diff --git a/Assets/Tmp/WeaponStats/Mat2.mat.meta b/Assets/Tmp/WeaponStats/Mat2.mat.meta new file mode 100644 index 0000000..cefa7c9 --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat2.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 58e9cc7346ee7d140bfe90df87afcf1c +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Tmp/WeaponStats/Mat3.mat b/Assets/Tmp/WeaponStats/Mat3.mat new file mode 100644 index 0000000..24ae57f --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat3.mat @@ -0,0 +1,133 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 8 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: Mat3 + m_Shader: {fileID: 4800000, guid: 933532a4fcc9baf4fa0491de14d08ed7, type: 3} + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: [] + m_InvalidKeywords: [] + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: + RenderType: Opaque + disabledShaderPasses: [] + m_LockedProperties: + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BaseMap: + m_Texture: {fileID: 2800000, guid: 8874919551ff02f4bbddb05d0b1b33be, type: 3} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _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: 8874919551ff02f4bbddb05d0b1b33be, 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} + - _SpecGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_Lightmaps: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_LightmapsInd: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - unity_ShadowMasks: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + m_Ints: [] + m_Floats: + - _AlphaClip: 0 + - _AlphaToMask: 0 + - _Blend: 0 + - _BlendModePreserveSpecular: 1 + - _BumpScale: 1 + - _ClearCoatMask: 0 + - _ClearCoatSmoothness: 0 + - _Cull: 2 + - _Cutoff: 0.5 + - _DetailAlbedoMapScale: 1 + - _DetailNormalMapScale: 1 + - _DstBlend: 0 + - _DstBlendAlpha: 0 + - _EnvironmentReflections: 1 + - _GlossMapScale: 0 + - _Glossiness: 0 + - _GlossyReflections: 0 + - _Metallic: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.005 + - _QueueOffset: 0 + - _ReceiveShadows: 1 + - _Smoothness: 0.5 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 1 + - _SrcBlend: 1 + - _SrcBlendAlpha: 1 + - _Surface: 0 + - _WorkflowMode: 1 + - _ZWrite: 1 + m_Colors: + - _BaseColor: {r: 1, g: 1, b: 1, a: 1} + - _Color: {r: 1, g: 1, b: 1, 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: [] +--- !u!114 &1687091801796460326 +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: + version: 7 diff --git a/Assets/Tmp/WeaponStats/Mat3.mat.meta b/Assets/Tmp/WeaponStats/Mat3.mat.meta new file mode 100644 index 0000000..46a8c2f --- /dev/null +++ b/Assets/Tmp/WeaponStats/Mat3.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: ca6bc29a761921d4dbcf49ee8c280eb0 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 2100000 + userData: + assetBundleName: + assetBundleVariant: