Merge branch 'main' of http://burning.i234.me/idlegirl/idlegirl
# Conflicts: # Library/ArtifactDB # Library/Bee/1300b0aEDbg-inputdata.json # Library/Bee/1300b0aEDbg.dag # Library/Bee/1300b0aEDbg.dag.json # Library/Bee/1300b0aEDbg.dag.payloads # Library/Bee/1300b0aEDbg.dag_derived # Library/Bee/1300b0aEDbg.dag_fsmtime # Library/Bee/TundraBuildState.state # Library/Bee/TundraBuildState.state.map # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp-Editor.dll # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp-Editor.pdb # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp.dll # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp.pdb # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp.ref.dll # Library/Bee/artifacts/1300b0aEDbg.dag/Assembly-CSharp.rsp # Library/Bee/artifacts/1300b0aEDbg.dag/post-processed/Assembly-CSharp-Editor.dll # Library/Bee/artifacts/1300b0aEDbg.dag/post-processed/Assembly-CSharp-Editor.pdb # Library/Bee/artifacts/1300b0aEDbg.dag/post-processed/Assembly-CSharp.dll # Library/Bee/artifacts/1300b0aEDbg.dag/post-processed/Assembly-CSharp.pdb # Library/Bee/backend1.traceevents # Library/Bee/backend2.traceevents # Library/Bee/buildprogram0.traceevents # Library/Bee/fullprofile.json # Library/Bee/tundra.digestcache # Library/Bee/tundra.log.json # Library/BurstCache/JIT/BurstCacheManifest.cm # Library/BurstCache/JIT/Hashes/a110ffe6b760e4b56cb86ae44bc7857d.bhc # Library/BurstCache/JIT/Hashes/f890d1fdde3a07f1cb7ddaf50227f1a0.bhc # Library/SceneVisibilityState.asset # Library/ScriptAssemblies/Assembly-CSharp-Editor.dll # Library/ScriptAssemblies/Assembly-CSharp-Editor.pdb # Library/ScriptAssemblies/Assembly-CSharp.dll # Library/ScriptAssemblies/Assembly-CSharp.pdb # Library/Search/transactions.db # Library/SourceAssetDB # Library/StateCache/MainStageHierarchy/4d/4d2a36d9faf65734f0bbefb3ee623532.json # Library/ilpp.pid # Logs/shadercompiler-UnityShaderCompiler.exe0.log # UserSettings/Layouts/default-2022.dwlt
This commit is contained in:
지용훈
commit
2f884bee07