Update 4/24/23

Fixed the extra hair, Overhauled the Environment Manager, Removed Save Bloat, Added Loading Screen before Character Menu.
This commit is contained in:
Schaken-Mods 2023-04-24 17:54:43 -05:00
parent 056fbbc58b
commit ca9718144f
611 changed files with 24148 additions and 19424 deletions

View File

@ -14,7 +14,9 @@ public class INIReader : MonoBehaviour
[Header("Objects that need initialized on load")]
[SerializeField] private Slider ScreenshotRes;
[SerializeField] private Slider MusicVolume;
[SerializeField] private Slider UIVolume;
[SerializeField] private List<Toggle> ScreenshotExtension;
[SerializeField] private bool InitializeSettings = false;
// Start is called before the first frame update
@ -90,77 +92,81 @@ public class INIReader : MonoBehaviour
sw.WriteLine("[Sound Settings]");
sw.WriteLine("MusicVolume = 1");
sw.WriteLine("UIVolume = 1");
}
} else {
// General Settings
RCKSettings.NPC_TO_NPC_CONVERSATION_DISTANCE = float.Parse(ReadSettingString("General", "NPC_TO_NPC_CONVERSATION_DISTANCE", "3.5"));
RCKSettings.NPC_LOOKAT_TARGET_DISTANCE = float.Parse(ReadSettingString("General", "NPC_LOOKAT_TARGET_DISTANCE", "5"));
RCKSettings.NPC_STOP_FOLLOW_AFTER_DISTANCE = float.Parse(ReadSettingString("General", "NPC_STOP_FOLLOW_AFTER_DISTANCE", "2.2"));
RCKSettings.PLAYER_HEARS_NPC_DIALOGUES_DISTANCE = float.Parse(ReadSettingString("General", "PLAYER_HEARS_NPC_DIALOGUES_DISTANCE", "15"));
RCKSettings.PLAYER_DISTANCE_TO_DIALOGUE = float.Parse(ReadSettingString("General", "PLAYER_DISTANCE_TO_DIALOGUE", "3"));
RCKSettings.PLAYER_DISTANCE_TO_DISPLAY_ENEMY_BAR = float.Parse(ReadSettingString("General", "PLAYER_DISTANCE_TO_DISPLAY_ENEMY_BAR", "100"));
RCKSettings.CHARGED_ATTACK_MOUSE_DOWN_TIME = float.Parse(ReadSettingString("General", "CHARGED_ATTACK_MOUSE_DOWN_TIME", "0.5"));
RCKSettings.MIN_VELOCITY_TO_CONTINUE_ROTATING_ARROW = float.Parse(ReadSettingString("General", "MIN_VELOCITY_TO_CONTINUE_ROTATING_ARROW", "5"));
RCKSettings.DISTANCE_SHOW_NPC_IN_COMBAT_UI = float.Parse(ReadSettingString("General", "DISTANCE_SHOW_NPC_IN_COMBAT_UI", "100"));
RCKSettings.MELEE_GENERAL_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "MELEE_GENERAL_RIGIDBODY_FORCE", "20"));
RCKSettings.ARROW_GENERAL_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "ARROW_GENERAL_RIGIDBODY_FORCE", "5"));
RCKSettings.MELEE_ONBODY_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "MELEE_ONBODY_RIGIDBODY_FORCE", "35"));
RCKSettings.ARROW_ONBODY_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "ARROW_ONBODY_RIGIDBODY_FORCE", "10"));
RCKSettings.DRAIN_HEALTH_DEFAULT_RATE = float.Parse(ReadSettingString("General", "DRAIN_HEALTH_DEFAULT_RATE", "200"));
RCKSettings.DRAIN_STAMINA_DEFAULT_RATE = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_DEFAULT_RATE", "200"));
RCKSettings.DISTANCE_WHEN_NPCS_START_LOOK_AT = float.Parse(ReadSettingString("General", "DISTANCE_WHEN_NPCS_START_LOOK_AT", "3.5"));
RCKSettings.CROSSHAIR_HIT_TIME = float.Parse(ReadSettingString("General", "CROSSHAIR_HIT_TIME", ".25"));
RCKSettings.STOPPING_DETECTION_THRESHOLD = float.Parse(ReadSettingString("General", "STOPPING_DETECTION_THRESHOLD", "0.15"));
RCKSettings.HOSTILE_FACTION_COMBAT_THERSHOLD = float.Parse(ReadSettingString("General", "HOSTILE_FACTION_COMBAT_THERSHOLD", "10"));
if (InitializeSettings) {
// General Settings
RCKSettings.NPC_TO_NPC_CONVERSATION_DISTANCE = float.Parse(ReadSettingString("General", "NPC_TO_NPC_CONVERSATION_DISTANCE", "3.5"));
RCKSettings.NPC_LOOKAT_TARGET_DISTANCE = float.Parse(ReadSettingString("General", "NPC_LOOKAT_TARGET_DISTANCE", "5"));
RCKSettings.NPC_STOP_FOLLOW_AFTER_DISTANCE = float.Parse(ReadSettingString("General", "NPC_STOP_FOLLOW_AFTER_DISTANCE", "2.2"));
RCKSettings.PLAYER_HEARS_NPC_DIALOGUES_DISTANCE = float.Parse(ReadSettingString("General", "PLAYER_HEARS_NPC_DIALOGUES_DISTANCE", "15"));
RCKSettings.PLAYER_DISTANCE_TO_DIALOGUE = float.Parse(ReadSettingString("General", "PLAYER_DISTANCE_TO_DIALOGUE", "3"));
RCKSettings.PLAYER_DISTANCE_TO_DISPLAY_ENEMY_BAR = float.Parse(ReadSettingString("General", "PLAYER_DISTANCE_TO_DISPLAY_ENEMY_BAR", "100"));
RCKSettings.CHARGED_ATTACK_MOUSE_DOWN_TIME = float.Parse(ReadSettingString("General", "CHARGED_ATTACK_MOUSE_DOWN_TIME", "0.5"));
RCKSettings.MIN_VELOCITY_TO_CONTINUE_ROTATING_ARROW = float.Parse(ReadSettingString("General", "MIN_VELOCITY_TO_CONTINUE_ROTATING_ARROW", "5"));
RCKSettings.DISTANCE_SHOW_NPC_IN_COMBAT_UI = float.Parse(ReadSettingString("General", "DISTANCE_SHOW_NPC_IN_COMBAT_UI", "100"));
RCKSettings.MELEE_GENERAL_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "MELEE_GENERAL_RIGIDBODY_FORCE", "20"));
RCKSettings.ARROW_GENERAL_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "ARROW_GENERAL_RIGIDBODY_FORCE", "5"));
RCKSettings.MELEE_ONBODY_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "MELEE_ONBODY_RIGIDBODY_FORCE", "35"));
RCKSettings.ARROW_ONBODY_RIGIDBODY_FORCE = float.Parse(ReadSettingString("General", "ARROW_ONBODY_RIGIDBODY_FORCE", "10"));
RCKSettings.DRAIN_HEALTH_DEFAULT_RATE = float.Parse(ReadSettingString("General", "DRAIN_HEALTH_DEFAULT_RATE", "200"));
RCKSettings.DRAIN_STAMINA_DEFAULT_RATE = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_DEFAULT_RATE", "200"));
RCKSettings.DISTANCE_WHEN_NPCS_START_LOOK_AT = float.Parse(ReadSettingString("General", "DISTANCE_WHEN_NPCS_START_LOOK_AT", "3.5"));
RCKSettings.CROSSHAIR_HIT_TIME = float.Parse(ReadSettingString("General", "CROSSHAIR_HIT_TIME", ".25"));
RCKSettings.STOPPING_DETECTION_THRESHOLD = float.Parse(ReadSettingString("General", "STOPPING_DETECTION_THRESHOLD", "0.15"));
RCKSettings.HOSTILE_FACTION_COMBAT_THERSHOLD = float.Parse(ReadSettingString("General", "HOSTILE_FACTION_COMBAT_THERSHOLD", "10"));
// EDITOR
RCKSettings.EDITOR_AI_LOAD_LOCATION = ReadSettingString("EDITOR", "EDITOR_AI_LOAD_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/");
RCKSettings.EDITOR_AI_SAVE_LOCATION = ReadSettingString("EDITOR", "EDITOR_AI_SAVE_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/");
RCKSettings.EDITOR_CREATUREAI_LOAD_LOCATION = ReadSettingString("EDITOR", "EDITOR_CREATUREAI_LOAD_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/Creatures/");
RCKSettings.EDITOR_CREATUREAI_SAVE_LOCATION = ReadSettingString("EDITOR", "EDITOR_CREATUREAI_SAVE_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/Creatures/");
// EDITOR
RCKSettings.EDITOR_AI_LOAD_LOCATION = ReadSettingString("EDITOR", "EDITOR_AI_LOAD_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/");
RCKSettings.EDITOR_AI_SAVE_LOCATION = ReadSettingString("EDITOR", "EDITOR_AI_SAVE_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/");
RCKSettings.EDITOR_CREATUREAI_LOAD_LOCATION = ReadSettingString("EDITOR", "EDITOR_CREATUREAI_LOAD_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/Creatures/");
RCKSettings.EDITOR_CREATUREAI_SAVE_LOCATION = ReadSettingString("EDITOR", "EDITOR_CREATUREAI_SAVE_LOCATION", "Assets/RPG Creation Kit/Prefab Library/AI/Creatures/");
//Code
RCKSettings.DEFAULT_WEAPON_REACH = float.Parse(ReadSettingString("General", "DEFAULT_WEAPON_REACH", "4.0"));
float TempA = float.Parse(ReadSettingString("General", "INTERACTOR_RAYCAST_MAXDISTANCE", "0"));
if (TempA == 0f) {
RCKSettings.INTERACTOR_RAYCAST_MAXDISTANCE = float.MaxValue;
} else {
RCKSettings.INTERACTOR_RAYCAST_MAXDISTANCE = TempA;
}
RCKSettings.DRAIN_STAMINA_ON_ATTACK_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_ON_ATTACK_SPEEDAMOUNT", "25"));
RCKSettings.DRAIN_STAMINA_ON_ATTACKBLOCKED_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_ON_ATTACKBLOCKED_SPEEDAMOUNT", "25"));
RCKSettings.DRAIN_MANA_ON_CAST_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_MANA_ON_CAST_SPEEDAMOUNT", "25"));
RCKSettings.PROJECTILE_DESPAWN_TIME = float.Parse(ReadSettingString("General", "PROJECTILE_DESPAWN_TIME", "30"));
RCKSettings.DISTANCE_BEFORE_ROTATING_TO_TARGET = float.Parse(ReadSettingString("General", "DISTANCE_BEFORE_ROTATING_TO_TARGET", "4.5"));
//Code
RCKSettings.DEFAULT_WEAPON_REACH = float.Parse(ReadSettingString("General", "DEFAULT_WEAPON_REACH", "4.0"));
float TempA = float.Parse(ReadSettingString("General", "INTERACTOR_RAYCAST_MAXDISTANCE", "0"));
if (TempA == 0f) {
RCKSettings.INTERACTOR_RAYCAST_MAXDISTANCE = float.MaxValue;
} else {
RCKSettings.INTERACTOR_RAYCAST_MAXDISTANCE = TempA;
}
RCKSettings.DRAIN_STAMINA_ON_ATTACK_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_ON_ATTACK_SPEEDAMOUNT", "25"));
RCKSettings.DRAIN_STAMINA_ON_ATTACKBLOCKED_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_STAMINA_ON_ATTACKBLOCKED_SPEEDAMOUNT", "25"));
RCKSettings.DRAIN_MANA_ON_CAST_SPEEDAMOUNT = float.Parse(ReadSettingString("General", "DRAIN_MANA_ON_CAST_SPEEDAMOUNT", "25"));
RCKSettings.PROJECTILE_DESPAWN_TIME = float.Parse(ReadSettingString("General", "PROJECTILE_DESPAWN_TIME", "30"));
RCKSettings.DISTANCE_BEFORE_ROTATING_TO_TARGET = float.Parse(ReadSettingString("General", "DISTANCE_BEFORE_ROTATING_TO_TARGET", "4.5"));
// Save Game
RCKSettings.JSON_PRETTY_PRINT = ReadSettingBool("Save Game", "JSON_PRETTY_PRINT", false);
RCKSettings.PLAYER_DAMAGE_SPEED = float.Parse(ReadSettingString("Save Game", "PLAYER_DAMAGE_SPEED", "100"));
// Save Game
RCKSettings.JSON_PRETTY_PRINT = ReadSettingBool("Save Game", "JSON_PRETTY_PRINT", false);
RCKSettings.PLAYER_DAMAGE_SPEED = float.Parse(ReadSettingString("Save Game", "PLAYER_DAMAGE_SPEED", "100"));
// NEW GAME START
RCKSettings.RCK_NEW_STARTING_LOCATION = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_LOCATION", "Starting cave");
RCKSettings.RCK_NEW_STARTING_WORLDSPACEID = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_WORLDSPACEID", "00CanyonInteriors");
RCKSettings.RCK_NEW_STARTING_CELLID = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_CELLID", "CanyonCaveCell1-1Cave2");
RCKSettings.RCK_NEW_STARTING_LEVEL = ReadSettingInt("NEW GAME START", "RCK_NEW_STARTING_LEVEL", 1);
float StartPOSX = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSX", "93.52182"));
float StartPOSY = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSY", "-6.028"));
float StartPOSZ = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSZ", "-76.271"));
RCKSettings.RCK_NEW_STARTING_POS = new Vector3(StartPOSX, StartPOSY, StartPOSZ);
float StartROTX = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTX", "0"));
float StartROTY = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTY", "0"));
float StartROTZ = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTZ", "0"));
RCKSettings.RCK_NEW_STARTING_ROT = new Vector3(StartROTX, StartROTY, StartROTZ);
RCKSettings.ATTRIBUTES_DEF_HEALTH = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_HEALTH", "200.0"));
RCKSettings.ATTRIBUTES_DEF_STAMINA = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_STAMINA", "200.0"));
RCKSettings.ATTRIBUTES_DEF_MANA = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_MANA", "200.0"));
// NEW GAME START
RCKSettings.RCK_NEW_STARTING_LOCATION = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_LOCATION", "Starting cave");
RCKSettings.RCK_NEW_STARTING_WORLDSPACEID = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_WORLDSPACEID", "00CanyonInteriors");
RCKSettings.RCK_NEW_STARTING_CELLID = ReadSettingString("NEW GAME START", "RCK_NEW_STARTING_CELLID", "CanyonCaveCell1-1Cave2");
RCKSettings.RCK_NEW_STARTING_LEVEL = ReadSettingInt("NEW GAME START", "RCK_NEW_STARTING_LEVEL", 1);
float StartPOSX = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSX", "93.52182"));
float StartPOSY = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSY", "-6.028"));
float StartPOSZ = float.Parse(ReadSettingString("NEW GAME START", "STARTING_POSZ", "-76.271"));
RCKSettings.RCK_NEW_STARTING_POS = new Vector3(StartPOSX, StartPOSY, StartPOSZ);
float StartROTX = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTX", "0"));
float StartROTY = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTY", "0"));
float StartROTZ = float.Parse(ReadSettingString("NEW GAME START", "STARTING_ROTZ", "0"));
RCKSettings.RCK_NEW_STARTING_ROT = new Vector3(StartROTX, StartROTY, StartROTZ);
RCKSettings.ATTRIBUTES_DEF_HEALTH = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_HEALTH", "200.0"));
RCKSettings.ATTRIBUTES_DEF_STAMINA = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_STAMINA", "200.0"));
RCKSettings.ATTRIBUTES_DEF_MANA = float.Parse(ReadSettingString("NEW GAME START", "ATTRIBUTES_DEF_MANA", "200.0"));
// Screenshot tools
ScreenshotRes.value = (float)ReadSettingInt("Screenshot Tool", "ScreenshotMultiplier", 0);
int A = ReadSettingInt("Screenshot Tool", "ScreenshotExtension", 0);
ScreenshotExtension[A].isOn = true;
// Screenshot tools
ScreenshotRes.value = (float)ReadSettingInt("Screenshot Tool", "ScreenshotMultiplier", 0);
int A = ReadSettingInt("Screenshot Tool", "ScreenshotExtension", 0);
ScreenshotExtension[A].isOn = true;
}
// Sound settings
MusicVolume.value = float.Parse(ReadSettingString("Sound Settings", "MusicVolume", "1"));
UIVolume.value = float.Parse(ReadSettingString("Sound Settings", "UIVolume", "1"));
}
}
@ -172,6 +178,10 @@ public class INIReader : MonoBehaviour
SaveSettingString("Sound Settings", "MusicVolume", MusicVolume.value.ToString());
}
public void SetUIVolume() {
SaveSettingString("Sound Settings", "UIVolume", UIVolume.value.ToString());
}
/////////////////////////////////////////
////// - Read and save settings - ///////

