From d6599cd6f7ae73b29e2decb66b96b6a6d5442724 Mon Sep 17 00:00:00 2001 From: Ittipon Teerapruettikulchai Date: Fri, 5 Jul 2019 16:38:22 +0700 Subject: [PATCH] Update demo content --- Prefabs/OrcsArcher2D(AIDemo).prefab | 61 ++++++++++++++++++++++------- Prefabs/Warrior2D(AIDemo).prefab | 61 ++++++++++++++++++++++------- Scenes/00Init_2D(AIDemo).unity | 5 ++- 3 files changed, 97 insertions(+), 30 deletions(-) diff --git a/Prefabs/OrcsArcher2D(AIDemo).prefab b/Prefabs/OrcsArcher2D(AIDemo).prefab index 0f46a23..2f75267 100644 --- a/Prefabs/OrcsArcher2D(AIDemo).prefab +++ b/Prefabs/OrcsArcher2D(AIDemo).prefab @@ -126,6 +126,7 @@ GameObject: - component: {fileID: 114877638974942912} - component: {fileID: 114308812000665012} - component: {fileID: 114383154828356954} + - component: {fileID: 114423900364055418} m_Layer: 0 m_Name: OrcsArcher2D(AIDemo) m_TagString: Untagged @@ -394,6 +395,19 @@ MonoBehaviour: layerMask: serializedVersion: 2 m_Bits: 256 +--- !u!114 &114423900364055418 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1777251013356746} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a250dc50d53944b80c6628ab2509d5, type: 3} + m_Name: + m_EditorClassIdentifier: + mainModel: {fileID: 114424167947571634} + vehicleModels: [] --- !u!114 &114424167947571634 MonoBehaviour: m_ObjectHideFlags: 1 @@ -405,7 +419,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eab0561f743b29941b9e3fed07578b68, type: 3} m_Name: m_EditorClassIdentifier: - dataId: -1020703260 hiddingObjects: [] effectContainers: - effectSocket: Floor @@ -413,6 +426,8 @@ MonoBehaviour: - effectSocket: Body transform: {fileID: 4848377747683098} setEffectContainersBySetters: 0 + modelManager: {fileID: 114423900364055418} + modelId: equipmentContainers: [] setEquipmentContainersBySetters: 0 spriteRenderer: {fileID: 212157896959509878} @@ -491,19 +506,6 @@ MonoBehaviour: audioClips: [] weaponAnimations2D: [] skillAnimations2D: [] - defaultSkillCastAnimation2D: - down: {fileID: 0} - up: {fileID: 0} - left: {fileID: 0} - right: {fileID: 0} - downLeft: {fileID: 0} - downRight: {fileID: 0} - upLeft: {fileID: 0} - upRight: {fileID: 0} - triggerDurationRate: 0 - extraDuration: 0 - audioClips: [] - skillCastAnimations2D: [] magnitudeToPlayMoveClip: 0.1 sampleAnimation: 0 sampleDirection: 0 @@ -642,6 +644,37 @@ MonoBehaviour: doNotSyncInitialDataImmediately: 0 syncMode: 0 value: + movementState: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 2 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: 0 + currentDirection: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 2 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: {x: 0, y: 0} + passengingVehicle: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 3 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: + objectId: 0 + seatIndex: 0 + cameraTargetTransform: {fileID: 0} + model: {fileID: 114424167947571634} currentHp: behaviour: {fileID: 0} elementId: 0 diff --git a/Prefabs/Warrior2D(AIDemo).prefab b/Prefabs/Warrior2D(AIDemo).prefab index ed588d2..7e071c3 100644 --- a/Prefabs/Warrior2D(AIDemo).prefab +++ b/Prefabs/Warrior2D(AIDemo).prefab @@ -63,6 +63,7 @@ GameObject: - component: {fileID: 114757329484041034} - component: {fileID: 114244173189548708} - component: {fileID: 114373457388471766} + - component: {fileID: 114019986012758338} m_Layer: 0 m_Name: Warrior2D(AIDemo) m_TagString: Untagged @@ -303,6 +304,19 @@ BoxCollider2D: serializedVersion: 2 m_Size: {x: 0.5, y: 1} m_EdgeRadius: 0 +--- !u!114 &114019986012758338 +MonoBehaviour: + m_ObjectHideFlags: 1 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInternal: {fileID: 100100000} + m_GameObject: {fileID: 1329702655160078} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 99a250dc50d53944b80c6628ab2509d5, type: 3} + m_Name: + m_EditorClassIdentifier: + mainModel: {fileID: 114902627479170308} + vehicleModels: [] --- !u!114 &114244173189548708 MonoBehaviour: m_ObjectHideFlags: 1 @@ -374,6 +388,37 @@ MonoBehaviour: doNotSyncInitialDataImmediately: 0 syncMode: 0 value: + movementState: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 2 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: 0 + currentDirection: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 2 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: {x: 0, y: 0} + passengingVehicle: + behaviour: {fileID: 0} + elementId: 0 + deliveryMethod: 3 + sendInterval: 0.1 + alwaysSync: 0 + doNotSyncInitialDataImmediately: 1 + syncMode: 0 + value: + objectId: 0 + seatIndex: 0 + cameraTargetTransform: {fileID: 0} + model: {fileID: 114902627479170308} currentHp: behaviour: {fileID: 0} elementId: 0 @@ -785,7 +830,6 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: eab0561f743b29941b9e3fed07578b68, type: 3} m_Name: m_EditorClassIdentifier: - dataId: 925586142 hiddingObjects: [] effectContainers: - effectSocket: Floor @@ -793,6 +837,8 @@ MonoBehaviour: - effectSocket: Body transform: {fileID: 4220959519723220} setEffectContainersBySetters: 0 + modelManager: {fileID: 114019986012758338} + modelId: equipmentContainers: [] setEquipmentContainersBySetters: 0 spriteRenderer: {fileID: 212720684570947580} @@ -921,19 +967,6 @@ MonoBehaviour: extraDuration: 0 audioClips: [] skillAnimations2D: [] - defaultSkillCastAnimation2D: - down: {fileID: 0} - up: {fileID: 0} - left: {fileID: 0} - right: {fileID: 0} - downLeft: {fileID: 0} - downRight: {fileID: 0} - upLeft: {fileID: 0} - upRight: {fileID: 0} - triggerDurationRate: 0 - extraDuration: 0 - audioClips: [] - skillCastAnimations2D: [] magnitudeToPlayMoveClip: 0.1 sampleAnimation: 1 sampleDirection: 0 diff --git a/Scenes/00Init_2D(AIDemo).unity b/Scenes/00Init_2D(AIDemo).unity index f62bb9d..1255022 100644 --- a/Scenes/00Init_2D(AIDemo).unity +++ b/Scenes/00Init_2D(AIDemo).unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 0} - m_IndirectSpecularColor: {r: 0.44657844, g: 0.49641222, b: 0.57481694, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -142,7 +142,6 @@ MonoBehaviour: m_Name: m_EditorClassIdentifier: currentLogLevel: 0 - connectKey: SampleConnectKey networkAddress: localhost networkPort: 7770 useWebSocket: 0 @@ -750,6 +749,8 @@ MonoBehaviour: keyCode: 9 - keyName: Reload keyCode: 114 + - keyName: ExitVehicle + keyCode: 120 --- !u!114 &1379718505 MonoBehaviour: m_ObjectHideFlags: 0