# Conflicts: # assets/Scene/GameScene.fire # assets/Script/Map.ts # assets/Script/module/Config/GameConfig.ts # assets/common.meta |
||
|---|---|---|
| .. | ||
| GameConfig.ts | ||
| GameConfig.ts.meta | ||
| ReviveCostConfig.ts | ||
| ReviveCostConfig.ts.meta | ||
# Conflicts: # assets/Scene/GameScene.fire # assets/Script/Map.ts # assets/Script/module/Config/GameConfig.ts # assets/common.meta |
||
|---|---|---|
| .. | ||
| GameConfig.ts | ||
| GameConfig.ts.meta | ||
| ReviveCostConfig.ts | ||
| ReviveCostConfig.ts.meta | ||