diff --git a/Assets/Quests/CH01.meta b/Assets/Quests/CH01.meta new file mode 100644 index 000000000..971666224 --- /dev/null +++ b/Assets/Quests/CH01.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15523b68260734f2c9bb8e1be977aaca +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Quests/CH01/CH01MainQuest.asset b/Assets/Quests/CH01/CH01MainQuest.asset new file mode 100644 index 000000000..d31095aea --- /dev/null +++ b/Assets/Quests/CH01/CH01MainQuest.asset @@ -0,0 +1,129 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !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: 641a501636ec3644993211c008d9a8a4, type: 3} + m_Name: CH01MainQuest + m_EditorClassIdentifier: + m_isInstance: 0 + m_originalAsset: {fileID: 0} + m_fileVersion: 0 + m_id: + m_text: Quest-187694 + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_title: + m_text: Quest -187694 + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_icon: {fileID: 0} + m_group: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_labels: [] + m_questGiverID: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_isTrackable: 1 + m_showInTrackHUD: 1 + m_isAbandonable: 0 + m_rememberIfAbandoned: 0 + m_deleteWhenComplete: 0 + m_autostartConditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_offerConditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_offerConditionsUnmetContentList: [] + m_offerContentList: [] + m_maxTimes: 1 + m_timesAccepted: 0 + m_cooldownSeconds: 3600 + m_cooldownSecondsRemaining: 0 + m_noRepeatIfSuccessful: 0 + m_saveAllIfWaitingToStart: 0 + m_state: 0 + m_stateInfoList: + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + - m_actionList: [] + m_categorizedContentList: + - m_contentList: [] + - m_contentList: [] + - m_contentList: [] + m_counterList: [] + m_nodeList: + - m_id: + m_text: Quest-187694.start + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_internalName: + m_text: Start + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_nodeType: 0 + m_isOptional: 0 + m_state: 0 + m_speaker: + m_text: + m_stringAsset: {fileID: 0} + m_textTable: {fileID: 0} + m_textTableFieldID: 0 + m_stateInfoList: [] + m_conditionSet: + m_conditionList: [] + m_conditionCountMode: 0 + m_minConditionCount: 0 + m_numTrueConditions: 0 + m_childIndexList: + m_canvasRect: + serializedVersion: 2 + x: 200 + y: 20 + width: 120 + height: 48 + m_goalEntityTypeName: + m_nextContentID: 0 diff --git a/Assets/Quests/CH01/CH01MainQuest.asset.meta b/Assets/Quests/CH01/CH01MainQuest.asset.meta new file mode 100644 index 000000000..105d9348f --- /dev/null +++ b/Assets/Quests/CH01/CH01MainQuest.asset.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 7c05893494c66451e840480ab09a9eb3 +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 11400000 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Quests/CH01Quest.asset b/Assets/Quests/CH01/CH01Quest.asset similarity index 100% rename from Assets/Quests/CH01Quest.asset rename to Assets/Quests/CH01/CH01Quest.asset diff --git a/Assets/Quests/CH01Quest.asset.meta b/Assets/Quests/CH01/CH01Quest.asset.meta similarity index 100% rename from Assets/Quests/CH01Quest.asset.meta rename to Assets/Quests/CH01/CH01Quest.asset.meta diff --git a/Assets/Scripts/Skills/TreeSpotController.cs b/Assets/Scripts/Skills/TreeSpotController.cs index f008fcc6e..ff3bef315 100644 --- a/Assets/Scripts/Skills/TreeSpotController.cs +++ b/Assets/Scripts/Skills/TreeSpotController.cs @@ -86,7 +86,8 @@ namespace Beyond [Header("")] [SerializeField] private Skills skillRequiredToPlant; - [HideInInspector] public bItem itemRequiredToPlant, itemRequiredToGrow, itemRequiredToHeal; + //[HideInInspector] + public bItem itemRequiredToPlant, itemRequiredToGrow, itemRequiredToHeal; private const string growinAnimation = "Growing", fruitsAnimation = "Fruits ", sickAnimation = "Sick"; diff --git a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat index fd9bcbb81..3375fde88 100644 --- a/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat +++ b/Assets/ThirdParty/FluXY/Resources/Materials/Splat.mat @@ -65,11 +65,11 @@ Material: m_Offset: {x: 0, y: 0} m_Ints: [] m_Floats: - - _BlendOp: 2 + - _BlendOp: 0 - _BumpScale: 1 - _Cutoff: 0.5 - _DetailNormalMapScale: 1 - - _DstBlend: 10 + - _DstBlend: 1 - _GlossMapScale: 1 - _Glossiness: 0.5 - _GlossyReflections: 1