# Conflicts: # Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs |
||
|---|---|---|
| .. | ||
| Effect | ||
| Live2d | ||
| Map | ||
| UI | ||
| Effect.meta | ||
| Live2d.meta | ||
| Map.meta | ||
| UI.meta | ||
# Conflicts: # Assets/Scripts/Editor/GameEditor/FrameTool/HotFixWindow.cs |
||
|---|---|---|
| .. | ||
| Effect | ||
| Live2d | ||
| Map | ||
| UI | ||
| Effect.meta | ||
| Live2d.meta | ||
| Map.meta | ||
| UI.meta | ||