서원석

구현코드 업로드(중간보고서 내용까지)

Showing 1000 changed files with 166 additions and 64 deletions

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.

No preview for this file type
No preview for this file type
...@@ -30,7 +30,7 @@ AnimatorState: ...@@ -30,7 +30,7 @@ AnimatorState:
30 m_PrefabInstance: {fileID: 0} 30 m_PrefabInstance: {fileID: 0}
31 m_PrefabAsset: {fileID: 0} 31 m_PrefabAsset: {fileID: 0}
32 m_Name: flyAnimation 32 m_Name: flyAnimation
33 - m_Speed: 8 33 + m_Speed: 16
34 m_CycleOffset: 0 34 m_CycleOffset: 0
35 m_Transitions: [] 35 m_Transitions: []
36 m_StateMachineBehaviours: [] 36 m_StateMachineBehaviours: []
......
...@@ -8,7 +8,6 @@ public class RaycastController : MonoBehaviour ...@@ -8,7 +8,6 @@ public class RaycastController : MonoBehaviour
8 8
9 public float maxDistanceRay= 100f; 9 public float maxDistanceRay= 100f;
10 public static RaycastController instance; 10 public static RaycastController instance;
11 - public Text birdName;
12 public Transform gunFlashTarget; 11 public Transform gunFlashTarget;
13 public float fireRate = 1.6f; 12 public float fireRate = 1.6f;
14 private bool nextShot = true; 13 private bool nextShot = true;
...@@ -16,21 +15,23 @@ public class RaycastController : MonoBehaviour ...@@ -16,21 +15,23 @@ public class RaycastController : MonoBehaviour
16 15
17 AudioSource audio; 16 AudioSource audio;
18 public AudioClip[] clips; 17 public AudioClip[] clips;
18 +
19 void Awake() { 19 void Awake() {
20 if (instance == null) { 20 if (instance == null) {
21 instance = this; 21 instance = this;
22 } 22 }
23 } 23 }
24 24
25 - public void playSound(int sound) {
26 - audio.clip = clips[sound];
27 - audio.Play();
28 - }
29 -
30 // Start is called before the first frame update 25 // Start is called before the first frame update
31 void Start() 26 void Start()
32 { 27 {
33 StartCoroutine(spawnNewBird()); 28 StartCoroutine(spawnNewBird());
29 + audio = GetComponent<AudioSource>();
30 + }
31 +
32 + public void playSound(int sound) {
33 + audio.clip = clips[sound];
34 + audio.Play();
34 } 35 }
35 36
36 // Update is called once per frame 37 // Update is called once per frame
...@@ -47,20 +48,23 @@ public class RaycastController : MonoBehaviour ...@@ -47,20 +48,23 @@ public class RaycastController : MonoBehaviour
47 } 48 }
48 49
49 private IEnumerator takeShot() { 50 private IEnumerator takeShot() {
51 +
52 + gunScript.instance.fireSound();
53 +
50 Ray ray = Camera.main.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0)); 54 Ray ray = Camera.main.ViewportPointToRay(new Vector3(0.5f, 0.5f, 0));
51 RaycastHit hit; 55 RaycastHit hit;
52 56
53 int layer_mask = LayerMask.GetMask("birdLayer"); 57 int layer_mask = LayerMask.GetMask("birdLayer");
54 if(Physics.Raycast(ray, out hit, maxDistanceRay, layer_mask)) { 58 if(Physics.Raycast(ray, out hit, maxDistanceRay, layer_mask)) {
59 +
55 //debug 60 //debug
56 objName = hit.collider.gameObject.name; 61 objName = hit.collider.gameObject.name;
57 - birdName.text = objName;
58 Vector3 birdPosition = hit.collider.gameObject.transform.position; 62 Vector3 birdPosition = hit.collider.gameObject.transform.position;
59 63
60 if(objName == "Bird_Asset(Clone)") { 64 if(objName == "Bird_Asset(Clone)") {
61 GameObject Boom = Instantiate(Resources.Load("boom", typeof(GameObject))) as GameObject; 65 GameObject Boom = Instantiate(Resources.Load("boom", typeof(GameObject))) as GameObject;
62 Boom.transform.position = birdPosition; 66 Boom.transform.position = birdPosition;
63 - 67 + playSound(1);
64 Destroy(hit.collider.gameObject); 68 Destroy(hit.collider.gameObject);
65 StartCoroutine(spawnNewBird()); 69 StartCoroutine(spawnNewBird());
66 StartCoroutine(clearBoom()); 70 StartCoroutine(clearBoom());
...@@ -72,6 +76,12 @@ public class RaycastController : MonoBehaviour ...@@ -72,6 +76,12 @@ public class RaycastController : MonoBehaviour
72 76
73 yield return new WaitForSeconds(fireRate); 77 yield return new WaitForSeconds(fireRate);
74 nextShot = true; 78 nextShot = true;
79 +
80 + GameObject[] gunSmokeGroup = GameObject.FindGameObjectsWithTag("GunSmoke");
81 + foreach (GameObject theSmoke in gunSmokeGroup) {
82 + Destroy(theSmoke.gameObject);
83 + }
84 +
75 } 85 }
76 private IEnumerator clearBoom() { 86 private IEnumerator clearBoom() {
77 yield return new WaitForSeconds(1.5f); 87 yield return new WaitForSeconds(1.5f);
...@@ -93,9 +103,9 @@ public class RaycastController : MonoBehaviour ...@@ -93,9 +103,9 @@ public class RaycastController : MonoBehaviour
93 103
94 //Random Start Position 104 //Random Start Position
95 Vector3 temp; 105 Vector3 temp;
96 - temp.x = Random.Range(-4.8f/2, 4.8f/2); 106 + temp.x = Random.Range(-2f, 2f);
97 - temp.y = Random.Range(1f/2, 5f/2); 107 + temp.y = Random.Range(1f, 3f);
98 - temp.z = Random.Range(-4.8f/2, 4.8f/2); 108 + temp.z = Random.Range(2f, 2f);
99 newBird.transform.position = new Vector3(temp.x,temp.y,temp.z); 109 newBird.transform.position = new Vector3(temp.x,temp.y,temp.z);
100 } 110 }
101 } 111 }
......
1 +using System.Collections;
2 +using System.Collections.Generic;
3 +using UnityEngine;
4 +
5 +public class gameController : MonoBehaviour
6 +{
7 + // Start is called before the first frame update
8 + void Start()
9 + {
10 +
11 + }
12 +
13 + // Update is called once per frame
14 + void Update()
15 + {
16 +
17 + }
18 +}
1 +fileFormatVersion: 2
2 +guid: 4c476f0c2b8ff4ba89a9f5603ce6cc4a
3 +MonoImporter:
4 + externalObjects: {}
5 + serializedVersion: 2
6 + defaultReferences: []
7 + executionOrder: 0
8 + icon: {instanceID: 0}
9 + userData:
10 + assetBundleName:
11 + assetBundleVariant:
1 +using System.Collections;
2 +using System.Collections.Generic;
3 +using UnityEngine;
4 +
5 +public class gunScript : MonoBehaviour
6 +{
7 +
8 + AudioSource audio;
9 + public static gunScript instance;
10 +
11 + void Awake() {
12 + if(instance == null) {
13 + instance = this;
14 + }
15 + }
16 +
17 + // Start is called before the first frame update
18 + void Start()
19 + {
20 + audio = GetComponent<AudioSource>();
21 + }
22 +
23 + public void fireSound() {
24 + audio.Play();
25 + }
26 +}
1 +fileFormatVersion: 2
2 +guid: 6dc1edebffd1f4db094497799c3153d8
3 +MonoImporter:
4 + externalObjects: {}
5 + serializedVersion: 2
6 + defaultReferences: []
7 + executionOrder: 0
8 + icon: {instanceID: 0}
9 + userData:
10 + assetBundleName:
11 + assetBundleVariant:
...@@ -18,9 +18,10 @@ public class targetcollider : MonoBehaviour ...@@ -18,9 +18,10 @@ public class targetcollider : MonoBehaviour
18 18
19 public void moveTarget() { 19 public void moveTarget() {
20 Vector3 temp; 20 Vector3 temp;
21 - temp.x = Random.Range(-4.8f/2, 4.8f/2); 21 + temp.x = Random.Range(-2f, 2f);
22 - temp.y = Random.Range(1f/2, 3f/2); 22 + temp.y = Random.Range(1f, 3f);
23 - temp.z = Random.Range(-4.8f/2, 4.8f/2); 23 + temp.z = Random.Range(-2f, 2f);
24 transform.position = new Vector3(temp.x,temp.y,temp.z); 24 transform.position = new Vector3(temp.x,temp.y,temp.z);
25 + RaycastController.instance.playSound(0);
25 } 26 }
26 } 27 }
......
...@@ -21,7 +21,7 @@ MonoBehaviour: ...@@ -21,7 +21,7 @@ MonoBehaviour:
21 m_ShowMode: 4 21 m_ShowMode: 4
22 m_Title: 22 m_Title:
23 m_RootView: {fileID: 6} 23 m_RootView: {fileID: 6}
24 - m_MinSize: {x: 875, y: 542} 24 + m_MinSize: {x: 875, y: 300}
25 m_MaxSize: {x: 10000, y: 10000} 25 m_MaxSize: {x: 10000, y: 10000}
26 m_Maximized: 0 26 m_Maximized: 0
27 --- !u!114 &2 27 --- !u!114 &2
...@@ -48,7 +48,7 @@ MonoBehaviour: ...@@ -48,7 +48,7 @@ MonoBehaviour:
48 m_MinSize: {x: 679, y: 492} 48 m_MinSize: {x: 679, y: 492}
49 m_MaxSize: {x: 14002, y: 14042} 49 m_MaxSize: {x: 14002, y: 14042}
50 vertical: 0 50 vertical: 0
51 - controlID: 108 51 + controlID: 58
52 --- !u!114 &3 52 --- !u!114 &3
53 MonoBehaviour: 53 MonoBehaviour:
54 m_ObjectHideFlags: 52 54 m_ObjectHideFlags: 52
...@@ -64,9 +64,9 @@ MonoBehaviour: ...@@ -64,9 +64,9 @@ MonoBehaviour:
64 m_Children: [] 64 m_Children: []
65 m_Position: 65 m_Position:
66 serializedVersion: 2 66 serializedVersion: 2
67 - x: 822 67 + x: 823
68 y: 0 68 y: 0
69 - width: 415 69 + width: 414
70 height: 705 70 height: 705
71 m_MinSize: {x: 276, y: 71} 71 m_MinSize: {x: 276, y: 71}
72 m_MaxSize: {x: 4001, y: 4021} 72 m_MaxSize: {x: 4001, y: 4021}
...@@ -92,7 +92,7 @@ MonoBehaviour: ...@@ -92,7 +92,7 @@ MonoBehaviour:
92 serializedVersion: 2 92 serializedVersion: 2
93 x: 0 93 x: 0
94 y: 0 94 y: 0
95 - width: 251 95 + width: 252
96 height: 427 96 height: 427
97 m_MinSize: {x: 201, y: 221} 97 m_MinSize: {x: 201, y: 221}
98 m_MaxSize: {x: 4001, y: 4021} 98 m_MaxSize: {x: 4001, y: 4021}
...@@ -118,7 +118,7 @@ MonoBehaviour: ...@@ -118,7 +118,7 @@ MonoBehaviour:
118 serializedVersion: 2 118 serializedVersion: 2
119 x: 0 119 x: 0
120 y: 427 120 y: 427
121 - width: 822 121 + width: 823
122 height: 278 122 height: 278
123 m_MinSize: {x: 231, y: 271} 123 m_MinSize: {x: 231, y: 271}
124 m_MaxSize: {x: 10001, y: 10021} 124 m_MaxSize: {x: 10001, y: 10021}
...@@ -214,12 +214,12 @@ MonoBehaviour: ...@@ -214,12 +214,12 @@ MonoBehaviour:
214 serializedVersion: 2 214 serializedVersion: 2
215 x: 0 215 x: 0
216 y: 0 216 y: 0
217 - width: 822 217 + width: 823
218 height: 705 218 height: 705
219 m_MinSize: {x: 403, y: 492} 219 m_MinSize: {x: 403, y: 492}
220 m_MaxSize: {x: 10001, y: 14042} 220 m_MaxSize: {x: 10001, y: 14042}
221 vertical: 1 221 vertical: 1
222 - controlID: 109 222 + controlID: 59
223 --- !u!114 &10 223 --- !u!114 &10
224 MonoBehaviour: 224 MonoBehaviour:
225 m_ObjectHideFlags: 52 225 m_ObjectHideFlags: 52
...@@ -239,12 +239,12 @@ MonoBehaviour: ...@@ -239,12 +239,12 @@ MonoBehaviour:
239 serializedVersion: 2 239 serializedVersion: 2
240 x: 0 240 x: 0
241 y: 0 241 y: 0
242 - width: 822 242 + width: 823
243 height: 427 243 height: 427
244 m_MinSize: {x: 403, y: 221} 244 m_MinSize: {x: 403, y: 221}
245 m_MaxSize: {x: 8003, y: 4021} 245 m_MaxSize: {x: 8003, y: 4021}
246 vertical: 0 246 vertical: 0
247 - controlID: 110 247 + controlID: 60
248 --- !u!114 &11 248 --- !u!114 &11
249 MonoBehaviour: 249 MonoBehaviour:
250 m_ObjectHideFlags: 52 250 m_ObjectHideFlags: 52
...@@ -260,7 +260,7 @@ MonoBehaviour: ...@@ -260,7 +260,7 @@ MonoBehaviour:
260 m_Children: [] 260 m_Children: []
261 m_Position: 261 m_Position:
262 serializedVersion: 2 262 serializedVersion: 2
263 - x: 251 263 + x: 252
264 y: 0 264 y: 0
265 width: 571 265 width: 571
266 height: 427 266 height: 427
...@@ -290,15 +290,15 @@ MonoBehaviour: ...@@ -290,15 +290,15 @@ MonoBehaviour:
290 m_MaxSize: {x: 4000, y: 4000} 290 m_MaxSize: {x: 4000, y: 4000}
291 m_TitleContent: 291 m_TitleContent:
292 m_Text: Animator 292 m_Text: Animator
293 - m_Image: {fileID: -6973158847631862895, guid: 0000000000000000d000000000000000, 293 + m_Image: {fileID: 663490763026382308, guid: 0000000000000000d000000000000000,
294 type: 0} 294 type: 0}
295 m_Tooltip: 295 m_Tooltip:
296 m_Pos: 296 m_Pos:
297 serializedVersion: 2 297 serializedVersion: 2
298 - x: 280 298 + x: 260
299 - y: 75 299 + y: 30
300 - width: 722 300 + width: 589
301 - height: 405 301 + height: 433
302 m_ViewDataDictionary: {fileID: 0} 302 m_ViewDataDictionary: {fileID: 0}
303 m_ViewTransforms: 303 m_ViewTransforms:
304 m_KeySerializationHelper: 304 m_KeySerializationHelper:
...@@ -371,7 +371,7 @@ MonoBehaviour: ...@@ -371,7 +371,7 @@ MonoBehaviour:
371 m_MaxSize: {x: 2048, y: 2048} 371 m_MaxSize: {x: 2048, y: 2048}
372 m_TitleContent: 372 m_TitleContent:
373 m_Text: Asset Store 373 m_Text: Asset Store
374 - m_Image: {fileID: -4391848389275900105, guid: 0000000000000000d000000000000000, 374 + m_Image: {fileID: 357073275683767465, guid: 0000000000000000d000000000000000,
375 type: 0} 375 type: 0}
376 m_Tooltip: 376 m_Tooltip:
377 m_Pos: 377 m_Pos:
...@@ -397,14 +397,14 @@ MonoBehaviour: ...@@ -397,14 +397,14 @@ MonoBehaviour:
397 m_MaxSize: {x: 10000, y: 10000} 397 m_MaxSize: {x: 10000, y: 10000}
398 m_TitleContent: 398 m_TitleContent:
399 m_Text: Project 399 m_Text: Project
400 - m_Image: {fileID: -2032128904892744680, guid: 0000000000000000d000000000000000, 400 + m_Image: {fileID: -7501376956915960154, guid: 0000000000000000d000000000000000,
401 type: 0} 401 type: 0}
402 m_Tooltip: 402 m_Tooltip:
403 m_Pos: 403 m_Pos:
404 serializedVersion: 2 404 serializedVersion: 2
405 x: 43 405 x: 43
406 y: 502 406 y: 502
407 - width: 821 407 + width: 822
408 height: 257 408 height: 257
409 m_ViewDataDictionary: {fileID: 0} 409 m_ViewDataDictionary: {fileID: 0}
410 m_SearchFilter: 410 m_SearchFilter:
...@@ -420,20 +420,20 @@ MonoBehaviour: ...@@ -420,20 +420,20 @@ MonoBehaviour:
420 m_SkipHidden: 0 420 m_SkipHidden: 0
421 m_SearchArea: 1 421 m_SearchArea: 1
422 m_Folders: 422 m_Folders:
423 - - Assets/Resources 423 + - Assets/Sounds
424 m_ViewMode: 1 424 m_ViewMode: 1
425 m_StartGridSize: 64 425 m_StartGridSize: 64
426 m_LastFolders: 426 m_LastFolders:
427 - - Assets/Resources 427 + - Assets/Sounds
428 m_LastFoldersGridSize: -1 428 m_LastFoldersGridSize: -1
429 m_LastProjectPath: /Users/sws/Duck Hunter AR 429 m_LastProjectPath: /Users/sws/Duck Hunter AR
430 m_LockTracker: 430 m_LockTracker:
431 m_IsLocked: 0 431 m_IsLocked: 0
432 m_FolderTreeState: 432 m_FolderTreeState:
433 - scrollPos: {x: 0, y: 79} 433 + scrollPos: {x: 0, y: 78.36273}
434 - m_SelectedIDs: a83a0000 434 + m_SelectedIDs: 3a3b0000
435 - m_LastClickedID: 15016 435 + m_LastClickedID: 15162
436 - m_ExpandedIDs: 00000000883a000000ca9a3b 436 + m_ExpandedIDs: 000000000c3b00000e3b0000103b000000ca9a3b
437 m_RenameOverlay: 437 m_RenameOverlay:
438 m_UserAcceptedRename: 0 438 m_UserAcceptedRename: 0
439 m_Name: 439 m_Name:
...@@ -461,7 +461,7 @@ MonoBehaviour: ...@@ -461,7 +461,7 @@ MonoBehaviour:
461 scrollPos: {x: 0, y: 0} 461 scrollPos: {x: 0, y: 0}
462 m_SelectedIDs: 462 m_SelectedIDs:
463 m_LastClickedID: 0 463 m_LastClickedID: 0
464 - m_ExpandedIDs: 00000000883a0000 464 + m_ExpandedIDs: 000000000c3b00000e3b0000103b0000
465 m_RenameOverlay: 465 m_RenameOverlay:
466 m_UserAcceptedRename: 0 466 m_UserAcceptedRename: 0
467 m_Name: 467 m_Name:
...@@ -533,14 +533,14 @@ MonoBehaviour: ...@@ -533,14 +533,14 @@ MonoBehaviour:
533 m_MaxSize: {x: 4000, y: 4000} 533 m_MaxSize: {x: 4000, y: 4000}
534 m_TitleContent: 534 m_TitleContent:
535 m_Text: Inspector 535 m_Text: Inspector
536 - m_Image: {fileID: 8356117983803934776, guid: 0000000000000000d000000000000000, 536 + m_Image: {fileID: -6905738622615590433, guid: 0000000000000000d000000000000000,
537 type: 0} 537 type: 0}
538 m_Tooltip: 538 m_Tooltip:
539 m_Pos: 539 m_Pos:
540 serializedVersion: 2 540 serializedVersion: 2
541 - x: 865 541 + x: 866
542 y: 75 542 y: 75
543 - width: 414 543 + width: 413
544 height: 684 544 height: 684
545 m_ViewDataDictionary: {fileID: 0} 545 m_ViewDataDictionary: {fileID: 0}
546 m_OpenAddComponentMenu: 0 546 m_OpenAddComponentMenu: 0
...@@ -571,14 +571,14 @@ MonoBehaviour: ...@@ -571,14 +571,14 @@ MonoBehaviour:
571 m_MaxSize: {x: 4000, y: 4000} 571 m_MaxSize: {x: 4000, y: 4000}
572 m_TitleContent: 572 m_TitleContent:
573 m_Text: Hierarchy 573 m_Text: Hierarchy
574 - m_Image: {fileID: -9000905672528348964, guid: 0000000000000000d000000000000000, 574 + m_Image: {fileID: -590624980919486359, guid: 0000000000000000d000000000000000,
575 type: 0} 575 type: 0}
576 m_Tooltip: 576 m_Tooltip:
577 m_Pos: 577 m_Pos:
578 serializedVersion: 2 578 serializedVersion: 2
579 x: 43 579 x: 43
580 y: 75 580 y: 75
581 - width: 250 581 + width: 251
582 height: 406 582 height: 406
583 m_ViewDataDictionary: {fileID: 0} 583 m_ViewDataDictionary: {fileID: 0}
584 m_SceneHierarchy: 584 m_SceneHierarchy:
...@@ -586,21 +586,21 @@ MonoBehaviour: ...@@ -586,21 +586,21 @@ MonoBehaviour:
586 scrollPos: {x: 0, y: 0} 586 scrollPos: {x: 0, y: 0}
587 m_SelectedIDs: 587 m_SelectedIDs:
588 m_LastClickedID: 0 588 m_LastClickedID: 0
589 - m_ExpandedIDs: 60fbffff 589 + m_ExpandedIDs: 22f1ffff3ef1ffff26f4ffff34f4ffff68fbfffff2390000123a0000663a0000
590 m_RenameOverlay: 590 m_RenameOverlay:
591 m_UserAcceptedRename: 0 591 m_UserAcceptedRename: 0
592 - m_Name: 592 + m_Name: Landscape
593 - m_OriginalName: 593 + m_OriginalName: Landscape
594 m_EditFieldRect: 594 m_EditFieldRect:
595 serializedVersion: 2 595 serializedVersion: 2
596 x: 0 596 x: 0
597 y: 0 597 y: 0
598 width: 0 598 width: 0
599 height: 0 599 height: 0
600 - m_UserData: 0 600 + m_UserData: 14834
601 m_IsWaitingForDelay: 0 601 m_IsWaitingForDelay: 0
602 m_IsRenaming: 0 602 m_IsRenaming: 0
603 - m_OriginalEventType: 11 603 + m_OriginalEventType: 0
604 m_IsRenamingFilename: 0 604 m_IsRenamingFilename: 0
605 m_ClientGUIView: {fileID: 4} 605 m_ClientGUIView: {fileID: 4}
606 m_SearchString: 606 m_SearchString:
...@@ -626,12 +626,12 @@ MonoBehaviour: ...@@ -626,12 +626,12 @@ MonoBehaviour:
626 m_MaxSize: {x: 4000, y: 4000} 626 m_MaxSize: {x: 4000, y: 4000}
627 m_TitleContent: 627 m_TitleContent:
628 m_Text: Scene 628 m_Text: Scene
629 - m_Image: {fileID: -131512000283675692, guid: 0000000000000000d000000000000000, 629 + m_Image: {fileID: 2318424515335265636, guid: 0000000000000000d000000000000000,
630 type: 0} 630 type: 0}
631 m_Tooltip: 631 m_Tooltip:
632 m_Pos: 632 m_Pos:
633 serializedVersion: 2 633 serializedVersion: 2
634 - x: 294 634 + x: 295
635 y: 75 635 y: 75
636 width: 569 636 width: 569
637 height: 406 637 height: 406
...@@ -646,9 +646,9 @@ MonoBehaviour: ...@@ -646,9 +646,9 @@ MonoBehaviour:
646 m_PlayAudio: 0 646 m_PlayAudio: 0
647 m_AudioPlay: 0 647 m_AudioPlay: 0
648 m_Position: 648 m_Position:
649 - m_Target: {x: -0.3424908, y: 6.095478, z: -0.054552317} 649 + m_Target: {x: 0.14776051, y: 0.14266396, z: -0.2225892}
650 speed: 2 650 speed: 2
651 - m_Value: {x: -0.3424908, y: 6.095478, z: -0.054552317} 651 + m_Value: {x: 0.14776051, y: 0.14266396, z: -0.2225892}
652 m_RenderMode: 0 652 m_RenderMode: 0
653 m_CameraMode: 653 m_CameraMode:
654 drawMode: 0 654 drawMode: 0
...@@ -694,13 +694,13 @@ MonoBehaviour: ...@@ -694,13 +694,13 @@ MonoBehaviour:
694 m_GridAxis: 1 694 m_GridAxis: 1
695 m_gridOpacity: 0.5 695 m_gridOpacity: 0.5
696 m_Rotation: 696 m_Rotation:
697 - m_Target: {x: -0.25960436, y: 0.5711201, z: -0.19677876, w: -0.7534632} 697 + m_Target: {x: -0.494238, y: 0.5050252, z: -0.48078093, w: -0.5191611}
698 speed: 2 698 speed: 2
699 - m_Value: {x: -0.25960422, y: 0.5711197, z: -0.19677864, w: -0.75346273} 699 + m_Value: {x: -0.49423793, y: 0.50502515, z: -0.48078087, w: -0.51916105}
700 m_Size: 700 m_Size:
701 - m_Target: 3.6011362 701 + m_Target: 2.888471
702 speed: 2 702 speed: 2
703 - m_Value: 3.6011362 703 + m_Value: 2.888472
704 m_Ortho: 704 m_Ortho:
705 m_Target: 0 705 m_Target: 0
706 speed: 2 706 speed: 2
...@@ -718,7 +718,7 @@ MonoBehaviour: ...@@ -718,7 +718,7 @@ MonoBehaviour:
718 m_FarClip: 10000 718 m_FarClip: 10000
719 m_DynamicClip: 1 719 m_DynamicClip: 1
720 m_OcclusionCulling: 0 720 m_OcclusionCulling: 0
721 - m_LastSceneViewRotation: {x: -0.25960436, y: 0.5711201, z: -0.19677876, w: -0.7534632} 721 + m_LastSceneViewRotation: {x: -0.08717229, y: 0.89959055, z: -0.21045254, w: -0.3726226}
722 m_LastSceneViewOrtho: 0 722 m_LastSceneViewOrtho: 0
723 m_ReplacementShader: {fileID: 0} 723 m_ReplacementShader: {fileID: 0}
724 m_ReplacementString: 724 m_ReplacementString:
...@@ -741,12 +741,12 @@ MonoBehaviour: ...@@ -741,12 +741,12 @@ MonoBehaviour:
741 m_MaxSize: {x: 4000, y: 4000} 741 m_MaxSize: {x: 4000, y: 4000}
742 m_TitleContent: 742 m_TitleContent:
743 m_Text: Game 743 m_Text: Game
744 - m_Image: {fileID: 257045534191678443, guid: 0000000000000000d000000000000000, 744 + m_Image: {fileID: -2087823869225018852, guid: 0000000000000000d000000000000000,
745 type: 0} 745 type: 0}
746 m_Tooltip: 746 m_Tooltip:
747 m_Pos: 747 m_Pos:
748 serializedVersion: 2 748 serializedVersion: 2
749 - x: 294 749 + x: 295
750 y: 75 750 y: 75
751 width: 569 751 width: 569
752 height: 406 752 height: 406
...@@ -786,7 +786,7 @@ MonoBehaviour: ...@@ -786,7 +786,7 @@ MonoBehaviour:
786 m_HSlider: 0 786 m_HSlider: 0
787 m_VSlider: 0 787 m_VSlider: 0
788 m_IgnoreScrollWheelUntilClicked: 0 788 m_IgnoreScrollWheelUntilClicked: 0
789 - m_EnableMouseInput: 0 789 + m_EnableMouseInput: 1
790 m_EnableSliderZoomHorizontal: 0 790 m_EnableSliderZoomHorizontal: 0
791 m_EnableSliderZoomVertical: 0 791 m_EnableSliderZoomVertical: 0
792 m_UniformScale: 1 792 m_UniformScale: 1
...@@ -833,7 +833,7 @@ MonoBehaviour: ...@@ -833,7 +833,7 @@ MonoBehaviour:
833 m_MaxSize: {x: 4000, y: 4000} 833 m_MaxSize: {x: 4000, y: 4000}
834 m_TitleContent: 834 m_TitleContent:
835 m_Text: Console 835 m_Text: Console
836 - m_Image: {fileID: -3303252850963283158, guid: 0000000000000000d000000000000000, 836 + m_Image: {fileID: 111653112392082826, guid: 0000000000000000d000000000000000,
837 type: 0} 837 type: 0}
838 m_Tooltip: 838 m_Tooltip:
839 m_Pos: 839 m_Pos:
...@@ -843,3 +843,28 @@ MonoBehaviour: ...@@ -843,3 +843,28 @@ MonoBehaviour:
843 width: 850 843 width: 850
844 height: 275 844 height: 275
845 m_ViewDataDictionary: {fileID: 0} 845 m_ViewDataDictionary: {fileID: 0}
846 +--- !u!114 &20
847 +MonoBehaviour:
848 + m_ObjectHideFlags: 52
849 + m_CorrespondingSourceObject: {fileID: 0}
850 + m_PrefabInstance: {fileID: 0}
851 + m_PrefabAsset: {fileID: 0}
852 + m_GameObject: {fileID: 0}
853 + m_Enabled: 1
854 + m_EditorHideFlags: 0
855 + m_Script: {fileID: 12059, guid: 0000000000000000e000000000000000, type: 0}
856 + m_Name:
857 + m_EditorClassIdentifier: UnityEditor:UnityEditor.Experimental.TerrainAPI:PaintTextureTool
858 + m_MinSize: {x: 100, y: 100}
859 + m_MaxSize: {x: 4000, y: 4000}
860 + m_TitleContent:
861 + m_Text: Failed to load
862 + m_Image: {fileID: 0}
863 + m_Tooltip:
864 + m_Pos:
865 + serializedVersion: 2
866 + x: 0
867 + y: 0
868 + width: 320
869 + height: 550
870 + m_ViewDataDictionary: {fileID: 0}
......