-
Notifications
You must be signed in to change notification settings - Fork 156
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #5377 from planetarium/merge/release-200.0.5-to-main
Merge/release 200.0.5 to main
- Loading branch information
Showing
1,107 changed files
with
766,667 additions
and
38,462 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
8 changes: 8 additions & 0 deletions
8
nekoyume/Assets/AddressableAssets/Character/Monster/211000.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
153 changes: 153 additions & 0 deletions
153
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.atlas.txt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,153 @@ | ||
211000.png | ||
size:2048,1024 | ||
filter:Linear,Linear | ||
pma:true | ||
arm_L | ||
bounds:451,630,247,392 | ||
arm_R | ||
bounds:2,560,447,462 | ||
body_01 | ||
bounds:1660,756,295,266 | ||
offsets:0,2,296,268 | ||
body_02 | ||
bounds:449,214,216,258 | ||
rotate:90 | ||
dust_01 | ||
bounds:446,8,121,102 | ||
offsets:3,3,126,106 | ||
dust_02 | ||
bounds:569,4,113,106 | ||
offsets:2,0,117,106 | ||
effect_01 | ||
bounds:285,2,62,57 | ||
offsets:2,1,67,60 | ||
rotate:90 | ||
effect_03 | ||
bounds:1157,353,195,144 | ||
offsets:14,13,219,171 | ||
rotate:90 | ||
eye | ||
bounds:1957,758,78,72 | ||
offsets:5,3,87,79 | ||
face_01-1 | ||
bounds:959,98,237,192 | ||
offsets:2,1,241,194 | ||
face_01-2 | ||
bounds:709,142,196,248 | ||
offsets:1,0,198,250 | ||
rotate:90 | ||
face_01-3 | ||
bounds:1746,89,65,45 | ||
offsets:1,1,67,47 | ||
face_01-4 | ||
bounds:1317,547,269,200 | ||
offsets:1,1,271,202 | ||
face_01-5 | ||
bounds:700,749,318,273 | ||
offsets:2,2,321,276 | ||
face_02-1 | ||
bounds:1414,114,237,187 | ||
offsets:2,1,241,189 | ||
rotate:90 | ||
face_02-2 | ||
bounds:451,432,196,247 | ||
offsets:1,1,198,250 | ||
rotate:90 | ||
face_02-3 | ||
bounds:1746,136,65,51 | ||
offsets:1,1,67,53 | ||
face_02-4 | ||
bounds:709,340,248,199 | ||
offsets:1,1,250,201 | ||
face_02-5 | ||
bounds:1020,749,318,273 | ||
offsets:2,2,321,276 | ||
face_03-1 | ||
bounds:1910,586,168,136 | ||
offsets:0,0,169,136 | ||
rotate:90 | ||
face_03-4 | ||
bounds:1603,171,193,139 | ||
rotate:90 | ||
finger_01_L | ||
bounds:2,2,62,155 | ||
rotate:90 | ||
finger_01_R | ||
bounds:1957,832,78,190 | ||
finger_02_L | ||
bounds:1955,245,104,83 | ||
rotate:90 | ||
finger_02_R | ||
bounds:1847,245,106,104 | ||
finger_03_L | ||
bounds:1409,42,70,160 | ||
rotate:90 | ||
finger_03_R | ||
bounds:1588,530,94,217 | ||
finger_04_L | ||
bounds:1070,9,87,101 | ||
rotate:90 | ||
finger_04_R | ||
bounds:799,27,99,113 | ||
finger_05_L | ||
bounds:159,5,59,124 | ||
rotate:90 | ||
finger_05_R | ||
bounds:1198,23,98,209 | ||
rotate:90 | ||
finger_06_L | ||
bounds:379,13,65,60 | ||
finger_06_R | ||
bounds:1744,255,109,101 | ||
rotate:90 | ||
finger_07_L | ||
bounds:900,54,47,86 | ||
finger_07_R | ||
bounds:379,75,65,111 | ||
finger_08_L | ||
bounds:1744,189,83,64 | ||
finger_08_R | ||
bounds:949,9,119,87 | ||
hand_L | ||
bounds:1755,369,183,126 | ||
rotate:90 | ||
hand_R | ||
bounds:1542,366,211,162 | ||
head_01-1 | ||
bounds:1303,353,237,192 | ||
offsets:2,1,241,194 | ||
head_01-2 | ||
bounds:959,292,196,247 | ||
offsets:1,1,198,250 | ||
head_01-3 | ||
bounds:1746,42,65,45 | ||
offsets:1,1,67,47 | ||
head_01-4 | ||
bounds:1042,550,273,197 | ||
offsets:1,1,275,199 | ||
head_01-5 | ||
bounds:1340,749,318,273 | ||
offsets:2,2,321,276 | ||
head_01-6 | ||
bounds:1198,123,214,228 | ||
head_02 | ||
bounds:700,541,340,206 | ||
head_03 | ||
bounds:1684,554,224,200 | ||
offsets:1,0,225,200 | ||
head_04 | ||
bounds:1883,351,117,201 | ||
offsets:0,1,118,204 | ||
head_05 | ||
bounds:449,112,100,216 | ||
offsets:0,7,100,225 | ||
rotate:90 | ||
neck | ||
bounds:684,27,113,113 | ||
shadow | ||
bounds:2,66,375,120 | ||
shoulder_L | ||
bounds:1603,13,141,156 | ||
offsets:0,1,142,157 | ||
shoulder_R | ||
bounds:2,188,445,370 |
7 changes: 7 additions & 0 deletions
7
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.atlas.txt.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file added
BIN
+1.98 MB
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
111 changes: 111 additions & 0 deletions
111
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.png.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Binary file added
BIN
+115 KB
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.skel.bytes
Binary file not shown.
7 changes: 7 additions & 0 deletions
7
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000.skel.bytes.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
19 changes: 19 additions & 0 deletions
19
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000_Atlas.asset
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!114 &11400000 | ||
MonoBehaviour: | ||
m_ObjectHideFlags: 0 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_GameObject: {fileID: 0} | ||
m_Enabled: 1 | ||
m_EditorHideFlags: 0 | ||
m_Script: {fileID: 11500000, guid: a6b194f808b1af6499c93410e504af42, type: 3} | ||
m_Name: 211000_Atlas | ||
m_EditorClassIdentifier: | ||
textureLoadingMode: 0 | ||
onDemandTextureLoader: {fileID: 0} | ||
atlasFile: {fileID: 4900000, guid: 7180ba348e5c08845afc1148a93bfc8f, type: 3} | ||
materials: | ||
- {fileID: 2100000, guid: 4e2367c02718ffe4ea4fbe5c6c4a7a6e, type: 2} |
8 changes: 8 additions & 0 deletions
8
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000_Atlas.asset.meta
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
50 changes: 50 additions & 0 deletions
50
nekoyume/Assets/AddressableAssets/Character/Monster/211000/211000_Material-Screen.mat
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
%YAML 1.1 | ||
%TAG !u! tag:unity3d.com,2011: | ||
--- !u!21 &2100000 | ||
Material: | ||
serializedVersion: 8 | ||
m_ObjectHideFlags: 0 | ||
m_CorrespondingSourceObject: {fileID: 0} | ||
m_PrefabInstance: {fileID: 0} | ||
m_PrefabAsset: {fileID: 0} | ||
m_Name: 211000_Material-Screen | ||
m_Shader: {fileID: 4800000, guid: 4e8caa36c07aacf4ab270da00784e4d9, type: 3} | ||
m_ValidKeywords: [] | ||
m_InvalidKeywords: | ||
- _USE8NEIGHBOURHOOD_ON | ||
m_LightmapFlags: 4 | ||
m_EnableInstancingVariants: 0 | ||
m_DoubleSidedGI: 0 | ||
m_CustomRenderQueue: -1 | ||
stringTagMap: {} | ||
disabledShaderPasses: [] | ||
m_SavedProperties: | ||
serializedVersion: 3 | ||
m_TexEnvs: | ||
- <noninit>: | ||
m_Texture: {fileID: 0} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
- _MainTex: | ||
m_Texture: {fileID: 2800000, guid: dfe940521934e3c4abadfdafe8d9e30c, type: 3} | ||
m_Scale: {x: 1, y: 1} | ||
m_Offset: {x: 0, y: 0} | ||
m_Ints: [] | ||
m_Floats: | ||
- <noninit>: 0 | ||
- _Cutoff: 0.1 | ||
- _OutlineMipLevel: 0 | ||
- _OutlineOpaqueAlpha: 1 | ||
- _OutlineReferenceTexWidth: 1024 | ||
- _OutlineSmoothness: 1 | ||
- _OutlineWidth: 3 | ||
- _StencilComp: 8 | ||
- _StencilRef: 1 | ||
- _StraightAlphaInput: 0 | ||
- _ThresholdEnd: 0.25 | ||
- _Use8Neighbourhood: 1 | ||
m_Colors: | ||
- <noninit>: {r: 0, g: 2.018574, b: 1e-45, a: 0.000007121922} | ||
- _Color: {r: 1, g: 1, b: 1, a: 1} | ||
- _OutlineColor: {r: 1, g: 1, b: 0, a: 1} | ||
m_BuildTextureStacks: [] |
Oops, something went wrong.