This commit is contained in:
wsh
2025-05-29 05:34:12 +09:00
40 changed files with 5421 additions and 451 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 676 B

After

Width:  |  Height:  |  Size: 574 B

View File

@@ -49,7 +49,7 @@ TextureImporter:
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteBorder: {x: 4, y: 4, z: 4, w: 4}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
@@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 32
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
@@ -101,7 +101,7 @@ TextureImporter:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
internalID: 1537655665
vertices: []
indices:
edges: []

Binary file not shown.

Before

Width:  |  Height:  |  Size: 181 B

After

Width:  |  Height:  |  Size: 401 B

View File

@@ -69,7 +69,7 @@ TextureImporter:
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
maxTextureSize: 32
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1

View File

@@ -0,0 +1,146 @@
%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: Mat_Wall
m_Shader: {fileID: 4800000, guid: 0e9d5a909a1f7e84882a534d0d11e49f, type: 3}
m_Parent: {fileID: 0}
m_ModifiedSerializedProperties: 0
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses:
- MOTIONVECTORS
m_LockedProperties:
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BaseMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _BumpMap:
m_Texture: {fileID: 2800000, guid: aa6ee954e121ebb468372bc92467052e, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 2800000, guid: 1a39e2d3348aacd4c9fa545fd12b3711, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 2800000, guid: 6b4154d947ee3b442b2853039b803c0b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_Lightmaps:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_LightmapsInd:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- unity_ShadowMasks:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _AddPrecomputedVelocity: 0
- _AlphaClip: 0
- _AlphaToMask: 0
- _Blend: 0
- _BlendModePreserveSpecular: 1
- _BumpScale: 1
- _ClearCoatMask: 0
- _ClearCoatSmoothness: 0
- _Cull: 2
- _Cutoff: 0.5
- _DetailAlbedoMapScale: 1
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _DstBlendAlpha: 0
- _EnvironmentReflections: 1
- _GlossMapScale: 0
- _Glossiness: 1
- _GlossyReflections: 0
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.005
- _QueueControl: 0
- _QueueOffset: 0
- _ReceiveShadows: 1
- _Smoothness: 0.5
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _SrcBlendAlpha: 1
- _Surface: 0
- _UVSec: 0
- _UseAoMap: 1
- _UseColorMap: 0
- _UseEmissiveMap: 0
- _UseMetallicMap: 0
- _UseNormalMap: 1
- _UseRoughnessMap: 0
- _WorkflowMode: 1
- _ZWrite: 1
m_Colors:
- _BaseColor: {r: 1, g: 1, b: 1, a: 1}
- _Color: {r: 0.7058824, g: 0.7058824, b: 0.7058824, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 0.2, g: 0.2, b: 0.2, a: 1}
- _UvOffset: {r: 0, g: 0, b: 0, a: 0}
- _UvTiling: {r: 1, g: 1, b: 0, a: 0}
m_BuildTextureStacks: []
m_AllowLocking: 1
--- !u!114 &7258523911634376477
MonoBehaviour:
m_ObjectHideFlags: 11
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: d0353a89b1f911e48b9e16bdc9f2e058, type: 3}
m_Name:
m_EditorClassIdentifier:
version: 9

View File

@@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: a192154651cada04ea3eb3282dd13e98
NativeFormatImporter:
externalObjects: {}
mainObjectFileID: 2100000
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -112,7 +112,7 @@ RectTransform:
m_Father: {fileID: 1685799791316290074}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 2, y: 0}
m_SizeDelta: {x: 8, y: 20}
m_Pivot: {x: 0.5, y: 0.5}
@@ -187,9 +187,9 @@ RectTransform:
m_Children: []
m_Father: {fileID: 8706268858069865467}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 367.5, y: -12.5}
m_SizeDelta: {x: 25, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1680300306342414744
@@ -1286,9 +1286,9 @@ RectTransform:
m_Father: {fileID: 3774859264702987967}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: -20, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!222 &5719838569939595036
CanvasRenderer:
@@ -1741,7 +1741,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: -0.00034048597, y: 0.009771946}
m_AnchoredPosition: {x: -0.00034048597, y: 0.00007824988}
m_SizeDelta: {x: 282.99957, y: 2}
m_Pivot: {x: 0, y: 1}
--- !u!114 &2780744526690132257
@@ -1857,7 +1857,7 @@ RectTransform:
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 209, y: -65.5}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 380, y: 25}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!114 &6435129193268940334
MonoBehaviour:
@@ -1917,7 +1917,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!224 &2790108437195061205
RectTransform:
m_ObjectHideFlags: 0
@@ -1925,7 +1925,7 @@ RectTransform:
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 7484356029459005624}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@@ -1937,9 +1937,9 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: -77.5}
m_SizeDelta: {x: 420, y: 925}
m_Pivot: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 427}
m_SizeDelta: {x: 420, y: 967}
m_Pivot: {x: 1, y: 1}
--- !u!114 &4816600667775265712
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -2023,9 +2023,9 @@ RectTransform:
- {fileID: 5912509791969580700}
m_Father: {fileID: 8706268858069865467}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 0, y: -12.5}
m_SizeDelta: {x: 347, y: 25}
m_Pivot: {x: 0, y: 0.5}
--- !u!222 &7830414178492404806
@@ -2317,7 +2317,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 0}
m_SizeDelta: {x: 96.57, y: 21.48}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5751785171858270131
CanvasRenderer:

