Skip to content

Commit 91315a4

Browse files
authored
Merge pull request #7014 from planetarium/feature/world9
Feature/world9
2 parents 3b569d7 + cade076 commit 91315a4

File tree

513 files changed

+118837
-11688
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

513 files changed

+118837
-11688
lines changed
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: FallDown
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 92abe0399f8f1e641a7f1bce1fa50880, type: 2}
16+
animationName: FallDown

nekoyume/Assets/AddressableAssets/Character/Monster/203007/ReferenceAssets/FallDown.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Runaway
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 92abe0399f8f1e641a7f1bce1fa50880, type: 2}
16+
animationName: Runaway

nekoyume/Assets/AddressableAssets/Character/Monster/203007/ReferenceAssets/Runaway.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Attack
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Attack

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Attack.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Casting
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Casting

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Casting.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Die
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Die

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Die.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Hit
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Hit

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Hit.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Idle
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Idle

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Idle.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 6e3e95a05e4c9774397eeeb7bdee8ccb, type: 3}
13+
m_Name: Run
14+
m_EditorClassIdentifier:
15+
skeletonDataAsset: {fileID: 11400000, guid: 769f17a7e6b32dc4788300bdffd8afbf, type: 2}
16+
animationName: Run

nekoyume/Assets/AddressableAssets/Character/Monster/209002/ReferenceAssets/Run.asset.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

nekoyume/Assets/AddressableAssets/Character/Monster/210000.meta

Lines changed: 8 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
210000.png
2+
size:1024,128
3+
filter:Linear,Linear
4+
pma:true
5+
arm_L
6+
bounds:417,63,93,63
7+
offsets:1,1,95,65
8+
arm_R
9+
bounds:139,15,68,130
10+
offsets:1,1,70,132
11+
rotate:90
12+
body_01
13+
bounds:836,2,71,60
14+
body_02-1
15+
bounds:2,21,135,105
16+
body_02-2
17+
bounds:909,2,60,35
18+
rotate:90
19+
body_02-3
20+
bounds:512,26,83,33
21+
body_03
22+
bounds:271,2,66,70
23+
rotate:90
24+
face
25+
bounds:343,2,66,54
26+
offsets:1,1,68,56
27+
rotate:90
28+
face2
29+
bounds:946,13,66,54
30+
offsets:1,1,68,56
31+
rotate:90
32+
finger_L_01
33+
bounds:767,28,24,28
34+
offsets:1,1,26,30
35+
rotate:90
36+
finger_L_02
37+
bounds:686,2,19,21
38+
offsets:1,1,21,23
39+
finger_L_03
40+
bounds:729,27,25,36
41+
offsets:1,1,27,38
42+
rotate:90
43+
finger_L_04
44+
bounds:512,2,36,22
45+
offsets:1,1,38,24
46+
finger_L_05
47+
bounds:797,17,15,35
48+
offsets:1,2,17,38
49+
finger_L_06
50+
bounds:814,26,26,19
51+
offsets:1,1,28,21
52+
rotate:90
53+
finger_L_07
54+
bounds:271,70,13,25
55+
offsets:1,1,15,27
56+
rotate:90
57+
finger_L_08
58+
bounds:1002,46,23,20
59+
offsets:1,1,25,22
60+
rotate:90
61+
finger_R_01
62+
bounds:94,7,12,32
63+
offsets:1,1,14,34
64+
rotate:90
65+
finger_R_02
66+
bounds:74,2,18,17
67+
offsets:1,1,20,19
68+
finger_R_03
69+
bounds:686,25,27,41
70+
offsets:1,1,29,43
71+
rotate:90
72+
finger_R_04
73+
bounds:797,2,13,17
74+
offsets:1,1,15,19
75+
rotate:90
76+
finger_R_05
77+
bounds:550,2,22,36
78+
offsets:1,1,24,38
79+
rotate:90
80+
finger_R_06
81+
bounds:914,65,25,14
82+
offsets:1,1,27,16
83+
finger_R_07
84+
bounds:767,2,28,24
85+
hand_L
86+
bounds:597,15,44,49
87+
offsets:1,1,46,51
88+
rotate:90
89+
hand_R
90+
bounds:648,24,36,35
91+
offsets:1,1,38,37
92+
head2
93+
bounds:764,54,70,72
94+
head3
95+
bounds:399,8,53,73
96+
rotate:90
97+
head4
98+
bounds:648,12,10,16
99+
offsets:1,1,12,18
100+
rotate:90
101+
head_02
102+
bounds:688,54,74,72
103+
offsets:1,2,76,75
104+
leaf_01
105+
bounds:707,13,19,10
106+
offsets:1,1,21,12
107+
leaf_02
108+
bounds:1002,13,31,18
109+
offsets:1,1,33,20
110+
rotate:90
111+
leg_01
112+
bounds:836,64,62,76
113+
rotate:90
114+
leg_02
115+
bounds:299,70,116,56
116+
leg_03
117+
bounds:474,7,54,36
118+
rotate:90
119+
leg_04
120+
bounds:2,5,70,14
121+
leg_05
122+
bounds:914,81,86,45
123+
leg_06
124+
bounds:1002,71,55,18
125+
rotate:90
126+
shadow
127+
bounds:139,85,158,41
128+
offsets:2,1,162,44
129+
shoulder_L
130+
bounds:512,61,89,65
131+
offsets:1,1,91,67
132+
shoulder_R
133+
bounds:603,61,83,65
134+
offsets:1,1,85,67

nekoyume/Assets/AddressableAssets/Character/Monster/210000/210000.atlas.txt.meta

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
Loading

0 commit comments

Comments
 (0)