unified scene working - small but with inventory and portals. has simple fix coming - overlaps in script use buttons still here, need flags to fix - simple torso for player character

This commit is contained in:
jonasty 2022-04-05 10:21:55 +03:00
parent 53893b63a6
commit ccafc9e970
58 changed files with 18075 additions and 6403 deletions

View File

@ -65,37 +65,6 @@ Transform:
m_Father: {fileID: 4501704942324762} m_Father: {fileID: 4501704942324762}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1007709937547950
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4453350789320212}
m_Layer: 0
m_Name: Set Character_Character_Male_Legs_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4453350789320212
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1007709937547950}
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_Children: []
m_Father: {fileID: 4493021605688238}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1008321977315354 --- !u!1 &1008321977315354
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -485,37 +454,6 @@ Transform:
m_Father: {fileID: 4822120185942956} m_Father: {fileID: 4822120185942956}
m_RootOrder: 5 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1065583186896960
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4684616241190890}
m_Layer: 0
m_Name: Set Character_Character_Male_Hair_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4684616241190890
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1065583186896960}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.9900991, y: 0.9900991, z: 0.990099}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 4493021605688238}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1068447607716544 --- !u!1 &1068447607716544
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
@ -1230,7 +1168,7 @@ Transform:
- {fileID: 4307644995924180} - {fileID: 4307644995924180}
- {fileID: 4977433765208342} - {fileID: 4977433765208342}
m_Father: {fileID: 4026128850371490} m_Father: {fileID: 4026128850371490}
m_RootOrder: 2 m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1239127053433692 --- !u!1 &1239127053433692
GameObject: GameObject:
@ -1782,7 +1720,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4026128850371490} m_Father: {fileID: 4026128850371490}
m_RootOrder: 5 m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1333928879224930 --- !u!1 &1333928879224930
GameObject: GameObject:
@ -1846,10 +1784,10 @@ Transform:
m_Children: m_Children:
- {fileID: 4094373081905234} - {fileID: 4094373081905234}
- {fileID: 4505894016144902} - {fileID: 4505894016144902}
- {fileID: 4358411822311794}
- {fileID: 4157798315238530}
- {fileID: 4732703978680780} - {fileID: 4732703978680780}
- {fileID: 4157798315238530}
- {fileID: 4794190135753666} - {fileID: 4794190135753666}
- {fileID: 4358411822311794}
m_Father: {fileID: 4493021605688238} m_Father: {fileID: 4493021605688238}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -2507,7 +2445,7 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: [] m_Children: []
m_Father: {fileID: 4026128850371490} m_Father: {fileID: 4026128850371490}
m_RootOrder: 4 m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1502755542236114 --- !u!1 &1502755542236114
GameObject: GameObject:
@ -3082,9 +3020,6 @@ Transform:
m_ConstrainProportionsScale: 0 m_ConstrainProportionsScale: 0
m_Children: m_Children:
- {fileID: 4026128850371490} - {fileID: 4026128850371490}
- {fileID: 4453350789320212}
- {fileID: 4360253625057714}
- {fileID: 4684616241190890}
m_Father: {fileID: 4532250632830336} m_Father: {fileID: 4532250632830336}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@ -3914,37 +3849,6 @@ Transform:
m_Father: {fileID: 4667278343817002} m_Father: {fileID: 4667278343817002}
m_RootOrder: 0 m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1858149772007134
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4360253625057714}
m_Layer: 0
m_Name: Set Character_Character_Male_Torso_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4360253625057714
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1858149772007134}
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_Children: []
m_Father: {fileID: 4493021605688238}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1865346217033004 --- !u!1 &1865346217033004
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

View File

