# Conflicts: # assets/Scene/GameScene.fire # assets/Script/Map.ts # assets/Script/module/Config/GameConfig.ts # assets/common.meta |
||
|---|---|---|
| .. | ||
| font | ||
| img | ||
| music | ||
| prefab | ||
| script | ||
| font.meta | ||
| img.meta | ||
| music.meta | ||
| prefab.meta | ||
| script.meta | ||
# Conflicts: # assets/Scene/GameScene.fire # assets/Script/Map.ts # assets/Script/module/Config/GameConfig.ts # assets/common.meta |
||
|---|---|---|
| .. | ||
| font | ||
| img | ||
| music | ||
| prefab | ||
| script | ||
| font.meta | ||
| img.meta | ||
| music.meta | ||
| prefab.meta | ||
| script.meta | ||