diff --git a/Assets/Scenes/Fo.unity b/Assets/Scenes/Fo.unity index ba252fb..aae8b9a 100644 --- a/Assets/Scenes/Fo.unity +++ b/Assets/Scenes/Fo.unity @@ -14420,7 +14420,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 1743699421} attackParticleSystem: {fileID: 935199052} jumpAudio: {fileID: 56950065} attackHammerAudio: {fileID: 903724192} @@ -14784,7 +14784,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1945543621} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.58337, y: -1.184237, z: -10} + m_LocalPosition: {x: -13.58521, y: -1.1842628, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1968056610} diff --git a/Assets/Scenes/Ji.unity b/Assets/Scenes/Ji.unity index e3ae711..4c31e35 100644 --- a/Assets/Scenes/Ji.unity +++ b/Assets/Scenes/Ji.unity @@ -14078,7 +14078,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 146800596} attackParticleSystem: {fileID: 127489380} jumpAudio: {fileID: 443390971} attackHammerAudio: {fileID: 1658910332} @@ -14890,7 +14890,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1956046895} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -0.493083, y: -7.310318, z: -10} + m_LocalPosition: {x: -0.4946699, y: -7.3103647, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 417846922} diff --git a/Assets/Scenes/Yi.unity b/Assets/Scenes/Yi.unity index c810bd6..d38fdee 100644 --- a/Assets/Scenes/Yi.unity +++ b/Assets/Scenes/Yi.unity @@ -10015,7 +10015,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 1156390167} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: -13.58337, y: -1.184237, z: -10} + m_LocalPosition: {x: -13.58521, y: -1.1842628, z: -10} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 1178553515} @@ -10866,7 +10866,7 @@ MonoBehaviour: catching: {fileID: 0} specialMoneyCount: 0 isAnnoying: 0 - creatBoardUI: {fileID: 0} + creatBoardUI: {fileID: 484260808} attackParticleSystem: {fileID: 802489789} jumpAudio: {fileID: 1722459463} attackHammerAudio: {fileID: 1919797166} @@ -10991,7 +10991,19 @@ MonoBehaviour: m_ActionId: d92eaf00-7eaf-4292-ae80-6bfff20b5930 m_ActionName: Normal/Sickle[/Keyboard/u,/XInputControllerWindows/rightTrigger] - m_PersistentCalls: - m_Calls: [] + m_Calls: + - m_Target: {fileID: 1383361093} + m_TargetAssemblyTypeName: MyPlayer, Assembly-CSharp + m_MethodName: OnInteractive + m_Mode: 0 + m_Arguments: + m_ObjectArgument: {fileID: 0} + m_ObjectArgumentAssemblyTypeName: UnityEngine.Object, UnityEngine + m_IntArgument: 0 + m_FloatArgument: 0 + m_StringArgument: + m_BoolArgument: 0 + m_CallState: 2 m_ActionId: 7cf0a787-dc2d-42b1-9ed9-c840ccfa3ce9 m_ActionName: Normal/Interactive[/Keyboard/f] - m_PersistentCalls: @@ -11004,7 +11016,7 @@ MonoBehaviour: m_ActionName: Normal/Interactive1[/XInputControllerWindows/buttonNorth,/XInputControllerWindows/buttonNorth,/Keyboard/f] m_NeverAutoSwitchControlSchemes: 0 m_DefaultControlScheme: Play - m_DefaultActionMap: 5167283d-f146-4538-9eb5-86f686e115be + m_DefaultActionMap: NullMap m_SplitScreenIndex: -1 m_Camera: {fileID: 0} --- !u!50 &1383361096 diff --git a/ProjectSettings/ProjectSettings.asset b/ProjectSettings/ProjectSettings.asset index 9ced852..de3e208 100644 --- a/ProjectSettings/ProjectSettings.asset +++ b/ProjectSettings/ProjectSettings.asset @@ -145,7 +145,7 @@ PlayerSettings: 16:10: 1 16:9: 1 Others: 1 - bundleVersion: 1.0 + bundleVersion: 1.1 preloadedAssets: - {fileID: -233813179328996068, guid: c904ac9773b374d419329ca1a0f380ac, type: 2} metroInputSource: 0 diff --git a/UserSettings/EditorUserSettings.asset b/UserSettings/EditorUserSettings.asset index 9cd8bc4..b276650 100644 --- a/UserSettings/EditorUserSettings.asset +++ b/UserSettings/EditorUserSettings.asset @@ -12,28 +12,28 @@ EditorUserSettings: value: 22424703114646680e0b0227036c4b150503563f22213229 flags: 0 RecentlyUsedScenePath-2: - value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f - flags: 0 - RecentlyUsedScenePath-3: - value: 22424703114646680e0b0227036c791f580216233831 - flags: 0 - RecentlyUsedScenePath-4: - value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 - flags: 0 - RecentlyUsedScenePath-5: - value: 22424703114646680e0b0227036c6619580216233831 - flags: 0 - RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c7000131911242b66333e243d04 flags: 0 - RecentlyUsedScenePath-7: + RecentlyUsedScenePath-3: + value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb + flags: 0 + RecentlyUsedScenePath-4: + value: 22424703114646680e0b0227036c7b192c16162d1f3c2737281d1820f6ae2136ebf32f + flags: 0 + RecentlyUsedScenePath-5: + value: 22424703114646680e0b0227036c6b153a021713251b32312a2c2936f1f47a2decee22f0 + flags: 0 + RecentlyUsedScenePath-6: value: 22424703114646680e0b0227036c5c0518590d24253c3f flags: 0 + RecentlyUsedScenePath-7: + value: 22424703114646680e0b0227036c791f580216233831 + flags: 0 RecentlyUsedScenePath-8: value: 22424703114646680e0b0227036c7519580216233831 flags: 0 RecentlyUsedScenePath-9: - value: 22424703114646680e0b0227036c661925162b3e2d2f2304283a097df7ee3d2cfb + value: 22424703114646680e0b0227036c6619580216233831 flags: 0 UnityEditor.ShaderGraph.Blackboard: value: 18135939215a0a5004000b0e15254b524c030a3f2964643d120d1230e9e93a3fd6e826abbd2e2d293c4ead313b08042de6030a0afa240c0d020be94c4baf5e435d8715fa32c70d15d11612dacc11fee5d3c5d1fe9ab1b7968e93e2ffcbc3e7e2f0b3ffe0e8b0be9af8ffaeffff8e85dd8390e3949c8899daa7