@ -19,249 +19,15 @@ AnimatorController:
- serializedVersion: 5 - serializedVersion: 5
m_Name: Base Layer m_Name: Base Layer
m_StateMachine: {fileID: 1107632418391388642} m_StateMachine: {fileID: 1107632418391388642}
m_Mask: {fileID: 0} m_Mask: {fileID: 31900000, guid: f32bdd1ccc464a34b86c27bb77cadc39, type: 2}
m_Motions: [] m_Motions: []
m_Behaviours: [] m_Behaviours: []
m_BlendingMode: 0 m_BlendingMode: 0
m_SyncedLayerIndex: -1 m_SyncedLayerIndex: -1
m_DefaultWeight: 0 m_DefaultWeight: 0
m_IKPass: 0 m_IKPass: 1
m_SyncedLayerAffectsTiming: 0 m_SyncedLayerAffectsTiming: 0
m_Controller: {fileID: 9100000} m_Controller: {fileID: 9100000}
--- !u!1102 &1102003536358159248
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Land
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400004, guid: 238163f950175d845b03cb6dac0c6e60, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102075184184080350
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Roll
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 68d04a7b9dcc0fd4b877df82f02d1d61, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102097913726934338
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Jump Up
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 238163f950175d845b03cb6dac0c6e60, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102142064644649106
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Block Hit
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: fe09d69bd98991f4d84f6c67e4e3492c, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102157342845842840
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Get Up
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: fa48ae6d3a4854443898a58add5074ff, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102171612686385896
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Damage Heavy
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: 23fd8c182a6515648baa9d0a89922e73, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102220301679994620
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Attack 3
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400004, guid: 176fac875603d3f419eb970f987aeab5, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102274922726278086
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sprint
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 7e9d3ca0c95bb8749ab91f3a407bea2d, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102332064981782274
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Stance
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 8a646e73f32d5ab46be5ca7d3ebb4f3d, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102414701294786830 --- !u!1102 &1102414701294786830
AnimatorState: AnimatorState:
serializedVersion: 6 serializedVersion: 6
@ -282,376 +48,12 @@ AnimatorState:
m_MirrorParameterActive: 0 m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0 m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0 m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: f03b4671842f14f4b98bfc645df0e1ed, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102421402161273378
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Die
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 1b89fcc283287844b8d68f9e0cc329cc, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102545652085291482
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Attack 2
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: 176fac875603d3f419eb970f987aeab5, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102554951633155134
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Die
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: fa48ae6d3a4854443898a58add5074ff, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102635382796221860
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Damage Heavy
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: 1b31cb902429704429a2c2584363dd59, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102635579427550910
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Block
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: fe09d69bd98991f4d84f6c67e4e3492c, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102662826810688700
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male_Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 00ed1997eb74a40498b28747b3fdb59a, type: 3} m_Motion: {fileID: 7400000, guid: 00ed1997eb74a40498b28747b3fdb59a, type: 3}
m_Tag: m_Tag:
m_SpeedParameter: m_SpeedParameter:
m_MirrorParameter: m_MirrorParameter:
m_CycleOffsetParameter: m_CycleOffsetParameter:
m_TimeParameter: m_TimeParameter:
--- !u!1102 &1102678307518385000
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Attack 1
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 176fac875603d3f419eb970f987aeab5, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102723739437390148
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Fall
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: 238163f950175d845b03cb6dac0c6e60, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102777843178486112
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Damage Light
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 23fd8c182a6515648baa9d0a89922e73, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102791233351445532
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Roll
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 512db7c09f1ecd24aa783375a03e5964, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102836371342211284
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male_Sword_Walk
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 0f5f811a33031524680b227a45dc9848, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102872702011382600
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Damage Light
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 1b31cb902429704429a2c2584363dd59, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102924031727420378
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Sword Sprint
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400000, guid: 92e13e67a26415646a752312d3ac0230, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1102 &1102930749543856260
AnimatorState:
serializedVersion: 6
m_ObjectHideFlags: 1
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Male Get Up
m_Speed: 1
m_CycleOffset: 0
m_Transitions: []
m_StateMachineBehaviours: []
m_Position: {x: 50, y: 50, z: 0}
m_IKOnFeet: 0
m_WriteDefaultValues: 1
m_Mirror: 0
m_SpeedParameterActive: 0
m_MirrorParameterActive: 0
m_CycleOffsetParameterActive: 0
m_TimeParameterActive: 0
m_Motion: {fileID: 7400002, guid: 1b89fcc283287844b8d68f9e0cc329cc, type: 3}
m_Tag:
m_SpeedParameter:
m_MirrorParameter:
m_CycleOffsetParameter:
m_TimeParameter:
--- !u!1107 &1107632418391388642 --- !u!1107 &1107632418391388642
AnimatorStateMachine: AnimatorStateMachine:
serializedVersion: 6 serializedVersion: 6
@ -661,78 +63,9 @@ AnimatorStateMachine:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: Base Layer m_Name: Base Layer
m_ChildStates: m_ChildStates:
- serializedVersion: 1
m_State: {fileID: 1102678307518385000}
m_Position: {x: 792, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102545652085291482}
m_Position: {x: 792, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102220301679994620}
m_Position: {x: 792, y: 324, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102635382796221860}
m_Position: {x: 792, y: 72, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102872702011382600}
m_Position: {x: 792, y: 24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102421402161273378}
m_Position: {x: 1008, y: 24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102930749543856260}
m_Position: {x: 1008, y: 72, z: 0}
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1102414701294786830} m_State: {fileID: 1102414701294786830}
m_Position: {x: 360, y: 24, z: 0} m_Position: {x: 350, y: 110, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102723739437390148}
m_Position: {x: 1224, y: 72, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102097913726934338}
m_Position: {x: 1224, y: 24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102003536358159248}
m_Position: {x: 1224, y: 120, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102075184184080350}
m_Position: {x: 1440, y: 24, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102274922726278086}
m_Position: {x: 576, y: 72, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102635579427550910}
m_Position: {x: 1008, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102142064644649106}
m_Position: {x: 1008, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102171612686385896}
m_Position: {x: 1224, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102777843178486112}
m_Position: {x: 1224, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102554951633155134}
m_Position: {x: 1440, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102157342845842840}
m_Position: {x: 1440, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102791233351445532}
m_Position: {x: 1656, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102924031727420378}
m_Position: {x: 576, y: 276, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102332064981782274}
m_Position: {x: 370, y: 230, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102836371342211284}
m_Position: {x: 576, y: 228, z: 0}
- serializedVersion: 1
m_State: {fileID: 1102662826810688700}
m_Position: {x: 580, y: 20, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []
@ -740,6 +73,6 @@ AnimatorStateMachine:
m_StateMachineBehaviours: [] m_StateMachineBehaviours: []
m_AnyStatePosition: {x: 50, y: 20, z: 0} m_AnyStatePosition: {x: 50, y: 20, z: 0}
m_EntryPosition: {x: 100, y: 120, z: 0} m_EntryPosition: {x: 100, y: 120, z: 0}
m_ExitPosition: {x: 408, y: -96, z: 0} m_ExitPosition: {x: 390, y: -20, z: 0}
m_ParentStateMachinePosition: {x: 800, y: 20, z: 0} m_ParentStateMachinePosition: {x: 800, y: 20, z: 0}
m_DefaultState: {fileID: 1102332064981782274} m_DefaultState: {fileID: 1102414701294786830}

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: da52a93af762fab4ab9085821b0fb632
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 10f2e5d2e4dd2ba42b4dcf6195a74f02
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0, g: 0, b: 0, a: 1} - _BaseColor: {r: 0, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -9,13 +9,13 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PeaceParticle m_Name: PeaceParticle
m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3} m_Shader: {fileID: 4800000, guid: 0406db5a14f94604a8c57ccfbc9f3b46, type: 3}
m_ShaderKeywords: _EMISSION m_ShaderKeywords: _ALPHATEST_ON _EMISSION
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 2450
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: TransparentCutout
disabledShaderPasses: disabledShaderPasses:
- ALWAYS - ALWAYS
m_SavedProperties: m_SavedProperties:

View File

@ -22,7 +22,7 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: ScreenMaterial m_Name: ScreenMaterial
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -58,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 5f365aeaff5197549888455c6be54b37, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: df03d2cdd7c41534fa95797c3b186ca8, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: c704ccf98609c79458c5816c029a99de, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 466d221c743ab400a8318afe7b830593, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1} - _BaseColor: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.5, g: 0.5, b: 0.5, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -18,6 +18,7 @@ Material:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- DepthOnly - DepthOnly
- SHADOWCASTER
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -109,7 +110,7 @@ Material:
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0, g: 0.33439997, b: 0.08359996, a: 0.5} - _BaseColor: {r: 0, g: 0.33439997, b: 0.08359996, a: 0.5}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0, g: 0.33439994, b: 0.08359993, a: 0.5}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 0} - _EmissionColor: {r: 0, g: 0, b: 0, a: 0}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -58,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: b1e192ef5397548b28e9549ba9e04a14, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -58,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 47c72aea7837946679d91402f5af8665, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: b7600ae2b00af42b3b06a37401929b21, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.037715577, g: 0.033018887, b: 1, a: 1} - _BaseColor: {r: 0.037715577, g: 0.033018887, b: 1, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.037715577, g: 0.033018887, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -58,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 6f62dbb8fce29e04fb0a99913642d116, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -45,8 +45,8 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: da225b0c7f6a4e04899586c942121e17, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 2, y: 2}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}

View File

@ -31,6 +31,7 @@ Material:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- DepthOnly - DepthOnly
- SHADOWCASTER
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -122,7 +123,7 @@ Material:
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0, g: 0.75735295, b: 0.13057807, a: 0.78431374} - _BaseColor: {r: 0, g: 0.75735295, b: 0.13057807, a: 0.78431374}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0, g: 0.75735295, b: 0.13057804, a: 0.78431374}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: CubeMaterial m_Name: CubeMaterial
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _EMISSION _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR m_ShaderKeywords: _EMISSION
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -33,7 +33,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 020d1a102a7f2a14ebf6cefe7b977303, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SpecGlossMap: - _SpecGlossMap:

View File

@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: b28381ec2a3dce5459a8fd396a0eb560, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.06666665, g: 0.06666665, b: 0.06666665, a: 1} - _BaseColor: {r: 0.06666665, g: 0.06666665, b: 0.06666665, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.066666625, g: 0.066666625, b: 0.066666625, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -108,7 +108,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8897059, g: 0.72160023, b: 0.35980752, a: 1} - _BaseColor: {r: 0.8897059, g: 0.72160023, b: 0.35980752, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8897059, g: 0.72160023, b: 0.3598075, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.8897059, g: 0.46335077, b: 0.006541961, a: 1} - _BaseColor: {r: 0.8897059, g: 0.46335077, b: 0.006541961, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.8897059, g: 0.46335077, b: 0.006541961, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -22,7 +22,7 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: UnitCircleMaterial m_Name: UnitCircleMaterial
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _EMISSION _SPECULAR_COLOR _SURFACE_TYPE_TRANSPARENT m_ShaderKeywords: _EMISSION _SURFACE_TYPE_TRANSPARENT
m_LightmapFlags: 1 m_LightmapFlags: 1
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -31,6 +31,7 @@ Material:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- DepthOnly - DepthOnly
- SHADOWCASTER
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -47,7 +48,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 875557e634eec5c42a4681b331501c01, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _SpecGlossMap: - _SpecGlossMap:

View File

@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 4ec2ac6d3b1cb8f43a2a6c06562bb358 guid: 1de1acf70cc9f4841acccb4083d16212
PrefabImporter: PrefabImporter:
externalObjects: {} externalObjects: {}
userData: userData:

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 8bc88477f037e96478019bba8de301fd
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: BlockyTree m_Name: BlockyTree
m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3} m_Shader: {fileID: 4800000, guid: 8d2bb70cbf9db8d4da26e15b26e74248, type: 3}
m_ShaderKeywords: _GLOSSINESS_FROM_BASE_ALPHA _SPECULAR_COLOR m_ShaderKeywords:
m_LightmapFlags: 4 m_LightmapFlags: 4
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
@ -45,7 +45,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 2800000, guid: 06c861ce5a38d2549851bbba4bea0808, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:

View File

