This commit is contained in:
bridge
2025-12-03 00:10:10 +08:00
parent 31ab56251b
commit a5363a07ad
9 changed files with 85 additions and 148 deletions

View File

@@ -83,8 +83,8 @@ function getTexture() {
function getScale() {
const tex = getTexture()
if (!tex) return 1
// Scale up: 2.5x tile size (was 1.8x)
return (props.tileSize * 2.5) / Math.max(tex.width, tex.height)
// Scale up: 4.25x tile size (larger medium size)
return (props.tileSize * 4.25) / Math.max(tex.width, tex.height)
}
const drawFallback = (g: Graphics) => {
@@ -96,10 +96,10 @@ const drawFallback = (g: Graphics) => {
const nameStyle = {
fontFamily: '"Microsoft YaHei", sans-serif',
fontSize: 42, // Increased from 36
fontSize: 65, // Larger medium size
fontWeight: 'bold',
fill: '#ffffff',
stroke: { color: '#000000', width: 6 }, // Thicker stroke
stroke: { color: '#000000', width: 5.5 }, // Thicker stroke
align: 'center',
dropShadow: {
color: '#000000',

View File

@@ -107,9 +107,9 @@ function getRegionStyle(type: string) {
}
const style = {
fontFamily: '"Microsoft YaHei", sans-serif',
fontSize: type === 'sect' ? 48 : 64,
fontSize: type === 'sect' ? 85 : 100,
fill: type === 'sect' ? '#ffcc00' : (type === 'city' ? '#ccffcc' : '#ffffff'),
stroke: { color: '#000000', width: 8, join: 'round' },
stroke: { color: '#000000', width: 7, join: 'round' },
align: 'center',
dropShadow: {
color: '#000000',

View File

@@ -45,7 +45,12 @@ export function useTextures() {
'SWAMP': '/assets/tiles/swamp.png',
'CAVE': '/assets/tiles/cave.png',
'RUINS': '/assets/tiles/ruins.png',
'FARM': '/assets/tiles/farm.png'
'FARM': '/assets/tiles/farm.png',
'ISLAND': '/assets/tiles/island.png',
'BAMBOO': '/assets/tiles/bamboo.png',
'GOBI': '/assets/tiles/gobi.png',
'TUNDRA': '/assets/tiles/tundra.png',
'MARSH': '/assets/tiles/swamp.png'
}
const tilePromises = Object.entries(manifest).map(async ([key, url]) => {
@@ -87,15 +92,25 @@ export function useTextures() {
if (textures.value[key]) return // 已经加载过
// 假设图片路径规则:/assets/sects/宗门名.png
// 优先尝试 .png如果需要支持 .jpg 可能需要额外逻辑,这里先定死 .png
// 使用 encodeURIComponent 处理中文路径
const url = `/assets/sects/${sectName}.png`
try {
// 尝试直接加载Pixi v7+ Assets.load 通常能处理 URL
// 为了兼容性,我们保留原始字符串,如果失败再尝试 encode
const tex = await Assets.load(url)
textures.value[key] = tex
console.log(`Loaded sect texture: ${sectName}`)
} catch (e) {
console.warn(`Failed to load sect texture for ${sectName}, using fallback.`)
// 加载失败时不占位MapLayer 会 fallback 到 CITY
// 尝试 encode 再次加载
try {
const encodedUrl = `/assets/sects/${encodeURIComponent(sectName)}.png`
const tex = await Assets.load(encodedUrl)
textures.value[key] = tex
console.log(`Loaded sect texture (encoded): ${sectName}`)
} catch (e2) {
console.warn(`Failed to load sect texture for ${sectName} (both raw and encoded), using fallback.`, e)
}
}
}