-
Notifications
You must be signed in to change notification settings - Fork 0
/
typescript
137 lines (110 loc) · 7.48 KB
/
typescript
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
Script started on Fri Nov 6 12:02:22 2015
l[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=lls[?1l>
]2;ls -G]1;lsAssembly-CSharp.csproj README.md [1m[36mTemp[39;49m[0m
[1m[36mAssets[39;49m[0m [1m[36mScript[39;49m[0m typescript
[1m[36mLibrary[39;49m[0m StarPoo.sln
[1m[36mProjectSettings[39;49m[0m StarPoo.userprefs
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=SScript[?1l>
]2;Script]1;Script[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo/Script]1;..tarpoo/Script[0m[27m[24m[J[01;32m➜ [01;32m [36mScript [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=lls[?1l>
]2;ls -G]1;lsaaaaaaaaaaa - 복사본 (2).js
aaaaaaaaaaa - 복사본.js
aaaaaaaaaaa.js
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo/Script]1;..tarpoo/Script[0m[27m[24m[J[01;32m➜ [01;32m [36mScript [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=...[?1l>
]2;..]1;..[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=lls[?1l>
]2;ls -G]1;lsAssembly-CSharp.csproj README.md [1m[36mTemp[39;49m[0m
[1m[36mAssets[39;49m[0m [1m[36mScript[39;49m[0m typescript
[1m[36mLibrary[39;49m[0m StarPoo.sln
[1m[36mProjectSettings[39;49m[0m StarPoo.userprefs
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=ggjit g ggit status[?1l>
]2;git status]1;gitOn branch feature/MakeTeamScene
Your branch is up-to-date with 'origin/feature/MakeTeamScene'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
[31mmodified: Assets/JavaScriptLoader.cs[m
[31mmodified: Assets/Scenes/MakeTeam.unity[m
Untracked files:
(use "git add <file>..." to include in what will be committed)
[31mAssets/Resources/TeamPannel.prefab[m
[31mAssets/Resources/TeamPannel.prefab.meta[m
[31mAssets/TeamListPannel.cs[m
[31mAssets/TeamListPannel.cs.meta[m
[31mtypescript[m
no changes added to commit (use "git add" and/or "git commit -a")
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=ggcg gga --all[?1l>
]2;git add --all]1;ga[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=ggc -m "d ㅇ c b team add/remove btn"[?1l>
]2;git commit -v -m "team add/remove btn"]1;gc[feature/MakeTeamScene 2285f4b] team add/remove btn
7 files changed, 638 insertions(+), 212 deletions(-)
create mode 100644 Assets/Resources/TeamPannel.prefab
create mode 100644 Assets/Resources/TeamPannel.prefab.meta
create mode 100644 Assets/TeamListPannel.cs
create mode 100644 Assets/TeamListPannel.cs.meta
create mode 100644 typescript
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=ggp origin feature/MakeTeamScene [?1l>
]2;git push origin feature/MakeTeamScene]1;gpCounting objects: 12, done.
Delta compression using up to 8 threads.
Compressing objects: 8% (1/12) Compressing objects: 16% (2/12) Compressing objects: 25% (3/12) Compressing objects: 33% (4/12) Compressing objects: 41% (5/12) Compressing objects: 50% (6/12) Compressing objects: 58% (7/12) Compressing objects: 66% (8/12) Compressing objects: 75% (9/12) Compressing objects: 83% (10/12) Compressing objects: 91% (11/12) Compressing objects: 100% (12/12) Compressing objects: 100% (12/12), done.
Writing objects: 8% (1/12) Writing objects: 16% (2/12) Writing objects: 25% (3/12) Writing objects: 33% (4/12) Writing objects: 41% (5/12) Writing objects: 50% (6/12) Writing objects: 58% (7/12) Writing objects: 66% (8/12) Writing objects: 75% (9/12) Writing objects: 83% (10/12) Writing objects: 91% (11/12) Writing objects: 100% (12/12) Writing objects: 100% (12/12), 3.98 KiB | 0 bytes/s, done.
Total 12 (delta 7), reused 0 (delta 0)
To [email protected]:oopartians/SpaceBattle.git
431c783..2285f4b feature/MakeTeamScene -> feature/MakeTeamScene
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=ㅎ ggit a status[?1l>
]2;git status]1;gitOn branch feature/MakeTeamScene
Your branch is up-to-date with 'origin/feature/MakeTeamScene'.
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
[31mmodified: Assets/Fleet.cs[m
[31mmodified: Assets/JavaScriptLoader.cs[m
[31mmodified: Assets/Match.cs[m
[31mmodified: Assets/Team.cs[m
[31mmodified: Assets/TeamListPannel.cs[m
[31mmodified: typescript[m
no changes added to commit (use "git add" and/or "git commit -a")
[1m[7m%[27m[1m[0m ]2;gameegg@gameeggui-MacBook-Pro: ~/Develop/Unity/starpoo]1;..Unity/starpoo[0m[27m[24m[J[01;32m➜ [01;32m [36mstarpoo [01;34mgit:([31mfeature/MakeTeamScene[34m) [33m✗[00m[00m[01;34m [00m[K[?1h=g