diff --git a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset index 67c3328..fe178d2 100644 --- a/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset +++ b/client/Assets/ArticyImporter/Content/Generated/ArticyEditorSettings.asset @@ -21,6 +21,6 @@ MonoBehaviour: mLastUsedPackagesHash: 1177269412 mLastUsedPackagesCount: 1 mLastBuildCode: 1 - mLastEditorStartupTimeTicks: 638227832516976288 + mLastEditorStartupTimeTicks: 638229670566548155 mNewVersionAvailable: 1 mLastAttachedFlowPlayerValue: 0 diff --git a/client/Assets/Game/Driver.unity b/client/Assets/Game/Driver.unity index b5daf58..387dd49 100644 --- a/client/Assets/Game/Driver.unity +++ b/client/Assets/Game/Driver.unity @@ -1134,14 +1134,14 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1481844499} - m_LocalRotation: {x: 0.30070576, y: 0, z: 0, w: 0.953717} + m_LocalRotation: {x: 0.2164396, y: 0, z: 0, w: 0.97629607} m_LocalPosition: {x: 0, y: 6.8829165, z: -9.329824} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 441416963} m_Father: {fileID: 2053699350} m_RootOrder: 1 - m_LocalEulerAnglesHint: {x: 35, y: 0, z: 0} + m_LocalEulerAnglesHint: {x: 25, y: 0, z: 0} --- !u!114 &1481844501 MonoBehaviour: m_ObjectHideFlags: 0 diff --git a/client/Assets/Game/Scripts/_Define/GameConstStatic.cs b/client/Assets/Game/Scripts/_Define/GameConstStatic.cs index ac30a41..7f1461f 100644 --- a/client/Assets/Game/Scripts/_Define/GameConstStatic.cs +++ b/client/Assets/Game/Scripts/_Define/GameConstStatic.cs @@ -16,7 +16,7 @@ namespace Game public static Vector3 DownLeft = new Vector3(-1, 0, -1).normalized; public static Vector3 DownRight = new Vector3(1, 0, -1).normalized; - public static Quaternion CommonRot = Quaternion.AngleAxis(10, Vector3.right); + public static Quaternion CommonRot = Quaternion.AngleAxis(0, Vector3.right); public static readonly Dictionary MoveCommand2Dir = new Dictionary() diff --git a/client/Assets/Plugins/FluidBehaviorTree/Editor/Fluid.BehaviorTree.Editor.asmdef b/client/Assets/Plugins/FluidBehaviorTree/Editor/Fluid.BehaviorTree.Editor.asmdef index 35da73e..630d446 100644 --- a/client/Assets/Plugins/FluidBehaviorTree/Editor/Fluid.BehaviorTree.Editor.asmdef +++ b/client/Assets/Plugins/FluidBehaviorTree/Editor/Fluid.BehaviorTree.Editor.asmdef @@ -1,7 +1,9 @@ { "name": "Fluid.BehaviorTree.Editor", "references": [ - "Fluid.BehaviorTree" + "Fluid.BehaviorTree", + "UnityEditor.UI", + "UnityEngine.UI" ], "optionalUnityReferences": [], "includePlatforms": [ diff --git a/client/Assets/Plugins/FluidBehaviorTree/Runtime/Fluid.BehaviorTree.asmdef b/client/Assets/Plugins/FluidBehaviorTree/Runtime/Fluid.BehaviorTree.asmdef index 4287f80..5f70d26 100644 --- a/client/Assets/Plugins/FluidBehaviorTree/Runtime/Fluid.BehaviorTree.asmdef +++ b/client/Assets/Plugins/FluidBehaviorTree/Runtime/Fluid.BehaviorTree.asmdef @@ -1,6 +1,6 @@ { "name": "Fluid.BehaviorTree", - "references": [], + "references": ["GUID:343deaaf83e0cee4ca978e7df0b80d21","GUID:2bafac87e7f4b9b418d9448d219b01ab"], "optionalUnityReferences": [], "includePlatforms": [], "excludePlatforms": [] diff --git a/client/Assets/Resources/Character/_design_hero01_flat.aseprite b/client/Assets/Resources/Character/_design_hero01_flat.aseprite index 46a09d2..6a1b845 100644 Binary files a/client/Assets/Resources/Character/_design_hero01_flat.aseprite and b/client/Assets/Resources/Character/_design_hero01_flat.aseprite differ diff --git a/client/Assets/Resources/Character/_design_hero01_flat/_design_hero01_flat.png b/client/Assets/Resources/Character/_design_hero01_flat/_design_hero01_flat.png index 16cf718..62538d3 100644 Binary files a/client/Assets/Resources/Character/_design_hero01_flat/_design_hero01_flat.png and b/client/Assets/Resources/Character/_design_hero01_flat/_design_hero01_flat.png differ diff --git a/client/Assets/Resources/Character/hero01/hero01_move.png b/client/Assets/Resources/Character/hero01/hero01_move.png index 7d8b09b..da40e9c 100644 Binary files a/client/Assets/Resources/Character/hero01/hero01_move.png and b/client/Assets/Resources/Character/hero01/hero01_move.png differ diff --git a/client/Assets/Resources/Character/hero01_move.aseprite b/client/Assets/Resources/Character/hero01_move.aseprite index 678a2d9..6a6ab50 100644 Binary files a/client/Assets/Resources/Character/hero01_move.aseprite and b/client/Assets/Resources/Character/hero01_move.aseprite differ diff --git a/client/Assets/Resources/Prefab/Level/level0001.prefab b/client/Assets/Resources/Prefab/Level/level0001.prefab index fced523..861ff2a 100644 --- a/client/Assets/Resources/Prefab/Level/level0001.prefab +++ b/client/Assets/Resources/Prefab/Level/level0001.prefab @@ -599,8 +599,8 @@ Light: serializedVersion: 10 m_Type: 1 m_Shape: 0 - m_Color: {r: 0.9150943, g: 0.8410021, b: 0.75538445, a: 1} - m_Intensity: 1.2 + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_Intensity: 1 m_Range: 10 m_SpotAngle: 30 m_InnerSpotAngle: 21.80208