View File

@ -15,7 +15,7 @@ Material:
- IRAYUBER_DUALLOBESPECULARREFLECTIVITYACTIVE
- _DOUBLESIDED_ON
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2000
stringTagMap:

View File

@ -28,7 +28,7 @@ Material:
- IRAYUBER_DUALLOBESPECULARREFLECTIVITYACTIVE
- _DOUBLESIDED_ON
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2000
stringTagMap:

View File

@ -15,7 +15,7 @@ Material:
- IRAYUBER_DUALLOBESPECULARREFLECTIVITYACTIVE
- _DOUBLESIDED_ON
m_LightmapFlags: 2
m_EnableInstancingVariants: 0
m_EnableInstancingVariants: 1
m_DoubleSidedGI: 1
m_CustomRenderQueue: 2000
stringTagMap:

View File

@ -1,10 +0,0 @@
fileFormatVersion: 2
guid: 0b825cbf410d6d44da7340d69de42236
ScriptedImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 2
userData:
assetBundleName:
assetBundleVariant:
script: {fileID: 11500000, guid: 74b20127438474d259671807b26b59f2, type: 3}

View File

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

View File

@ -1,446 +0,0 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &3779636896301971427
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5477636384708732947}
- component: {fileID: 879412960401098215}
- component: {fileID: 8373468795918857764}
m_Layer: 0
m_Name: DoorFrame_LOD2
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &5477636384708732947
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3779636896301971427}
m_LocalRotation: {x: 0.00000005960466, y: 0, z: -0, w: 1}
m_LocalPosition: {x: -0.497172, y: 1.2434497e-15, z: -0.016249849}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2284843477593073978}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &879412960401098215
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3779636896301971427}
m_Mesh: {fileID: 7091393209744437672, guid: 4ae4e050183883f42900fa1a0f2887de, type: 3}
--- !u!23 &8373468795918857764
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 3779636896301971427}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &4215905933126860110
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 2284843477593073978}
- component: {fileID: 4375609020605941100}
- component: {fileID: 1233953239368441486}
- component: {fileID: 250505584937521574}
m_Layer: 0
m_Name: Daz3D__DoorFrame
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &2284843477593073978
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4215905933126860110}
m_LocalRotation: {x: 0.000000081460335, y: 0, z: -0, w: 1}
m_LocalPosition: {x: 0.497172, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
- {fileID: 4573100230706393799}
- {fileID: 3243368214716604677}
- {fileID: 5477636384708732947}
- {fileID: 1396044511527966159}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!95 &4375609020605941100
Animator:
serializedVersion: 4
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4215905933126860110}
m_Enabled: 1
m_Avatar: {fileID: 9000000, guid: 4ae4e050183883f42900fa1a0f2887de, type: 3}
m_Controller: {fileID: 0}
m_CullingMode: 0
m_UpdateMode: 0
m_ApplyRootMotion: 0
m_LinearVelocityBlending: 0
m_StabilizeFeet: 0
m_WarningMessage:
m_HasTransformHierarchy: 1
m_AllowConstantClipSamplingOptimization: 1
m_KeepAnimatorControllerStateOnDisable: 0
--- !u!205 &1233953239368441486
LODGroup:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4215905933126860110}
serializedVersion: 2
m_LocalReferencePoint: {x: -0.059031844, y: 1.6076335, z: -0.012691736}
m_Size: 3.605032
m_FadeMode: 0
m_AnimateCrossFading: 0
m_LastLODIsBillboard: 0
m_LODs:
- screenRelativeHeight: 0.25
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 2549735615504888169}
- screenRelativeHeight: 0.125
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 6212790706420803120}
- screenRelativeHeight: 0.0625
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 8373468795918857764}
- screenRelativeHeight: 0.01
fadeTransitionWidth: 0
renderers:
- renderer: {fileID: 2428498502741874449}
m_Enabled: 1
--- !u!114 &250505584937521574
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4215905933126860110}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 5a237cd1edabd402bb18b45be88b01ed, type: 3}
m_Name:
m_EditorClassIdentifier:
SourceFBX: {fileID: 919132149155446097, guid: 4ae4e050183883f42900fa1a0f2887de,
type: 3}
ReplaceOnImport: 1
--- !u!1 &5232729599049748647
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3243368214716604677}
- component: {fileID: 3621671738276847814}
- component: {fileID: 6212790706420803120}
m_Layer: 0
m_Name: DoorFrame_LOD1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &3243368214716604677
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5232729599049748647}
m_LocalRotation: {x: 0.00000005960466, y: 0, z: -0, w: 1}
m_LocalPosition: {x: -0.497172, y: 1.065814e-15, z: -0.016249849}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2284843477593073978}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3621671738276847814
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5232729599049748647}
m_Mesh: {fileID: 6770919716927393955, guid: 4ae4e050183883f42900fa1a0f2887de, type: 3}
--- !u!23 &6212790706420803120
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5232729599049748647}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8142164792027074168
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1396044511527966159}
- component: {fileID: 3893361144764195683}
- component: {fileID: 2428498502741874449}
m_Layer: 0
m_Name: DoorFrame_LOD3
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1396044511527966159
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8142164792027074168}
m_LocalRotation: {x: 0.00000005960466, y: 0, z: -0, w: 1}
m_LocalPosition: {x: -0.497172, y: 1.5987211e-15, z: -0.016249849}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2284843477593073978}
m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &3893361144764195683
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8142164792027074168}
m_Mesh: {fileID: 5108513017770282169, guid: 4ae4e050183883f42900fa1a0f2887de, type: 3}
--- !u!23 &2428498502741874449
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8142164792027074168}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}
--- !u!1 &8830787387711793254
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 4573100230706393799}
- component: {fileID: 2669950520324505989}
- component: {fileID: 2549735615504888169}
m_Layer: 0
m_Name: DoorFrame_LOD0
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4573100230706393799
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8830787387711793254}
m_LocalRotation: {x: 0.00000005960466, y: 0, z: -0, w: 1}
m_LocalPosition: {x: -0.497172, y: 7.105427e-16, z: -0.016249849}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 2284843477593073978}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!33 &2669950520324505989
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8830787387711793254}
m_Mesh: {fileID: -5988726567863378959, guid: 4ae4e050183883f42900fa1a0f2887de, type: 3}
--- !u!23 &2549735615504888169
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8830787387711793254}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_StaticShadowCaster: 0
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 0}
- {fileID: 0}
- {fileID: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_AdditionalVertexStreams: {fileID: 0}

View File

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

View File

@ -874,10 +874,10 @@ MonoBehaviour:
teleports: 0
toCell: {fileID: 0}
linkedDoorObjRef:
onDoorOpen: {fileID: 0}
onDoorOpenLocked: {fileID: 0}
onDoorOpenUnlocked: {fileID: 0}
onDoorClose: {fileID: 0}
onDoorOpen: {fileID: 8300000, guid: 94071824c3dd7a24d8032a96f6d0d157, type: 3}
onDoorOpenLocked: {fileID: 8300000, guid: 0ccc409b1966fdc448753d5185ba27d6, type: 3}
onDoorOpenUnlocked: {fileID: 8300000, guid: 0ccc409b1966fdc448753d5185ba27d6, type: 3}
onDoorClose: {fileID: 8300000, guid: 5daabac04d5b24a499f175cc93206213, type: 3}
teleportMarker: {fileID: 0}
isOpened: 0
--- !u!65 &8723151953468371353

File diff suppressed because it is too large Load Diff

View File

@ -33,6 +33,7 @@ namespace RPGCreationKit
public static readonly string FactionEditorIcon = "Assets/RPG Creation Kit/GeneralIcons/Icons/FactionEditorIcon.png";
public static readonly string MainMenuIcon = "Assets/RPG Creation Kit/GeneralIcons/Icons/MainMenuEditorIcon.png";
public static readonly string ActorLoaderIcon = "Assets/RPG Creation Kit/GeneralIcons/Icons/ActorEditorIcon.png";
public static Sprite NO_ITEM_ICON;
}

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.0 KiB

