调整部分数据表配置,优化 SpriteCache 功能

This commit is contained in:
2026-09-13 20:36:21 +08:00
parent de53890de6
commit 7dc529a840
520 changed files with 24231 additions and 967 deletions
Binary file not shown.
+14 -7
View File
@@ -1,6 +1,7 @@
[ [
{ {
"name": "近战敌人", "enemyType": 1,
"logicType": "MeleeEnemy",
"maxHealth": 50, "maxHealth": 50,
"hpAddPerLevel": 50, "hpAddPerLevel": 50,
"attackDamage": 1, "attackDamage": 1,
@@ -15,7 +16,8 @@
"prefab": "MeleeEnemy" "prefab": "MeleeEnemy"
}, },
{ {
"name": "远程敌人", "enemyType": 2,
"logicType": "RemoteEnemy",
"maxHealth": 40, "maxHealth": 40,
"hpAddPerLevel": 40, "hpAddPerLevel": 40,
"attackDamage": 1, "attackDamage": 1,
@@ -30,7 +32,8 @@
"prefab": "RemoteEnemy" "prefab": "RemoteEnemy"
}, },
{ {
"name": "蝙蝠", "enemyType": 3,
"logicType": "BatEnemy",
"maxHealth": 20, "maxHealth": 20,
"hpAddPerLevel": 15, "hpAddPerLevel": 15,
"attackDamage": 1, "attackDamage": 1,
@@ -45,7 +48,8 @@
"prefab": "MeleeEnemy" "prefab": "MeleeEnemy"
}, },
{ {
"name": "骷髅兵", "enemyType": 4,
"logicType": "SkeletonEnemy",
"maxHealth": 80, "maxHealth": 80,
"hpAddPerLevel": 60, "hpAddPerLevel": 60,
"attackDamage": 2, "attackDamage": 2,
@@ -60,7 +64,8 @@
"prefab": "MeleeEnemy" "prefab": "MeleeEnemy"
}, },
{ {
"name": "骷髅巨人", "enemyType": 5,
"logicType": "SkeletonGiantEnemy",
"maxHealth": 200, "maxHealth": 200,
"hpAddPerLevel": 120, "hpAddPerLevel": 120,
"attackDamage": 3, "attackDamage": 3,
@@ -75,7 +80,8 @@
"prefab": "MeleeEnemy" "prefab": "MeleeEnemy"
}, },
{ {
"name": "幽灵", "enemyType": 6,
"logicType": "GhostEnemy",
"maxHealth": 30, "maxHealth": 30,
"hpAddPerLevel": 25, "hpAddPerLevel": 25,
"attackDamage": 1, "attackDamage": 1,
@@ -90,7 +96,8 @@
"prefab": "RemoteEnemy" "prefab": "RemoteEnemy"
}, },
{ {
"name": "火焰法师", "enemyType": 7,
"logicType": "FireMageEnemy",
"maxHealth": 60, "maxHealth": 60,
"hpAddPerLevel": 45, "hpAddPerLevel": 45,
"attackDamage": 2, "attackDamage": 2,
@@ -1 +1 @@
�� 
@@ -1,5 +1,5 @@
[ [
{ {
"elapsedTime": 1000 "weaponCapacity": 6
} }
] ]
Binary file not shown.
+100 -75
View File
@@ -1,127 +1,152 @@
[ [
{ {
"Id": 1001, "id": 1001,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1001 "propId": 1001,
"weaponType": 0
}, },
{ {
"Id": 1002, "id": 1002,
"GoodsType": 2, "goodsType": 2,
"GoodsTypeId": 1001 "propId": 0,
"weaponType": 1
}, },
{ {
"Id": 1003, "id": 1003,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1002 "propId": 1002,
"weaponType": 0
}, },
{ {
"Id": 1004, "id": 1004,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1003 "propId": 1003,
"weaponType": 0
}, },
{ {
"Id": 1005, "id": 1005,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1004 "propId": 1004,
"weaponType": 0
}, },
{ {
"Id": 1006, "id": 1006,
"GoodsType": 2, "goodsType": 2,
"GoodsTypeId": 1002 "propId": 0,
"weaponType": 2
}, },
{ {
"Id": 1007, "id": 1007,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1005 "propId": 1005,
"weaponType": 0
}, },
{ {
"Id": 1008, "id": 1008,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1006 "propId": 1006,
"weaponType": 0
}, },
{ {
"Id": 1009, "id": 1009,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1007 "propId": 1007,
"weaponType": 0
}, },
{ {
"Id": 1010, "id": 1010,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1008 "propId": 1008,
"weaponType": 0
}, },
{ {
"Id": 1011, "id": 1011,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1009 "propId": 1009,
"weaponType": 0
}, },
{ {
"Id": 1012, "id": 1012,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1010 "propId": 1010,
"weaponType": 0
}, },
{ {
"Id": 1013, "id": 1013,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1011 "propId": 1011,
"weaponType": 0
}, },
{ {
"Id": 1014, "id": 1014,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1012 "propId": 1012,
"weaponType": 0
}, },
{ {
"Id": 1015, "id": 1015,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1013 "propId": 1013,
"weaponType": 0
}, },
{ {
"Id": 1016, "id": 1016,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1014 "propId": 1014,
"weaponType": 0
}, },
{ {
"Id": 1017, "id": 1017,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1015 "propId": 1015,
"weaponType": 0
}, },
{ {
"Id": 1018, "id": 1018,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1016 "propId": 1016,
"weaponType": 0
}, },
{ {
"Id": 1019, "id": 1019,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1017 "propId": 1017,
"weaponType": 0
}, },
{ {
"Id": 1020, "id": 1020,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1018 "propId": 1018,
"weaponType": 0
}, },
{ {
"Id": 1021, "id": 1021,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1019 "propId": 1019,
"weaponType": 0
}, },
{ {
"Id": 1022, "id": 1022,
"GoodsType": 1, "goodsType": 1,
"GoodsTypeId": 1020 "propId": 1020,
"weaponType": 0
}, },
{ {
"Id": 1023, "id": 1023,
"GoodsType": 2, "goodsType": 2,
"GoodsTypeId": 1003 "propId": 0,
"weaponType": 3
}, },
{ {
"Id": 1024, "id": 1024,
"GoodsType": 2, "goodsType": 2,
"GoodsTypeId": 1004 "propId": 0,
"weaponType": 4
}, },
{ {
"Id": 1025, "id": 1025,
"GoodsType": 2, "goodsType": 2,
"GoodsTypeId": 1005 "propId": 0,
"weaponType": 5
} }
] ]
@@ -1,5 +1,5 @@
 餈烐��䔶犖� 餈𦦵��䔶犖�< 餈烐��䔶犖斆< 餈烐��䔶犖斆�躰�䧧< 撉琿���䧧 餈𦦵��䔶犖�< 餈烐��䔶犖 � ��<�Ќ<�Ќ�И<�И� <
��躰�箮< 撉琿���䧧撟賜�斆F�躰�䧧撟賜�䧧F 餈烐��䔶犖䧧 撉琿�撌其犖籖 �怎�瘜訫��P  撉琿���� 撉琿�撌其犖炥 �怎�瘜訫�䧧Z �Ф�а<�И�ЌF�И�ИF�И�@��P �Ф�p�ИZ
�躰� 
箮 撉琿���籖撟賜�䧧 �怎�瘜訫��x �а�@�И� x
+23 -23
View File
@@ -3,12 +3,12 @@
"id": 1, "id": 1,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "近战敌人", "enemyType": 1,
"enemyCount": 5, "enemyCount": 5,
"interval": 4000 "interval": 4000
}, },
{ {
"enemyName": "远程敌人", "enemyType": 2,
"enemyCount": 2, "enemyCount": 2,
"interval": 5000 "interval": 5000
} }
@@ -19,7 +19,7 @@
"id": 2, "id": 2,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "近战敌人", "enemyType": 1,
"enemyCount": 8, "enemyCount": 8,
"interval": 3500 "interval": 3500
} }
@@ -30,12 +30,12 @@
"id": 3, "id": 3,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "近战敌人", "enemyType": 1,
"enemyCount": 6, "enemyCount": 6,
"interval": 3500 "interval": 3500
}, },
{ {
"enemyName": "蝙蝠", "enemyType": 3,
"enemyCount": 4, "enemyCount": 4,
"interval": 3000 "interval": 3000
} }
@@ -46,12 +46,12 @@
"id": 4, "id": 4,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "骷髅兵", "enemyType": 4,
"enemyCount": 6, "enemyCount": 6,
"interval": 3000 "interval": 3000
}, },
{ {
"enemyName": "远程敌人", "enemyType": 2,
"enemyCount": 4, "enemyCount": 4,
"interval": 4000 "interval": 4000
} }
@@ -62,12 +62,12 @@
"id": 5, "id": 5,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "近战敌人", "enemyType": 1,
"enemyCount": 10, "enemyCount": 10,
"interval": 2500 "interval": 2500
}, },
{ {
"enemyName": "蝙蝠", "enemyType": 3,
"enemyCount": 5, "enemyCount": 5,
"interval": 2000 "interval": 2000
} }
@@ -78,12 +78,12 @@
"id": 6, "id": 6,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "骷髅兵", "enemyType": 4,
"enemyCount": 6, "enemyCount": 6,
"interval": 3000 "interval": 3000
}, },
{ {
"enemyName": "幽灵", "enemyType": 6,
"enemyCount": 5, "enemyCount": 5,
"interval": 3500 "interval": 3500
} }
@@ -94,12 +94,12 @@
"id": 7, "id": 7,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "蝙蝠", "enemyType": 3,
"enemyCount": 5, "enemyCount": 5,
"interval": 3000 "interval": 3000
}, },
{ {
"enemyName": "幽灵", "enemyType": 6,
"enemyCount": 4, "enemyCount": 4,
"interval": 3000 "interval": 3000
} }
@@ -110,17 +110,17 @@
"id": 8, "id": 8,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "近战敌人", "enemyType": 1,
"enemyCount": 8, "enemyCount": 8,
"interval": 3000 "interval": 3000
}, },
{ {
"enemyName": "骷髅巨人", "enemyType": 5,
"enemyCount": 2, "enemyCount": 2,
"interval": 8000 "interval": 8000
}, },
{ {
"enemyName": "火焰法师", "enemyType": 7,
"enemyCount": 3, "enemyCount": 3,
"interval": 5000 "interval": 5000
} }
@@ -131,17 +131,17 @@
"id": 9, "id": 9,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "骷髅兵", "enemyType": 4,
"enemyCount": 8, "enemyCount": 8,
"interval": 2500 "interval": 2500
}, },
{ {
"enemyName": "骷髅巨人", "enemyType": 5,
"enemyCount": 3, "enemyCount": 3,
"interval": 6000 "interval": 6000
}, },
{ {
"enemyName": "火焰法师", "enemyType": 7,
"enemyCount": 4, "enemyCount": 4,
"interval": 3000 "interval": 3000
} }
@@ -152,22 +152,22 @@
"id": 10, "id": 10,
"enemySpawnConfigs": [ "enemySpawnConfigs": [
{ {
"enemyName": "蝙蝠", "enemyType": 3,
"enemyCount": 10, "enemyCount": 10,
"interval": 2000 "interval": 2000
}, },
{ {
"enemyName": "骷髅兵", "enemyType": 4,
"enemyCount": 3, "enemyCount": 3,
"interval": 8000 "interval": 8000
}, },
{ {
"enemyName": "幽灵", "enemyType": 6,
"enemyCount": 5, "enemyCount": 5,
"interval": 3000 "interval": 3000
}, },
{ {
"enemyName": "火焰法师", "enemyType": 7,
"enemyCount": 4, "enemyCount": 4,
"interval": 4000 "interval": 4000
} }
@@ -1 +1 @@
┐ИХ┌▄Х┌┴2┐ЙГ┴≥И╫©2┐КХ└▒2┐ЛИ╪╩Е╜░ 2┐МХ┘©2┐НГ°╪Г²⌡2┐ОХ┌▄Х┌┴─√┐ПГ┴≥И╫©─√┐ЯХ└▒─√┐РИ╪╩Е╜░ ─√┐СХ┘©─√┐ТГ°╪Г²⌡─√┐УХ┌▄Х┌┴│,┐ЖГ┴≥И╫©│,┐ВХ└▒│,┐ЬИ╪╩Е╜░ │,┐ЫХ┘©│,┐ЗГ°╪Г²⌡│, ┐ИХ┌▄Х┌┴2Х┌▄Х┌┴┐ЙГ┴≥И╫©2Г┴≥И╫©┐КХ└▒2Х└▒┐ЛИ╪╩Е╜░ 2И╪╩Е╜░┐МХ┘©2Х┘©┐НГ°╪Г²⌡2Г°╪Г²⌡┐ОХ┌▄Х┌┴─√Х┌▄Х┌┴┐ПГ┴≥И╫©─√Г┴≥И╫©┐ЯХ└▒─√Х└▒┐РИ╪╩Е╜░ ─√И╪╩Е╜░┐СХ┘©─√Х┘©┐ТГ°╪Г²⌡─√Г°╪Г²⌡┐УХ┌▄Х┌┴│,Х┌▄Х┌┴┐ЖГ┴≥И╫©│,Г┴≥И╫©┐ВХ└▒│,Х└▒┐ЬИ╪╩Е╜░ │,И╪╩Е╜░┐ЫХ┘©│,Х┘©┐ЗГ°╪Г²⌡│,Г°╪Г²⌡
@@ -9,7 +9,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "肌肉"
}, },
{ {
"id": 1002, "id": 1002,
@@ -21,7 +22,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "牙齿"
}, },
{ {
"id": 1003, "id": 1003,
@@ -33,7 +35,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "脑"
}, },
{ {
"id": 1004, "id": 1004,
@@ -45,7 +48,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "鼻子"
}, },
{ {
"id": 1005, "id": 1005,
@@ -57,7 +61,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "腿"
}, },
{ {
"id": 1006, "id": 1006,
@@ -69,7 +74,8 @@
"value": 50, "value": 50,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "眼睛"
}, },
{ {
"id": 1007, "id": 1007,
@@ -81,7 +87,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "肌肉"
}, },
{ {
"id": 1008, "id": 1008,
@@ -93,7 +100,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "牙齿"
}, },
{ {
"id": 1009, "id": 1009,
@@ -105,7 +113,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "脑"
}, },
{ {
"id": 1010, "id": 1010,
@@ -117,7 +126,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "鼻子"
}, },
{ {
"id": 1011, "id": 1011,
@@ -129,7 +139,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "腿"
}, },
{ {
"id": 1012, "id": 1012,
@@ -141,7 +152,8 @@
"value": 150, "value": 150,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "眼睛"
}, },
{ {
"id": 1013, "id": 1013,
@@ -153,7 +165,8 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "肌肉"
}, },
{ {
"id": 1014, "id": 1014,
@@ -165,7 +178,8 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "牙齿"
}, },
{ {
"id": 1015, "id": 1015,
@@ -177,7 +191,8 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "脑"
}, },
{ {
"id": 1016, "id": 1016,
@@ -189,7 +204,8 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "鼻子"
}, },
{ {
"id": 1017, "id": 1017,
@@ -201,7 +217,8 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "腿"
}, },
{ {
"id": 1018, "id": 1018,
@@ -213,6 +230,7 @@
"value": 300, "value": 300,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "眼睛"
} }
] ]
Binary file not shown.
+40 -20
View File
@@ -15,7 +15,8 @@
"value": 12, "value": 12,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "铁护腕"
}, },
{ {
"id": 1002, "id": 1002,
@@ -38,7 +39,8 @@
"value": 11, "value": 11,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "狂战士药剂"
}, },
{ {
"id": 1003, "id": 1003,
@@ -61,7 +63,8 @@
"value": 23, "value": 23,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "龙鳞护符"
}, },
{ {
"id": 1004, "id": 1004,
@@ -74,7 +77,8 @@
"value": 79, "value": 79,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "泰坦壁垒"
}, },
{ {
"id": 1005, "id": 1005,
@@ -92,7 +96,8 @@
"value": 10, "value": 10,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "轻便短靴"
}, },
{ {
"id": 1006, "id": 1006,
@@ -115,7 +120,8 @@
"value": 44, "value": 44,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "幽灵披风"
}, },
{ {
"id": 1007, "id": 1007,
@@ -128,7 +134,8 @@
"value": 62, "value": 62,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "精钢胸甲"
}, },
{ {
"id": 1008, "id": 1008,
@@ -146,7 +153,8 @@
"value": 27, "value": 27,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "暗影之刃"
}, },
{ {
"id": 1009, "id": 1009,
@@ -169,7 +177,8 @@
"value": 8, "value": 8,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "旅行者徽章"
}, },
{ {
"id": 1010, "id": 1010,
@@ -182,7 +191,8 @@
"value": 190, "value": 190,
"isPercent": true "isPercent": true
} }
] ],
"sprite": "疾风手套"
}, },
{ {
"id": 1011, "id": 1011,
@@ -195,7 +205,8 @@
"value": 57, "value": 57,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "巨人之力卷轴"
}, },
{ {
"id": 1012, "id": 1012,
@@ -213,7 +224,8 @@
"value": 27, "value": 27,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "不死鸟之心"
}, },
{ {
"id": 1013, "id": 1013,
@@ -231,7 +243,8 @@
"value": 7, "value": 7,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "幸运草"
}, },
{ {
"id": 1014, "id": 1014,
@@ -249,7 +262,8 @@
"value": 38, "value": 38,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "石肤戒指"
}, },
{ {
"id": 1015, "id": 1015,
@@ -267,7 +281,8 @@
"value": 32, "value": 32,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "风行者胫甲"
}, },
{ {
"id": 1016, "id": 1016,
@@ -290,7 +305,8 @@
"value": 24, "value": 24,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "幻影斗篷"
}, },
{ {
"id": 1017, "id": 1017,
@@ -303,7 +319,8 @@
"value": 23, "value": 23,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "木质盾牌"
}, },
{ {
"id": 1018, "id": 1018,
@@ -321,7 +338,8 @@
"value": 69, "value": 69,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "生命之戒"
}, },
{ {
"id": 1019, "id": 1019,
@@ -344,7 +362,8 @@
"value": 20, "value": 20,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "精灵耳环"
}, },
{ {
"id": 1020, "id": 1020,
@@ -367,6 +386,7 @@
"value": 27, "value": 27,
"isPercent": false "isPercent": false
} }
] ],
"sprite": "战神勋章"
} }
] ]
Binary file not shown.
+4 -2
View File
@@ -17,7 +17,8 @@
} }
], ],
"initialItems": [], "initialItems": [],
"prefab": "Player" "prefab": "Player",
"sprite": "全能者"
}, },
{ {
"name": "老人", "name": "老人",
@@ -26,6 +27,7 @@
"coin": 5, "coin": 5,
"modifiers": [], "modifiers": [],
"initialItems": [], "initialItems": [],
"prefab": "Player" "prefab": "Player",
"sprite": "老人"
} }
] ]
Binary file not shown.
+167 -1
View File
@@ -1 +1,167 @@
[] [
{
"key": "小刀",
"atlasPath": "Weapon.png",
"spriteIndex": 0
},
{
"key": "手枪",
"atlasPath": "Weapon.png",
"spriteIndex": 1
},
{
"key": "斧头",
"atlasPath": "Weapon.png",
"spriteIndex": 2
},
{
"key": "闪电",
"atlasPath": "Weapon.png",
"spriteIndex": 3
},
{
"key": "长枪",
"atlasPath": "Weapon.png",
"spriteIndex": 4
},
{
"key": "铁护腕",
"atlasPath": "Prop.png",
"spriteIndex": 0
},
{
"key": "狂战士药剂",
"atlasPath": "Prop.png",
"spriteIndex": 1
},
{
"key": "龙鳞护符",
"atlasPath": "Prop.png",
"spriteIndex": 2
},
{
"key": "泰坦壁垒",
"atlasPath": "Prop.png",
"spriteIndex": 3
},
{
"key": "轻便短靴",
"atlasPath": "Prop.png",
"spriteIndex": 4
},
{
"key": "幽灵披风",
"atlasPath": "Prop.png",
"spriteIndex": 5
},
{
"key": "精钢胸甲",
"atlasPath": "Prop.png",
"spriteIndex": 6
},
{
"key": "暗影之刃",
"atlasPath": "Prop.png",
"spriteIndex": 7
},
{
"key": "旅行者徽章",
"atlasPath": "Prop.png",
"spriteIndex": 8
},
{
"key": "疾风手套",
"atlasPath": "Prop.png",
"spriteIndex": 9
},
{
"key": "巨人之力卷轴",
"atlasPath": "Prop.png",
"spriteIndex": 10
},
{
"key": "不死鸟之心",
"atlasPath": "Prop.png",
"spriteIndex": 11
},
{
"key": "幸运草",
"atlasPath": "Prop.png",
"spriteIndex": 12
},
{
"key": "石肤戒指",
"atlasPath": "Prop.png",
"spriteIndex": 13
},
{
"key": "风行者胫甲",
"atlasPath": "Prop.png",
"spriteIndex": 14
},
{
"key": "幻影斗篷",
"atlasPath": "Prop.png",
"spriteIndex": 15
},
{
"key": "木质盾牌",
"atlasPath": "Prop.png",
"spriteIndex": 16
},
{
"key": "生命之戒",
"atlasPath": "Prop.png",
"spriteIndex": 17
},
{
"key": "精灵耳环",
"atlasPath": "Prop.png",
"spriteIndex": 18
},
{
"key": "战神勋章",
"atlasPath": "Prop.png",
"spriteIndex": 19
},
{
"key": "全能者",
"atlasPath": "Role.png",
"spriteIndex": 0
},
{
"key": "老人",
"atlasPath": "Role.png",
"spriteIndex": 1
},
{
"key": "肌肉",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 0
},
{
"key": "牙齿",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 1
},
{
"key": "脑",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 2
},
{
"key": "鼻子",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 3
},
{
"key": "腿",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 4
},
{
"key": "眼睛",
"atlasPath": "LevelUpReward.png",
"spriteIndex": 5
}
]
Binary file not shown.
+20 -15
View File
@@ -1,7 +1,7 @@
[ [
{ {
"id": 1001, "weaponType": 1,
"name": "小刀", "logicType": "WeaponKnife",
"rarity": 1, "rarity": 1,
"price": 120, "price": 120,
"attack": 100, "attack": 100,
@@ -15,11 +15,12 @@
] ]
], ],
"modifiers": [], "modifiers": [],
"prefab": "WeaponKnife" "prefab": "WeaponKnife",
"sprite": "小刀"
}, },
{ {
"id": 1002, "weaponType": 2,
"name": "手枪", "logicType": "WeaponHandgun",
"rarity": 1, "rarity": 1,
"price": 130, "price": 130,
"attack": 120, "attack": 120,
@@ -28,11 +29,12 @@
"attackSoundId": 10000, "attackSoundId": 10000,
"parameters": [], "parameters": [],
"modifiers": [], "modifiers": [],
"prefab": "WeaponHandgun" "prefab": "WeaponHandgun",
"sprite": "手枪"
}, },
{ {
"id": 1003, "weaponType": 3,
"name": "斧头", "logicType": "WeaponSlash",
"rarity": 1, "rarity": 1,
"price": 100, "price": 100,
"attack": 150, "attack": 150,
@@ -46,11 +48,12 @@
] ]
], ],
"modifiers": [], "modifiers": [],
"prefab": "WeaponSlash" "prefab": "WeaponSlash",
"sprite": "斧头"
}, },
{ {
"id": 1004, "weaponType": 4,
"name": "闪电", "logicType": "WeaponLightning",
"rarity": 1, "rarity": 1,
"price": 150, "price": 150,
"attack": 80, "attack": 80,
@@ -64,11 +67,12 @@
] ]
], ],
"modifiers": [], "modifiers": [],
"prefab": "WeaponLightning" "prefab": "WeaponLightning",
"sprite": "闪电"
}, },
{ {
"id": 1005, "weaponType": 5,
"name": "长枪", "logicType": "WeaponLance",
"rarity": 1, "rarity": 1,
"price": 100, "price": 100,
"attack": 100, "attack": 100,
@@ -90,6 +94,7 @@
] ]
], ],
"modifiers": [], "modifiers": [],
"prefab": "WeaponLance" "prefab": "WeaponLance",
"sprite": "长枪"
} }
] ]
@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using SepCore.Event; using SepCore.Event;
using SepCore.Definition; using SepCore.Definition;
@@ -48,8 +49,8 @@ public class RuntimeDebugPanelComponent : MonoBehaviour
private float _spawnRateScaleInput = 1f; private float _spawnRateScaleInput = 1f;
private float _extendDurationSeconds = 30f; private float _extendDurationSeconds = 30f;
private PropConfig[] _allProps = Array.Empty<PropConfig>(); private IReadOnlyList<PropConfig> _allProps;
private PropConfig[] _filteredProps = Array.Empty<PropConfig>(); private IReadOnlyList<PropConfig> _filteredProps;
private string[] _displayNames = Array.Empty<string>(); private string[] _displayNames = Array.Empty<string>();
private int _cornerTapCount; private int _cornerTapCount;
@@ -212,7 +213,7 @@ public class RuntimeDebugPanelComponent : MonoBehaviour
PropConfig selectedProp = GetSelectedProp(); PropConfig selectedProp = GetSelectedProp();
if (selectedProp == null) return; if (selectedProp == null) return;
GUILayout.Label($"Selected: {selectedProp.Title} ({selectedProp.Rarity})"); GUILayout.Label($"Selected: {selectedProp.Name} ({selectedProp.Rarity})");
GUILayout.Label(ItemDescUtility.CreatePropDescription(selectedProp.Modifiers), GUILayout.Height(40f)); GUILayout.Label(ItemDescUtility.CreatePropDescription(selectedProp.Modifiers), GUILayout.Height(40f));
GUILayout.BeginHorizontal(); GUILayout.BeginHorizontal();
@@ -397,27 +398,24 @@ public class RuntimeDebugPanelComponent : MonoBehaviour
private void EnsurePropList(bool force = false) private void EnsurePropList(bool force = false)
{ {
if (!force && _allProps != null && _allProps.Length > 0) return; if (!force && _allProps != null && _allProps.Count > 0) return;
if (GameEntry.Luban == null) if (GameEntry.Luban == null)
{ {
_allProps = Array.Empty<PropConfig>(); _allProps = Array.Empty<PropConfig>();
_filteredProps = Array.Empty<PropConfig>();
_displayNames = Array.Empty<string>(); _displayNames = Array.Empty<string>();
return; return;
} }
var table = GameEntry.Luban.GetTable<PropConfig>(); _allProps = GameEntry.Luban.GetTable<PropConfig>();
_allProps = table != null ? table.ToArray() : Array.Empty<PropConfig>(); _selectedIndex = Mathf.Clamp(_selectedIndex, 0, Mathf.Max(0, _allProps.Count - 1));
_selectedIndex = Mathf.Clamp(_selectedIndex, 0, Mathf.Max(0, _allProps.Length - 1));
ApplyFilter(_searchText); ApplyFilter(_searchText);
} }
private void ApplyFilter(string keyword) private void ApplyFilter(string keyword)
{ {
if (_allProps == null || _allProps.Length == 0) if (_allProps == null || _allProps.Count == 0)
{ {
_filteredProps = Array.Empty<PropConfig>();
_displayNames = Array.Empty<string>(); _displayNames = Array.Empty<string>();
return; return;
} }
@@ -431,19 +429,19 @@ public class RuntimeDebugPanelComponent : MonoBehaviour
string search = keyword.Trim(); string search = keyword.Trim();
_filteredProps = _allProps.Where(p => _filteredProps = _allProps.Where(p =>
p != null && p != null &&
(p.Title?.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0 || (p.Name?.IndexOf(search, StringComparison.OrdinalIgnoreCase) >= 0 ||
p.Id.ToString().Contains(search))).ToArray(); p.Id.ToString().Contains(search))).ToArray();
} }
_displayNames = _filteredProps.Select(p => $"[{p.Id}] {p.Title} ({p.Rarity})").ToArray(); _displayNames = _filteredProps.Select(p => $"[{p.Id}] {p.Name} ({p.Rarity})").ToArray();
if (_displayNames.Length == 0) _selectedIndex = 0; if (_displayNames.Length == 0) _selectedIndex = 0;
else _selectedIndex = Mathf.Clamp(_selectedIndex, 0, _displayNames.Length - 1); else _selectedIndex = Mathf.Clamp(_selectedIndex, 0, _displayNames.Length - 1);
} }
private PropConfig GetSelectedProp() private PropConfig GetSelectedProp()
{ {
if (_filteredProps == null || _filteredProps.Length == 0) return null; if (_filteredProps == null || _filteredProps.Count == 0) return null;
_selectedIndex = Mathf.Clamp(_selectedIndex, 0, _filteredProps.Length - 1); _selectedIndex = Mathf.Clamp(_selectedIndex, 0, _filteredProps.Count - 1);
return _filteredProps[_selectedIndex]; return _filteredProps[_selectedIndex];
} }
@@ -1,7 +0,0 @@
namespace SepCore.Definition
{
public sealed partial class LevelUpRewardConfig
{
public string IconAssetName => $"levelupreward_{(Id >= 1000 ? Id - 900 : Id)}_icon";
}
}
@@ -1,8 +0,0 @@
namespace SepCore.Definition
{
public sealed partial class PropConfig
{
public string Title => Name;
public string IconAssetName => $"prop_{(Id >= 1000 ? Id - 900 : Id)}_icon";
}
}
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 37131c7b023611f4b83978960f4b3df4
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -1,10 +0,0 @@
namespace SepCore.Definition
{
public sealed partial class RoleConfig
{
public int Id => Name == "老人" ? 102 : 101;
public string RoleName => Name;
public string IconName => $"role_{Id}_icon";
public int WeaponCapacity => 6;
}
}
@@ -1,10 +0,0 @@
namespace SepCore.Definition
{
public sealed partial class WeaponConfig
{
/// <summary>
/// 图标资源名称(映射 weapon_1_icon ~ weapon_5_icon)。
/// </summary>
public string IconAssetName => $"weapon_{(Id >= 1000 ? Id % 1000 : Id)}_icon";
}
}
@@ -1,11 +0,0 @@
fileFormatVersion: 2
guid: 430f837865b92144c82328dc2ce58823
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:
@@ -18,6 +18,7 @@ namespace SepCore.Definition
public const int DataTableAsset = 100; public const int DataTableAsset = 100;
public const int DictionaryAsset = 100; public const int DictionaryAsset = 100;
public const int FontAsset = 50; public const int FontAsset = 50;
public const int SpriteAsset = 40;
public const int MusicAsset = 20; public const int MusicAsset = 20;
public const int SceneAsset = 0; public const int SceneAsset = 0;
public const int SoundAsset = 30; public const int SoundAsset = 30;
@@ -16,9 +16,9 @@ namespace SepCore.Definition
{ {
_modifiers.AddRange(prop.Modifiers); _modifiers.AddRange(prop.Modifiers);
} }
Title = prop.Title; Title = prop.Name;
Rarity = prop.Rarity; Rarity = prop.Rarity;
IconAssetName = prop.IconAssetName; IconAssetName = prop.Sprite;
} }
public PropItem(IEnumerable<modifier> modifiers) public PropItem(IEnumerable<modifier> modifiers)
@@ -1,14 +0,0 @@
namespace SepCore.Definition
{
public enum EnemyType : byte
{
None = 0,
MeleeEnemy = 1,
RemoteEnemy = 2,
BatEnemy = 3,
SkeletonEnemy = 4,
SkeletonGiantEnemy = 5,
GhostEnemy = 6,
FireMageEnemy = 7,
}
}
@@ -1,3 +0,0 @@
fileFormatVersion: 2
guid: 2aa817d65bcc425a9e015f3c1de7c9a9
timeCreated: 1770209105
@@ -1,12 +0,0 @@
namespace SepCore.Definition
{
public enum WeaponType : int
{
None = 0,
WeaponKnife = 1001,
WeaponHandgun = 1002,
WeaponSlash = 1003,
WeaponLightning = 1004,
WeaponLance = 1005,
}
}
@@ -1,68 +0,0 @@
using System;
using System.Collections.Generic;
using SepCore.Definition;
using UnityEngine;
namespace SepCore.Entity
{
[Serializable]
public class EnemyData : TargetableObjectData
{
private readonly EnemyConfig _enemyConfig;
private readonly EnemyType _enemyType;
public EnemyData(int entityId, EnemyConfig enemyConfig, EnemyType enemyType, int level)
: base(enemyConfig != null ? enemyConfig.Prefab : string.Empty, entityId, CampType.Enemy)
{
_enemyConfig = enemyConfig;
_enemyType = enemyType;
int effectiveLevel = Mathf.Max(1, level);
MaxHealthBase = _enemyConfig != null
? _enemyConfig.MaxHealth + _enemyConfig.HpAddPerLevel * (effectiveLevel - 1)
: 100;
}
public EnemyType EnemyType => _enemyType;
public override int MaxHealthBase { get; }
public int AttackDamage => _enemyConfig?.AttackDamage ?? 0;
public float AttackCooldown => _enemyConfig?.AttackCooldown ?? 1f;
public float AttackRange => _enemyConfig?.AttackRange ?? 1.5f;
public float SpeedBase => _enemyConfig?.Speed ?? 2f;
public int DropCoin => _enemyConfig?.CoinDrop ?? 0;
public int DropExp => _enemyConfig?.ExpDrop ?? 0;
public float DropPercent => _enemyConfig?.DropPercent ?? 0f;
public float Scale => _enemyConfig?.Scale ?? 1f;
public Color Color
{
get
{
if (_enemyConfig != null &&
!string.IsNullOrEmpty(_enemyConfig.Color) &&
ColorUtility.TryParseHtmlString(_enemyConfig.Color, out Color color))
{
return color;
}
return Color.white;
}
}
public IReadOnlyDictionary<string, string> Params => null;
public bool TryGetParam(string key, out string value)
{
value = null;
return false;
}
}
}
@@ -9,10 +9,6 @@ namespace SepCore.Entity
_value = value; _value = value;
} }
public CoinData(int value, int entityId, int typeId) : this(value, entityId, "CoinEntity")
{
}
public int Value public int Value
{ {
get => _value; get => _value;
@@ -0,0 +1,62 @@
using System;
using System.Collections.Generic;
using SepCore.Definition;
using UnityEngine;
namespace SepCore.Entity
{
[Serializable]
public class EnemyData : TargetableObjectData
{
private readonly EnemyConfig _enemyConfig;
public EnemyData(int entityId, EnemyConfig enemyConfig, int level)
: base(enemyConfig.Prefab, entityId, CampType.Enemy)
{
_enemyConfig = enemyConfig;
int effectiveLevel = Mathf.Max(1, level);
MaxHealthBase = enemyConfig.MaxHealth + enemyConfig.HpAddPerLevel * (effectiveLevel - 1);
}
public EnemyType EnemyType => _enemyConfig.EnemyType;
public string LogicType => _enemyConfig.LogicType;
public override int MaxHealthBase { get; }
public int AttackDamage => _enemyConfig.AttackDamage;
public float AttackCooldown => _enemyConfig.AttackCooldown;
public float AttackRange => _enemyConfig.AttackRange;
public float SpeedBase => _enemyConfig.Speed;
public int DropCoin => _enemyConfig.CoinDrop;
public int DropExp => _enemyConfig.ExpDrop;
public float DropPercent => _enemyConfig.DropPercent;
public float Scale => _enemyConfig.Scale;
public Color Color
{
get
{
// 空/非法颜色值视为无染色(乘以白色)。
return ColorUtility.TryParseHtmlString(_enemyConfig.Color, out Color color)
? color
: Color.white;
}
}
public IReadOnlyDictionary<string, string> Params => null;
public bool TryGetParam(string key, out string value)
{
value = null;
return false;
}
}
}
@@ -9,10 +9,6 @@ namespace SepCore.Entity
_value = value; _value = value;
} }
public ExpData(int value, int entityId, int typeId) : this(value, entityId, "ExpEntity")
{
}
public int Value public int Value
{ {
get => _value; get => _value;
@@ -13,10 +13,6 @@ namespace SepCore.Entity
MaxHealthBase = 100; MaxHealthBase = 100;
} }
public PlayerData(int entityId, int typeId) : this(entityId, "Player")
{
}
public override int MaxHealthBase { get; } public override int MaxHealthBase { get; }
} }
} }
@@ -17,13 +17,15 @@ namespace SepCore.Entity
public WeaponConfig Config => _weaponConfig; public WeaponConfig Config => _weaponConfig;
public WeaponType WeaponType => (WeaponType)_weaponConfig.Id; public WeaponType WeaponType => _weaponConfig.WeaponType;
public string LogicType => _weaponConfig.LogicType;
public int Attack => _weaponConfig.Attack; public int Attack => _weaponConfig.Attack;
public string Title => _weaponConfig.Name; public string Title => _weaponConfig.WeaponType.ToString();
public string IconAssetName => _weaponConfig.IconAssetName; public string IconAssetName => _weaponConfig.Sprite;
public Rarity Rarity => _weaponConfig.Rarity; public Rarity Rarity => _weaponConfig.Rarity;
@@ -9,18 +9,18 @@ namespace SepCore.Event
public override int Id => EventId; public override int Id => EventId;
public int RoleId { get; private set; } = -1; public string RoleName { get; private set; }
public static SelectRoleHoverEventArgs Create(int roleId) public static SelectRoleHoverEventArgs Create(string roleName)
{ {
var args = ReferencePool.Acquire<SelectRoleHoverEventArgs>(); var args = ReferencePool.Acquire<SelectRoleHoverEventArgs>();
args.RoleId = roleId; args.RoleName = roleName;
return args; return args;
} }
public override void Clear() public override void Clear()
{ {
RoleId = -1; RoleName = null;
} }
} }
} }
@@ -16,7 +16,8 @@ public sealed partial class EnemyConfig : Luban.BeanBase
{ {
public EnemyConfig(ByteBuf _buf) public EnemyConfig(ByteBuf _buf)
{ {
Name = _buf.ReadString(); EnemyType = (EnemyType)_buf.ReadInt();
LogicType = _buf.ReadString();
MaxHealth = _buf.ReadInt(); MaxHealth = _buf.ReadInt();
HpAddPerLevel = _buf.ReadInt(); HpAddPerLevel = _buf.ReadInt();
AttackDamage = _buf.ReadInt(); AttackDamage = _buf.ReadInt();
@@ -38,9 +39,13 @@ public sealed partial class EnemyConfig : Luban.BeanBase
} }
/// <summary> /// <summary>
/// 名称 /// 敌人类型
/// </summary> /// </summary>
public readonly string Name; public readonly EnemyType EnemyType;
/// <summary>
/// 逻辑类型
/// </summary>
public readonly string LogicType;
/// <summary> /// <summary>
/// 最大生命 /// 最大生命
/// </summary> /// </summary>
@@ -108,13 +113,15 @@ public sealed partial class EnemyConfig : Luban.BeanBase
Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab); Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab);
} }
public override string ToString() public override string ToString()
{ {
return "{ " return "{ "
+ "name:" + Name + "," + "enemyType:" + EnemyType + ","
+ "logicType:" + LogicType + ","
+ "maxHealth:" + MaxHealth + "," + "maxHealth:" + MaxHealth + ","
+ "hpAddPerLevel:" + HpAddPerLevel + "," + "hpAddPerLevel:" + HpAddPerLevel + ","
+ "attackDamage:" + AttackDamage + "," + "attackDamage:" + AttackDamage + ","
@@ -0,0 +1,54 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SepCore.Definition
{
/// <summary>
/// 敌人类型
/// </summary>
public enum EnemyType : byte
{
/// <summary>
/// 无
/// </summary>
None = 0,
/// <summary>
/// 近战敌人
/// </summary>
MeleeEnemy = 1,
/// <summary>
/// 远程敌人
/// </summary>
RemoteEnemy = 2,
/// <summary>
/// 蝙蝠
/// </summary>
BatEnemy = 3,
/// <summary>
/// 骷髅兵
/// </summary>
SkeletonEnemy = 4,
/// <summary>
/// 骷髅巨人
/// </summary>
SkeletonGiantEnemy = 5,
/// <summary>
/// 幽灵
/// </summary>
GhostEnemy = 6,
/// <summary>
/// 火焰法师
/// </summary>
FireMageEnemy = 7,
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 6d60ad7c035b4aa4abd87deb1d572847 guid: a8fa6fc84c7516d4c88f81a40a1b61ea
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
@@ -16,7 +16,7 @@ public sealed partial class GlobalConfig : Luban.BeanBase
{ {
public GlobalConfig(ByteBuf _buf) public GlobalConfig(ByteBuf _buf)
{ {
ElapsedTime = _buf.ReadInt(); WeaponCapacity = _buf.ReadInt();
} }
public static GlobalConfig DeserializeGlobalConfig(ByteBuf _buf) public static GlobalConfig DeserializeGlobalConfig(ByteBuf _buf)
@@ -24,7 +24,10 @@ public sealed partial class GlobalConfig : Luban.BeanBase
return new GlobalConfig(_buf); return new GlobalConfig(_buf);
} }
public readonly int ElapsedTime; /// <summary>
/// 最大持有武器数量
/// </summary>
public readonly int WeaponCapacity;
public const int __ID__ = -958250779; public const int __ID__ = -958250779;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -37,7 +40,7 @@ public sealed partial class GlobalConfig : Luban.BeanBase
public override string ToString() public override string ToString()
{ {
return "{ " return "{ "
+ "elapsedTime:" + ElapsedTime + "," + "weaponCapacity:" + WeaponCapacity + ","
+ "}"; + "}";
} }
} }
@@ -18,7 +18,9 @@ public sealed partial class GoodsConfig : Luban.BeanBase
{ {
Id = _buf.ReadInt(); Id = _buf.ReadInt();
GoodsType = (GoodsType)_buf.ReadInt(); GoodsType = (GoodsType)_buf.ReadInt();
GoodsTypeId = _buf.ReadInt(); PropId = _buf.ReadInt();
PropId_Ref = null;
WeaponType = (WeaponType)_buf.ReadInt();
} }
public static GoodsConfig DeserializeGoodsConfig(ByteBuf _buf) public static GoodsConfig DeserializeGoodsConfig(ByteBuf _buf)
@@ -35,9 +37,14 @@ public sealed partial class GoodsConfig : Luban.BeanBase
/// </summary> /// </summary>
public readonly GoodsType GoodsType; public readonly GoodsType GoodsType;
/// <summary> /// <summary>
/// 商品对应物品Id /// 道具商品Id
/// </summary> /// </summary>
public readonly int GoodsTypeId; public readonly int PropId;
public PropConfig PropId_Ref;
/// <summary>
/// 武器商品类型
/// </summary>
public readonly WeaponType WeaponType;
public const int __ID__ = 1358452248; public const int __ID__ = 1358452248;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -46,15 +53,17 @@ public sealed partial class GoodsConfig : Luban.BeanBase
{ {
PropId_Ref = tables.TbPropConfig.GetOrDefault(PropId);
} }
public override string ToString() public override string ToString()
{ {
return "{ " return "{ "
+ "Id:" + Id + "," + "id:" + Id + ","
+ "GoodsType:" + GoodsType + "," + "goodsType:" + GoodsType + ","
+ "GoodsTypeId:" + GoodsTypeId + "," + "propId:" + PropId + ","
+ "weaponType:" + WeaponType + ","
+ "}"; + "}";
} }
} }
@@ -20,6 +20,8 @@ public sealed partial class LevelUpRewardConfig : Luban.BeanBase
Title = _buf.ReadString(); Title = _buf.ReadString();
Rarity = (Rarity)_buf.ReadInt(); Rarity = (Rarity)_buf.ReadInt();
{int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}} {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}}
Sprite = _buf.ReadString();
Sprite_Ref = null;
} }
public static LevelUpRewardConfig DeserializeLevelUpRewardConfig(ByteBuf _buf) public static LevelUpRewardConfig DeserializeLevelUpRewardConfig(ByteBuf _buf)
@@ -40,6 +42,11 @@ public sealed partial class LevelUpRewardConfig : Luban.BeanBase
/// </summary> /// </summary>
public readonly Rarity Rarity; public readonly Rarity Rarity;
public readonly System.Collections.Generic.List<modifier> Modifiers; public readonly System.Collections.Generic.List<modifier> Modifiers;
/// <summary>
/// 图标
/// </summary>
public readonly string Sprite;
public SpriteConfig Sprite_Ref;
public const int __ID__ = 1603299856; public const int __ID__ = 1603299856;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -50,6 +57,7 @@ public sealed partial class LevelUpRewardConfig : Luban.BeanBase
foreach (var _e in Modifiers) { _e?.ResolveRef(tables); } foreach (var _e in Modifiers) { _e?.ResolveRef(tables); }
Sprite_Ref = tables.TbSpriteConfig.GetOrDefault(Sprite);
} }
public override string ToString() public override string ToString()
@@ -59,6 +67,7 @@ public sealed partial class LevelUpRewardConfig : Luban.BeanBase
+ "title:" + Title + "," + "title:" + Title + ","
+ "rarity:" + Rarity + "," + "rarity:" + Rarity + ","
+ "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + "," + "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + ","
+ "sprite:" + Sprite + ","
+ "}"; + "}";
} }
} }
@@ -21,6 +21,8 @@ public sealed partial class PropConfig : Luban.BeanBase
Rarity = (Rarity)_buf.ReadInt(); Rarity = (Rarity)_buf.ReadInt();
Price = _buf.ReadInt(); Price = _buf.ReadInt();
{int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}} {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}}
Sprite = _buf.ReadString();
Sprite_Ref = null;
} }
public static PropConfig DeserializePropConfig(ByteBuf _buf) public static PropConfig DeserializePropConfig(ByteBuf _buf)
@@ -45,6 +47,11 @@ public sealed partial class PropConfig : Luban.BeanBase
/// </summary> /// </summary>
public readonly int Price; public readonly int Price;
public readonly System.Collections.Generic.List<modifier> Modifiers; public readonly System.Collections.Generic.List<modifier> Modifiers;
/// <summary>
/// 图标
/// </summary>
public readonly string Sprite;
public SpriteConfig Sprite_Ref;
public const int __ID__ = 91068581; public const int __ID__ = 91068581;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -56,6 +63,7 @@ public sealed partial class PropConfig : Luban.BeanBase
foreach (var _e in Modifiers) { _e?.ResolveRef(tables); } foreach (var _e in Modifiers) { _e?.ResolveRef(tables); }
Sprite_Ref = tables.TbSpriteConfig.GetOrDefault(Sprite);
} }
public override string ToString() public override string ToString()
@@ -66,6 +74,7 @@ public sealed partial class PropConfig : Luban.BeanBase
+ "rarity:" + Rarity + "," + "rarity:" + Rarity + ","
+ "price:" + Price + "," + "price:" + Price + ","
+ "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + "," + "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + ","
+ "sprite:" + Sprite + ","
+ "}"; + "}";
} }
} }
@@ -24,6 +24,8 @@ public sealed partial class RoleConfig : Luban.BeanBase
{int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);InitialItems = new System.Collections.Generic.List<int>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { int _e0; _e0 = _buf.ReadInt(); InitialItems.Add(_e0);}} {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);InitialItems = new System.Collections.Generic.List<int>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { int _e0; _e0 = _buf.ReadInt(); InitialItems.Add(_e0);}}
Prefab = _buf.ReadString(); Prefab = _buf.ReadString();
Prefab_Ref = null; Prefab_Ref = null;
Sprite = _buf.ReadString();
Sprite_Ref = null;
} }
public static RoleConfig DeserializeRoleConfig(ByteBuf _buf) public static RoleConfig DeserializeRoleConfig(ByteBuf _buf)
@@ -42,6 +44,8 @@ public sealed partial class RoleConfig : Luban.BeanBase
public readonly System.Collections.Generic.List<int> InitialItems; public readonly System.Collections.Generic.List<int> InitialItems;
public readonly string Prefab; public readonly string Prefab;
public EntityConfig Prefab_Ref; public EntityConfig Prefab_Ref;
public readonly string Sprite;
public SpriteConfig Sprite_Ref;
public const int __ID__ = -1280631944; public const int __ID__ = -1280631944;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -55,6 +59,7 @@ public sealed partial class RoleConfig : Luban.BeanBase
foreach (var _e in Modifiers) { _e?.ResolveRef(tables); } foreach (var _e in Modifiers) { _e?.ResolveRef(tables); }
Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab); Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab);
Sprite_Ref = tables.TbSpriteConfig.GetOrDefault(Sprite);
} }
public override string ToString() public override string ToString()
@@ -67,6 +72,7 @@ public sealed partial class RoleConfig : Luban.BeanBase
+ "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + "," + "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + ","
+ "initialItems:" + Luban.StringUtil.CollectionToString(InitialItems) + "," + "initialItems:" + Luban.StringUtil.CollectionToString(InitialItems) + ","
+ "prefab:" + Prefab + "," + "prefab:" + Prefab + ","
+ "sprite:" + Sprite + ","
+ "}"; + "}";
} }
} }
@@ -17,12 +17,12 @@ namespace SepCore.Definition
/// </summary> /// </summary>
public partial class TbEnemyConfig public partial class TbEnemyConfig
{ {
private readonly System.Collections.Generic.Dictionary<string, EnemyConfig> _dataMap; private readonly System.Collections.Generic.Dictionary<EnemyType, EnemyConfig> _dataMap;
private readonly System.Collections.Generic.List<EnemyConfig> _dataList; private readonly System.Collections.Generic.List<EnemyConfig> _dataList;
public TbEnemyConfig(ByteBuf _buf) public TbEnemyConfig(ByteBuf _buf)
{ {
_dataMap = new System.Collections.Generic.Dictionary<string, EnemyConfig>(); _dataMap = new System.Collections.Generic.Dictionary<EnemyType, EnemyConfig>();
_dataList = new System.Collections.Generic.List<EnemyConfig>(); _dataList = new System.Collections.Generic.List<EnemyConfig>();
for(int n = _buf.ReadSize() ; n > 0 ; --n) for(int n = _buf.ReadSize() ; n > 0 ; --n)
@@ -30,16 +30,16 @@ public partial class TbEnemyConfig
EnemyConfig _v; EnemyConfig _v;
_v = EnemyConfig.DeserializeEnemyConfig(_buf); _v = EnemyConfig.DeserializeEnemyConfig(_buf);
_dataList.Add(_v); _dataList.Add(_v);
_dataMap.Add(_v.Name, _v); _dataMap.Add(_v.EnemyType, _v);
} }
} }
public System.Collections.Generic.Dictionary<string, EnemyConfig> DataMap => _dataMap; public System.Collections.Generic.Dictionary<EnemyType, EnemyConfig> DataMap => _dataMap;
public System.Collections.Generic.List<EnemyConfig> DataList => _dataList; public System.Collections.Generic.List<EnemyConfig> DataList => _dataList;
public EnemyConfig GetOrDefault(string key) => _dataMap.TryGetValue(key, out var v) ? v : null; public EnemyConfig GetOrDefault(EnemyType key) => _dataMap.TryGetValue(key, out var v) ? v : null;
public EnemyConfig Get(string key) => _dataMap[key]; public EnemyConfig Get(EnemyType key) => _dataMap[key];
public EnemyConfig this[string key] => _dataMap[key]; public EnemyConfig this[EnemyType key] => _dataMap[key];
public void ResolveRef(Tables tables) public void ResolveRef(Tables tables)
{ {
@@ -30,7 +30,10 @@ public partial class TbGlobalConfig
} }
public int ElapsedTime => _data.ElapsedTime; /// <summary>
/// 最大持有武器数量
/// </summary>
public int WeaponCapacity => _data.WeaponCapacity;
public void ResolveRef(Tables tables) public void ResolveRef(Tables tables)
{ {
@@ -17,12 +17,12 @@ namespace SepCore.Definition
/// </summary> /// </summary>
public partial class TbWeaponConfig public partial class TbWeaponConfig
{ {
private readonly System.Collections.Generic.Dictionary<int, WeaponConfig> _dataMap; private readonly System.Collections.Generic.Dictionary<WeaponType, WeaponConfig> _dataMap;
private readonly System.Collections.Generic.List<WeaponConfig> _dataList; private readonly System.Collections.Generic.List<WeaponConfig> _dataList;
public TbWeaponConfig(ByteBuf _buf) public TbWeaponConfig(ByteBuf _buf)
{ {
_dataMap = new System.Collections.Generic.Dictionary<int, WeaponConfig>(); _dataMap = new System.Collections.Generic.Dictionary<WeaponType, WeaponConfig>();
_dataList = new System.Collections.Generic.List<WeaponConfig>(); _dataList = new System.Collections.Generic.List<WeaponConfig>();
for(int n = _buf.ReadSize() ; n > 0 ; --n) for(int n = _buf.ReadSize() ; n > 0 ; --n)
@@ -30,16 +30,16 @@ public partial class TbWeaponConfig
WeaponConfig _v; WeaponConfig _v;
_v = WeaponConfig.DeserializeWeaponConfig(_buf); _v = WeaponConfig.DeserializeWeaponConfig(_buf);
_dataList.Add(_v); _dataList.Add(_v);
_dataMap.Add(_v.Id, _v); _dataMap.Add(_v.WeaponType, _v);
} }
} }
public System.Collections.Generic.Dictionary<int, WeaponConfig> DataMap => _dataMap; public System.Collections.Generic.Dictionary<WeaponType, WeaponConfig> DataMap => _dataMap;
public System.Collections.Generic.List<WeaponConfig> DataList => _dataList; public System.Collections.Generic.List<WeaponConfig> DataList => _dataList;
public WeaponConfig GetOrDefault(int key) => _dataMap.TryGetValue(key, out var v) ? v : null; public WeaponConfig GetOrDefault(WeaponType key) => _dataMap.TryGetValue(key, out var v) ? v : null;
public WeaponConfig Get(int key) => _dataMap[key]; public WeaponConfig Get(WeaponType key) => _dataMap[key];
public WeaponConfig this[int key] => _dataMap[key]; public WeaponConfig this[WeaponType key] => _dataMap[key];
public void ResolveRef(Tables tables) public void ResolveRef(Tables tables)
{ {
@@ -16,8 +16,8 @@ public sealed partial class WeaponConfig : Luban.BeanBase
{ {
public WeaponConfig(ByteBuf _buf) public WeaponConfig(ByteBuf _buf)
{ {
Id = _buf.ReadInt(); WeaponType = (WeaponType)_buf.ReadInt();
Name = _buf.ReadString(); LogicType = _buf.ReadString();
Rarity = (Rarity)_buf.ReadInt(); Rarity = (Rarity)_buf.ReadInt();
Price = _buf.ReadInt(); Price = _buf.ReadInt();
Attack = _buf.ReadInt(); Attack = _buf.ReadInt();
@@ -28,6 +28,8 @@ public sealed partial class WeaponConfig : Luban.BeanBase
{int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}} {int n0 = System.Math.Min(_buf.ReadSize(), _buf.Size);Modifiers = new System.Collections.Generic.List<modifier>(n0);for(var i0 = 0 ; i0 < n0 ; i0++) { modifier _e0; _e0 = modifier.Deserializemodifier(_buf); Modifiers.Add(_e0);}}
Prefab = _buf.ReadString(); Prefab = _buf.ReadString();
Prefab_Ref = null; Prefab_Ref = null;
Sprite = _buf.ReadString();
Sprite_Ref = null;
} }
public static WeaponConfig DeserializeWeaponConfig(ByteBuf _buf) public static WeaponConfig DeserializeWeaponConfig(ByteBuf _buf)
@@ -36,13 +38,13 @@ public sealed partial class WeaponConfig : Luban.BeanBase
} }
/// <summary> /// <summary>
/// 武器id /// 武器类型
/// </summary> /// </summary>
public readonly int Id; public readonly WeaponType WeaponType;
/// <summary> /// <summary>
/// 武器名 /// 逻辑类型
/// </summary> /// </summary>
public readonly string Name; public readonly string LogicType;
/// <summary> /// <summary>
/// 道具品质 /// 道具品质
/// </summary> /// </summary>
@@ -77,6 +79,11 @@ public sealed partial class WeaponConfig : Luban.BeanBase
/// </summary> /// </summary>
public readonly string Prefab; public readonly string Prefab;
public EntityConfig Prefab_Ref; public EntityConfig Prefab_Ref;
/// <summary>
/// 图标
/// </summary>
public readonly string Sprite;
public SpriteConfig Sprite_Ref;
public const int __ID__ = 127041694; public const int __ID__ = 127041694;
public override int GetTypeId() => __ID__; public override int GetTypeId() => __ID__;
@@ -94,13 +101,14 @@ public sealed partial class WeaponConfig : Luban.BeanBase
foreach (var _e in Modifiers) { _e?.ResolveRef(tables); } foreach (var _e in Modifiers) { _e?.ResolveRef(tables); }
Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab); Prefab_Ref = tables.TbEntityConfig.GetOrDefault(Prefab);
Sprite_Ref = tables.TbSpriteConfig.GetOrDefault(Sprite);
} }
public override string ToString() public override string ToString()
{ {
return "{ " return "{ "
+ "id:" + Id + "," + "weaponType:" + WeaponType + ","
+ "name:" + Name + "," + "logicType:" + LogicType + ","
+ "rarity:" + Rarity + "," + "rarity:" + Rarity + ","
+ "price:" + Price + "," + "price:" + Price + ","
+ "attack:" + Attack + "," + "attack:" + Attack + ","
@@ -110,6 +118,7 @@ public sealed partial class WeaponConfig : Luban.BeanBase
+ "parameters:" + Luban.StringUtil.CollectionToString(Parameters) + "," + "parameters:" + Luban.StringUtil.CollectionToString(Parameters) + ","
+ "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + "," + "modifiers:" + Luban.StringUtil.CollectionToString(Modifiers) + ","
+ "prefab:" + Prefab + "," + "prefab:" + Prefab + ","
+ "sprite:" + Sprite + ","
+ "}"; + "}";
} }
} }
@@ -0,0 +1,46 @@
//------------------------------------------------------------------------------
// <auto-generated>
// This code was generated by a tool.
// Changes to this file may cause incorrect behavior and will be lost if
// the code is regenerated.
// </auto-generated>
//------------------------------------------------------------------------------
namespace SepCore.Definition
{
/// <summary>
/// 武器类型
/// </summary>
public enum WeaponType : byte
{
/// <summary>
/// 无
/// </summary>
None = 0,
/// <summary>
/// 小刀
/// </summary>
Knife = 1,
/// <summary>
/// 手枪
/// </summary>
Handgun = 2,
/// <summary>
/// 斧头
/// </summary>
Axe = 3,
/// <summary>
/// 闪电
/// </summary>
Lightning = 4,
/// <summary>
/// 长枪
/// </summary>
Lance = 5,
}
}
@@ -1,5 +1,5 @@
fileFormatVersion: 2 fileFormatVersion: 2
guid: 1e4fe53d087154645ad496d2f178c843 guid: 98dbb9ae443a07e4284d96741de14f3d
MonoImporter: MonoImporter:
externalObjects: {} externalObjects: {}
serializedVersion: 2 serializedVersion: 2
@@ -19,8 +19,7 @@ public sealed partial class enemySpawnConfig : Luban.BeanBase
{ {
public enemySpawnConfig(ByteBuf _buf) public enemySpawnConfig(ByteBuf _buf)
{ {
EnemyName = _buf.ReadString(); EnemyType = (EnemyType)_buf.ReadInt();
EnemyName_Ref = null;
EnemyCount = _buf.ReadInt(); EnemyCount = _buf.ReadInt();
Interval = _buf.ReadInt(); Interval = _buf.ReadInt();
} }
@@ -33,8 +32,7 @@ public sealed partial class enemySpawnConfig : Luban.BeanBase
/// <summary> /// <summary>
/// 要出的怪名 /// 要出的怪名
/// </summary> /// </summary>
public readonly string EnemyName; public readonly EnemyType EnemyType;
public EnemyConfig EnemyName_Ref;
/// <summary> /// <summary>
/// 一次出的数量 /// 一次出的数量
/// </summary> /// </summary>
@@ -49,7 +47,7 @@ public sealed partial class enemySpawnConfig : Luban.BeanBase
public void ResolveRef(Tables tables) public void ResolveRef(Tables tables)
{ {
EnemyName_Ref = tables.TbEnemyConfig.GetOrDefault(EnemyName);
} }
@@ -57,7 +55,7 @@ public sealed partial class enemySpawnConfig : Luban.BeanBase
public override string ToString() public override string ToString()
{ {
return "{ " return "{ "
+ "enemyName:" + EnemyName + "," + "enemyType:" + EnemyType + ","
+ "enemyCount:" + EnemyCount + "," + "enemyCount:" + EnemyCount + ","
+ "interval:" + Interval + "," + "interval:" + Interval + ","
+ "}"; + "}";
@@ -65,9 +65,12 @@ namespace SepCore.CustomUtility
return Utility.Text.Format("Assets/GameMain/UI/UISounds/{0}.wav", assetName); return Utility.Text.Format("Assets/GameMain/UI/UISounds/{0}.wav", assetName);
} }
public static string GetUITextureIconAsset(string assetName) /// <summary>
/// 获取图片资源路径,assetName 为相对 Assets/GameMain/Textures 的路径,需包含扩展名
/// </summary>
public static string GetSpriteAsset(string assetName)
{ {
return Utility.Text.Format("Assets/GameMain/UI/UISprites/Icons/{0}.png", assetName); return Utility.Text.Format("Assets/GameMain/Textures/{0}", assetName);
} }
} }
} }
@@ -1,4 +1,5 @@
using System; using System;
using System.Collections.Generic;
using System.Linq; using System.Linq;
using SepCore.Definition; using SepCore.Definition;
using SepCore.Entity; using SepCore.Entity;
@@ -18,8 +19,8 @@ namespace SepCore.Editor
private int _selectedIndex; private int _selectedIndex;
private int _addCount = 1; private int _addCount = 1;
private Vector2 _scroll; private Vector2 _scroll;
private PropConfig[] _allProps = Array.Empty<PropConfig>(); private IReadOnlyList<PropConfig> _allProps;
private PropConfig[] _filteredProps = Array.Empty<PropConfig>(); private IReadOnlyList<PropConfig> _filteredProps;
private string[] _displayNames = Array.Empty<string>(); private string[] _displayNames = Array.Empty<string>();
private float _spawnRateScaleInput = 1f; private float _spawnRateScaleInput = 1f;
@@ -188,7 +189,7 @@ namespace SepCore.Editor
if (selectedProp == null) return; if (selectedProp == null) return;
_scroll = EditorGUILayout.BeginScrollView(_scroll, GUILayout.Height(120f)); _scroll = EditorGUILayout.BeginScrollView(_scroll, GUILayout.Height(120f));
EditorGUILayout.LabelField("Title", selectedProp.Title); EditorGUILayout.LabelField("Title", selectedProp.Name);
EditorGUILayout.LabelField("Rarity", selectedProp.Rarity.ToString()); EditorGUILayout.LabelField("Rarity", selectedProp.Rarity.ToString());
EditorGUILayout.LabelField("Description"); EditorGUILayout.LabelField("Description");
EditorGUILayout.HelpBox(ItemDescUtility.CreatePropDescription(selectedProp.Modifiers), MessageType.None); EditorGUILayout.HelpBox(ItemDescUtility.CreatePropDescription(selectedProp.Modifiers), MessageType.None);
@@ -215,7 +216,7 @@ namespace SepCore.Editor
player.AddProp(new PropItem(selectedProp)); player.AddProp(new PropItem(selectedProp));
} }
ShowNotification(new GUIContent($"Added Buff: {selectedProp.Title} x{_addCount}")); ShowNotification(new GUIContent($"Added Buff: {selectedProp.Name} x{_addCount}"));
} }
private void RefreshPropList() private void RefreshPropList()
@@ -227,16 +228,15 @@ namespace SepCore.Editor
_displayNames = Array.Empty<string>(); _displayNames = Array.Empty<string>();
return; return;
} }
var table = GameEntry.Luban.GetTable<PropConfig>(); _allProps = GameEntry.Luban.GetTable<PropConfig>();
_allProps = table != null ? table.ToArray() : Array.Empty<PropConfig>();
_selectedIndex = 0; _selectedIndex = 0;
ApplyFilter(_searchText); ApplyFilter(_searchText);
} }
private void ApplyFilter(string searchText) private void ApplyFilter(string searchText)
{ {
if (_allProps == null || _allProps.Length == 0) if (_allProps == null || _allProps.Count == 0)
{ {
_filteredProps = Array.Empty<PropConfig>(); _filteredProps = Array.Empty<PropConfig>();
_displayNames = Array.Empty<string>(); _displayNames = Array.Empty<string>();
@@ -252,11 +252,11 @@ namespace SepCore.Editor
string keyword = searchText.Trim(); string keyword = searchText.Trim();
_filteredProps = _allProps.Where(p => _filteredProps = _allProps.Where(p =>
p != null && p != null &&
(p.Title?.IndexOf(keyword, StringComparison.OrdinalIgnoreCase) >= 0 || (p.Name?.IndexOf(keyword, StringComparison.OrdinalIgnoreCase) >= 0 ||
p.Id.ToString().Contains(keyword))).ToArray(); p.Id.ToString().Contains(keyword))).ToArray();
} }
_displayNames = _filteredProps.Select(p => $"[{p.Id}] {p.Title} ({p.Rarity})").ToArray(); _displayNames = _filteredProps.Select(p => $"[{p.Id}] {p.Name} ({p.Rarity})").ToArray();
if (_displayNames.Length == 0) if (_displayNames.Length == 0)
{ {
_selectedIndex = 0; _selectedIndex = 0;
@@ -268,8 +268,8 @@ namespace SepCore.Editor
private PropConfig GetSelectedProp() private PropConfig GetSelectedProp()
{ {
if (_filteredProps == null || _filteredProps.Length == 0) return null; if (_filteredProps == null || _filteredProps.Count == 0) return null;
_selectedIndex = Mathf.Clamp(_selectedIndex, 0, _filteredProps.Length - 1); _selectedIndex = Mathf.Clamp(_selectedIndex, 0, _filteredProps.Count - 1);
return _filteredProps[_selectedIndex]; return _filteredProps[_selectedIndex];
} }
@@ -1,5 +1,6 @@
using System; using System;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using SepCore.Event; using SepCore.Event;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
@@ -68,7 +69,7 @@ namespace SepCore.UI
if (_iconArea != null && !string.IsNullOrEmpty(_context.IconAssetName)) if (_iconArea != null && !string.IsNullOrEmpty(_context.IconAssetName))
{ {
string iconAssetName = _context.IconAssetName; string iconAssetName = _context.IconAssetName;
var sprite = await GameEntry.SpriteCache.GetSprite(iconAssetName); var sprite = await SpriteLoader.LoadSpriteByKeyAsync(iconAssetName);
if (_context != null && _context.IconAssetName == iconAssetName) if (_context != null && _context.IconAssetName == iconAssetName)
{ {
_iconArea.OnInit(sprite, context.Rarity); _iconArea.OnInit(sprite, context.Rarity);
@@ -59,7 +59,7 @@ namespace SepCore.UI
Icon = null, Icon = null,
Rarity = reward.Rarity, Rarity = reward.Rarity,
Description = ItemDescUtility.CreatePropDescription(reward.Modifiers), Description = ItemDescUtility.CreatePropDescription(reward.Modifiers),
IconAssetName = reward.IconAssetName IconAssetName = reward.Sprite
}); });
} }
@@ -1,4 +1,5 @@
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using TMPro; using TMPro;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -42,7 +43,7 @@ namespace SepCore.UI
if (string.IsNullOrEmpty(iconAssetName)) return; if (string.IsNullOrEmpty(iconAssetName)) return;
var sprite = await GameEntry.SpriteCache.GetSprite(iconAssetName); var sprite = await SpriteLoader.LoadSpriteByKeyAsync(iconAssetName);
_iconArea.SetIcon(sprite); _iconArea.SetIcon(sprite);
} }
} }
@@ -1,4 +1,5 @@
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using SepCore.Event; using SepCore.Event;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -29,7 +30,7 @@ namespace SepCore.UI
if (_iconArea != null) if (_iconArea != null)
{ {
var sprite = await GameEntry.SpriteCache.GetSprite(_context.IconAssetName); var sprite = await SpriteLoader.LoadSpriteByKeyAsync(_context.IconAssetName);
_iconArea.OnInit(sprite, context.Rarity); _iconArea.OnInit(sprite, context.Rarity);
} }
} }
@@ -8,7 +8,7 @@ namespace SepCore.UI
{ {
public class GoodsItemContext : UIContext public class GoodsItemContext : UIContext
{ {
public string Title; public string Name;
public Rarity Rarity; public Rarity Rarity;
public Sprite Icon; public Sprite Icon;
public ItemType ItemType; public ItemType ItemType;
@@ -17,7 +17,7 @@ namespace SepCore.UI
public GoodsItemContext() public GoodsItemContext()
{ {
Title = string.Empty; Name = string.Empty;
Description = string.Empty; Description = string.Empty;
Rarity = Rarity.White; Rarity = Rarity.White;
Price = 0; Price = 0;
@@ -29,7 +29,7 @@ namespace SepCore.UI
{ {
if (rawData == null) if (rawData == null)
{ {
Title = string.Empty; Name = string.Empty;
Description = string.Empty; Description = string.Empty;
Rarity = Rarity.White; Rarity = Rarity.White;
Price = 0; Price = 0;
@@ -45,25 +45,25 @@ namespace SepCore.UI
if (rawData.DataRow == null) if (rawData.DataRow == null)
{ {
Icon = null; Icon = null;
Title = string.Empty; Name = string.Empty;
} }
else if (ItemType == ItemType.Weapon) else if (ItemType == ItemType.Weapon)
{ {
if (rawData.DataRow is WeaponConfig weaponConfig) if (rawData.DataRow is WeaponConfig weaponConfig)
{ {
Title = weaponConfig.Name; Name = weaponConfig.WeaponType.ToString();
Description = ItemDescUtility.CreateWeaponDescription(weaponConfig); Description = ItemDescUtility.CreateWeaponDescription(weaponConfig);
} }
else if (rawData.DataRow is WeaponData weaponData) else if (rawData.DataRow is WeaponData weaponData)
{ {
Title = weaponData.Title; Name = weaponData.Title;
Description = ItemDescUtility.CreateWeaponDescription(weaponData); Description = ItemDescUtility.CreateWeaponDescription(weaponData);
} }
} }
else else
{ {
var prop = (PropConfig)rawData.DataRow; var prop = (PropConfig)rawData.DataRow;
Title = prop.Title; Name = prop.Name;
Description = ItemDescUtility.CreatePropDescription(prop.Modifiers); Description = ItemDescUtility.CreatePropDescription(prop.Modifiers);
} }
} }
@@ -1,8 +1,8 @@
using System.Collections.Generic; using System.Collections.Generic;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using SepCore.Definition; using SepCore.Definition;
using SepCore.Entity; using SepCore.Entity;
using SepCore.Entity.Weapon;
using UnityGameFramework.Runtime; using UnityGameFramework.Runtime;
namespace SepCore.UI namespace SepCore.UI
@@ -164,13 +164,13 @@ namespace SepCore.UI
var context = new GoodsItemContext(rawData); var context = new GoodsItemContext(rawData);
context.Icon = context.ItemType switch context.Icon = context.ItemType switch
{ {
ItemType.Weapon => await GameEntry.SpriteCache.GetSprite(rawData.DataRow switch ItemType.Weapon => await SpriteLoader.LoadSpriteByKeyAsync(rawData.DataRow switch
{ {
WeaponConfig weaponConfig => weaponConfig.IconAssetName, WeaponConfig weaponConfig => weaponConfig.Sprite,
WeaponData weaponData => weaponData.IconAssetName, WeaponData weaponData => weaponData.IconAssetName,
_ => string.Empty _ => string.Empty
}), }),
ItemType.Prop => await GameEntry.SpriteCache.GetSprite(((PropConfig)rawData.DataRow).IconAssetName), ItemType.Prop => await SpriteLoader.LoadSpriteByKeyAsync(((PropConfig)rawData.DataRow).Sprite),
_ => null _ => null
}; };
return context; return context;
@@ -1,7 +1,7 @@
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.Event; using SepCore.Event;
using SepCore.Definition; using SepCore.Definition;
using SepCore.Entity.Weapon; using SepCore.Entity;
using GameFramework.Event; using GameFramework.Event;
using UnityEngine; using UnityEngine;
using UnityGameFramework.Runtime; using UnityGameFramework.Runtime;
@@ -22,7 +22,7 @@ namespace SepCore.UI
public void Init(GoodsItemContext data) public void Init(GoodsItemContext data)
{ {
_iconArea.OnInit(data.Icon, data.Rarity); _iconArea.OnInit(data.Icon, data.Rarity);
_titleText.text = data.Title; _titleText.text = data.Name;
_typeText.text = data.ItemType switch _typeText.text = data.ItemType switch
{ {
ItemType.None => "error", ItemType.None => "error",
@@ -1,4 +1,5 @@
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using SepCore.AsyncTask;
using SepCore.Event; using SepCore.Event;
using UnityEngine; using UnityEngine;
using UnityEngine.UI; using UnityEngine.UI;
@@ -19,7 +20,7 @@ namespace SepCore.UI
return; return;
} }
_roleImage.sprite = await GameEntry.SpriteCache.GetSprite(_context.IconName); _roleImage.sprite = await SpriteLoader.LoadSpriteByKeyAsync(_context.IconName);
} }
public void OnReset() public void OnReset()
@@ -34,7 +35,7 @@ namespace SepCore.UI
return; return;
} }
GameEntry.Event.Fire(this, SelectRoleHoverEventArgs.Create(_context.RoleId)); GameEntry.Event.Fire(this, SelectRoleHoverEventArgs.Create(_context.RoleName));
} }
public void OnConfirmRoleClick() public void OnConfirmRoleClick()
@@ -2,7 +2,7 @@ namespace SepCore.UI
{ {
public class RoleItemContext : UIContext public class RoleItemContext : UIContext
{ {
public int RoleId; public string RoleName;
public string IconName; public string IconName;
} }
} }
@@ -50,7 +50,7 @@ namespace SepCore.UI
RoleItemRawData itemRawData = rawData.RoleItems[i]; RoleItemRawData itemRawData = rawData.RoleItems[i];
roleItems[i] = new RoleItemContext roleItems[i] = new RoleItemContext
{ {
RoleId = itemRawData.RoleId, RoleName = itemRawData.RoleName,
IconName = itemRawData.IconName IconName = itemRawData.IconName
}; };
} }
@@ -60,7 +60,7 @@ namespace SepCore.UI
{ {
propertyContext = new RolePropertyAreaContext propertyContext = new RolePropertyAreaContext
{ {
RoleName = rawData.SelectedRole.RoleName, RoleName = rawData.SelectedRole.Name,
InitialPropertyText = ItemDescUtility.CreatePropDescription(rawData.SelectedRole.InitialProperties) InitialPropertyText = ItemDescUtility.CreatePropDescription(rawData.SelectedRole.InitialProperties)
?? string.Empty ?? string.Empty
}; };
@@ -168,7 +168,7 @@ namespace SepCore.UI
return; return;
} }
SelectRoleRawData rawData = _useCase.SelectRole(args.RoleId); SelectRoleRawData rawData = _useCase.SelectRole(args.RoleName);
await OpenUIAsync(rawData); await OpenUIAsync(rawData);
} }
@@ -3,7 +3,6 @@ using System.Collections.Generic;
using System.Text; using System.Text;
using SepCore.Definition; using SepCore.Definition;
using SepCore.Entity; using SepCore.Entity;
using SepCore.Entity.Weapon;
using UnityGameFramework.Runtime; using UnityGameFramework.Runtime;
namespace SepCore.CustomUtility namespace SepCore.CustomUtility
@@ -87,7 +87,7 @@ namespace SepCore.Procedure
GameEntry.InputModule?.SetGameplayExploreContext(); GameEntry.InputModule?.SetGameplayExploreContext();
CurrentLevel = 1; CurrentLevel = 1;
_currentPlayerData = new PlayerData(-1, 1001); _currentPlayerData = new PlayerData(-1);
EnterAsync(procedureOwner).Forget(); EnterAsync(procedureOwner).Forget();
} }
@@ -130,11 +130,9 @@ namespace SepCore.Procedure
GameEntry.CameraModule?.SetTarget(Player != null ? Player.CachedTransform : null); GameEntry.CameraModule?.SetTarget(Player != null ? Player.CachedTransform : null);
await GameEntry.UIRouter.OpenUIAsync(UIFormType.HudForm); await GameEntry.UIRouter.OpenUIAsync(UIFormType.HudForm);
int selectedRoleId = procedureOwner.GetData<VarInt32>("SelectedRoleId").Value; string selectedRoleName = procedureOwner.GetData<VarString>("SelectedRoleName").Value;
var roles = GameEntry.Luban.GetTable<RoleConfig>(); var role = GameEntry.Luban.Get<RoleConfig>(selectedRoleName);
var role = roles.FirstOrDefault(r => r.Id == selectedRoleId) var expConfig = GameEntry.Luban.Get<LevelExperienceConfig>(selectedRoleName);
?? (selectedRoleId >= 0 && selectedRoleId < roles.Count ? roles[selectedRoleId] : roles[0]);
var expConfig = GameEntry.Luban.Get<LevelExperienceConfig>(role.Name);
Player.InitRole(role, expConfig); Player.InitRole(role, expConfig);
InitGameState(); InitGameState();
@@ -13,11 +13,11 @@ namespace SepCore.Procedure
private bool _startGame = false; private bool _startGame = false;
private int _selectedRoleId = 0; private string _selectedRoleName = null;
public void ConfirmSelectRole(int roleId) public void ConfirmSelectRole(string roleName)
{ {
_selectedRoleId = roleId; _selectedRoleName = roleName;
_startGame = true; _startGame = true;
} }
@@ -50,7 +50,7 @@ namespace SepCore.Procedure
if (_startGame) if (_startGame)
{ {
procedureOwner.SetData<VarInt32>("NextSceneType", (int)SceneType.Game); procedureOwner.SetData<VarInt32>("NextSceneType", (int)SceneType.Game);
procedureOwner.SetData<VarInt32>("SelectedRoleId", _selectedRoleId); procedureOwner.SetData<VarString>("SelectedRoleName", _selectedRoleName);
ChangeState<ProcedureChangeScene>(procedureOwner); ChangeState<ProcedureChangeScene>(procedureOwner);
} }
} }
@@ -5,7 +5,6 @@ using SepCore.EnemyManager;
using SepCore.HPBar; using SepCore.HPBar;
using SepCore.InputModule.Runtime; using SepCore.InputModule.Runtime;
using SepCore.CameraModule; using SepCore.CameraModule;
using SepCore.SpriteCache;
using SepCore.UIRouter; using SepCore.UIRouter;
using SepCore.Simulation; using SepCore.Simulation;
using SepCore.Timer; using SepCore.Timer;
@@ -27,8 +26,6 @@ public partial class GameEntry
public static SimulationWorld SimulationWorld { get; private set; } public static SimulationWorld SimulationWorld { get; private set; }
public static SpriteCacheComponent SpriteCache { get; private set; }
public static UIRouterComponent UIRouter { get; private set; } public static UIRouterComponent UIRouter { get; private set; }
public static InputModuleComponent InputModule { get; private set; } public static InputModuleComponent InputModule { get; private set; }
@@ -45,7 +42,6 @@ public partial class GameEntry
DamageText = UnityGameFramework.Runtime.GameEntry.GetComponent<DamageTextComponent>(); DamageText = UnityGameFramework.Runtime.GameEntry.GetComponent<DamageTextComponent>();
EnemyManager = UnityGameFramework.Runtime.GameEntry.GetComponent<EnemyManagerComponent>(); EnemyManager = UnityGameFramework.Runtime.GameEntry.GetComponent<EnemyManagerComponent>();
SimulationWorld = UnityGameFramework.Runtime.GameEntry.GetComponent<SimulationWorld>(); SimulationWorld = UnityGameFramework.Runtime.GameEntry.GetComponent<SimulationWorld>();
SpriteCache = UnityGameFramework.Runtime.GameEntry.GetComponent<SpriteCacheComponent>();
UIRouter = UnityGameFramework.Runtime.GameEntry.GetComponent<UIRouterComponent>(); UIRouter = UnityGameFramework.Runtime.GameEntry.GetComponent<UIRouterComponent>();
InputModule = UnityGameFramework.Runtime.GameEntry.GetComponent<InputModuleComponent>(); InputModule = UnityGameFramework.Runtime.GameEntry.GetComponent<InputModuleComponent>();
CameraModule = UnityGameFramework.Runtime.GameEntry.GetComponent<CameraModuleComponent>(); CameraModule = UnityGameFramework.Runtime.GameEntry.GetComponent<CameraModuleComponent>();
@@ -5,7 +5,6 @@ using Cysharp.Threading.Tasks;
using SepCore.CustomUtility; using SepCore.CustomUtility;
using SepCore.Definition; using SepCore.Definition;
using SepCore.Entity; using SepCore.Entity;
using SepCore.Entity.Weapon;
using UnityGameFramework.Runtime; using UnityGameFramework.Runtime;
using HideEntityCompleteEventArgs = UnityGameFramework.Runtime.HideEntityCompleteEventArgs; using HideEntityCompleteEventArgs = UnityGameFramework.Runtime.HideEntityCompleteEventArgs;
using ShowEntityFailureEventArgs = UnityGameFramework.Runtime.ShowEntityFailureEventArgs; using ShowEntityFailureEventArgs = UnityGameFramework.Runtime.ShowEntityFailureEventArgs;
@@ -162,22 +161,11 @@ namespace SepCore.AsyncTask
float timeout = 30f, float timeout = 30f,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
if (data == null) Type enemyType = GetLogicType(data.LogicType);
{
Log.Warning("Enemy data is invalid.");
return UniTask.FromResult<EnemyBase>(null);
}
Type enemyType = TryGetType(data.EnemyType.ToString());
EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName); EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName);
if (enemyType == null || entityConfig == null)
{
Log.Warning("Can not load enemy logic type or entity config for assetName '{0}'.", data.AssetName);
return UniTask.FromResult<EnemyBase>(null);
}
return entityComponent return entityComponent.ShowEntityAsync(
.ShowEntityAsync(data.Id, enemyType, AssetUtility.GetEntityAsset(entityConfig.PrefabPath), "Enemy", data.Id, enemyType, AssetUtility.GetEntityAsset(entityConfig.PrefabPath), "Enemy",
Constant.AssetPriority.EnemyAsset, data, timeout, cancellationToken) Constant.AssetPriority.EnemyAsset, data, timeout, cancellationToken)
.ContinueWith(entity => entity?.Logic as EnemyBase); .ContinueWith(entity => entity?.Logic as EnemyBase);
} }
@@ -190,22 +178,11 @@ namespace SepCore.AsyncTask
float timeout = 30f, float timeout = 30f,
CancellationToken cancellationToken = default) CancellationToken cancellationToken = default)
{ {
if (data == null) Type weaponType = GetLogicType(data.LogicType);
{
Log.Warning("Weapon data is invalid.");
return UniTask.FromResult<WeaponBase>(null);
}
Type weaponType = TryGetType("Weapon." + data.WeaponType);
EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName); EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName);
if (weaponType == null || entityConfig == null)
{
Log.Warning("Can not load weapon logic type or entity config for assetName '{0}'.", data.AssetName);
return UniTask.FromResult<WeaponBase>(null);
}
return entityComponent return entityComponent.ShowEntityAsync(
.ShowEntityAsync(data.Id, weaponType, AssetUtility.GetEntityAsset(entityConfig.PrefabPath), "Weapon", data.Id, weaponType, AssetUtility.GetEntityAsset(entityConfig.PrefabPath), "Weapon",
Constant.AssetPriority.WeaponAsset, data, timeout, cancellationToken) Constant.AssetPriority.WeaponAsset, data, timeout, cancellationToken)
.ContinueWith(entity => entity?.Logic as WeaponBase); .ContinueWith(entity => entity?.Logic as WeaponBase);
} }
@@ -298,24 +275,13 @@ namespace SepCore.AsyncTask
float timeout, float timeout,
CancellationToken cancellationToken) where T : EntityLogic CancellationToken cancellationToken) where T : EntityLogic
{ {
if (data == null)
{
Log.Warning("Data is invalid.");
return UniTask.FromResult<T>(null);
}
EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName); EntityConfig entityConfig = GameEntry.Luban.Get<EntityConfig>(data.AssetName);
if (entityConfig == null)
{
Log.Warning("Can not load entity assetName '{0}' from data table.", data.AssetName);
return UniTask.FromResult<T>(null);
}
return entityComponent.ShowEntityAsync<T>(data.Id, AssetUtility.GetEntityAsset(entityConfig.PrefabPath), return entityComponent.ShowEntityAsync<T>(data.Id, AssetUtility.GetEntityAsset(entityConfig.PrefabPath),
entityGroupName, priority, data, timeout, cancellationToken); entityGroupName, priority, data, timeout, cancellationToken);
} }
private static Type TryGetType(string rawTypeName) private static Type GetLogicType(string rawTypeName)
{ {
string typeName = EntityNamespace + rawTypeName; string typeName = EntityNamespace + rawTypeName;
if (!_typeDict.TryGetValue(typeName, out Type type)) if (!_typeDict.TryGetValue(typeName, out Type type))
@@ -323,8 +289,7 @@ namespace SepCore.AsyncTask
type = Type.GetType(typeName); type = Type.GetType(typeName);
if (type == null) if (type == null)
{ {
Log.Warning("Can not load entity type '{0}'.", typeName); throw new InvalidOperationException($"Can not load entity type '{typeName}'.");
return null;
} }
_typeDict.Add(typeName, type); _typeDict.Add(typeName, type);
@@ -1,4 +1,5 @@
using System; using System;
using System.Threading;
using Cysharp.Threading.Tasks; using Cysharp.Threading.Tasks;
using GameFramework.Resource; using GameFramework.Resource;
using UnityGameFramework.Runtime; using UnityGameFramework.Runtime;
@@ -20,14 +21,33 @@ namespace SepCore.AsyncTask
/// <param name="resourceComponent">资源组件</param> /// <param name="resourceComponent">资源组件</param>
/// <param name="assetName">资源名称</param> /// <param name="assetName">资源名称</param>
/// <param name="priority">加载优先级</param> /// <param name="priority">加载优先级</param>
/// <returns>加载完成的资源</returns> /// <param name="userData">用户自定义数据</param>
public static UniTask<T> LoadAssetAsync<T>(this ResourceComponent resourceComponent, string assetName, int priority = 0) /// <param name="progress">加载进度</param>
/// <param name="timeout">超时时间(秒),0表示不超时</param>
/// <returns>加载的资源</returns>
public static UniTask<T> LoadAssetAsync<T>(this ResourceComponent resourceComponent,
string assetName,
int priority = 0,
object userData = null,
IProgress<float> progress = null,
float timeout = 0f) where T : class
{ {
var tcs = AutoResetUniTaskCompletionSource<T>.Create(); var tcs = new UniTaskCompletionSource<T>();
resourceComponent.LoadAsset(assetName, priority, new LoadAssetCallbacks(
(_, asset, _, _) => tcs.TrySetResult((T)asset), var callbacks = new LoadAssetCallbacks(
(_, _, errorMessage, _) => tcs.TrySetException(new Exception(errorMessage)) (name, asset, duration, ud) => tcs.TrySetResult((T)asset),
)); (name, status, errorMessage, ud) => tcs.TrySetException(new Exception($"加载资源失败: {name}, status: {status}, error: {errorMessage}")),
(name, p, ud) => progress?.Report(p)
);
resourceComponent.LoadAsset(assetName, typeof(T), priority, callbacks, userData);
if (timeout > 0f)
{
UniTask.Delay(TimeSpan.FromSeconds(timeout), cancellationToken: CancellationToken.None)
.ContinueWith(() => tcs.TrySetException(new TimeoutException($"加载资源超时: {assetName}, {timeout}秒")));
}
return tcs.Task; return tcs.Task;
} }
@@ -0,0 +1,202 @@
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
using Cysharp.Threading.Tasks;
using SepCore.CustomUtility;
using SepCore.Definition;
using UnityEngine;
using UnityGameFramework.Runtime;
namespace SepCore.AsyncTask
{
/// <summary>
/// 图集 Sprite 加载器,通过图集名 + 序号定位 Sprite。
/// 序号 -1 表示图集本身就是一张完整 Sprite,不需要切分。
/// </summary>
public static class SpriteLoader
{
private const float DefaultPixelsPerUnit = 32f;
private static readonly Dictionary<string, Texture2D> _textureCache = new();
private static readonly Dictionary<string, Task<Texture2D>> _loadingTextures = new();
private static readonly Dictionary<string, Dictionary<int, Sprite>> _spriteCache = new();
/// <summary>
/// 异步加载图集 Sprite
/// </summary>
/// <param name="config">Sprite 配置</param>
/// <param name="tileSize">切分块尺寸(像素),默认 32</param>
/// <param name="pixelsPerUnit">Sprite 像素单位比,默认 32</param>
/// <param name="timeout">超时时间(秒),0 表示不超时</param>
/// <returns>加载的 Sprite,失败时返回 null</returns>
public static UniTask<Sprite> LoadSpriteAsync(SpriteConfig config, int tileSize = 32,
float pixelsPerUnit = DefaultPixelsPerUnit, float timeout = 0f)
{
return LoadSpriteAsync(config.AtlasPath, config.SpriteIndex, tileSize, pixelsPerUnit, timeout);
}
/// <summary>
/// 异步加载图集 Sprite,按资源键查 tbspriteconfig 表定位
/// </summary>
/// <param name="key">tbspriteconfig 的资源键</param>
/// <param name="tileSize">切分块尺寸(像素),默认 32</param>
/// <param name="pixelsPerUnit">Sprite 像素单位比,默认 32</param>
/// <param name="timeout">超时时间(秒),0 表示不超时</param>
/// <returns>加载的 Sprite,失败时返回 null</returns>
public static UniTask<Sprite> LoadSpriteByKeyAsync(string key, int tileSize = 32,
float pixelsPerUnit = DefaultPixelsPerUnit, float timeout = 0f)
{
SpriteConfig config = global::GameEntry.Luban.Get<SpriteConfig>(key);
if (config == null)
{
Log.Error("Sprite config not found: {0}", key);
return default;
}
return LoadSpriteAsync(config, tileSize, pixelsPerUnit, timeout);
}
/// <summary>
/// 异步加载图集 Sprite
/// </summary>
/// <param name="atlasName">图集名称(相对 Assets/GameMain/Textures 的路径,含扩展名,如 32rogues/monsters.png)</param>
/// <param name="index">序号,-1 表示整张图集作为一张 Sprite</param>
/// <param name="tileSize">切分块尺寸(像素),默认 32</param>
/// <param name="pixelsPerUnit">Sprite 像素单位比,默认 32</param>
/// <param name="timeout">超时时间(秒),0 表示不超时</param>
/// <returns>加载的 Sprite,失败时返回 null</returns>
public static async UniTask<Sprite> LoadSpriteAsync(string atlasName, int index, int tileSize = 32,
float pixelsPerUnit = DefaultPixelsPerUnit, float timeout = 0f)
{
Texture2D texture = await GetTextureAsync(atlasName, timeout);
if (texture == null)
{
return null;
}
int cacheKey = index < 0 ? -1 : index;
if (!_spriteCache.TryGetValue(atlasName, out Dictionary<int, Sprite> sprites))
{
sprites = new Dictionary<int, Sprite>();
_spriteCache[atlasName] = sprites;
}
if (sprites.TryGetValue(cacheKey, out Sprite cached))
{
return cached;
}
Sprite sprite = CreateSprite(texture, cacheKey, tileSize, pixelsPerUnit);
if (sprite != null)
{
sprites[cacheKey] = sprite;
}
return sprite;
}
/// <summary>
/// 释放指定图集的所有 Sprite 和纹理引用
/// </summary>
public static void Release(string atlasName)
{
if (_spriteCache.TryGetValue(atlasName, out Dictionary<int, Sprite> sprites))
{
foreach (Sprite sprite in sprites.Values)
{
if (sprite != null)
{
UnityEngine.Object.Destroy(sprite);
}
}
sprites.Clear();
_spriteCache.Remove(atlasName);
}
if (_textureCache.TryGetValue(atlasName, out Texture2D texture))
{
global::GameEntry.Resource.UnloadAsset(texture);
_textureCache.Remove(atlasName);
}
}
/// <summary>
/// 释放所有图集的 Sprite 和纹理引用
/// </summary>
public static void ReleaseAll()
{
List<string> atlasNames = new List<string>(_textureCache.Keys);
foreach (string atlasName in atlasNames)
{
Release(atlasName);
}
}
private static async UniTask<Texture2D> GetTextureAsync(string atlasName, float timeout)
{
if (_textureCache.TryGetValue(atlasName, out Texture2D cached))
{
return cached;
}
if (_loadingTextures.TryGetValue(atlasName, out Task<Texture2D> loading))
{
return await loading;
}
Task<Texture2D> task = LoadTextureAsync(atlasName, timeout).AsTask();
_loadingTextures[atlasName] = task;
try
{
Texture2D texture = await task;
if (texture != null)
{
_textureCache[atlasName] = texture;
}
return texture;
}
finally
{
_loadingTextures.Remove(atlasName);
}
}
private static async UniTask<Texture2D> LoadTextureAsync(string atlasName, float timeout)
{
try
{
return await global::GameEntry.Resource.LoadAssetAsync<Texture2D>(
AssetUtility.GetSpriteAsset(atlasName), Constant.AssetPriority.SpriteAsset, timeout: timeout);
}
catch (Exception e)
{
Log.Error("加载图集失败: {0}, error: {1}", atlasName, e);
return null;
}
}
private static Sprite CreateSprite(Texture2D texture, int index, int tileSize, float pixelsPerUnit)
{
if (index < 0)
{
return Sprite.Create(texture, new Rect(0f, 0f, texture.width, texture.height),
new Vector2(0.5f, 0.5f), pixelsPerUnit, 0, SpriteMeshType.FullRect);
}
int columns = Mathf.Max(1, texture.width / tileSize);
int rows = Mathf.Max(1, texture.height / tileSize);
int column = index % columns;
int row = index / columns;
if (row >= rows)
{
Log.Error("图集 {0} 序号 {1} 超出范围 (cols: {2}, rows: {3})", texture.name, index, columns, rows);
return null;
}
float x = column * tileSize;
float y = texture.height - (row + 1) * tileSize;
// 交互描边需要完整矩形网格,才能在 Shader 中为图案四周扩展留白。
return Sprite.Create(texture, new Rect(x, y, tileSize, tileSize),
new Vector2(0.5f, 0.5f), pixelsPerUnit, 0, SpriteMeshType.FullRect);
}
}
}

Some files were not shown because too many files have changed in this diff Show More