@ -116,7 +116,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 0.31971127, g: 0.6764706, b: 0.1790657, a: 1} - _BaseColor: {r: 0.31971127, g: 0.6764706, b: 0.1790657, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0.3197112, g: 0.6764706, b: 0.17906567, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -18,6 +18,7 @@ Material:
RenderType: Transparent RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- DepthOnly - DepthOnly
- SHADOWCASTER
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -109,7 +110,7 @@ Material:
- _ZWrite: 0 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 0, g: 1, b: 1, a: 0.39215687} - _BaseColor: {r: 0, g: 1, b: 1, a: 0.39215687}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 0, g: 1, b: 1, a: 0.39215687}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -59,7 +59,7 @@ Material:
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 4.42, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 0.17647055, b: 0, a: 1} - _BaseColor: {r: 1, g: 0.17647055, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 0.17647052, b: 0, a: 1}
- _EmissionColor: {r: 3.3584905, g: 0.89676964, b: 0, a: 1} - _EmissionColor: {r: 3.3584905, g: 0.89676964, b: 0, a: 1}
- _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1} - _SpecColor: {r: 0.19999996, g: 0.19999996, b: 0.19999996, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -13,11 +13,13 @@ Material:
m_LightmapFlags: 0 m_LightmapFlags: 0
m_EnableInstancingVariants: 0 m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0 m_DoubleSidedGI: 0
m_CustomRenderQueue: -1 m_CustomRenderQueue: 3000
stringTagMap: stringTagMap:
RenderType: Opaque RenderType: Transparent
disabledShaderPasses: disabledShaderPasses:
- ALWAYS - ALWAYS
- DepthOnly
- SHADOWCASTER
m_SavedProperties: m_SavedProperties:
serializedVersion: 3 serializedVersion: 3
m_TexEnvs: m_TexEnvs:
@ -78,7 +80,7 @@ Material:
- _DistortionEnabled: 0 - _DistortionEnabled: 0
- _DistortionStrength: 1 - _DistortionStrength: 1
- _DistortionStrengthScaled: 0 - _DistortionStrengthScaled: 0
- _DstBlend: 0 - _DstBlend: 1
- _EmissionEnabled: 0 - _EmissionEnabled: 0
- _FlipbookBlending: 0 - _FlipbookBlending: 0
- _FlipbookMode: 0 - _FlipbookMode: 0
@ -96,10 +98,10 @@ Material:
- _SoftParticlesFarFadeDistance: 1 - _SoftParticlesFarFadeDistance: 1
- _SoftParticlesNearFadeDistance: 0 - _SoftParticlesNearFadeDistance: 0
- _SpecularHighlights: 1 - _SpecularHighlights: 1
- _SrcBlend: 1 - _SrcBlend: 5
- _Surface: 1 - _Surface: 1
- _UVSec: 0 - _UVSec: 0
- _ZWrite: 1 - _ZWrite: 0
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1} - _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0} - _BaseColorAddSubDiff: {r: 0, g: 0, b: 0, a: 0}

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-5731830232000471156
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -87,7 +74,6 @@ Material:
m_Texture: {fileID: 2800000, guid: ca13d685b85b71148902b6cbb9c2cc2a, type: 3} m_Texture: {fileID: 2800000, guid: ca13d685b85b71148902b6cbb9c2cc2a, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AO: 0.5 - _AO: 0.5
- _AlphaClip: 0 - _AlphaClip: 0
@ -134,4 +120,3 @@ Material:
- _WaveAndDistance: {r: 0, g: 0, b: 0, a: 0} - _WaveAndDistance: {r: 0, g: 0, b: 0, a: 0}
- _WavingTint: {r: 1, g: 1, b: 1, a: 1} - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
- _Wind: {r: 1, g: 1, b: 4, a: 8} - _Wind: {r: 1, g: 1, b: 4, a: 8}
m_BuildTextureStacks: []

View File

@ -52,7 +52,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaClip: 0 - _AlphaClip: 0
- _BendFactor: 1 - _BendFactor: 1
@ -86,7 +85,6 @@ Material:
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _Wind: {r: 1, g: 1, b: 4, a: 8} - _Wind: {r: 1, g: 1, b: 4, a: 8}
m_BuildTextureStacks: []
--- !u!114 &7194788835790524367 --- !u!114 &7194788835790524367
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
@ -99,4 +97,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 5 version: 1

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-1923339434607324432
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -87,7 +74,6 @@ Material:
m_Texture: {fileID: 2800000, guid: ca13d685b85b71148902b6cbb9c2cc2a, type: 3} m_Texture: {fileID: 2800000, guid: ca13d685b85b71148902b6cbb9c2cc2a, type: 3}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AO: 0.2 - _AO: 0.2
- _AlphaClip: 0 - _AlphaClip: 0
@ -135,4 +121,3 @@ Material:
- _WaveAndDistance: {r: 0, g: 0, b: 0, a: 0} - _WaveAndDistance: {r: 0, g: 0, b: 0, a: 0}
- _WavingTint: {r: 1, g: 1, b: 1, a: 1} - _WavingTint: {r: 1, g: 1, b: 1, a: 1}
- _Wind: {r: 1, g: 1, b: 4, a: 8} - _Wind: {r: 1, g: 1, b: 4, a: 8}
m_BuildTextureStacks: []

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2918463686727096205
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -71,7 +58,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- Vector1_B354E7B6: 0 - Vector1_B354E7B6: 0
- _BumpScale: 1 - _BumpScale: 1
@ -94,4 +80,3 @@ Material:
m_Colors: m_Colors:
- _Color: {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} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8512861308378651111
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -143,7 +130,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
@ -177,4 +163,3 @@ Material:
- _Dimension: {r: 0, g: 0, b: 0, a: 0} - _Dimension: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-8750453106089040180
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -159,7 +146,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
@ -193,4 +179,3 @@ Material:
- _Dimension: {r: 0, g: 0, b: 0, a: 0} - _Dimension: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-2268538992902384522
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -143,7 +130,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
@ -185,4 +171,3 @@ Material:
- _Dimension: {r: 0, g: 0, b: 0, a: 0} - _Dimension: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -80,7 +80,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaClip: 0 - _AlphaClip: 0
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
@ -116,7 +115,6 @@ Material:
- _Dimension: {r: 0, g: 0, b: 0, a: 0} - _Dimension: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []
--- !u!114 &5556368059512315859 --- !u!114 &5556368059512315859
MonoBehaviour: MonoBehaviour:
m_ObjectHideFlags: 11 m_ObjectHideFlags: 11
@ -129,4 +127,4 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3} m_Script: {fileID: 11500000, guid: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name: m_Name:
m_EditorClassIdentifier: m_EditorClassIdentifier:
version: 5 version: 1

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-63348729599876536
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -83,7 +70,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
@ -109,4 +95,3 @@ Material:
- _Dimension: {r: 0, g: 0, b: 0, a: 0} - _Dimension: {r: 0, g: 0, b: 0, a: 0}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 1} - _SpecColor: {r: 1, g: 1, b: 1, a: 1}
m_BuildTextureStacks: []