View File

@ -0,0 +1,123 @@
fileFormatVersion: 2
guid: 2863b5a3ed47fdb40a95a399df23e174
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 12
mipmaps:
mipMapMode: 0
enableMipMap: 1
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMasterTextureLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
cookieLightType: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 3
buildTarget: Server
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
nameFileIdTable: {}
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@ -17,7 +17,7 @@ RenderSettings:
m_Fog: 1
m_FogColor: {r: 0, g: 0, b: 0, a: 1}
m_FogMode: 3
m_FogDensity: 0.0025
m_FogDensity: 1
m_LinearFogStart: 0
m_LinearFogEnd: 300
m_AmbientSkyColor: {r: 0, g: 0.0829449, b: 0.3584906, a: 1}
@ -21337,11 +21337,13 @@ MonoBehaviour:
iniPath:
ScreenshotRes: {fileID: 2031229347}
MusicVolume: {fileID: 247426172}
UIVolume: {fileID: 0}
ScreenshotExtension:
- {fileID: 632306200}
- {fileID: 632306199}
- {fileID: 632306198}
- {fileID: 632306197}
InitializeSettings: 0
--- !u!4 &442218738
Transform:
m_ObjectHideFlags: 0
@ -40956,7 +40958,7 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1043395086}
m_LocalRotation: {x: -0.42276502, y: -0.62776315, z: 0.00634557, w: 0.6535617}
m_LocalRotation: {x: 0, y: 0.7071068, z: 0, w: 0.7071068}
m_LocalPosition: {x: 346.13, y: 217.391, z: -129.45}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -40965,7 +40967,7 @@ Transform:
- {fileID: 270079901}
m_Father: {fileID: 0}
m_RootOrder: 5
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_LocalEulerAnglesHint: {x: 0, y: 90, z: 0}
--- !u!114 &1043395088
MonoBehaviour:
m_ObjectHideFlags: 0
@ -75512,14 +75514,14 @@ Transform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1980799713}
m_LocalRotation: {x: -0.61237246, y: -0.35355338, z: -0.35355338, w: 0.61237246}
m_LocalRotation: {x: -0.061628457, y: 0.70441604, z: 0.70441604, w: 0.061628457}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 1043395087}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: -257, y: 90, z: 180}
m_LocalEulerAnglesHint: {x: -90, y: 0, z: 0}
--- !u!1 &1981800435
GameObject:
m_ObjectHideFlags: 0

