finsihed castle walls, adding attack, block and kick aniamtions and input. Started on NPCdiagloue system
This commit is contained in:
SHOUTING_PIRATE
@@ -47,7 +47,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 43
|
||||
controlID: 168
|
||||
draggingID: 0
|
||||
--- !u!114 &3
|
||||
MonoBehaviour:
|
||||
@@ -73,7 +73,7 @@ MonoBehaviour:
|
||||
m_MinSize: {x: 300, y: 100}
|
||||
m_MaxSize: {x: 24288, y: 16192}
|
||||
vertical: 0
|
||||
controlID: 44
|
||||
controlID: 169
|
||||
draggingID: 0
|
||||
--- !u!114 &4
|
||||
MonoBehaviour:
|
||||
@@ -90,12 +90,12 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 1419
|
||||
x: 1291
|
||||
y: 0
|
||||
width: 301
|
||||
width: 429
|
||||
height: 1301
|
||||
m_MinSize: {x: 276, y: 76}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
m_MinSize: {x: 275, y: 50}
|
||||
m_MaxSize: {x: 4000, y: 4000}
|
||||
m_ActualView: {fileID: 16}
|
||||
m_Panes:
|
||||
- {fileID: 16}
|
||||
@@ -118,7 +118,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 184
|
||||
width: 300
|
||||
height: 923
|
||||
m_MinSize: {x: 201, y: 226}
|
||||
m_MaxSize: {x: 4001, y: 4026}
|
||||
@@ -144,7 +144,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 923
|
||||
width: 1419
|
||||
width: 1291
|
||||
height: 378
|
||||
m_MinSize: {x: 231, y: 276}
|
||||
m_MaxSize: {x: 10001, y: 10026}
|
||||
@@ -244,12 +244,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1419
|
||||
width: 1291
|
||||
height: 1301
|
||||
m_MinSize: {x: 200, y: 100}
|
||||
m_MaxSize: {x: 16192, y: 16192}
|
||||
vertical: 1
|
||||
controlID: 45
|
||||
controlID: 98
|
||||
draggingID: 0
|
||||
--- !u!114 &11
|
||||
MonoBehaviour:
|
||||
@@ -270,12 +270,12 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 1419
|
||||
width: 1291
|
||||
height: 923
|
||||
m_MinSize: {x: 200, y: 50}
|
||||
m_MaxSize: {x: 16192, y: 8096}
|
||||
vertical: 0
|
||||
controlID: 46
|
||||
controlID: 99
|
||||
draggingID: 0
|
||||
--- !u!114 &12
|
||||
MonoBehaviour:
|
||||
@@ -292,9 +292,9 @@ MonoBehaviour:
|
||||
m_Children: []
|
||||
m_Position:
|
||||
serializedVersion: 2
|
||||
x: 184
|
||||
x: 300
|
||||
y: 0
|
||||
width: 1235
|
||||
width: 991
|
||||
height: 923
|
||||
m_MinSize: {x: 202, y: 226}
|
||||
m_MaxSize: {x: 4002, y: 4026}
|
||||
@@ -327,9 +327,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Animation\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 194
|
||||
x: 300
|
||||
y: 79
|
||||
width: 1295
|
||||
width: 989
|
||||
height: 897
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -344,7 +344,7 @@ MonoBehaviour:
|
||||
m_OverlaysVisible: 1
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_LastSelectedObjectID: -38466
|
||||
m_LastSelectedObjectID: -2828
|
||||
--- !u!114 &14
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 52
|
||||
@@ -366,9 +366,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Animator\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 195
|
||||
y: 24
|
||||
width: 1295
|
||||
x: 300
|
||||
y: 79
|
||||
width: 989
|
||||
height: 897
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -386,6 +386,8 @@ MonoBehaviour:
|
||||
- {fileID: -583667153462818733, guid: 51c4a0d02c9637c42a2d0649b8794040, type: 2}
|
||||
- {fileID: 2346916106479442559, guid: 0096f2761f10865498663f3fd162dc5a, type: 2}
|
||||
- {fileID: 6950599834694431869, guid: 2991c665b8290f64aad65bf22eae9d4d, type: 2}
|
||||
- {fileID: -5602963042399094863, guid: 40db3173a05ae3242b1c182a09b0a183, type: 2}
|
||||
- {fileID: 6904719651407550685, guid: 40db3173a05ae3242b1c182a09b0a183, type: 2}
|
||||
m_ValueSerializationHelper:
|
||||
- e00: 1
|
||||
e01: 0
|
||||
@@ -435,10 +437,42 @@ MonoBehaviour:
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
- e00: 0.8751836
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 202.14609
|
||||
e10: 0
|
||||
e11: 0.8751836
|
||||
e12: 0
|
||||
e13: 138.02303
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
- e00: 1
|
||||
e01: 0
|
||||
e02: 0
|
||||
e03: 108
|
||||
e10: 0
|
||||
e11: 1
|
||||
e12: 0
|
||||
e13: 344
|
||||
e20: 0
|
||||
e21: 0
|
||||
e22: 1
|
||||
e23: 0
|
||||
e30: 0
|
||||
e31: 0
|
||||
e32: 0
|
||||
e33: 1
|
||||
m_PreviewAnimator: {fileID: 0}
|
||||
m_AnimatorController: {fileID: 9100000, guid: 2991c665b8290f64aad65bf22eae9d4d, type: 2}
|
||||
m_AnimatorController: {fileID: 9100000, guid: 40db3173a05ae3242b1c182a09b0a183, type: 2}
|
||||
m_BreadCrumbs:
|
||||
- m_Target: {fileID: 6950599834694431869, guid: 2991c665b8290f64aad65bf22eae9d4d, type: 2}
|
||||
- m_Target: {fileID: -5602963042399094863, guid: 40db3173a05ae3242b1c182a09b0a183, type: 2}
|
||||
m_ScrollPosition: {x: 0, y: 0}
|
||||
stateMachineGraph: {fileID: 0}
|
||||
stateMachineGraphGUI: {fileID: 0}
|
||||
@@ -474,7 +508,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 1002
|
||||
width: 1418
|
||||
width: 1290
|
||||
height: 352
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -498,7 +532,7 @@ MonoBehaviour:
|
||||
m_SkipHidden: 0
|
||||
m_SearchArea: 1
|
||||
m_Folders:
|
||||
- Assets/Hayq Art/Middle Ages Environment Pack/Prefabs/General_Fence
|
||||
- Assets/Scripts
|
||||
m_Globs: []
|
||||
m_ProductIds:
|
||||
m_AnyWithAssetOrigin: 0
|
||||
@@ -508,30 +542,30 @@ MonoBehaviour:
|
||||
m_ViewMode: 1
|
||||
m_StartGridSize: 16
|
||||
m_LastFolders:
|
||||
- Assets/Hayq Art/Middle Ages Environment Pack/Prefabs/General_Fence
|
||||
- Assets/Scripts
|
||||
m_LastFoldersGridSize: 16
|
||||
m_LastProjectPath: E:\Unity\Projects\CartoonRPG
|
||||
m_LockTracker:
|
||||
m_IsLocked: 0
|
||||
m_FolderTreeState:
|
||||
scrollPos: {x: 0, y: 228}
|
||||
m_SelectedIDs: 0ac30100
|
||||
m_LastClickedID: 115466
|
||||
m_ExpandedIDs: 00000000a0af0000a2af0000a4af0000a6af0000a8af0000aaaf0000acaf0000b0af0000b2af0000b4af0000b6af0000b8af0000bcaf0000cacc0000d0cc0000d2cc00000cff0000b2220100926d0100466e010052c1010070c20100f8c20100cac4010000ca9a3b
|
||||
scrollPos: {x: 0, y: 1002.58014}
|
||||
m_SelectedIDs: 08e30100
|
||||
m_LastClickedID: 123656
|
||||
m_ExpandedIDs: 00000000bccf0000becf0000c0cf0000c2cf0000c4cf0000c6cf0000c8cf0000cacf0000cccf0000cecf0000d0cf0000d4cf0000d6cf0000d8cf0000dacf0000dccf0000decf0000e0cf0000e2cf0000e4cf0000e6cf000014d2000036d2000038d2000050d2000074d2000080180200328b040000ca9a3b
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_Name: Materials
|
||||
m_OriginalName: Materials
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_UserData: 137382
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_OriginalEventType: 0
|
||||
m_IsRenamingFilename: 1
|
||||
m_TrimLeadingAndTrailingWhitespace: 0
|
||||
m_ClientGUIView: {fileID: 6}
|
||||
@@ -546,7 +580,7 @@ MonoBehaviour:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs:
|
||||
m_LastClickedID: 0
|
||||
m_ExpandedIDs: 00000000a0af0000a2af0000a4af0000a6af0000a8af0000aaaf0000acaf0000aeaf0000b0af0000b2af0000b4af0000b6af0000b8af0000baaf0000bcaf0000beaf0000
|
||||
m_ExpandedIDs: 00000000bccf0000becf0000c0cf0000c2cf0000c4cf0000c6cf0000c8cf0000cacf0000cccf0000cecf0000d0cf0000d2cf0000d4cf0000d6cf0000d8cf0000dacf0000dccf0000decf0000e0cf0000e2cf0000e4cf0000e6cf0000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
@@ -575,21 +609,21 @@ MonoBehaviour:
|
||||
m_SelectedInstanceIDs:
|
||||
m_LastClickedInstanceID: 0
|
||||
m_HadKeyboardFocusLastEvent: 1
|
||||
m_ExpandedInstanceIDs: c623000026ce0000b2e6000078cf000088e7000082b80000e8bd0000debd0000e6bd0000b6980100fe10fcffd4c80000c2c80000b4c800000000000024d60000b8cc0000
|
||||
m_ExpandedInstanceIDs: c623000026ce0000b2e6000078cf000088e7000082b80000e8bd0000debd0000e6bd0000b6980100fe10fcffd4c80000c2c80000b4c800000000000024d60000b8cc0000f4850400aa1802009a180200
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name: General_Fence
|
||||
m_OriginalName: General_Fence
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 115466
|
||||
m_UserData: 0
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 0
|
||||
m_OriginalEventType: 11
|
||||
m_IsRenamingFilename: 1
|
||||
m_TrimLeadingAndTrailingWhitespace: 0
|
||||
m_ClientGUIView: {fileID: 6}
|
||||
@@ -625,9 +659,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Inspector\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 1419
|
||||
x: 1291
|
||||
y: 79
|
||||
width: 300
|
||||
width: 428
|
||||
height: 1275
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -676,7 +710,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 79
|
||||
width: 183
|
||||
width: 299
|
||||
height: 897
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -692,23 +726,23 @@ MonoBehaviour:
|
||||
m_SceneHierarchy:
|
||||
m_TreeViewState:
|
||||
scrollPos: {x: 0, y: 0}
|
||||
m_SelectedIDs: 4009fdff
|
||||
m_LastClickedID: -194240
|
||||
m_ExpandedIDs: a0e2fdff3eecfdff88f7fdff0e59feffbe67feff7c67ffffc469fffff06cffffba6dffffcaf6ffff00fbffffb8b20000
|
||||
m_SelectedIDs: 4eeaffff
|
||||
m_LastClickedID: -5554
|
||||
m_ExpandedIDs: c8ebfdff56f6fdff66f6fdff30fcfdffb001feffb401feffb801feffec01fefff001feff8202feffa202feff8003feff1af4ffff1ef4ffff22f4ffff26f4ffff96f4ffff9af4ffff9ef4ffffa2f4ffffa6f4ffffaaf4ffffd6f4ffff00fbffff26b20000
|
||||
m_RenameOverlay:
|
||||
m_UserAcceptedRename: 0
|
||||
m_Name:
|
||||
m_OriginalName:
|
||||
m_Name: SM_Chair_03
|
||||
m_OriginalName: SM_Chair_03
|
||||
m_EditFieldRect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 0
|
||||
height: 0
|
||||
m_UserData: 0
|
||||
m_UserData: -122924
|
||||
m_IsWaitingForDelay: 0
|
||||
m_IsRenaming: 0
|
||||
m_OriginalEventType: 11
|
||||
m_OriginalEventType: 0
|
||||
m_IsRenamingFilename: 0
|
||||
m_TrimLeadingAndTrailingWhitespace: 0
|
||||
m_ClientGUIView: {fileID: 5}
|
||||
@@ -740,9 +774,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Scene\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 184
|
||||
x: 300
|
||||
y: 79
|
||||
width: 1233
|
||||
width: 989
|
||||
height: 897
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -982,11 +1016,11 @@ MonoBehaviour:
|
||||
displayed: 0
|
||||
id: Scene View/Scene Visibility
|
||||
index: 5
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":0.0,"y":0.0},"m_SnapOffsetDelta":{"x":24.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
contents: '{"m_Layout":4,"m_Collapsed":false,"m_Floating":false,"m_FloatingSnapOffset":{"x":24.0,"y":0.0},"m_SnapOffsetDelta":{"x":0.0,"y":0.0},"m_FloatingSnapCorner":0,"m_Size":{"x":0.0,"y":0.0},"m_SizeOverridden":false}'
|
||||
floating: 0
|
||||
collapsed: 0
|
||||
snapOffset: {x: 0, y: 0}
|
||||
snapOffsetDelta: {x: 24, y: 0}
|
||||
snapOffset: {x: 24, y: 0}
|
||||
snapOffsetDelta: {x: 0, y: 0}
|
||||
snapCorner: 0
|
||||
layout: 4
|
||||
size: {x: 0, y: 0}
|
||||
@@ -1326,9 +1360,9 @@ MonoBehaviour:
|
||||
m_AudioPlay: 0
|
||||
m_DebugDrawModesUseInteractiveLightBakingData: 0
|
||||
m_Position:
|
||||
m_Target: {x: 98.21942, y: 424.7469, z: 208.21033}
|
||||
m_Target: {x: 777.2602, y: 224.81328, z: 29.973959}
|
||||
speed: 2
|
||||
m_Value: {x: 98.21942, y: 424.7469, z: 208.21033}
|
||||
m_Value: {x: 777.2602, y: 224.81328, z: 29.973959}
|
||||
m_RenderMode: 0
|
||||
m_CameraMode:
|
||||
drawMode: 0
|
||||
@@ -1366,7 +1400,7 @@ MonoBehaviour:
|
||||
m_Fade:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
m_Value: 1
|
||||
m_Value: 0
|
||||
m_Color: {r: 0.5, g: 0.5, b: 0.5, a: 0.4}
|
||||
m_Pivot: {x: 0, y: 0, z: 0}
|
||||
m_Size: {x: 0.05, y: 0.05}
|
||||
@@ -1374,13 +1408,13 @@ MonoBehaviour:
|
||||
m_GridAxis: 1
|
||||
m_gridOpacity: 0.5
|
||||
m_Rotation:
|
||||
m_Target: {x: 0.30916807, y: -0.65644616, z: 0.3387694, w: 0.59914917}
|
||||
m_Target: {x: 0.1997054, y: -0.76728994, z: 0.2844696, w: 0.5393392}
|
||||
speed: 2
|
||||
m_Value: {x: 0.3100273, y: -0.6558549, z: 0.3397113, w: 0.5986098}
|
||||
m_Value: {x: 0.19927898, y: -0.76674235, z: 0.28295913, w: 0.54067385}
|
||||
m_Size:
|
||||
m_Target: 1.866889
|
||||
m_Target: 1.1690236
|
||||
speed: 2
|
||||
m_Value: 1.866889
|
||||
m_Value: 1.1690236
|
||||
m_Ortho:
|
||||
m_Target: 0
|
||||
speed: 2
|
||||
@@ -1398,7 +1432,7 @@ MonoBehaviour:
|
||||
m_FarClip: 10000
|
||||
m_DynamicClip: 1
|
||||
m_OcclusionCulling: 0
|
||||
m_LastSceneViewRotation: {x: -0.28196254, y: -0.71669453, z: 0.42319635, w: -0.47749394}
|
||||
m_LastSceneViewRotation: {x: -0.066794656, y: 0.6964652, z: -0.065828696, w: -0.71171445}
|
||||
m_LastSceneViewOrtho: 0
|
||||
m_Viewpoint:
|
||||
m_SceneView: {fileID: 18}
|
||||
@@ -1435,9 +1469,9 @@ MonoBehaviour:
|
||||
m_TextWithWhitespace: "Game\u200B"
|
||||
m_Pos:
|
||||
serializedVersion: 2
|
||||
x: 194
|
||||
x: 300
|
||||
y: 79
|
||||
width: 1295
|
||||
width: 989
|
||||
height: 897
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
@@ -1456,7 +1490,7 @@ MonoBehaviour:
|
||||
m_ShowGizmos: 0
|
||||
m_TargetDisplay: 0
|
||||
m_ClearColor: {r: 0, g: 0, b: 0, a: 0}
|
||||
m_TargetSize: {x: 1295, y: 876}
|
||||
m_TargetSize: {x: 989, y: 876}
|
||||
m_TextureFilterMode: 0
|
||||
m_TextureHideFlags: 61
|
||||
m_RenderIMGUI: 1
|
||||
@@ -1471,8 +1505,8 @@ MonoBehaviour:
|
||||
m_VRangeLocked: 0
|
||||
hZoomLockedByDefault: 0
|
||||
vZoomLockedByDefault: 0
|
||||
m_HBaseRangeMin: -647.5
|
||||
m_HBaseRangeMax: 647.5
|
||||
m_HBaseRangeMin: -494.5
|
||||
m_HBaseRangeMax: 494.5
|
||||
m_VBaseRangeMin: -438
|
||||
m_VBaseRangeMax: 438
|
||||
m_HAllowExceedBaseRangeMin: 1
|
||||
@@ -1483,7 +1517,7 @@ MonoBehaviour:
|
||||
m_HSlider: 0
|
||||
m_VSlider: 0
|
||||
m_IgnoreScrollWheelUntilClicked: 0
|
||||
m_EnableMouseInput: 0
|
||||
m_EnableMouseInput: 1
|
||||
m_EnableSliderZoomHorizontal: 0
|
||||
m_EnableSliderZoomVertical: 0
|
||||
m_UniformScale: 1
|
||||
@@ -1492,23 +1526,23 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 21
|
||||
width: 1295
|
||||
width: 989
|
||||
height: 876
|
||||
m_Scale: {x: 1, y: 1}
|
||||
m_Translation: {x: 647.5, y: 438}
|
||||
m_Translation: {x: 494.5, y: 438}
|
||||
m_MarginLeft: 0
|
||||
m_MarginRight: 0
|
||||
m_MarginTop: 0
|
||||
m_MarginBottom: 0
|
||||
m_LastShownAreaInsideMargins:
|
||||
serializedVersion: 2
|
||||
x: -647.5
|
||||
x: -494.5
|
||||
y: -438
|
||||
width: 1295
|
||||
width: 989
|
||||
height: 876
|
||||
m_MinimalGUI: 1
|
||||
m_defaultScale: 1
|
||||
m_LastWindowPixelSize: {x: 1295, y: 897}
|
||||
m_LastWindowPixelSize: {x: 989, y: 897}
|
||||
m_ClearInEditMode: 1
|
||||
m_NoCameraWarning: 1
|
||||
m_LowResolutionForAspectRatios: 01000000000000000000
|
||||
@@ -1538,7 +1572,7 @@ MonoBehaviour:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 1002
|
||||
width: 1490
|
||||
width: 1290
|
||||
height: 352
|
||||
m_SerializedDataModeController:
|
||||
m_DataMode: 0
|
||||
|
||||
Reference in New Issue
Block a user