View File

@ -1,18 +1,5 @@
%YAML 1.1 %YAML 1.1
%TAG !u! tag:unity3d.com,2011: %TAG !u! tag:unity3d.com,2011:
--- !u!114 &-384026743064476005
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: 5
--- !u!21 &2100000 --- !u!21 &2100000
Material: Material:
serializedVersion: 6 serializedVersion: 6
@ -69,7 +56,6 @@ Material:
m_Texture: {fileID: 0} m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats: m_Floats:
- _AlphaCutoff: 0.5 - _AlphaCutoff: 0.5
- _BumpScale: 1 - _BumpScale: 1
@ -92,4 +78,3 @@ Material:
m_Colors: m_Colors:
- _Color: {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} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

View File

@ -58,7 +58,7 @@ Material:
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MainTex: - _MainTex:
m_Texture: {fileID: 0} m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0}
m_Scale: {x: 1, y: 1} m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0} m_Offset: {x: 0, y: 0}
- _MetallicGlossMap: - _MetallicGlossMap:
@ -121,7 +121,7 @@ Material:
- _ZWrite: 1 - _ZWrite: 1
m_Colors: m_Colors:
- _BaseColor: {r: 1, g: 0, b: 0, a: 1} - _BaseColor: {r: 1, g: 0, b: 0, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1} - _Color: {r: 1, g: 0, b: 0, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1} - _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -8,4 +8,191 @@ AvatarMask:
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_Name: PlayerAvatarMask m_Name: PlayerAvatarMask
m_Mask: 01000000000000000000000001000000010000000000000000000000000000000000000001000000010000000100000001000000 m_Mask: 01000000000000000000000001000000010000000000000000000000000000000000000001000000010000000100000001000000
m_Elements: [] m_Elements:
- m_Path:
m_Weight: 1
- m_Path: Character
m_Weight: 1
- m_Path: Character/Character Pelvis
m_Weight: 1
- m_Path: Character/Character Pelvis/Character L Thigh
m_Weight: 1
- m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf
m_Weight: 1
- m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf/Character
L Foot
m_Weight: 1
- m_Path: Character/Character Pelvis/Character L Thigh/Character L Calf/Character
L Foot/Character L Toe0
m_Weight: 1
- m_Path: Character/Character Pelvis/Character R Thigh
m_Weight: 1
- m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf
m_Weight: 1
- m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf/Character
R Foot
m_Weight: 1
- m_Path: Character/Character Pelvis/Character R Thigh/Character R Calf/Character
R Foot/Character R Toe0
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger0
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger0/Character L Finger01
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger0/Character L Finger01/Character L Finger02
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger1
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger1/Character L Finger11
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger1/Character L Finger11/Character L Finger12
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger2
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger2/Character L Finger21
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger2/Character L Finger21/Character L Finger22
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger3
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger3/Character L Finger31
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger3/Character L Finger31/Character L Finger32
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger4
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger4/Character L Finger41
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character L Clavicle/Character L UpperArm/Character L Forearm/Character
L Hand/Character L Finger4/Character L Finger41/Character L Finger42
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character Neck
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character Neck/Character Head
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger0
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger0/Character R Finger01
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger0/Character R Finger01/Character R Finger02
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger1
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger1/Character R Finger11
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger1/Character R Finger11/Character R Finger12
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger2
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger2/Character R Finger21
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger2/Character R Finger21/Character R Finger22
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger3
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger3/Character R Finger31
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger3/Character R Finger31/Character R Finger32
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger4
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger4/Character R Finger41
m_Weight: 1
- m_Path: Character/Character Pelvis/Character Spine/Character Spine1/Character
Spine2/Character R Clavicle/Character R UpperArm/Character R Forearm/Character
R Hand/Character R Finger4/Character R Finger41/Character R Finger42
m_Weight: 1
- m_Path: Male_Animation_Skeleton
m_Weight: 1

File diff suppressed because it is too large Load Diff

View File

@ -11,7 +11,7 @@ GameObject:
- component: {fileID: 2379572801740370593} - component: {fileID: 2379572801740370593}
- component: {fileID: 4068109678196737010} - component: {fileID: 4068109678196737010}
- component: {fileID: 6499664607162104859} - component: {fileID: 6499664607162104859}
m_Layer: 0 m_Layer: 10
m_Name: Particles m_Name: Particles
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -4834,7 +4834,7 @@ GameObject:
- component: {fileID: 3928666337405863709} - component: {fileID: 3928666337405863709}
- component: {fileID: 824121554007831541} - component: {fileID: 824121554007831541}
- component: {fileID: 3271421586109646936} - component: {fileID: 3271421586109646936}
m_Layer: 0 m_Layer: 10
m_Name: IceBolt m_Name: IceBolt
m_TagString: Throwable m_TagString: Throwable
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -4909,7 +4909,7 @@ GameObject:
- component: {fileID: 2102031460483932676} - component: {fileID: 2102031460483932676}
- component: {fileID: 4375552687043340816} - component: {fileID: 4375552687043340816}
- component: {fileID: 3855994618173844762} - component: {fileID: 3855994618173844762}
m_Layer: 0 m_Layer: 10
m_Name: Particles (1) m_Name: Particles (1)
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}
@ -9731,7 +9731,7 @@ GameObject:
- component: {fileID: 3673146804360629590} - component: {fileID: 3673146804360629590}
- component: {fileID: 3043515321997219863} - component: {fileID: 3043515321997219863}
- component: {fileID: 1981692454099464338} - component: {fileID: 1981692454099464338}
m_Layer: 0 m_Layer: 10
m_Name: Particle System m_Name: Particle System
m_TagString: Untagged m_TagString: Untagged
m_Icon: {fileID: 0} m_Icon: {fileID: 0}