View File

@@ -244,7 +244,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
m_IsActive: 1
--- !u!224 &3904775533281402009
RectTransform:
m_ObjectHideFlags: 0
@@ -533,8 +533,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 271.16638, y: -308.54465}
m_SizeDelta: {x: 476.6372, y: 302.5107}
m_AnchoredPosition: {x: 271.16638, y: -303.99945}
m_SizeDelta: {x: 476.6372, y: 293.4203}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &7948285827537267962
CanvasRenderer:
@@ -1314,7 +1314,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0.0005283559}
m_SizeDelta: {x: 0, y: 0}
m_Pivot: {x: 0, y: 1}
--- !u!114 &3191639708568242626

View File

@@ -1064,8 +1064,8 @@ MonoBehaviour:
m_fontMaterials: []
m_fontColor32:
serializedVersion: 2
rgba: 4278190080
m_fontColor: {r: 0, g: 0, b: 0, a: 1}
rgba: 4292269782
m_fontColor: {r: 0.8396226, g: 0.8396226, b: 0.8396226, a: 1}
m_enableVertexGradient: 0
m_colorMode: 3
m_fontColorGradient:
@@ -1082,8 +1082,8 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 36
m_fontSizeBase: 36
m_fontSize: 13
m_fontSizeBase: 13
m_fontWeight: 400
m_enableAutoSizing: 0
m_fontSizeMin: 18

View File