View File

@ -14,6 +14,7 @@ namespace RPGCreationKit.CellsSystem
Texture refreshButtonIcon;
Texture worldLoaderButtonIcon;
Texture mainMenuLoaderButtonIcon;
Texture ActorLoaderButtonIcon;
bool init = false;
public List<Worldspace> worldspaces;
@ -47,6 +48,7 @@ namespace RPGCreationKit.CellsSystem
refreshButtonIcon = AssetDatabase.LoadAssetAtPath<Texture>(EditorIconsPath.RefreshButton);
worldLoaderButtonIcon = AssetDatabase.LoadAssetAtPath<Texture>(EditorIconsPath.WorldLoaderIcon);
mainMenuLoaderButtonIcon = AssetDatabase.LoadAssetAtPath<Texture>(EditorIconsPath.MainMenuIcon);
ActorLoaderButtonIcon = AssetDatabase.LoadAssetAtPath<Texture>(EditorIconsPath.ActorLoaderIcon);
if(selectedWorldspace == null)
selectedWorldspace = null;
@ -61,6 +63,16 @@ namespace RPGCreationKit.CellsSystem
EditorGUILayout.LabelField("Worldspace:", EditorStyles.boldLabel);
if (GUILayout.Button(new GUIContent(ActorLoaderButtonIcon, "Loads the scene _CharacterCreation_."), GUILayout.MaxWidth(32)))
{
if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())
{
// Open scene in single mode
string[] guidsWL = AssetDatabase.FindAssets("t:scene _CharacterCreation_");
EditorSceneManager.OpenScene(AssetDatabase.GUIDToAssetPath(guidsWL[0]), OpenSceneMode.Single);
}
}
if (GUILayout.Button(new GUIContent(mainMenuLoaderButtonIcon, "Loads the scene _MainMenu_."), GUILayout.MaxWidth(32)))
{
if (EditorSceneManager.SaveCurrentModifiedScenesIfUserWantsTo())

View File

@ -513,9 +513,10 @@ namespace RPGCreationKit
CellInformation CurCell = rootGameObjects[z].GetComponent<CellInformation>();
CurCell.PlayMusic();
SunLightManager EnvMan = GameObject.Find("EnvironmentManager").GetComponent<SunLightManager>();
if (currentWorldspace.worldSpaceType == Worldspace.WorldSpaceType.Interior) {
EnvMan.IsInterior = true;
EnvMan.InteriorFog = (CurCell.FogDensity * 10000f);
// EnvMan.InteriorFog = (CurCell.FogDensity * 10000f); // <- now handled in Presets
} else {
EnvMan.IsInterior = false;
}

View File

@ -35,6 +35,8 @@ public class CharacterCreationManager : MonoBehaviour
[SerializeField] private GameObject PanelLipsMenu;
[SerializeField] private GameObject ColorMenu;
[SerializeField] private GameObject PlayerSexManu;
[SerializeField] private AudioSource MusicAudio;
[SerializeField] private AudioSource UIAudio;
[SerializeField] private List<TextMeshProUGUI> SetStats;
[SerializeField] private TMP_InputField characterNameField;
@ -92,6 +94,16 @@ public class CharacterCreationManager : MonoBehaviour
Hair hair = (isCreatingMale) ? selectedRace.maleHairTypes[selectedHair] : selectedRace.femaleHairTypes[selectedHair];
hairTypeText.text = hair.hairName; // set the hairs name at initialization
string iniPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments)+@"\My Games\Firstborn\";
INIParser ini = new INIParser();
ini.Open(iniPath+@"\Settings.ini");
string Music = ini.ReadValue("Sound Settings", "MusicVolume", "1");
string UISound = ini.ReadValue("Sound Settings", "UIVolume", "1");
MusicAudio.volume = float.Parse(Music);
UIAudio.volume = float.Parse(UISound);
ini.Close();
}
@ -256,7 +268,7 @@ public class CharacterCreationManager : MonoBehaviour
{
// Cam_BodyToFace();
SkinnedMeshRenderer Face = currentCharacter.head;
SkinnedMeshRenderer Face = currentCharacter.head;
faceBlendshapes.Clear();

View File

@ -20,7 +20,8 @@ namespace RPGCreationKit
public GameObject mainMenuButtons;
public GameObject defaultSelected;
public GameObject previouslySelected;
public GameObject ModManager;
public GameObject LoginControls;
public GameObject Loading;
private void Start()
{
@ -50,18 +51,6 @@ namespace RPGCreationKit
}
public void LoadModManager()
{
mainMenuButtons.SetActive(false);
ModManager.SetActive(true);
}
public void MainMenu()
{
mainMenuButtons.SetActive(true);
ModManager.SetActive(false);
}
public void MainMenuButton_Load()
{
previouslySelected = EventSystem.current.currentSelectedGameObject;
@ -80,7 +69,14 @@ namespace RPGCreationKit
public void MainMenuButton_NewGame()
{
SceneManager.LoadScene("_CharacterCreation_");
mainMenuButtons.SetActive(false);
LoginControls.SetActive(false);
//Loading.SetActive(true);
LoadingScreenInfo.whatToLoad.Add("_CharacterCreation_");
SceneManager.LoadScene("_LoadingScreen_");
//SceneManager.LoadScene("_CharacterCreation_");
}
public void MainMenuButton_Exit()

View File

@ -187,6 +187,7 @@ namespace RPGCreationKit.Player
SkinnedMeshRenderer Hands = bodyData.hands;
SkinnedMeshRenderer Feet = bodyData.feet;
SkinnedMeshRenderer Lips = bodyData.Lips;
SkinnedMeshRenderer TempHair = bodyData.hair;
Material[] MyTorsoMats = Torso.materials;
Material[] MyLegsMats = Legs.materials;
@ -215,6 +216,7 @@ namespace RPGCreationKit.Player
if (_hairType != -1)
{
// Spawn new hair
Destroy(TempHair);
Hair hair = (!sex) ? _race.maleHairTypes[_hairType] : _race.femaleHairTypes[_hairType];
bodyData.hair = Instantiate(hair.mesh.gameObject, bodyData.transform).GetComponent<SkinnedMeshRenderer>();

View File

@ -12,8 +12,5 @@ namespace RPGCreationKit.SaveSystem
public int Month;
public int Day;
public float TimeOfDay;
public float Density;
public float Exposure;
public float Stars;
}
}

View File

@ -85,9 +85,6 @@ namespace RPGCreationKit.SaveSystem
}
SunLightManager EnviroMan = EnvironmentManager.GetComponent<SunLightManager>();
saveFile.Environment.TimeOfDay = EnviroMan.TimeOfDay;
saveFile.Environment.Density = EnviroMan.Density;
saveFile.Environment.Exposure = EnviroMan.Exposure;
saveFile.Environment.Stars = EnviroMan.Stars;
saveFile.Environment.Year = EnviroMan.Year;
saveFile.Environment.Month = EnviroMan.Month;
saveFile.Environment.Day = EnviroMan.Day;
@ -151,15 +148,9 @@ namespace RPGCreationKit.SaveSystem
// Environment
if (EnvironmentManager == null) {
EnvironmentManager = GameObject.Find("EnvironmentManager");
Debug.Log("EnvironmentManager property has been filled");
} else {
Debug.Log("EnvironmentManager = -"+EnvironmentManager+"-");
}
SunLightManager EnviroMan = EnvironmentManager.GetComponent<SunLightManager>();
saveFile.Environment.TimeOfDay = EnviroMan.TimeOfDay;
saveFile.Environment.Density = EnviroMan.Density;
saveFile.Environment.Exposure = EnviroMan.Exposure;
saveFile.Environment.Stars = EnviroMan.Stars;
// Save all factions
saveFile.PlayerData.playerFactions.Clear();

