diff --git a/.plastic/plastic.changes b/.plastic/plastic.changes index 24469120..543b2598 100644 Binary files a/.plastic/plastic.changes and b/.plastic/plastic.changes differ diff --git a/.plastic/plastic.wktree b/.plastic/plastic.wktree index 2b307fce..63f4bce3 100644 Binary files a/.plastic/plastic.wktree and b/.plastic/plastic.wktree differ diff --git a/Assets/0.SCENE/MainGame.unity b/Assets/0.SCENE/MainGame.unity index 927d4c9b..67741387 100644 --- a/Assets/0.SCENE/MainGame.unity +++ b/Assets/0.SCENE/MainGame.unity @@ -9116,7 +9116,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &85056389 MonoBehaviour: m_ObjectHideFlags: 0 @@ -9144,7 +9144,7 @@ Transform: m_GameObject: {fileID: 85056388} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 36.06, y: 6.7, z: 24.93} + m_LocalPosition: {x: 39.61, y: 6.7, z: 15.03} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -65956,7 +65956,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &600231663 MonoBehaviour: m_ObjectHideFlags: 0 @@ -65984,7 +65984,7 @@ Transform: m_GameObject: {fileID: 600231662} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 43.83, y: 7.99, z: 33.19} + m_LocalPosition: {x: 53.98, y: 7.99, z: 32.17} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -66392,6 +66392,8 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: targetObject: {fileID: 0} + hpFilledImage: {fileID: 0} + hpText: {fileID: 0} --- !u!1001 &603601734 PrefabInstance: m_ObjectHideFlags: 0 @@ -67986,6 +67988,10 @@ PrefabInstance: propertyPath: baseDamage value: 1 objectReference: {fileID: 0} + - target: {fileID: -3219543398048858031, guid: e9867839af14eb14ca3d49ee41fc5390, type: 3} + propertyPath: elementType + value: 1 + objectReference: {fileID: 0} - target: {fileID: -3219543398048858031, guid: e9867839af14eb14ca3d49ee41fc5390, type: 3} propertyPath: elementDamage value: 2 @@ -95703,6 +95709,11 @@ Transform: m_CorrespondingSourceObject: {fileID: 4449890379361532, guid: 4f283ac0ef0b13b4dafc3fe2dbbcedea, type: 3} m_PrefabInstance: {fileID: 885917830} m_PrefabAsset: {fileID: 0} +--- !u!1 &886442913 stripped +GameObject: + m_CorrespondingSourceObject: {fileID: 265854990890279069, guid: c34da37720b95c84887eda34e2d90e5b, type: 3} + m_PrefabInstance: {fileID: 4755848957906863847} + m_PrefabAsset: {fileID: 0} --- !u!1001 &886778378 PrefabInstance: m_ObjectHideFlags: 0 @@ -154378,7 +154389,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 8160405634931995834, guid: c34da37720b95c84887eda34e2d90e5b, type: 3} m_PrefabInstance: {fileID: 4755848957906863847} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 886442913} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: 21175cd26e6d59449b495b92d2dbb4ce, type: 3} @@ -154389,7 +154400,7 @@ MonoBehaviour: m_CorrespondingSourceObject: {fileID: 395629277865203624, guid: c34da37720b95c84887eda34e2d90e5b, type: 3} m_PrefabInstance: {fileID: 4755848957906863847} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 0} + m_GameObject: {fileID: 886442913} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 11500000, guid: d4397a1006477aa418ff1693bdc232a1, type: 3} @@ -204277,7 +204288,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &1927423249 MonoBehaviour: m_ObjectHideFlags: 0 @@ -204305,7 +204316,7 @@ Transform: m_GameObject: {fileID: 1927423248} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 38, y: 7.99, z: 41} + m_LocalPosition: {x: 38, y: 7.99, z: 47.93} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -219096,7 +219107,7 @@ GameObject: m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 - m_IsActive: 1 + m_IsActive: 0 --- !u!114 &2067270636 MonoBehaviour: m_ObjectHideFlags: 0 @@ -219124,7 +219135,7 @@ Transform: m_GameObject: {fileID: 2067270635} serializedVersion: 2 m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 38, y: 7.99, z: 41} + m_LocalPosition: {x: 19.62, y: 9.55, z: 55.02} m_LocalScale: {x: 1, y: 1, z: 1} m_ConstrainProportionsScale: 0 m_Children: [] @@ -225032,7 +225043,7 @@ MonoBehaviour: pHealth: {fileID: 1432447526} level: 1 currentExp: 0 - expTable: 0a000000140000001e000000 + expTable: 0a000000140000001e00000028000000320000003c00000046000000500000005a00000064000000 expFillImage: {fileID: 8460876325566303832} expText: {fileID: 5087510944396419465} levelText: {fileID: 1189169361667733870} @@ -228564,6 +228575,10 @@ PrefabInstance: propertyPath: m_Avatar value: objectReference: {fileID: 9000000, guid: 76cee5628aa6b874c96342f004fa138b, type: 3} + - target: {fileID: 6781151982184439901, guid: c34da37720b95c84887eda34e2d90e5b, type: 3} + propertyPath: m_ApplyRootMotion + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7686598050579119226, guid: c34da37720b95c84887eda34e2d90e5b, type: 3} propertyPath: lineWidth value: 0.6 @@ -229124,7 +229139,7 @@ PrefabInstance: objectReference: {fileID: 0} - target: {fileID: 5696671955299564549, guid: fa6d549ce18d8bb479c3660d83e704d3, type: 3} propertyPath: m_IsActive - value: 0 + value: 1 objectReference: {fileID: 0} - target: {fileID: 5862204985775830713, guid: fa6d549ce18d8bb479c3660d83e704d3, type: 3} propertyPath: m_Layer @@ -229222,6 +229237,10 @@ PrefabInstance: propertyPath: anim_Throw value: Attack_Throw1 objectReference: {fileID: 0} + - target: {fileID: 9108673629704904850, guid: fa6d549ce18d8bb479c3660d83e704d3, type: 3} + propertyPath: showDebugGizmos + value: 1 + objectReference: {fileID: 0} - target: {fileID: 9109463353651491833, guid: fa6d549ce18d8bb479c3660d83e704d3, type: 3} propertyPath: m_Layer value: 14 @@ -229427,7 +229446,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 9eb5b341f7503494e9b0f88cc4b1c17d, type: 3} m_Name: m_EditorClassIdentifier: - targetObject: {fileID: 0} + targetObject: {fileID: 886442913} + hpFilledImage: {fileID: 4391954558244079021} + hpText: {fileID: 7128939526209516821} --- !u!224 &8997534549618499257 RectTransform: m_ObjectHideFlags: 0 diff --git a/Assets/1.myPrefab/New Random Stat Card Data.asset b/Assets/1.myPrefab/New Random Stat Card Data.asset index ef467ef2..77ba1dd2 100644 --- a/Assets/1.myPrefab/New Random Stat Card Data.asset +++ b/Assets/1.myPrefab/New Random Stat Card Data.asset @@ -15,5 +15,5 @@ MonoBehaviour: icon: {fileID: 21300000, guid: 15546573e2e8b0c489f921128d1e5073, type: 3} requiredObsessionLevel: 1 possibleStats: 020000000100000000000000 - minValue: -10 + minValue: -3 maxValue: 1 diff --git a/Assets/Epic Toon FX/Materials/Misc/Magic/shield_magic_ADD.mat b/Assets/Epic Toon FX/Materials/Misc/Magic/shield_magic_ADD.mat index cc6625da..236555eb 100644 --- a/Assets/Epic Toon FX/Materials/Misc/Magic/shield_magic_ADD.mat +++ b/Assets/Epic Toon FX/Materials/Misc/Magic/shield_magic_ADD.mat @@ -2,13 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: shield_magic_ADD m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +22,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +39,7 @@ Material: m_Texture: {fileID: 2800000, guid: cf85581cb07626b46bceb11ed2b4349e, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -63,3 +71,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 1, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: [] diff --git a/Assets/Epic Toon FX/Materials/Misc/Sword/slash_ADD.mat b/Assets/Epic Toon FX/Materials/Misc/Sword/slash_ADD.mat index 8973c2aa..f6a2fa85 100644 --- a/Assets/Epic Toon FX/Materials/Misc/Sword/slash_ADD.mat +++ b/Assets/Epic Toon FX/Materials/Misc/Sword/slash_ADD.mat @@ -2,13 +2,19 @@ %TAG !u! tag:unity3d.com,2011: --- !u!21 &2100000 Material: - serializedVersion: 6 + serializedVersion: 8 m_ObjectHideFlags: 0 - m_PrefabParentObject: {fileID: 0} - m_PrefabInternal: {fileID: 0} + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} m_Name: slash_ADD m_Shader: {fileID: 211, guid: 0000000000000000f000000000000000, type: 0} - m_ShaderKeywords: _ALPHABLEND_ON _FADING_ON + m_Parent: {fileID: 0} + m_ModifiedSerializedProperties: 0 + m_ValidKeywords: + - _ALPHABLEND_ON + - _FADING_ON + m_InvalidKeywords: [] m_LightmapFlags: 0 m_EnableInstancingVariants: 0 m_DoubleSidedGI: 0 @@ -16,7 +22,8 @@ Material: stringTagMap: RenderType: Transparent disabledShaderPasses: - - ALWAYS + - GRABPASS + m_LockedProperties: m_SavedProperties: serializedVersion: 3 m_TexEnvs: @@ -32,6 +39,7 @@ Material: m_Texture: {fileID: 2800000, guid: ad2eaf8182c154b40a086d794c8d8ed1, type: 3} m_Scale: {x: 1, y: 1} m_Offset: {x: 0, y: 0} + m_Ints: [] m_Floats: - _BlendOp: 0 - _BumpScale: 1 @@ -63,3 +71,4 @@ Material: - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} - _SoftParticleFadeParams: {r: 0, g: 5, b: 0, a: 0} - _TintColor: {r: 0.5, g: 0.5, b: 0.5, a: 0.5} + m_BuildTextureStacks: []