@@ -34,10 +34,10 @@ RectTransform:
- {fileID: 3659157752733184371}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 258.90002, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &403790651948103616
CanvasRenderer:
@@ -148,7 +148,7 @@ RectTransform:
m_GameObject: {fileID: 976429591461805790}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.6, y: 0.6, z: 0.6}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4252678363211614324}
@@ -207,7 +207,6 @@ GameObject:
- component: {fileID: 943011681277070845}
- component: {fileID: 8279116357726748637}
- component: {fileID: 5460023221116052752}
- component: {fileID: 2927086329774069787}
- component: {fileID: 6126386908417317626}
m_Layer: 5
m_Name: Panel_Toolbox
@@ -231,21 +230,19 @@ RectTransform:
- {fileID: 1765852792291135138}
- {fileID: 7995741813397513926}
- {fileID: 8704022115876743419}
- {fileID: 1810086582732379567}
- {fileID: 4252678363211614324}
- {fileID: 3964166921491454580}
- {fileID: 8914158643671488508}
- {fileID: 5728574744260500265}
- {fileID: 3012754740992037236}
- {fileID: 5632901539187177488}
- {fileID: 2263537013832570856}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 0, y: -90}
m_SizeDelta: {x: 0, y: 30.802}
m_Pivot: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: -56}
m_SizeDelta: {x: 0, y: 38}
m_Pivot: {x: 0.5, y: 1}
--- !u!222 &8279116357726748637
CanvasRenderer:
m_ObjectHideFlags: 0
@@ -284,32 +281,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &2927086329774069787
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1799883531746712332}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 30649d3a9faa99c48a7b1166b86bf2a0, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Padding:
m_Left: 12
m_Right: 0
m_Top: 0
m_Bottom: 0
m_ChildAlignment: 3
m_Spacing: 4
m_ChildForceExpandWidth: 0
m_ChildForceExpandHeight: 1
m_ChildControlWidth: 0
m_ChildControlHeight: 0
m_ChildScaleWidth: 0
m_ChildScaleHeight: 0
m_ReverseArrangement: 0
--- !u!114 &6126386908417317626
MonoBehaviour:
m_ObjectHideFlags: 0
@@ -358,7 +329,7 @@ RectTransform:
m_GameObject: {fileID: 2148661660534290176}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8704022115876743419}
@@ -440,10 +411,10 @@ RectTransform:
- {fileID: 6841837657150548486}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 227.90002, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4179844308421223349
CanvasRenderer:
@@ -561,10 +532,10 @@ RectTransform:
- {fileID: 8388731506046622778}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 58, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &4829470509306811104
CanvasRenderer:
@@ -682,10 +653,10 @@ RectTransform:
- {fileID: 4541657039149619546}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 89, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &6955413316334478204
CanvasRenderer:
@@ -804,7 +775,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 20, y: 20}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8408161407759510081
CanvasRenderer:
@@ -834,7 +805,7 @@ MonoBehaviour:
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 21300000, guid: 5c5c28af665e95f4988e5bf051bb7dba, type: 3}
m_Sprite: {fileID: 21300000, guid: 4dfcc004e46d38e4685f2aa855692c5e, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -843,7 +814,7 @@ MonoBehaviour:
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
m_PixelsPerUnitMultiplier: 0.01
--- !u!1 &3750156139196021385
GameObject:
m_ObjectHideFlags: 0
@@ -871,7 +842,7 @@ RectTransform:
m_GameObject: {fileID: 3750156139196021385}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 7995741813397513926}
@@ -946,7 +917,7 @@ RectTransform:
m_GameObject: {fileID: 3763639011834202058}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.44, y: 0.44, z: 0.44}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3964166921491454580}
@@ -1021,7 +992,7 @@ RectTransform:
m_GameObject: {fileID: 3939832537072978030}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.56, y: 0.56, z: 0.56}
m_LocalScale: {x: 0.4, y: 0.4, z: 0.4}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8914158643671488508}
@@ -1069,81 +1040,6 @@ MonoBehaviour:
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4253241783204371659
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 5632901539187177488}
- component: {fileID: 1004228953067385115}
- component: {fileID: 3065881904437513760}
m_Layer: 5
m_Name: Image_1
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &5632901539187177488
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4253241783204371659}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1004228953067385115
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4253241783204371659}
m_CullTransparentMesh: 1
--- !u!114 &3065881904437513760
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4253241783204371659}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3490566, g: 0.3490566, b: 0.3490566, a: 0.18431373}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4884277709909651432
GameObject:
m_ObjectHideFlags: 0
@@ -1179,7 +1075,7 @@ RectTransform:
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 22, y: 22}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &8045416742983915349
CanvasRenderer:
@@ -1254,10 +1150,10 @@ RectTransform:
- {fileID: 7619173144796451753}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 196.90002, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &791579605769297379
CanvasRenderer:
@@ -1368,7 +1264,7 @@ RectTransform:
m_GameObject: {fileID: 5680193822537945371}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 1765852792291135138}
@@ -1518,7 +1414,7 @@ RectTransform:
m_GameObject: {fileID: 6672890127733647188}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.35, y: 0.35, z: 0.35}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 8914158643671488508}
@@ -1593,7 +1489,7 @@ RectTransform:
m_GameObject: {fileID: 6848665022145113459}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.25, y: 0.25, z: 0.25}
m_LocalScale: {x: 0.18, y: 0.18, z: 0.18}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 3964166921491454580}
@@ -1676,10 +1572,10 @@ RectTransform:
- {fileID: 6635576186156789577}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 303, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2700340825488370104
CanvasRenderer:
@@ -1702,7 +1598,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 1, b: 1, a: 0.2627451}
m_Color: {r: 1, g: 1, b: 1, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
@@ -1865,7 +1761,7 @@ RectTransform:
m_GameObject: {fileID: 8062871451586804408}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0.3, y: 0.3, z: 0.3}
m_LocalScale: {x: 0.2, y: 0.2, z: 0.2}
m_ConstrainProportionsScale: 1
m_Children: []
m_Father: {fileID: 4252678363211614324}
@@ -1948,10 +1844,10 @@ RectTransform:
- {fileID: 2748710989676237632}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 134, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1104937441688174212
CanvasRenderer:
@@ -2035,81 +1931,6 @@ MonoBehaviour:
m_OnClick:
m_PersistentCalls:
m_Calls: []
--- !u!1 &8286481477283088348
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1810086582732379567}
- component: {fileID: 2987962260483396557}
- component: {fileID: 4490649927983865753}
m_Layer: 5
m_Name: Image
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!224 &1810086582732379567
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8286481477283088348}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 1, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &2987962260483396557
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8286481477283088348}
m_CullTransparentMesh: 1
--- !u!114 &4490649927983865753
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8286481477283088348}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 0.3490566, g: 0.3490566, b: 0.3490566, a: 0.18431373}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &8669998191490944890
GameObject:
m_ObjectHideFlags: 0
@@ -2144,10 +1965,10 @@ RectTransform:
- {fileID: 8218864689472815799}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 27, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5923409785368501235
CanvasRenderer:
@@ -2266,10 +2087,10 @@ RectTransform:
- {fileID: 1492291967311882608}
m_Father: {fileID: 943011681277070845}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0}
m_AnchorMax: {x: 0, y: 0}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 36, y: 36}
m_AnchorMin: {x: 0, y: 1}
m_AnchorMax: {x: 0, y: 1}
m_AnchoredPosition: {x: 165.90002, y: -19}
m_SizeDelta: {x: 30, y: 30}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &584796686791580021
CanvasRenderer:

View File

@@ -615,7 +615,6 @@ RectTransform:
- {fileID: 2845470807523257321}
- {fileID: 8835006081575840586}
- {fileID: 4289371562000787196}
- {fileID: 3057577346065872911}
m_Father: {fileID: 0}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 1}
@@ -644,14 +643,14 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0, b: 0, a: 0}
m_Color: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 0}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Sprite: {fileID: 21300000, guid: bc1b61929a6609f4ca9e412e2a1d38b9, type: 3}
m_Type: 0
m_PreserveAspect: 0
m_FillCenter: 1
@@ -730,12 +729,12 @@ MonoBehaviour:
onScroll:
m_PersistentCalls:
m_Calls: []
selectedColor: {r: 1, g: 0, b: 0, a: 0.47058824}
hoverColor: {r: 0.8392157, g: 0.16078432, b: 0.16078432, a: 0.47058824}
selectedColor: {r: 1, g: 0, b: 0, a: 1}
hoverColor: {r: 0.8235294, g: 0.039215688, b: 0.06666667, a: 1}
upperLine: {fileID: 2946232207523233411}
lowerLine: {fileID: 4764771198905317747}
lineColor: {r: 1, g: 0, b: 0, a: 0.47058824}
highLight: {fileID: 4406185178758208484}
highLight: {fileID: 0}
isSelected: 0
--- !u!1 &3809916293675722094
GameObject:
@@ -812,116 +811,6 @@ MonoBehaviour:
m_FillOrigin: 2
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!1 &4406185178758208484
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 3057577346065872911}
- component: {fileID: 1400249360527683757}
- component: {fileID: 4366815112831407465}
- component: {fileID: 88918052287729287}
- component: {fileID: 4232004144655390926}
m_Layer: 5
m_Name: HighLightImage
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 0
--- !u!224 &3057577346065872911
RectTransform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406185178758208484}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 9151118461914384115}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0, y: 0.5}
m_AnchorMax: {x: 1, y: 0.5}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 0, y: 15}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &1400249360527683757
CanvasRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406185178758208484}
m_CullTransparentMesh: 1
--- !u!114 &4366815112831407465
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406185178758208484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Material: {fileID: 0}
m_Color: {r: 1, g: 0.9538098, b: 0, a: 0.19607843}
m_RaycastTarget: 1
m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
m_Maskable: 1
m_OnCullStateChanged:
m_PersistentCalls:
m_Calls: []
m_Sprite: {fileID: 0}
m_Type: 1
m_PreserveAspect: 0
m_FillCenter: 1
m_FillMethod: 4
m_FillAmount: 1
m_FillClockwise: 1
m_FillOrigin: 0
m_UseSpriteMesh: 0
m_PixelsPerUnitMultiplier: 1
--- !u!114 &88918052287729287
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406185178758208484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 306cc8c2b49d7114eaa3623786fc2126, type: 3}
m_Name:
m_EditorClassIdentifier:
m_IgnoreLayout: 1
m_MinWidth: -1
m_MinHeight: -1
m_PreferredWidth: -1
m_PreferredHeight: -1
m_FlexibleWidth: -1
m_FlexibleHeight: -1
m_LayoutPriority: 1
--- !u!114 &4232004144655390926
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 4406185178758208484}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 31a19414c41e5ae4aae2af33fee712f6, type: 3}
m_Name:
m_EditorClassIdentifier:
m_ShowMaskGraphic: 1
--- !u!1 &5103825728021134297
GameObject:
m_ObjectHideFlags: 0
@@ -1217,8 +1106,8 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 0.5, y: 0.5}
m_AnchorMax: {x: 0.5, y: 0.5}
m_AnchoredPosition: {x: 0, y: 4}
m_SizeDelta: {x: 110, y: 110}
m_AnchoredPosition: {x: 0, y: 0}
m_SizeDelta: {x: 80, y: 50}
m_Pivot: {x: 0.5, y: 0.5}
--- !u!222 &5193183312611458682
CanvasRenderer:

View File

@@ -194,7 +194,7 @@ namespace Studio.AssetTool
if (selectedAssetData == null)
return;
bool isPointerOutScrollRect = !assetScrollRect.IsPointerOverScrollRect();
if (item != null /*&& isPointerOutScrollRect*/)
if (item != null && isPointerOutScrollRect)
{
ConnectedAsset connectedAsset = new ConnectedAsset
{

View File

@@ -0,0 +1,10 @@
using System;
using UnityEngine;
namespace Studio
{
public class OptionURL
{
internal static string defaultPath = $"C:\\Users\\{Environment.UserName}";
}
}

View File

@@ -0,0 +1,2 @@
fileFormatVersion: 2
guid: e6d98f9c6f0b57a4baa2db43e9a75c3f

View File

@@ -37,11 +37,11 @@ namespace Studio.Manage
fbxFileManager.onLoadComplete += OnLoadCustomAsset;
onAddSettingPaths += canvas_Popup.panel_assetsetting.SetAssetPathItmes;
onSetAssetSetting += canvas_Popup.panel_assetsetting.SetAssetManager;
onAssetManagerDatas += (data) => projectManager.OpenProjectSettingsDataAfterDataLoad();
}
public void ClearFolderPathList()
{
localAssetPaths.Clear();
@@ -77,18 +77,20 @@ namespace Studio.Manage
folderPathList.Add(folderPath);
localAssetPaths.Add(folderPath);
}
LoadResourcesAsset();
//LoadLocalFBXDirectorys();
LoadLocalFBXDirectorys();
}
public void LoadResourcesAsset()
public void InitRessourceAsset()
{
var assets = Resources.LoadAll<GameObject>("Test");
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
fbxFileManager.LoadResource(assets);
}
public void LoadResourcesAsset()
{
OnLoadCustomAsset();
// var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
//canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
}
public void LoadLocalFBXDirectorys()
{
@@ -109,9 +111,6 @@ namespace Studio.Manage
var projectManager = ManagerHub.instance.Get<ProjectManager>();
var fbxFileManager = ManagerHub.instance.Get<FBXFileManager>();
var canvas_Popup = CanvasManager.instance.GetCanvas<Canvas_Popup>();
canvas_Popup.panel_3dfactorysetting.SetModelDropdownData(fbxFileManager.dataRepo);
if (projectManager.curProjectData.assetDatas.Count <= 0)
return;

View File

@@ -55,6 +55,7 @@ namespace Studio.Manage
fbxFileManager.ClearFilePaths();
assetManager.ClearFolderPathList();
assetManager.InitRessourceAsset();
assetManager.onAssetManagerDatas?.Invoke(null);
}
public void TopMenuNewProjectSettingData()

View File

@@ -1,4 +1,4 @@
using System;
using System;
using UnityEngine;
namespace Studio.Manage
@@ -13,11 +13,11 @@ namespace Studio.Manage
private void OnEnable()
{
Application.wantsToQuit += HandleForcedExitRequest;
//Application.wantsToQuit += HandleForcedExitRequest;
}
protected override void OnDestroy()
{
Application.wantsToQuit -= HandleForcedExitRequest;
//Application.wantsToQuit -= HandleForcedExitRequest;
}
public bool HandleForcedExitRequest()

View File