View File

@ -66,7 +66,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _Exposure: 0
- _Exposure: 1
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1

View File

@ -72,8 +72,8 @@ MonoBehaviour:
m_NumAlphaKeys: 2
FogColor:
serializedVersion: 2
key0: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
key1: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 1}
key0: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.078431375}
key1: {r: 0.5019608, g: 0.5019608, b: 0.5019608, a: 0.078431375}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
@ -99,3 +99,32 @@ MonoBehaviour:
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
StarsVisability:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 0}
key1: {r: 1, g: 1, b: 1, a: 0}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2

View File

@ -7,6 +7,7 @@ public class CharacterCreationVolume : MonoBehaviour
{
[SerializeField] private string iniPath;
[SerializeField] private Slider Volume;
[SerializeField] private Slider UIVolume;
// Start is called before the first frame update
void OnEnable()
{
@ -14,16 +15,27 @@ public class CharacterCreationVolume : MonoBehaviour
INIParser ini = new INIParser();
ini.Open(iniPath+@"\Settings.ini");
string Value = ini.ReadValue("Sound Settings", "MusicVolume", "1");
string UIValue = ini.ReadValue("Sound Settings", "UIVolume", "1");
Volume.value = float.Parse(Value);
UIVolume.value = float.Parse(UIValue);
ini.Close();
}
public void SaveVolume() {
iniPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments)+@"\My Games\Firstborn\";
INIParser ini = new INIParser();
ini.Open(iniPath+@"\Settings.ini");
ini.WriteValue("Sound Settings", "MusicVolume", Volume.value.ToString());
ini.Close();
}
public void SaveUIVolume() {
iniPath = System.Environment.GetFolderPath(System.Environment.SpecialFolder.MyDocuments)+@"\My Games\Firstborn\";
INIParser ini = new INIParser();
ini.Open(iniPath+@"\Settings.ini");
ini.WriteValue("Sound Settings", "UIVolume", UIVolume.value.ToString());
ini.Close();
}
}

View File

@ -14,21 +14,21 @@ MonoBehaviour:
m_EditorClassIdentifier:
AmbientColor:
serializedVersion: 2
key0: {r: 0, g: 0.0829449, b: 0.3584906, a: 1}
key1: {r: 0.59853244, g: 0.89105946, b: 1, a: 1}
key2: {r: 1, g: 1, b: 1, a: 0}
key0: {r: 0, g: 0.08627451, b: 0.36078432, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0.59853244, g: 0.89105946, b: 1, a: 0}
key3: {r: 1, g: 1, b: 1, a: 0}
key4: {r: 1, g: 0.8832244, b: 0.4381551, a: 0}
key5: {r: 0, g: 0.08627451, b: 0.36078432, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 1, g: 1, b: 1, a: 0}
key5: {r: 1, g: 0.8832244, b: 0.4381551, a: 0}
key6: {r: 0, g: 0.08627451, b: 0.36078432, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 14071
ctime1: 18890
ctime2: 27178
ctime3: 39899
ctime4: 47224
ctime5: 53585
ctime6: 0
ctime0: 6361
ctime1: 14071
ctime2: 18890
ctime3: 27178
ctime4: 39899
ctime5: 47224
ctime6: 53585
ctime7: 0
atime0: 0
atime1: 65535
@ -39,63 +39,92 @@ MonoBehaviour:
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 6
m_NumColorKeys: 7
m_NumAlphaKeys: 2
DirectionalColor:
serializedVersion: 2
key0: {r: 0, g: 0, b: 0, a: 1}
key1: {r: 0.7374312, g: 0.80792964, b: 0.9716981, a: 1}
key2: {r: 0.990566, g: 0.90404856, b: 0.6489557, a: 0}
key3: {r: 0.80641794, g: 0.8584906, b: 0.53003246, a: 0}
key4: {r: 1, g: 0.4572897, b: 0.4192872, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key0: {r: 0, g: 0, b: 0, a: 0}
key1: {r: 0.80641794, g: 0.8584906, b: 0.53003246, a: 0}
key2: {r: 0.7374312, g: 0.80792964, b: 0.9716981, a: 1}
key3: {r: 0.990566, g: 0.90404856, b: 0.6489557, a: 0.46666667}
key4: {r: 0.80641794, g: 0.8584906, b: 0.53003246, a: 0.5882353}
key5: {r: 1, g: 0.4572897, b: 0.4192872, a: 0.15686275}
key6: {r: 0, g: 0, b: 0, a: 1}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 12336
ctime1: 21203
ctime2: 28527
ctime3: 44333
ctime4: 49344
ctime5: 53392
ctime6: 0
ctime0: 4433
ctime1: 12336
ctime2: 21203
ctime3: 28527
ctime4: 44333
ctime5: 49344
ctime6: 53392
ctime7: 0
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
atime1: 13493
atime2: 18504
atime3: 24672
atime4: 33539
atime5: 47224
atime6: 50308
atime7: 51464
m_Mode: 0
m_NumColorKeys: 6
m_NumAlphaKeys: 2
m_NumColorKeys: 7
m_NumAlphaKeys: 8
FogColor:
serializedVersion: 2
key0: {r: 0, g: 0, b: 0, a: 1}
key1: {r: 1, g: 0.8399371, b: 0.466457, a: 1}
key2: {r: 0.7872117, g: 0.901399, b: 1, a: 0}
key3: {r: 1, g: 1, b: 1, a: 0}
key4: {r: 1, g: 0.7724392, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key0: {r: 0, g: 0, b: 0, a: 0.007843138}
key1: {r: 0.9778707, g: 0.9811321, b: 0.80012655, a: 0.007843138}
key2: {r: 0.990566, g: 0.97752583, b: 0.8638898, a: 1}
key3: {r: 0.7872117, g: 0.901399, b: 1, a: 0.042470932}
key4: {r: 1, g: 1, b: 1, a: 0.007843138}
key5: {r: 0.9811321, g: 0.85377187, b: 0.5687275, a: 0.007843138}
key6: {r: 0, g: 0, b: 0, a: 1}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 13685
ctime1: 17926
ctime2: 20432
ctime3: 37008
ctime4: 46646
ctime5: 54548
ctime0: 6361
ctime1: 13685
ctime2: 17926
ctime3: 20432
ctime4: 37008
ctime5: 46646
ctime6: 54548
ctime7: 59174
atime0: 0
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime1: 6361
atime2: 16384
atime3: 22745
atime4: 35081
atime5: 65535
atime6: 65535
atime7: 0
m_Mode: 0
m_NumColorKeys: 7
m_NumAlphaKeys: 6
StarsVisability:
serializedVersion: 2
key0: {r: 1, g: 1, b: 1, a: 1}
key1: {r: 1, g: 1, b: 1, a: 1}
key2: {r: 0, g: 0, b: 0, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 1}
key5: {r: 0, g: 0, b: 0, a: 1}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 0
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 0
atime1: 14264
atime2: 15806
atime3: 48766
atime4: 52814
atime5: 65535
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 6
m_NumAlphaKeys: 2
m_NumColorKeys: 2
m_NumAlphaKeys: 6

View File

@ -25,25 +25,6 @@ namespace RPGCreationKit
[SerializeField] public int Day = 1;
[SerializeField, Range(0, 24)] public float TimeOfDay;
[Header("Fog")]
[SerializeField] public float InteriorFog = 0f;
[SerializeField] private float MinDensity = 0.0001f;
[SerializeField] private float MaxDensity = 0.1f;
[SerializeField] private float DensitySpeed = 0.1f;
[SerializeField, Range(1000f, 0.1f)] public float Density = 1000f;
[Header("Sky")]
[SerializeField] private float MinExposure = 1.0f;
[SerializeField] private float MaxExposure = 5.04f;
[SerializeField] private float ExposureSpeed = 0.01f;
[SerializeField, Range(5.05f, 1.0f)] public float Exposure = 1.0f;
[Header("Stars")]
[SerializeField] private float MinStars = 0.0001f;
[SerializeField] private float MaxStars = 0.5f;
[SerializeField] private float StarsSpeed = 0.0001f;
[SerializeField, Range(0.0001f, 0.5f)] public float Stars = 0.5f;
void Start() {
StarsMat = StarsSky.GetComponent<ParticleSystem>().GetComponent<Renderer>().sharedMaterial;
@ -51,9 +32,6 @@ namespace RPGCreationKit
Month = SaveSystemManager.instance.saveFile.Environment.Month;
Day = SaveSystemManager.instance.saveFile.Environment.Day;
TimeOfDay = SaveSystemManager.instance.saveFile.Environment.TimeOfDay;
Density = SaveSystemManager.instance.saveFile.Environment.Density;
Exposure = SaveSystemManager.instance.saveFile.Environment.Exposure;
Stars = SaveSystemManager.instance.saveFile.Environment.Stars;
Loaded = true;
}
@ -87,86 +65,45 @@ namespace RPGCreationKit
if (Application.isPlaying) {
TimeOfDay += (Time.deltaTime / 180f);
TimeOfDay %= 24;
UpdateLighting(TimeOfDay / 24f);
if (IsInterior == false) {
// Setting the Fog
if (((TimeOfDay > 6.5f) && (TimeOfDay < 12f)) && ((Density / 10000f) > MinDensity)) {
Density -= (DensitySpeed);
RenderSettings.fogDensity = (Density / 10000f);
} else if (((TimeOfDay > 3f) && (TimeOfDay < 6.4f)) && ((Density / 10000f) < MaxDensity)) {
Density += (DensitySpeed);
RenderSettings.fogDensity = (Density / 10000f);
} else { // In case we are in a dead zone, catch fog up to where we went it.
if (RenderSettings.fogDensity != (Density / 10000f)) {
RenderSettings.fogDensity = (Density / 10000f);
}
}
// Setting the Sun
if (DirectionalLight.gameObject.activeSelf == true) {
if (RenderSettings.sun != DirectionalLight) {
RenderSettings.sun = DirectionalLight;
}
if (((TimeOfDay > 6.5f) && (TimeOfDay < 15f)) && (Exposure < MaxExposure)) {
Exposure += (ExposureSpeed);
RenderSettings.skybox.SetFloat("_Exposure", Exposure);
} else if (((TimeOfDay > 15f) && (TimeOfDay < 20f)) && (Exposure > MinExposure)) {
Exposure -= (ExposureSpeed);
RenderSettings.skybox.SetFloat("_Exposure", Exposure);
} else { // In case we are in a dead zone, lets catch up
if (RenderSettings.skybox.GetFloat("_Exposure") != Exposure) {
RenderSettings.skybox.SetFloat("_Exposure", Exposure);
}
}
}
// Setting the stars
Color color = StarsMat.color;
StarsSky.position = Player.position;
if (((TimeOfDay > 5f) && (TimeOfDay < 9f)) && (Stars > MinStars)) {
Stars -= (StarsSpeed);
color.a = Stars;
StarsMat.color = color;
} else if (((TimeOfDay > 18f) && (TimeOfDay < 21f)) && (Stars < MaxStars)) {
Stars += (StarsSpeed);
color.a = Stars;
StarsMat.color = color;
} else { // In case we are in a dead zone, lets catch up
if (StarsMat.color != color) {
color.a = Stars;
StarsMat.color = color;
}
}
} else {
// Remove the stars instantly
if (StarsMat.color.a != 0) {
Color color = StarsMat.color;
Stars = MinStars;
color.a = Stars;
StarsMat.color = color;
}
if (Density != InteriorFog) {
Density = InteriorFog;
RenderSettings.fogDensity = (Density / 10000f);
}
// Setting the Sun
Color DirectionalTempColor = Preset.DirectionalColor.Evaluate(TimeOfDay / 24f);
DirectionalLight.color = DirectionalTempColor;
RenderSettings.skybox.SetFloat("_Exposure", (DirectionalTempColor.a * 5));
}
} else {
UpdateLighting(TimeOfDay / 24f);
}
UpdateLighting(TimeOfDay / 24f);
}
private void UpdateLighting(float TimePercent) {
RenderSettings.ambientLight = Preset.AmbientColor.Evaluate(TimePercent);
RenderSettings.fogColor = Preset.FogColor.Evaluate(TimePercent);
// Fog
Color FogTempColor = Preset.FogColor.Evaluate(TimePercent);
RenderSettings.fogColor = FogTempColor;
RenderSettings.fogDensity = ((FogTempColor.a / 10) * 2);
// Setting the stars
StarsSky.position = Player.position;
Color StarsColor = Preset.StarsVisability.Evaluate(TimePercent);
Color color = StarsMat.color;
color.a = StarsColor.a;
StarsMat.color = color;
if (DirectionalLight != null) {
DirectionalLight.color = Preset.DirectionalColor.Evaluate(TimePercent);
DirectionalLight.transform.localRotation = Quaternion.Euler(new Vector3((TimePercent * 360f) -90f, -100, 40));
DirectionalLight.transform.localRotation = Quaternion.Euler(new Vector3((TimePercent * 360f) -90f, 170f, 0f));
StarsSky.localRotation = Quaternion.Euler(new Vector3((TimePercent * 360f) -90f, -100, 40));
}
}

View File

@ -10,6 +10,7 @@ public class SunLightPreset : ScriptableObject
public Gradient AmbientColor;
public Gradient DirectionalColor;
public Gradient FogColor;
public Gradient StarsVisability;
// Start is called before the first frame update
void Start()
{

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 273 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 38 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.3 KiB

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.9 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

After

Width:  |  Height:  |  Size: 92 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

Some files were not shown because too many files have changed in this diff Show More