View File

@ -9,7 +9,7 @@ public class ItemSpawner : MonoBehaviour
public GameObject placeToSpawn; public GameObject placeToSpawn;
public void SpawnItem() public void SpawnItem()
{ {
//Debug.Log("Spawned " + objectToSpawn); Debug.Log("Spawned " + objectToSpawn);
Instantiate(objectToSpawn, placeToSpawn.transform); Instantiate(objectToSpawn, placeToSpawn.transform);
} }
} }

View File

@ -26,22 +26,27 @@ public class PortalTeleporter : MonoBehaviour
traveller = other.gameObject.transform; traveller = other.gameObject.transform;
if (_portalIsEnabled && !_justUsed) if (_portalIsEnabled && !_justUsed)
{ {
linkedPortal._portalIsEnabled = false; if (other.name.StartsWith("Holster"))
_travellerIsOverlapping = true;
if (other.tag == "Throwable")
{ {
Debug.Log("Portal entered by throwable"); Debug.Log("holster");
HandleThrowable();
} }
else if (other.tag == "Player") else
{ {
Debug.Log("Portal entered by player"); linkedPortal._portalIsEnabled = false;
HandlePlayer(); _travellerIsOverlapping = true;
if (other.tag == "Throwable")
{
Debug.Log("Portal entered by throwable");
HandleThrowable();
}
else if (other.tag == "Player")
{
Debug.Log("Portal entered by player");
HandlePlayer();
}
} }
} }
} }
private void HandlePlayer() private void HandlePlayer()
{ {
Vector3 portalToTraveller = traveller.position - transform.position; Vector3 portalToTraveller = traveller.position - transform.position;
@ -54,7 +59,10 @@ public class PortalTeleporter : MonoBehaviour
rotationDiff += 180; rotationDiff += 180;
traveller.Rotate(Vector3.up, rotationDiff); traveller.Rotate(Vector3.up, rotationDiff);
Vector3 positionOffset = Quaternion.Euler(0f, rotationDiff, 0f) * portalToTraveller; Vector3 positionOffset = Quaternion.Euler(0f, rotationDiff, 0f) * portalToTraveller;
// Teleport
traveller.position = linkedPortalTransform.position + positionOffset; traveller.position = linkedPortalTransform.position + positionOffset;
AudioSource.PlayClipAtPoint(TeleportSound, traveller.position, 1); AudioSource.PlayClipAtPoint(TeleportSound, traveller.position, 1);
_travellerIsOverlapping = false; _travellerIsOverlapping = false;
_portalIsEnabled = false; _portalIsEnabled = false;

View File

@ -60,7 +60,7 @@ AnimatorStateMachine:
m_ChildStates: m_ChildStates:
- serializedVersion: 1 - serializedVersion: 1
m_State: {fileID: 1976992118943015047} m_State: {fileID: 1976992118943015047}
m_Position: {x: 270, y: 100, z: 0} m_Position: {x: 320, y: 120, z: 0}
m_ChildStateMachines: [] m_ChildStateMachines: []
m_AnyStateTransitions: [] m_AnyStateTransitions: []
m_EntryTransitions: [] m_EntryTransitions: []

View File

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 705507994} m_Sun: {fileID: 705507994}
m_IndirectSpecularColor: {r: 0.59937465, g: 0.5997507, b: 0.59948814, a: 1} m_IndirectSpecularColor: {r: 0.59937525, g: 0.5997512, b: 0.59948856, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -0,0 +1,7 @@
fileFormatVersion: 2
guid: 7cca917a98f847141bf1255c3a9ce78a
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

View File

@ -0,0 +1,235 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &-7874818457939672920
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jupiter/SkyShadow
m_Shader: {fileID: 4800000, guid: 561c1777fd66e5d488ef1b85ed82bbaa, type: 3}
m_ShaderKeywords: ALLOW_STEP_EFFECT
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs: []
m_Ints: []
m_Floats:
- _OverheadCloudAltitude: 1000
- _OverheadCloudAnimationSpeed: 50
- _OverheadCloudFlowDirectionX: 1
- _OverheadCloudFlowDirectionZ: 1
- _OverheadCloudRemapMax: 0
- _OverheadCloudRemapMin: 0
- _OverheadCloudShadowClipMask: 0
- _OverheadCloudSize: 10
- _OverheadCloudStep: 2
m_Colors:
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.5647059}
m_BuildTextureStacks: []
--- !u!21 &-16802411160788099
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Jupiter/Sky
m_Shader: {fileID: 4800000, guid: 3129e3b90193a0547900ecf4cf4e9864, type: 3}
m_ShaderKeywords: ALLOW_STEP_EFFECT DETAIL_OVERLAY OVERHEAD_CLOUD STARS STARS_LAYER_0
SUN
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _DetailOverlayCubemap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MoonCubemap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MoonTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _StarsCubemap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _StarsTwinkleMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SunCubemap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SunTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _DetailOverlayLayer: 0
- _DetailOverlayRotationSpeed: 0
- _HorizonCloudAnimationSpeed: 50
- _HorizonCloudEndPosition: 0.65
- _HorizonCloudSize: 4.91
- _HorizonCloudStartPosition: -0.1
- _HorizonCloudStep: 25
- _HorizonExponent: 4.9924045
- _HorizonStep: 500
- _HorizonThickness: 1
- _MoonGlow: 0
- _MoonLightIntensity: 0.14970514
- _MoonSize: 0
- _MoonSoftEdge: 0
- _OverheadCloudAltitude: 1000
- _OverheadCloudAnimationSpeed: 50
- _OverheadCloudFlowDirectionX: 1
- _OverheadCloudFlowDirectionZ: 1
- _OverheadCloudRemapMax: 1
- _OverheadCloudRemapMin: -0.49918935
- _OverheadCloudSize: 10
- _OverheadCloudStep: 2
- _StarsDensity0: 0.4
- _StarsDensity1: 0.34
- _StarsDensity2: 0.45
- _StarsEndPosition: 0
- _StarsGlow0: 0.01
- _StarsGlow1: 0.01
- _StarsGlow2: 0.01
- _StarsOpacity: 0.99833566
- _StarsSize0: 0.42
- _StarsSize1: 0.53
- _StarsSize2: 0.46
- _StarsStartPosition: -0.01
- _StarsTwinkle0: 5
- _StarsTwinkle1: 6
- _StarsTwinkle2: 2
- _SunGlow: 0.45
- _SunLightIntensity: 0.0000033593346
- _SunSize: 0.1
- _SunSoftEdge: 0.5
m_Colors:
- _DetailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
- _FogColor: {r: 0, g: 0, b: 0, a: 0}
- _GroundColor: {r: 0.2875742, g: 0.23928429, b: 0.3328195, a: 1}
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
- _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
- _MoonColor: {r: 1, g: 1, b: 1, a: 1}
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
- _MoonLightColor: {r: 0, g: 0, b: 0, a: 0}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.7890875}
- _SkyColor: {r: 0.08056989, g: 0.03172837, b: 0.21698111, a: 1}
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
- _SunColor: {r: 0.99931616, g: 0.9981878, b: 0.9963259, a: 0}
- _SunDirection: {r: 0, g: 0.9988158, b: 0.048652768, a: 0}
- _SunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
m_BuildTextureStacks: []
--- !u!114 &11400000
MonoBehaviour:
m_ObjectHideFlags: 0
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: fa5278d11d9502245b5cc174a196561b, type: 3}
m_Name: SkyProfile-457889269655148736
m_EditorClassIdentifier:
skyColor: {r: 0.2264151, g: 0.6028122, b: 0.9056604, a: 1}
horizonColor: {r: 1, g: 0.94944346, b: 0.839, a: 1}
groundColor: {r: 0.4339623, g: 0.4339623, b: 0.4339623, a: 1}
horizonThickness: 1
horizonExponent: 3
horizonStep: 500
fogSyncOption: 2
fogColor: {r: 0, g: 0, b: 0, a: 0}
enableStars: 1
starsStartPosition: -0.01
starsEndPosition: 0
starsOpacity: 0
starsLayerCount: 1
starsColor0: {r: 0, g: 0, b: 0, a: 0}
starsColor1: {r: 0, g: 0, b: 0, a: 0}
starsColor2: {r: 0, g: 0, b: 0, a: 0}
starsDensity0: 0
starsDensity1: 0
starsDensity2: 0
starsSize0: 0.01
starsSize1: 0.01
starsSize2: 0.01
starsGlow0: 0.01
starsGlow1: 0.01
starsGlow2: 0.01
starsTwinkle0: 0
starsTwinkle1: 0
starsTwinkle2: 0
useBakedStars: 0
starsCubemap: {fileID: 0}
starsTwinkleMap: {fileID: 0}
enableSun: 1
sunTexture: {fileID: 0}
sunColor: {r: 1, g: 0.9700814, b: 0.9009434, a: 1}
sunSize: 0.1
sunSoftEdge: 0.5
sunGlow: 0.45
useBakedSun: 0
sunCubemap: {fileID: 0}
sunLightColor: {r: 1, g: 0.9929226, b: 0.9009434, a: 1}
sunLightIntensity: 2
enableMoon: 0
moonTexture: {fileID: 0}
moonColor: {r: 0, g: 0, b: 0, a: 0}
moonSize: 0
moonSoftEdge: 0
moonGlow: 0
useBakedMoon: 0
moonCubemap: {fileID: 0}
moonLightColor: {r: 0, g: 0, b: 0, a: 0}
moonLightIntensity: 0
customCloudTexture: {fileID: 2800000, guid: d69d12cf3b1e2b144881667c78b2e4f9, type: 3}
enableHorizonCloud: 0
horizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
horizonCloudStartPosition: -0.1
horizonCloudEndPosition: 0.65
horizonCloudSize: 4.91
horizonCloudStep: 25
horizonCloudAnimationSpeed: 50
enableOverheadCloud: 1
overheadCloudColor: {r: 1, g: 1, b: 1, a: 0.5647059}
overheadCloudAltitude: 1000
overheadCloudSize: 10
overheadCloudStep: 2
overheadCloudAnimationSpeed: 50
overheadCloudFlowDirectionX: 1
overheadCloudFlowDirectionZ: 1
overheadCloudRemapMin: 0
overheadCloudRemapMax: 0
overheadCloudCastShadow: 0
overheadCloudShadowClipMask: 0
enableDetailOverlay: 1
detailOverlayTintColor: {r: 0, g: 0, b: 0, a: 0}
detailOverlayCubeMap: {fileID: 0}
detailOverlayLayer: 0
detailOverlayRotationSpeed: 0
allowStepEffect: 1
material: {fileID: -16802411160788099}
shadowMaterial: {fileID: -7874818457939672920}

