eri
This commit is contained in:
parent
25d61165ef
commit
0b812d3907
|
|
@ -97,10 +97,11 @@ messageinfo 엄청 느린 버그
|
||||||
|
|
||||||
스킬 드래그로 착용
|
스킬 드래그로 착용
|
||||||
pc 프리팹
|
pc 프리팹
|
||||||
pc 애님 (캐스팅 추가)
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
작업 완료
|
작업 완료
|
||||||
- 테스트맵
|
- 테스트맵
|
||||||
- 보스 이펙트
|
- 보스 이펙트
|
||||||
|
- pc 애님 (캐스팅 추가)
|
||||||
|
- pc 프리팹
|
||||||
|
|
@ -16,7 +16,6 @@ Material:
|
||||||
- _MK_ARTISTIC_ANIMATION_STUTTER
|
- _MK_ARTISTIC_ANIMATION_STUTTER
|
||||||
- _MK_ENVIRONMENT_REFLECTIONS_AMBIENT
|
- _MK_ENVIRONMENT_REFLECTIONS_AMBIENT
|
||||||
- _MK_LIGHT_CEL
|
- _MK_LIGHT_CEL
|
||||||
- _MK_RECEIVE_SHADOWS
|
|
||||||
- _MK_WRAPPED_DIFFUSE
|
- _MK_WRAPPED_DIFFUSE
|
||||||
m_InvalidKeywords:
|
m_InvalidKeywords:
|
||||||
- _EMISSIVE_SIMPLE
|
- _EMISSIVE_SIMPLE
|
||||||
|
|
@ -24,7 +23,6 @@ Material:
|
||||||
- _IS_CLIPPING_OFF
|
- _IS_CLIPPING_OFF
|
||||||
- _IS_OUTLINE_CLIPPING_NO
|
- _IS_OUTLINE_CLIPPING_NO
|
||||||
- _OUTLINE_NML
|
- _OUTLINE_NML
|
||||||
- _RECEIVESHADOWS_ON
|
|
||||||
- _WRAPPEDLIGHTING_ON
|
- _WRAPPEDLIGHTING_ON
|
||||||
m_LightmapFlags: 1
|
m_LightmapFlags: 1
|
||||||
m_EnableInstancingVariants: 0
|
m_EnableInstancingVariants: 0
|
||||||
|
|
@ -326,7 +324,7 @@ Material:
|
||||||
- _ATDistance: 1
|
- _ATDistance: 1
|
||||||
- _AddPrecomputedVelocity: 0
|
- _AddPrecomputedVelocity: 0
|
||||||
- _Add_Antipodean_RimLight: 0
|
- _Add_Antipodean_RimLight: 0
|
||||||
- _AdvancedTab: 0
|
- _AdvancedTab: 1
|
||||||
- _AlbedoAffectEmissive: 0
|
- _AlbedoAffectEmissive: 0
|
||||||
- _AlbedoMapIntensity: 1
|
- _AlbedoMapIntensity: 1
|
||||||
- _AlembicMotionVectors: 0
|
- _AlembicMotionVectors: 0
|
||||||
|
|
@ -385,7 +383,7 @@ Material:
|
||||||
- _DetailNormalMapScale: 1
|
- _DetailNormalMapScale: 1
|
||||||
- _DetailNormalScale: 1
|
- _DetailNormalScale: 1
|
||||||
- _DetailSmoothnessScale: 1
|
- _DetailSmoothnessScale: 1
|
||||||
- _DiffuseSmoothness: 0
|
- _DiffuseSmoothness: 0.3
|
||||||
- _DiffuseThresholdOffset: 0.25
|
- _DiffuseThresholdOffset: 0.25
|
||||||
- _DiffusionProfile: 0
|
- _DiffusionProfile: 0
|
||||||
- _DiffusionProfileHash: 0
|
- _DiffusionProfileHash: 0
|
||||||
|
|
@ -497,7 +495,7 @@ Material:
|
||||||
- _LightBands: 4
|
- _LightBands: 4
|
||||||
- _LightBandsScale: 0.5
|
- _LightBandsScale: 0.5
|
||||||
- _LightDirection_MaskOn: 0
|
- _LightDirection_MaskOn: 0
|
||||||
- _LightThreshold: 0.5
|
- _LightThreshold: 0.3
|
||||||
- _LinkDetailsWithBase: 1
|
- _LinkDetailsWithBase: 1
|
||||||
- _MatCap: 0
|
- _MatCap: 0
|
||||||
- _MaterialID: 1
|
- _MaterialID: 1
|
||||||
|
|
@ -523,7 +521,7 @@ Material:
|
||||||
- _PPDPrimitiveLength: 1
|
- _PPDPrimitiveLength: 1
|
||||||
- _PPDPrimitiveWidth: 1
|
- _PPDPrimitiveWidth: 1
|
||||||
- _Parallax: 0.02
|
- _Parallax: 0.02
|
||||||
- _ReceiveShadows: 1
|
- _ReceiveShadows: 0
|
||||||
- _ReceivesSSR: 1
|
- _ReceivesSSR: 1
|
||||||
- _RefractionModel: 0
|
- _RefractionModel: 0
|
||||||
- _RenderFace: 2
|
- _RenderFace: 2
|
||||||
|
|
@ -566,7 +564,7 @@ Material:
|
||||||
- _SpecularThresholdOffset: 0.25
|
- _SpecularThresholdOffset: 0.25
|
||||||
- _SrcBlend: 1
|
- _SrcBlend: 1
|
||||||
- _Stencil: 1
|
- _Stencil: 1
|
||||||
- _StencilComp: 0
|
- _StencilComp: 8
|
||||||
- _StencilFail: 0
|
- _StencilFail: 0
|
||||||
- _StencilMode: 0
|
- _StencilMode: 0
|
||||||
- _StencilNo: 1
|
- _StencilNo: 1
|
||||||
|
|
@ -574,19 +572,19 @@ Material:
|
||||||
- _StencilOpPass: 0
|
- _StencilOpPass: 0
|
||||||
- _StencilPass: 0
|
- _StencilPass: 0
|
||||||
- _StencilReadMask: 255
|
- _StencilReadMask: 255
|
||||||
- _StencilRef: 2
|
- _StencilRef: 0
|
||||||
- _StencilRefDepth: 0
|
- _StencilRefDepth: 0
|
||||||
- _StencilRefDistortionVec: 64
|
- _StencilRefDistortionVec: 64
|
||||||
- _StencilRefGBuffer: 2
|
- _StencilRefGBuffer: 2
|
||||||
- _StencilRefMV: 128
|
- _StencilRefMV: 128
|
||||||
- _StencilWriteMask: 3
|
- _StencilWriteMask: 255
|
||||||
- _StencilWriteMaskDepth: 32
|
- _StencilWriteMaskDepth: 32
|
||||||
- _StencilWriteMaskDistortionVec: 64
|
- _StencilWriteMaskDistortionVec: 64
|
||||||
- _StencilWriteMaskGBuffer: 3
|
- _StencilWriteMaskGBuffer: 3
|
||||||
- _StencilWriteMaskMV: 128
|
- _StencilWriteMaskMV: 128
|
||||||
- _StencilZFail: 0
|
- _StencilZFail: 0
|
||||||
- _StepOffset: 0
|
- _StepOffset: 0
|
||||||
- _StylizeTab: 0
|
- _StylizeTab: 1
|
||||||
- _SubsurfaceMask: 1
|
- _SubsurfaceMask: 1
|
||||||
- _SupportDecals: 1
|
- _SupportDecals: 1
|
||||||
- _Surface: 0
|
- _Surface: 0
|
||||||
|
|
|
||||||
|
|
@ -1 +1 @@
|
||||||
[{"n_CostumeID": "110001", "s_Image": "01 Ai 01", "s_Prefab": "Ai01", "exception": "아이 교복"}, {"n_CostumeID": "110002", "s_Image": "01 Ai 02", "s_Prefab": "Ai02", "exception": "아이 비키니"}, {"n_CostumeID": "110003", "s_Image": "01 Ai 03", "s_Prefab": "Ai03", "exception": "아이 파자마"}, {"n_CostumeID": "110004", "s_Image": "02 aki 01", "s_Prefab": "Aki01", "exception": "아키 교복"}, {"n_CostumeID": "110005", "s_Image": "02 aki 02", "s_Prefab": "Aki02", "exception": "아키 비키니"}, {"n_CostumeID": "110006", "s_Image": "03 Emika 01", "s_Prefab": "Emika01", "exception": ""}, {"n_CostumeID": "110007", "s_Image": "03 Emika 02", "s_Prefab": "Emika02", "exception": ""}, {"n_CostumeID": "110008", "s_Image": "03 Emika 03", "s_Prefab": "Emika03", "exception": ""}, {"n_CostumeID": "110009", "s_Image": "03 Emika 04", "s_Prefab": "Emika04", "exception": ""}]
|
[{"n_CostumeID": "110001", "s_Image": "01 Ai 01", "s_Prefab": "Ai01", "exception": "아이 교복"}, {"n_CostumeID": "110002", "s_Image": "01 Ai 02", "s_Prefab": "Ai02", "exception": "아이 비키니"}, {"n_CostumeID": "110003", "s_Image": "01 Ai 03", "s_Prefab": "Ai03", "exception": "아이 파자마"}, {"n_CostumeID": "110004", "s_Image": "02 aki 01", "s_Prefab": "Aki01", "exception": "아키 교복"}, {"n_CostumeID": "110005", "s_Image": "02 aki 02", "s_Prefab": "Aki02", "exception": "아키 비키니"}, {"n_CostumeID": "110006", "s_Image": "03 Emika 01", "s_Prefab": "Emika01", "exception": "교복"}, {"n_CostumeID": "110007", "s_Image": "03 Emika 02", "s_Prefab": "Emika02", "exception": "비키니"}, {"n_CostumeID": "110008", "s_Image": "03 Emika 03", "s_Prefab": "Emika03", "exception": "파자마"}, {"n_CostumeID": "110009", "s_Image": "03 Emika 04", "s_Prefab": "Emika04", "exception": "사복"}, {"n_CostumeID": "110010", "s_Image": "04 Eri 01", "s_Prefab": "Eri01", "exception": "교복"}, {"n_CostumeID": "110011", "s_Image": "04 Eri 02", "s_Prefab": "Eri02", "exception": "비키니"}, {"n_CostumeID": "110012", "s_Image": "04 Eri 03", "s_Prefab": "Eri03", "exception": "파자마"}, {"n_CostumeID": "110013", "s_Image": "04 Eri 04", "s_Prefab": "Eri04", "exception": "사복"}]
|
||||||
File diff suppressed because one or more lines are too long
|
|
@ -1 +1 @@
|
||||||
[{"exception": "아이 3종", "n_CollectionName": "101101", "n_CostumeID1": "110001", "n_CostumeID2": "110002", "n_CostumeID3": "110003", "n_CostumeID4": "0", "e_Stat": "STR", "n_StatValue": "5"}, {"exception": "아키 2종", "n_CollectionName": "101102", "n_CostumeID1": "110004", "n_CostumeID2": "110005", "n_CostumeID3": "0", "n_CostumeID4": "0", "e_Stat": "DEX", "n_StatValue": "5"}, {"exception": "에미카 4종", "n_CollectionName": "101103", "n_CostumeID1": "110006", "n_CostumeID2": "110007", "n_CostumeID3": "110008", "n_CostumeID4": "110009", "e_Stat": "INT", "n_StatValue": "5"}]
|
[{"exception": "아이 3종", "n_CollectionName": "101101", "n_CostumeID1": "110001", "n_CostumeID2": "110002", "n_CostumeID3": "110003", "n_CostumeID4": "0", "e_Stat": "STR", "n_StatValue": "5"}, {"exception": "아키 2종", "n_CollectionName": "101102", "n_CostumeID1": "110004", "n_CostumeID2": "110005", "n_CostumeID3": "0", "n_CostumeID4": "0", "e_Stat": "DEX", "n_StatValue": "5"}, {"exception": "에미카 4종", "n_CollectionName": "101103", "n_CostumeID1": "110006", "n_CostumeID2": "110007", "n_CostumeID3": "110008", "n_CostumeID4": "110009", "e_Stat": "INT", "n_StatValue": "5"}, {"exception": "에리 4종", "n_CollectionName": "101104", "n_CostumeID1": "110010", "n_CostumeID2": "110011", "n_CostumeID3": "110012", "n_CostumeID4": "110013", "e_Stat": "LUK", "n_StatValue": "5"}]
|
||||||
Binary file not shown.
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b8047431d19021843aa96363198e02a9
|
||||||
|
timeCreated: 1486453798
|
||||||
|
licenseType: Store
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: b048877f1c57dd645918896582b4887a
|
||||||
|
timeCreated: 1486454648
|
||||||
|
licenseType: Store
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 1ac1ea57cda75ba40938a30f2143be17
|
||||||
|
timeCreated: 1486454433
|
||||||
|
licenseType: Store
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,8 @@
|
||||||
|
fileFormatVersion: 2
|
||||||
|
guid: 9259c794b4a469d42947b04be37e88d8
|
||||||
|
timeCreated: 1486462851
|
||||||
|
licenseType: Store
|
||||||
|
NativeFormatImporter:
|
||||||
|
userData:
|
||||||
|
assetBundleName:
|
||||||
|
assetBundleVariant:
|
||||||
Loading…
Reference in New Issue