Skip to content

Commit

Permalink
release: v1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
oswalk committed Apr 5, 2024
1 parent 9570a17 commit b66afca
Show file tree
Hide file tree
Showing 168 changed files with 4,762 additions and 2,326 deletions.
27 changes: 26 additions & 1 deletion Assets/ARPG/Core/Editor/PackageImportPreprocess.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ static PackageImportPreprocess()
SerializedObject tagManager = new SerializedObject(AssetDatabase.LoadAllAssetsAtPath("ProjectSettings/TagManager.asset")[0]);
SerializedProperty layersProp = tagManager.FindProperty("layers");

string[] layerNames = {"Map", "MapPOI", "MapArrow"};
string[] layerNames = {"Map", "MapPOI", "MapArrow", "AMProjViz"};

foreach (string layerName in layerNames)
{
Expand Down Expand Up @@ -81,6 +81,31 @@ static PackageImportPreprocess()
alwaysIncludedShaders.GetArrayElementAtIndex(alwaysIncludedShaders.arraySize - 1).objectReferenceValue = shader;
}

// Unity 기본 쉐이더를 찾아서 추가.
var unlitColorShader = Shader.Find("Unlit/Color");
if (unlitColorShader == null)
{
Debug.LogError("Shader 'Unlit/Color' not found");
return;
}

bool shaderAlreadyIncluded = false;
for (int i = 0; i < alwaysIncludedShaders.arraySize; i++)
{
var shaderElement = alwaysIncludedShaders.GetArrayElementAtIndex(i);
if (shaderElement.objectReferenceValue == unlitColorShader)
{
shaderAlreadyIncluded = true;
break;
}
}

if (!shaderAlreadyIncluded)
{
alwaysIncludedShaders.arraySize++;
alwaysIncludedShaders.GetArrayElementAtIndex(alwaysIncludedShaders.arraySize - 1).objectReferenceValue = unlitColorShader;
}

graphicsSettings.ApplyModifiedProperties();
}
}
Binary file modified Assets/ARPG/Core/Plugins/Android/arm64-v8a/libARPG-plugin.so
Binary file not shown.
Binary file not shown.
Binary file modified Assets/ARPG/Core/Plugins/Windows/x64/ARPG-plugin.dll
Binary file not shown.
Binary file modified Assets/ARPG/Core/Plugins/iOS/libARPG-plugin.a
Binary file not shown.
42 changes: 39 additions & 3 deletions Assets/ARPG/Core/Prefabs/ARPlayGround.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ GameObject:
- component: {fileID: 5451198551273644276}
- component: {fileID: 8513705081441293160}
- component: {fileID: 8513705081441293163}
- component: {fileID: 1809109357865620303}
m_Layer: 0
m_Name: ARPlayGround
m_TagString: Untagged
Expand Down Expand Up @@ -50,6 +51,9 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_ContentsPath:
m_StreamingAsset: 1
m_LoadOnAwake: 1
m_VisualizeAMProj: 1
m_OnStageChanged:
m_PersistentCalls:
m_Calls: []
Expand All @@ -59,13 +63,16 @@ MonoBehaviour:
m_OnNavigationStarted:
m_PersistentCalls:
m_Calls: []
m_OnDistanceUpdated:
m_OnNavigationEnded:
m_PersistentCalls:
m_Calls: []
m_OnDestinationArrived:
m_OnNavigationReSearched:
m_PersistentCalls:
m_Calls: []
m_OnNavigationEnded:
m_OnDistanceUpdated:
m_PersistentCalls:
m_Calls: []
m_OnDestinationArrived:
m_PersistentCalls:
m_Calls: []
m_OnTransitMovingStarted:
Expand All @@ -74,6 +81,13 @@ MonoBehaviour:
m_OnTransitMovingEnded:
m_PersistentCalls:
m_Calls: []
m_OnCustomRangeEntered:
m_PersistentCalls:
m_Calls: []
m_OnCustomRangeExited:
m_PersistentCalls:
m_Calls: []
m_LogLevel: 3
--- !u!114 &4031693856957110526
MonoBehaviour:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -150,12 +164,21 @@ MonoBehaviour:
m_OnNavigationEnded:
m_PersistentCalls:
m_Calls: []
m_OnNavigationReSearched:
m_PersistentCalls:
m_Calls: []
m_OnTransitMovingStarted:
m_PersistentCalls:
m_Calls: []
m_OnTransitMovingEnded:
m_PersistentCalls:
m_Calls: []
m_OnCustomRangeEntered:
m_PersistentCalls:
m_Calls: []
m_OnCustomRangeExited:
m_PersistentCalls:
m_Calls: []
--- !u!114 &8513705081441293160
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -180,3 +203,16 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 0835b4dc51d284290a36ed910a7caf0d, type: 3}
m_Name:
m_EditorClassIdentifier:
useAndroidStreamingAssets: 0
--- !u!114 &1809109357865620303
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5451198551273644282}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 8e5f81c717c114cd3bd60fe75bb2b315, type: 3}
m_Name:
m_EditorClassIdentifier:
Loading

0 comments on commit b66afca

Please sign in to comment.