View File

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

View File

@ -181,11 +181,11 @@ Material:
- _HorizonCloudSize: 5 - _HorizonCloudSize: 5
- _HorizonCloudStartPosition: 0 - _HorizonCloudStartPosition: 0
- _HorizonCloudStep: 25 - _HorizonCloudStep: 25
- _HorizonExponent: 4.9935074 - _HorizonExponent: 4.9867373
- _HorizonStep: 500 - _HorizonStep: 500
- _HorizonThickness: 1 - _HorizonThickness: 1
- _MoonGlow: 0.24 - _MoonGlow: 0.24
- _MoonLightIntensity: 0.14974229 - _MoonLightIntensity: 0.1494839
- _MoonSize: 0.07 - _MoonSize: 0.07
- _MoonSoftEdge: 0.22 - _MoonSoftEdge: 0.22
- _OverheadCloudAltitude: 1000 - _OverheadCloudAltitude: 1000
@ -203,7 +203,7 @@ Material:
- _StarsGlow0: 0.01 - _StarsGlow0: 0.01
- _StarsGlow1: 0.01 - _StarsGlow1: 0.01
- _StarsGlow2: 0.01 - _StarsGlow2: 0.01
- _StarsOpacity: 0.99753976 - _StarsOpacity: 0.9950686
- _StarsSize0: 0.42 - _StarsSize0: 0.42
- _StarsSize1: 0.53 - _StarsSize1: 0.53
- _StarsSize2: 0.46 - _StarsSize2: 0.46
@ -212,24 +212,24 @@ Material:
- _StarsTwinkle1: 6 - _StarsTwinkle1: 6
- _StarsTwinkle2: 2 - _StarsTwinkle2: 2
- _SunGlow: 0.45 - _SunGlow: 0.45
- _SunLightIntensity: -0.0000037848865 - _SunLightIntensity: 0.0000058357195
- _SunSize: 0.07 - _SunSize: 0.07
- _SunSoftEdge: 0.5 - _SunSoftEdge: 0.5
m_Colors: m_Colors:
- _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1} - _DetailOverlayTintColor: {r: 1, g: 1, b: 1, a: 1}
- _FogColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1} - _FogColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
- _GroundColor: {r: 0.28735116, g: 0.23901054, b: 0.332644, a: 1} - _GroundColor: {r: 0.28866658, g: 0.24062498, b: 0.3336792, a: 1}
- _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1} - _HorizonCloudColor: {r: 1, g: 1, b: 1, a: 1}
- _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1} - _HorizonColor: {r: 0.4159287, g: 0.36391956, b: 0.5471698, a: 1}
- _MoonColor: {r: 1, g: 1, b: 1, a: 1} - _MoonColor: {r: 1, g: 1, b: 1, a: 1}
- _MoonDirection: {r: 1, g: 1, b: 1, a: 0} - _MoonDirection: {r: 1, g: 1, b: 1, a: 0}
- _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1} - _MoonLightColor: {r: 0.8431373, g: 0.9843138, b: 1, a: 1}
- _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.0841015} - _OverheadCloudColor: {r: 1, g: 1, b: 1, a: 0.08649225}
- _SkyColor: {r: 0.08400795, g: 0.04061514, b: 0.22721142, a: 1} - _SkyColor: {r: 0.08056989, g: 0.03172837, b: 0.21698111, a: 1}
- _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1} - _StarsColor0: {r: 0.96470594, g: 0.9450981, b: 0.76470596, a: 1}
- _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1} - _StarsColor1: {r: 1, g: 0.5294118, b: 0.93725497, a: 1}
- _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1} - _StarsColor2: {r: 0, g: 0.92549026, b: 1, a: 1}
- _SunColor: {r: 0.99916184, g: 0.9976116, b: 0.994954, a: 0} - _SunColor: {r: 0.9990927, g: 0.99759555, b: 0.9951253, a: 0}
- _SunDirection: {r: 0, g: 0, b: 1, a: 0} - _SunDirection: {r: 0, g: 0, b: 1, a: 0}
- _SunLightColor: {r: 1, g: 0.9921569, b: 0.90196085, a: 1} - _SunLightColor: {r: 1, g: 0.9921569, b: 0.90196085, a: 1}
m_BuildTextureStacks: [] m_BuildTextureStacks: []

View File

@ -20,7 +20,7 @@ PhysicsManager:
m_ContactsGeneration: 1 m_ContactsGeneration: 1
m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffffdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff m_LayerCollisionMatrix: fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffbfffffffdffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff
m_AutoSimulation: 1 m_AutoSimulation: 1
m_AutoSyncTransforms: 0 m_AutoSyncTransforms: 1
m_ReuseCollisionCallbacks: 1 m_ReuseCollisionCallbacks: 1
m_ClothInterCollisionSettingsToggle: 0 m_ClothInterCollisionSettingsToggle: 0
m_ClothGravity: {x: 0, y: -9.81, z: 0} m_ClothGravity: {x: 0, y: -9.81, z: 0}

View File

@ -8,6 +8,7 @@ TagManager:
- Throwable - Throwable
- Bullet - Bullet
- IceBolt - IceBolt
- Holster
layers: layers:
- Default - Default
- TransparentFX - TransparentFX