@@ -1,19 +1,17 @@
using Studio.AssetTool;
using Studio.Manage;
using Studio.VirtualFactory.Info;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Linq;
using Unity.Mathematics;
using UnityEditor.Build;
using UnityEngine;
namespace Studio.Staic.STKC
{
public class StackerCrane : AbstractFunctionObject
{
private Dictionary<string, string> CurrentEntity;
private Dictionary<string, string> CurrentEntity;
public override Dictionary<string, string> Info
{
get
@@ -72,7 +70,7 @@ namespace Studio.Staic.STKC
}
public void OnPlayStart()
{
if(isfirstStart ==false)
if (isfirstStart == false)
startPos = transform.position.z;
isfirstStart = true;
var type = GetComponent<CustomAssetRenderObject>().topic;
@@ -189,6 +187,6 @@ namespace Studio.Staic.STKC
onMotionStart -= StartAnim;
}
}
}

View File

@@ -13,7 +13,6 @@ namespace Studio.UI
private Button Button_SelectedFolder;
public Action<UI_FolderPathItem> onEndEditInputFieldURL;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
@@ -34,7 +33,7 @@ namespace Studio.UI
}
private void OnClickSelectedFolderButton()
{
var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", defaultPath, false);
var paths = StandaloneFileBrowser.OpenFolderPanel("Select AssetsFolder", "", false);
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{

View File

@@ -38,7 +38,6 @@ namespace Studio.UI
private float ratio;
public Action onClose;
public Button Button_Close;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public void Active(bool isActive)
{
@@ -99,7 +98,7 @@ namespace Studio.UI
private void OnClickImageSelectedButton()
{
var extensions = new[] { new ExtensionFilter("Image Files", "png", "jpg", "jpeg") };
StandaloneFileBrowser.OpenFilePanelAsync("이미지 열기", defaultPath, extensions, false, LoadImage);
StandaloneFileBrowser.OpenFilePanelAsync("이미지 열기", "", extensions, false, LoadImage);
}
private void OnAutoStartValuedChanged(bool isOn)
{
@@ -107,7 +106,7 @@ namespace Studio.UI
}
private void OnClickLanguagePackButton()
{
var packItem = StandaloneFileBrowser.OpenFilePanel("언어 팩 열기", defaultPath, "", false);
var packItem = StandaloneFileBrowser.OpenFilePanel("언어 팩 열기", "", "", false);
if (packItem != null && packItem.Count > 0)
{

View File

@@ -28,7 +28,6 @@ namespace Studio.UI
private Dictionary<string, string> languages = new Dictionary<string, string>();
private string json;
public string saveLanguage;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
@@ -39,7 +38,7 @@ namespace Studio.UI
}
void OnClickOpenFileButton()
{
StandaloneFileBrowser.OpenFilePanelAsync("Open File", defaultPath, "json", false, LoadJson);
StandaloneFileBrowser.OpenFilePanelAsync("Open File", "", "json", false, LoadJson);
}
void OnClickSaveButton()
{

View File

@@ -22,19 +22,17 @@ namespace Studio.UI
public Action onClickFileExplorer;
public Action onClickCreate;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
Button_FileExplorer.onClick.AddListener(OnClickFileExplorer);
Button_Create.onClick.AddListener(OnClickCreate);
InputField_ProjectRoute.text = defaultPath;
InputField_ProjectRoute.text = OptionURL.defaultPath;
}
private void OnClickFileExplorer()
{
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false);
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{

View File

@@ -30,7 +30,6 @@ namespace Studio.UI
public Button Button_Open;
public Action onClickOpen;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
@@ -77,7 +76,7 @@ namespace Studio.UI
private void OnClickFileExplorer()
{
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false);
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false);
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{

View File

@@ -18,7 +18,6 @@ namespace Studio.UI
public Button Button_Close;
public Action onClickCreate;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
@@ -29,7 +28,7 @@ namespace Studio.UI
}
private void OnClickFileExplorer()
{
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", defaultPath, false);
var paths = StandaloneFileBrowser.OpenFolderPanel("Select Folder", "", false);
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{
@@ -53,6 +52,9 @@ namespace Studio.UI
public void Open()
{
SetActive(true);
InputField_ProjectName.text = string.Empty;
InputField_ProjectRoute.text = OptionURL.defaultPath;
}
public void Close()

View File

@@ -17,7 +17,6 @@ namespace Studio.UI
public Button Button_Close;
public Action onClickOpen;
private string defaultPath = $"C:\\Users\\{Environment.UserName}";
public override void AfterAwake()
{
@@ -28,7 +27,7 @@ namespace Studio.UI
}
private void OnClickFileExplorer()
{
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", defaultPath, "ocs", false);
var paths = StandaloneFileBrowser.OpenFilePanel("Select Project", "", "ocs", false);
if (paths.Count > 0 && !string.IsNullOrEmpty(paths[0].Name))
{

View File

@@ -1,4 +1,4 @@
using System.Collections.Generic;
using UnityEngine;
using UnityEngine.UI;
@@ -34,7 +34,7 @@ namespace Studio.AssetLibraryTree
public Image upperLine;
public Image lowerLine;
public Color lineColor;
public GameObject highLight;
//public GameObject highLight;
private Image backgroundImage;
public bool isSelected;
private FBXFileManager fbxFileManager;
@@ -188,13 +188,13 @@ namespace Studio.AssetLibraryTree
}
public void ActivateMidHighlight()
{
highLight.SetActive(true);
//highLight.SetActive(true);
}
public void DeactivateAllHighlights()
{
upperLine.color = Color.clear;
lowerLine.color = Color.clear;
highLight.SetActive(false);
//highLight.SetActive(false);
}
public void OnLoadProgress(float ratio)
{

View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections;
using System.Collections.Generic;
using UnityEngine;
@@ -68,10 +68,10 @@ namespace Studio.AssetLibraryTree
{
itemUI.ActivateLowerHighlight();
}
else // Middle 60%
{
itemUI.ActivateMidHighlight();
}
//else // Middle 60%
//{
// itemUI.ActivateMidHighlight();
//}
hoverItemUI = itemUI;
}
}

View File

@@ -21,7 +21,7 @@ MonoBehaviour:
m_OverrideGlobalSceneList: 1
m_Scenes:
- m_enabled: 1
m_path: Assets/Scenes/New Scene.unity
m_path: Assets/Scenes/pre-0.24.0.unity
m_ScriptingDefines: []
m_PlayerSettingsYaml:
m_Settings:

View File

@@ -1,23 +0,0 @@
using Studio.Manage;
using UnityEngine;
namespace Studio
{
public class Test : MonoBehaviour
{
// Start is called once before the first execution of Update after the MonoBehaviour is created
void Start()
{
}
// Update is called once per frame
void Update()
{
if(Input.GetKeyDown(KeyCode.K))
{
ManagerHub.instance.Get<AssetManager>().LoadResourcesAsset();
}
}
}
}

View File

@@ -1,2 +0,0 @@
fileFormatVersion: 2
guid: 8a546a61f765e9a46b7a9e75cc879902

Binary file not shown.

After

Width:  |  Height:  |  Size: 2.1 KiB

View File

@@ -0,0 +1,117 @@
fileFormatVersion: 2
guid: bc1b61929a6609f4ca9e412e2a1d38b9
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 13
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
flipGreenChannel: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
vTOnly: 0
ignoreMipmapLimit: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: 1
aniso: 1
mipBias: 0
wrapU: 1
wrapV: 1
wrapW: 0
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 10, y: 10, z: 10, w: 10}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
flipbookRows: 1
flipbookColumns: 1
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
ignorePngGamma: 0
applyGammaDecoding: 0
swizzle: 50462976
cookieLightType: 0
platformSettings:
- serializedVersion: 4
buildTarget: DefaultTexturePlatform
maxTextureSize: 512
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
- serializedVersion: 4
buildTarget: Standalone
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
ignorePlatformSupport: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
customData:
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 1537655665
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spriteCustomMetadata:
entries: []
nameFileIdTable: {}
mipmapLimitGroupName:
pSDRemoveMatte: 0
userData:
assetBundleName:
assetBundleVariant:

View File

@@ -56,7 +56,17 @@ MonoBehaviour:
- rid: 4833515143083327508
- rid: 2393467941640208635
m_RuntimeSettings:
m_List: []
m_List:
- rid: 4833515143083327490
- rid: 4833515143083327492
- rid: 4833515143083327494
- rid: 4833515143083327495
- rid: 4833515143083327496
- rid: 4833515143083327497
- rid: 4833515143083327499
- rid: 4833515143083327501
- rid: 4833515143083327505
- rid: 4833515143083327508
m_AssetVersion: 8
m_ObsoleteDefaultVolumeProfile: {fileID: 0}
m_RenderingLayerNames: