소스 검색

更新敌人头像图片

更新敌人头像图片
Kziwws 1 주 전
부모
커밋
b3a7237cf6
100개의 변경된 파일5478개의 추가작업 그리고 2169개의 파일을 삭제
  1. 2 0
      .creator/asset-template/typescript/Custom Script Template Help Documentation.url
  2. 1 0
      .creator/default-meta.json
  3. 10 10
      assets/data/csv/enemy.csv
  4. 111 111
      assets/data/csv/levels.csv
  5. BIN
      assets/model/.DS_Store
  6. 2 2
      assets/model/all soldier.fbx.meta
  7. 9 39
      assets/model/enemy_weapon.fbx.meta
  8. 2 2
      assets/model/m24_98k_fix.fbx.meta
  9. 46 14
      assets/model/materials/base_tietu.mtl
  10. 1 0
      assets/model/materials/base_tietu.mtl.meta
  11. 0 0
      assets/model/materials/ground1.jpg
  12. 2 2
      assets/model/materials/ground1.jpg.meta
  13. 89 0
      assets/model/materials/ground1.mtl
  14. 1 0
      assets/model/materials/ground1.mtl.meta
  15. 89 0
      assets/model/materials/ground2.mtl
  16. 1 0
      assets/model/materials/ground2.mtl.meta
  17. BIN
      assets/model/materials/ground2.png
  18. 29 29
      assets/model/materials/ground2.png.meta
  19. 89 0
      assets/model/materials/ground3.mtl
  20. 1 0
      assets/model/materials/ground3.mtl.meta
  21. BIN
      assets/model/materials/ground3.png
  22. 134 0
      assets/model/materials/ground3.png.meta
  23. 89 0
      assets/model/materials/ground4.mtl
  24. 1 0
      assets/model/materials/ground4.mtl.meta
  25. BIN
      assets/model/materials/ground4.png
  26. 134 0
      assets/model/materials/ground4.png.meta
  27. 89 0
      assets/model/materials/ground5.mtl
  28. 1 0
      assets/model/materials/ground5.mtl.meta
  29. BIN
      assets/model/materials/ground5.png
  30. 134 0
      assets/model/materials/ground5.png.meta
  31. 2 2
      assets/model/player_die.fbx.meta
  32. 2 2
      assets/model/player_huandan.fbx.meta
  33. 2 2
      assets/model/player_idle.fbx.meta
  34. 2 2
      assets/model/player_weapon.fbx.meta
  35. 396 120
      assets/model/scenePrb.scene
  36. 2 2
      assets/model/shabao.fbx.meta
  37. 2 2
      assets/model/yuansu.fbx.meta
  38. 3 23
      assets/model/坦克动画/tank.fbx.meta
  39. 3 23
      assets/model/士兵动画/1_die.fbx.meta
  40. 3 23
      assets/model/士兵动画/1_run.fbx.meta
  41. 3 23
      assets/model/士兵动画/1_shoot.fbx.meta
  42. 3 23
      assets/model/士兵动画/1_walk.fbx.meta
  43. 2 2
      assets/model/士兵动画/2_die.fbx.meta
  44. 2 2
      assets/model/士兵动画/2_run.fbx.meta
  45. 2 2
      assets/model/士兵动画/2_shoot.fbx.meta
  46. 2 2
      assets/model/士兵动画/2_walk.fbx.meta
  47. 2 2
      assets/model/士兵动画/3_die.fbx.meta
  48. 2 2
      assets/model/士兵动画/3_run.fbx.meta
  49. 2 2
      assets/model/士兵动画/3_shoot.fbx.meta
  50. 2 2
      assets/model/士兵动画/3walk.fbx.meta
  51. 2 2
      assets/model/士兵动画/4_die.fbx.meta
  52. 2 2
      assets/model/士兵动画/4_run.fbx.meta
  53. 2 2
      assets/model/士兵动画/4_shoot.fbx.meta
  54. 2 2
      assets/model/士兵动画/4_walk.fbx.meta
  55. 3 23
      assets/model/士兵动画/5_die.fbx.meta
  56. 3 23
      assets/model/士兵动画/5_run.fbx.meta
  57. 3 23
      assets/model/士兵动画/5_shoot.fbx.meta
  58. 3 23
      assets/model/士兵动画/5_walk.fbx.meta
  59. 3 23
      assets/model/士兵动画/6_die.fbx.meta
  60. 3 23
      assets/model/士兵动画/6_run.fbx.meta
  61. 3 23
      assets/model/士兵动画/6_shoot.fbx.meta
  62. 3 23
      assets/model/士兵动画/6_walk.fbx.meta
  63. 37 10
      assets/prefabs/enemy/pistol.prefab
  64. 1 1
      assets/prefabs/enemy/scatter.prefab
  65. 5 2
      assets/prefabs/enemy/shield.prefab
  66. 37 10
      assets/prefabs/enemy/sniper_rifle.prefab
  67. 1 1
      assets/prefabs/enemy/tank_pao.prefab
  68. 1 1
      assets/prefabs/map/map1.prefab
  69. BIN
      assets/prefabs/texture/generalPistol.png
  70. 134 0
      assets/prefabs/texture/generalPistol.png.meta
  71. BIN
      assets/prefabs/texture/scatterCaptain.png
  72. 134 0
      assets/prefabs/texture/scatterCaptain.png.meta
  73. BIN
      assets/prefabs/texture/shieldSoldier.png
  74. 134 0
      assets/prefabs/texture/shieldSoldier.png.meta
  75. BIN
      assets/prefabs/texture/snipeCaptain.png
  76. 134 0
      assets/prefabs/texture/snipeCaptain.png.meta
  77. BIN
      assets/prefabs/texture/sniperSoldier.png
  78. 134 0
      assets/prefabs/texture/sniperSoldier.png.meta
  79. BIN
      assets/prefabs/texture/soldierPistol.png
  80. 134 0
      assets/prefabs/texture/soldierPistol.png.meta
  81. BIN
      assets/prefabs/texture/tank_enemy.png
  82. 134 0
      assets/prefabs/texture/tank_enemy.png.meta
  83. 352 120
      assets/prefabs/ui/gunfightShootUI.prefab
  84. 341 122
      assets/scenes/game.scene
  85. 6 1
      assets/scripts/items/item/TaskEnemyItem.ts
  86. 7 2
      assets/scripts/items/item/TaskItem.ts
  87. BIN
      assets/textures/main/enemy_header.png
  88. 425 51
      library/.assets-data.json
  89. 106 37
      library/.assets-dependency.json
  90. 1124 1012
      library/.assets-info1.0.0.json
  91. 1 1
      library/01/018a74cb-0fed-4096-af33-fef3cc3e4be0.json
  92. 1 1
      library/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@7d6ab.json
  93. 341 122
      library/10/10795865-5525-41fc-8bf7-0e8d6983b214.json
  94. 89 0
      library/18/18059aba-1f4c-4ae1-8307-85ef11c60e8a.json
  95. 89 0
      library/1b/1b122012-461a-4092-bd94-d767b1741605.json
  96. 1 1
      library/20/207978cc-c706-4831-8276-0b8242b27005@f9941.json
  97. BIN
      library/22/22ccf12e-038c-4dea-85e7-26bd81aadf2f.png
  98. BIN
      library/22/22ccf12e-038c-4dea-85e7-26bd81aadf2f@f9941_sprite_trim_.png
  99. 37 10
      library/28/28a9f61c-c9ee-4b56-acdd-86ed85c7d066.json
  100. 0 0
      library/2d/2d1d8ec3-c70e-4df4-aa6f-74df047b2657.json

+ 2 - 0
.creator/asset-template/typescript/Custom Script Template Help Documentation.url

@@ -0,0 +1,2 @@
+[InternetShortcut]
+URL=https://docs.cocos.com/creator/manual/en/scripting/setup.html#custom-script-template

+ 1 - 0
.creator/default-meta.json

@@ -0,0 +1 @@
+{"image":{"type":"sprite-frame"}}

+ 10 - 10
assets/data/csv/enemy.csv

@@ -1,12 +1,12 @@
-ID,名称,"类型
+ID,名称,名称多语言,"类型
 1_小兵
 2_BOSS",生命值,攻速(每几秒攻击一次),子弹数量,移速,使用武器,使用武器2,同一类兵种最小随机出兵间隔,同一类兵种最大随机出兵间隔,模型预制体,头像
-number,string,number,number,number,number,number,number,number,number,number,string,string
-id,name,type,hp,atk_speed,bullet_number,speed,enemy_weapon_id_1,enemy_weapon_id_2,min_interval,max_interval,prb_name,headshot
-10001,大兵,1,70,1.5,1,1,1001,0,0,0.2,enemy,
-10002,狙击兵,1,60,2.5,1,1.2,1002,0,0.1,0.3,enemy,
-10003,盾牌兵,1,120,2,1,0.75,1001,1003,0.1,0.3,enemy,
-20001,狙击队长,2,240,2,1,1.25,1004,0,0,0.2,enemy,
-20002,机枪队长,2,280,0.4,1,1,1005,0,0,0.2,enemy,
-20003,坦克,2,480,3,1,1.3,1006,0,0.3,1.5,enemy,
-20004,将军,2,420,1.5,1,1.2,1007,0,0.5,1.2,enemy,
+number,string,string,number,number,number,number,number,number,number,number,number,string,string
+id,name,name_lang,type,hp,atk_speed,bullet_number,speed,enemy_weapon_id_1,enemy_weapon_id_2,min_interval,max_interval,prb_name,headshot
+10001,大兵,Soldier,1,70,1.5,1,1,1001,0,0,0.2,enemy,soldierPistol
+10002,狙击兵,Sniper,1,60,2.5,1,1.2,1002,0,0.1,0.3,enemy,sniperSoldier
+10003,盾牌兵,Shield Bearer,1,120,2,1,0.75,1001,1003,0.1,0.3,enemy,shieldSoldier
+20001,狙击队长,Sniper Captain,2,240,2,1,1.25,1004,0,0,0.2,enemy,snipeCaptain
+20002,机枪队长,Boomstick,2,280,0.4,1,1,1005,0,0,0.2,enemy,scatterCaptain
+20003,坦克,Tank,2,480,3,1,1.3,1006,0,0.3,1.5,enemy,tank_enemy
+20004,将军,Sir Blasty,2,420,1.5,1,1.2,1007,0,0.5,1.2,enemy,generalPistol

+ 111 - 111
assets/data/csv/levels.csv

@@ -1,117 +1,117 @@
 ID,关卡名称,名字多语言,关卡任务,任务多语言,地图,玩家点位,敌人生命成长系数{生命值*(1+系数)},胜利奖励(itemID_数量),失败奖励(itemID_数量),关卡解锁(itemID),"敌人配置
 敌人类型_属性",敌人射击精准度
-number,string,string,string,string,string,number,number,string,string,number,string,number
+number,string,string,string,string,string,number,number,string,string,string,string,number
 id,name,name_lang,task,task_lang,map,point,coefficient,reward_1,reward_2,unlock,dispose,precision
-1,任务1,Task1,击杀所有敌军,Kill all the enemy troops,map1,1,0,1001_150,1001_30,,10001_5|10002_1,0.2
-2,任务2,Task2,击杀所有敌军,Kill all the enemy troops,map1,2,0,1001_200,1001_30,,10001_3|10002_3,0.2
-3,任务3,Task3,击杀所有敌军,Kill all the enemy troops,map1,3,0,1001_250,1001_30,,10001_4|10002_2|10003_1,0.2
-4,任务4,Task4,击杀所有敌军,Kill all the enemy troops,map1,4,0.1,1001_300,1001_30,,10001_5|10002_3|10003_1,0.2
-5,任务5,Task5,击杀所有敌军,Kill all the enemy troops,map1,5,0.1,1001_350,1001_30,,10001_3|10002_4|10003_1,0.2
-6,任务6,Task6,击杀所有敌军,Kill all the enemy troops,map2,1,0.1,1001_400,1001_30,,10001_3|10002_5|10003_1,0.2
-7,任务7,Task7,击杀所有敌军,Kill all the enemy troops,map2,2,0.2,1001_450,1001_30,,10001_4|10002_3|10003_2,0.2
-8,任务8,Task8,击杀所有敌军,Kill all the enemy troops,map2,3,0.2,1001_500,1001_30,,10001_5|10002_2|10003_3,0.2
-9,任务9,Task9,击杀所有敌军,Kill all the enemy troops,map2,4,0.2,1001_550,1001_30,,10001_6|10002_3|10003_1,0.2
-10,任务10,Task10,击杀所有敌军,Kill all the enemy troops,map2,5,0.2,1001_600,1001_30,100016,10001_3|10002_5|20001_1,0.2
-11,任务11,Task11,击杀所有敌军,Kill all the enemy troops,map3,1,0.3,1001_650,1001_50,,10001_3|10002_5,0.2
-12,任务12,Task12,击杀所有敌军,Kill all the enemy troops,map3,2,0.3,1001_700,1001_50,,10001_3|10002_4|10003_1,0.2
-13,任务13,Task13,击杀所有敌军,Kill all the enemy troops,map3,3,0.3,1001_750,1001_50,,10001_3|10002_4|10003_2,0.2
-14,任务14,Task14,击杀所有敌军,Kill all the enemy troops,map3,4,0.4,1001_800,1001_50,,10001_3|10002_5|10003_2,0.2
-15,任务15,Task15,击杀所有敌军,Kill all the enemy troops,map3,5,0.4,1001_850,1001_50,,10001_4|10002_4|10003_2,0.2
-16,任务16,Task16,击杀所有敌军,Kill all the enemy troops,map4,1,0.4,1001_900,1001_50,,10001_5|10002_3|10003_2,0.2
-17,任务17,Task17,击杀所有敌军,Kill all the enemy troops,map4,2,0.5,1001_950,1001_50,,10001_6|10002_3|10003_3,0.2
-18,任务18,Task18,击杀所有敌军,Kill all the enemy troops,map4,3,0.5,1001_1000,1001_50,,10001_6|10002_4|10003_3,0.2
-19,任务19,Task19,击杀所有敌军,Kill all the enemy troops,map4,4,0.5,1001_1050,1001_50,,10001_6|10002_5|10003_2,0.2
-20,任务20,Task20,击杀所有敌军,Kill all the enemy troops,map4,5,0.5,1001_1100,1001_50,100014,10002_7|10003_3|20002_1,0.2
-21,任务21,Task21,击杀所有敌军,Kill all the enemy troops,map5,1,0.6,1001_1150,1001_100,,10002_5|10003_3,0.2
-22,任务22,Task22,击杀所有敌军,Kill all the enemy troops,map5,2,0.6,1001_1200,1001_100,,10002_6|10003_4,0.2
-23,任务23,Task23,击杀所有敌军,Kill all the enemy troops,map5,3,0.6,1001_1250,1001_100,,10001_3|10002_5|10003_3,0.2
-24,任务24,Task24,击杀所有敌军,Kill all the enemy troops,map5,4,0.7,1001_1300,1001_100,,10001_5|10002_3|10003_3,0.2
-25,任务25,Task25,击杀所有敌军,Kill all the enemy troops,map5,5,0.7,1001_1350,1001_100,,10001_3|10002_5|10003_5,0.2
-26,任务26,Task26,击杀所有敌军,Kill all the enemy troops,map6,1,0.7,1001_1400,1001_100,,10001_5|10002_5|10003_6,0.3
-27,任务27,Task27,击杀所有敌军,Kill all the enemy troops,map6,2,0.8,1001_1450,1001_100,,10001_3|10002_3|10003_8,0.3
-28,任务28,Task28,击杀所有敌军,Kill all the enemy troops,map6,3,0.8,1001_1500,1001_100,,10001_3|10002_5|10003_8,0.3
-29,任务29,Task29,击杀所有敌军,Kill all the enemy troops,map6,4,0.8,1001_1550,1001_100,,10001_4|10002_4|10003_9,0.3
-30,任务30,Task30,击杀所有敌军,Kill all the enemy troops,map6,5,0.9,1001_1600,1001_100,100011,10001_5|10002_3|10003_3|20003_1,0.3
-31,任务31,Task31,击杀所有敌军,Kill all the enemy troops,map7,1,0.9,1001_1650,1001_150,,10001_6|10002_3|10003_2,0.3
-32,任务32,Task32,击杀所有敌军,Kill all the enemy troops,map7,2,0.9,1001_1700,1001_150,,10001_7|10002_4|10003_2,0.3
-33,任务33,Task33,击杀所有敌军,Kill all the enemy troops,map7,3,1,1001_1750,1001_150,,10001_8|10002_4|10003_3,0.3
-34,任务34,Task34,击杀所有敌军,Kill all the enemy troops,map7,4,1,1001_1800,1001_150,,10001_7|10002_4|10003_4,0.3
-35,任务35,Task35,击杀所有敌军,Kill all the enemy troops,map7,5,1,1001_1850,1001_150,,10001_8|10002_4|10003_5,0.3
-36,任务36,Task36,击杀所有敌军,Kill all the enemy troops,map8,1,1.1,1001_1900,1001_150,,10001_9|10002_4|10003_5,0.3
-37,任务37,Task37,击杀所有敌军,Kill all the enemy troops,map8,2,1.1,1001_1950,1001_150,,10001_8|10002_5|10003_5,0.3
-38,任务38,Task38,击杀所有敌军,Kill all the enemy troops,map8,3,1.1,1001_2000,1001_150,,10001_8|10002_6|10003_5,0.3
-39,任务39,Task39,击杀所有敌军,Kill all the enemy troops,map8,4,1.2,1001_2050,1001_150,,10001_7|10002_6|10003_6,0.3
-40,任务40,Task40,击杀所有敌军,Kill all the enemy troops,map8,5,1.2,1001_2100,1001_150,100015,10001_10|10002_2|10003_2|20004_1,0.3
-41,任务41,Task41,击杀所有敌军,Kill all the enemy troops,map9,1,1.2,1001_2150,1001_200,,10001_3|10002_8,0.3
-42,任务42,Task42,击杀所有敌军,Kill all the enemy troops,map9,2,1.3,1001_2200,1001_200,,10001_3|10002_6|10003_2,0.3
-43,任务43,Task43,击杀所有敌军,Kill all the enemy troops,map9,3,1.3,1001_2250,1001_200,,10001_3|10002_6|10003_3,0.3
-44,任务44,Task44,击杀所有敌军,Kill all the enemy troops,map9,4,1.3,1001_2300,1001_200,,10001_3|10002_8|10003_3,0.3
-45,任务45,Task45,击杀所有敌军,Kill all the enemy troops,map9,5,1.4,1001_2350,1001_200,,10001_5|10002_8|10003_6,0.3
-46,任务46,Task46,击杀所有敌军,Kill all the enemy troops,map10,1,1.4,1001_2400,1001_200,,10001_5|10002_8|10003_4,0.3
-47,任务47,Task47,击杀所有敌军,Kill all the enemy troops,map10,2,1.4,1001_2450,1001_200,,10001_5|10002_8|10003_5,0.3
-48,任务48,Task48,击杀所有敌军,Kill all the enemy troops,map10,3,1.5,1001_2500,1001_200,,10001_3|10002_10|10003_5,0.3
-49,任务49,Task49,击杀所有敌军,Kill all the enemy troops,map10,4,1.5,1001_2550,1001_200,,10001_5|10002_8|10003_5,0.3
-50,任务50,Task50,击杀所有敌军,Kill all the enemy troops,map10,5,1.5,1001_2600,1001_200,100012,10001_3|10002_5|10003_3|20001_1|20002_1,0.3
-51,任务51,Task51,击杀所有敌军,Kill all the enemy troops,map1,1,1.6,1001_2650,1001_250,,10001_5|10002_6|10003_2,0.3
-52,任务52,Task52,击杀所有敌军,Kill all the enemy troops,map1,2,1.6,1001_2700,1001_250,,10001_3|10002_6|10003_5,0.3
-53,任务53,Task53,击杀所有敌军,Kill all the enemy troops,map1,3,1.6,1001_2750,1001_250,,10001_3|10002_6|10003_6,0.3
-54,任务54,Task54,击杀所有敌军,Kill all the enemy troops,map1,4,1.7,1001_2800,1001_250,,10001_5|10002_8|10003_4,0.3
-55,任务55,Task55,击杀所有敌军,Kill all the enemy troops,map1,5,1.7,1001_2850,1001_250,,10001_3|10002_8|10003_5,0.3
-56,任务56,Task56,击杀所有敌军,Kill all the enemy troops,map2,1,1.7,1001_2900,1001_250,,10001_5|10002_6|10003_6,0.3
-57,任务57,Task57,击杀所有敌军,Kill all the enemy troops,map2,2,1.8,1001_2950,1001_250,,10001_5|10002_8|10003_5,0.3
-58,任务58,Task58,击杀所有敌军,Kill all the enemy troops,map2,3,1.8,1001_3000,1001_250,,10001_5|10002_10|10003_5,0.3
-59,任务59,Task59,击杀所有敌军,Kill all the enemy troops,map2,4,1.8,1001_3050,1001_250,,10001_5|10002_8|10003_8,0.3
-60,任务60,Task60,击杀所有敌军,Kill all the enemy troops,map2,5,2,1001_3100,1001_250,100017,10001_6|10002_3|10003_2|20003_1|20004_1,0.3
-61,任务61,Task61,击杀所有敌军,Kill all the enemy troops,map3,1,2,1001_3150,1001_300,,10001_5|10002_6|10003_2,0.3
-62,任务62,Task62,击杀所有敌军,Kill all the enemy troops,map3,2,2,1001_3200,1001_300,,10001_3|10002_6|10003_5,0.3
-63,任务63,Task63,击杀所有敌军,Kill all the enemy troops,map3,3,2.2,1001_3250,1001_300,,10001_3|10002_6|10003_6,0.3
-64,任务64,Task64,击杀所有敌军,Kill all the enemy troops,map3,4,2.2,1001_3300,1001_300,,10001_5|10002_8|10003_4,0.3
-65,任务65,Task65,击杀所有敌军,Kill all the enemy troops,map3,5,2.2,1001_3350,1001_300,,10001_3|10002_8|10003_5,0.3
-66,任务66,Task66,击杀所有敌军,Kill all the enemy troops,map4,1,2.4,1001_3400,1001_300,,10001_5|10002_6|10003_6,0.3
-67,任务67,Task67,击杀所有敌军,Kill all the enemy troops,map4,2,2.4,1001_3450,1001_300,,10001_5|10002_8|10003_5,0.3
-68,任务68,Task68,击杀所有敌军,Kill all the enemy troops,map4,3,2.4,1001_3500,1001_300,,10001_5|10002_10|10003_5,0.3
-69,任务69,Task69,击杀所有敌军,Kill all the enemy troops,map4,4,2.6,1001_3550,1001_300,,10001_5|10002_8|10003_8,0.3
-70,任务70,Task70,击杀所有敌军,Kill all the enemy troops,map4,5,2.6,1001_3600,1001_300,100013,10001_6|10002_3|10003_2|20003_1|20004_1,0.3
-71,任务71,Task71,击杀所有敌军,Kill all the enemy troops,map5,1,2.6,1001_3650,1001_350,,10001_5|10002_5|10003_2,0.3
-72,任务72,Task72,击杀所有敌军,Kill all the enemy troops,map5,2,2.8,1001_3700,1001_350,,10001_6|10002_4|10003_3,0.3
-73,任务73,Task73,击杀所有敌军,Kill all the enemy troops,map5,3,2.8,1001_3750,1001_350,,10001_6|10002_5|10003_3,0.3
-74,任务74,Task74,击杀所有敌军,Kill all the enemy troops,map5,4,2.8,1001_3800,1001_350,,10001_7|10002_5|10003_3,0.3
-75,任务75,Task75,击杀所有敌军,Kill all the enemy troops,map5,5,3,1001_3850,1001_350,,10001_7|10002_5|10003_5,0.3
-76,任务76,Task76,击杀所有敌军,Kill all the enemy troops,map6,1,3,1001_3900,1001_350,,10001_7|10002_6|10003_5,0.3
-77,任务77,Task77,击杀所有敌军,Kill all the enemy troops,map6,2,3,1001_3950,1001_350,,10001_8|10002_6|10003_5,0.3
-78,任务78,Task78,击杀所有敌军,Kill all the enemy troops,map6,3,3.2,1001_4000,1001_350,,10001_8|10002_6|10003_6,0.3
-79,任务79,Task79,击杀所有敌军,Kill all the enemy troops,map6,4,3.2,1001_4050,1001_350,,10001_6|10002_8|10003_6,0.3
-80,任务80,Task80,击杀所有敌军,Kill all the enemy troops,map6,5,3.2,1001_4100,1001_350,,10001_5|10002_3|10003_3|20001_1|20002_1|20003_1,0.3
-81,任务81,Task81,击杀所有敌军,Kill all the enemy troops,map7,1,3.4,1001_4150,1001_400,,10001_5|10002_7|10003_2,0.3
-82,任务82,Task82,击杀所有敌军,Kill all the enemy troops,map7,2,3.4,1001_4200,1001_400,,10001_4|10002_8|10003_3,0.3
-83,任务83,Task83,击杀所有敌军,Kill all the enemy troops,map7,3,3.4,1001_4250,1001_400,,10001_5|10002_6|10003_4,0.3
-84,任务84,Task84,击杀所有敌军,Kill all the enemy troops,map7,4,3.6,1001_4300,1001_400,,10001_5|10002_6|10003_5,0.3
-85,任务85,Task85,击杀所有敌军,Kill all the enemy troops,map7,5,3.6,1001_4350,1001_400,,10001_3|10002_8|10003_5,0.3
-86,任务86,Task86,击杀所有敌军,Kill all the enemy troops,map8,1,3.6,1001_4400,1001_400,,10001_3|10002_8|10003_6,0.3
-87,任务87,Task87,击杀所有敌军,Kill all the enemy troops,map8,2,3.8,1001_4450,1001_400,,10001_5|10002_8|10003_5,0.3
-88,任务88,Task88,击杀所有敌军,Kill all the enemy troops,map8,3,3.8,1001_4500,1001_400,,10001_5|10002_10|10003_5,0.3
-89,任务89,Task89,击杀所有敌军,Kill all the enemy troops,map8,4,3.8,1001_4550,1001_400,,10001_6|10002_8|10003_6,0.3
-90,任务90,Task90,击杀所有敌军,Kill all the enemy troops,map8,5,4,1001_4600,1001_400,,10001_3|10002_6|10003_3|20002_1|20003_1|20004_1,0.3
-91,任务91,Task91,击杀所有敌军,Kill all the enemy troops,map9,1,4,1001_4650,1001_450,,10001_3|10002_5|10003_5,0.3
-92,任务92,Task92,击杀所有敌军,Kill all the enemy troops,map9,2,4,1001_4700,1001_450,,10001_3|10002_6|10003_6,0.3
-93,任务93,Task93,击杀所有敌军,Kill all the enemy troops,map9,3,4.3,1001_4750,1001_450,,10001_5|10002_6|10003_6,0.3
-94,任务94,Task94,击杀所有敌军,Kill all the enemy troops,map9,4,4.3,1001_4800,1001_450,,10001_5|10002_8|10003_5,0.3
-95,任务95,Task95,击杀所有敌军,Kill all the enemy troops,map9,5,4.3,1001_4850,1001_450,,10001_5|10002_8|10003_6,0.3
-96,任务96,Task96,击杀所有敌军,Kill all the enemy troops,map10,1,4.6,1001_4900,1001_450,,10001_6|10002_6|10003_8,0.3
-97,任务97,Task97,击杀所有敌军,Kill all the enemy troops,map10,2,4.6,1001_4950,1001_450,,10001_6|10002_8|10003_8,0.3
-98,任务98,Task98,击杀所有敌军,Kill all the enemy troops,map10,3,4.6,1001_5000,1001_450,,10001_5|10002_10|10003_6,0.3
-99,任务99,Task99,击杀所有敌军,Kill all the enemy troops,map10,4,4.9,1001_5050,1001_450,,10001_5|10002_8|10003_8,0.3
-100,任务100,Task100,击杀所有敌军,Kill all the enemy troops,map10,5,4.9,1001_5100,1001_450,,10001_5|10002_3|10003_2|20001_1|20003_1|20004_1,0.3
-101,任务101,Task101,击杀所有敌军,Kill all the enemy troops,map1,1,4.9,1001_5150,1001_500,,10001_3|10002_5|10003_5,0.3
-102,任务102,Task102,击杀所有敌军,Kill all the enemy troops,map1,2,5.2,1001_5200,1001_500,,10001_3|10002_3|10003_8,0.3
-103,任务103,Task103,击杀所有敌军,Kill all the enemy troops,map1,3,5.2,1001_5250,1001_500,,10001_8|10002_4|10003_3,0.3
-104,任务104,Task104,击杀所有敌军,Kill all the enemy troops,map1,4,5.2,1001_5300,1001_500,,10001_7|10002_5|10003_5,0.3
-105,任务105,Task105,击杀所有敌军,Kill all the enemy troops,map1,5,5.5,1001_5350,1001_500,,10001_7|10002_7|10003_5,0.3
-106,任务106,Task106,击杀所有敌军,Kill all the enemy troops,map2,1,5.5,1001_5400,1001_500,,10001_8|10002_6|10003_6,0.3
-107,任务107,Task107,击杀所有敌军,Kill all the enemy troops,map2,2,5.5,1001_5450,1001_500,,10001_8|10002_6|10003_8,0.3
-108,任务108,Task108,击杀所有敌军,Kill all the enemy troops,map2,3,5.8,1001_5500,1001_500,,10001_6|10002_8|10003_8,0.3
-109,任务109,Task109,击杀所有敌军,Kill all the enemy troops,map2,4,5.8,1001_5550,1001_500,,10001_6|10002_8|10003_9,0.3
-110,任务110,Task110,击杀所有敌军,Kill all the enemy troops,map2,5,5.8,1001_5600,1001_500,,10001_3|10002_5|10003_2|20001_1|20002_1|20003_1|20004_1,0.3
+1,任务1,Task1,击杀所有敌军,Kill all the enemy troops,map1,1,0,1001_150,1001_30,10016|1/10,10001_5|10002_1,0.2
+2,任务2,Task2,击杀所有敌军,Kill all the enemy troops,map1,2,0,1001_200,1001_30,10016|2/10,10001_3|10002_3,0.2
+3,任务3,Task3,击杀所有敌军,Kill all the enemy troops,map1,3,0,1001_250,1001_30,10016|3/10,10001_4|10002_2|10003_1,0.2
+4,任务4,Task4,击杀所有敌军,Kill all the enemy troops,map1,4,0.1,1001_300,1001_30,10016|4/10,10001_5|10002_3|10003_1,0.2
+5,任务5,Task5,击杀所有敌军,Kill all the enemy troops,map1,5,0.1,1001_350,1001_30,10016|5/10,10001_3|10002_4|10003_1,0.2
+6,任务6,Task6,击杀所有敌军,Kill all the enemy troops,map2,1,0.1,1001_400,1001_30,10016|6/10,10001_3|10002_5|10003_1,0.2
+7,任务7,Task7,击杀所有敌军,Kill all the enemy troops,map2,2,0.2,1001_450,1001_30,10016|7/10,10001_4|10002_3|10003_2,0.2
+8,任务8,Task8,击杀所有敌军,Kill all the enemy troops,map2,3,0.2,1001_500,1001_30,10016|8/10,10001_5|10002_2|10003_3,0.2
+9,任务9,Task9,击杀所有敌军,Kill all the enemy troops,map2,4,0.2,1001_550,1001_30,10016|9/10,10001_6|10002_3|10003_1,0.2
+10,任务10,Task10,击杀所有敌军,Kill all the enemy troops,map2,5,0.2,1001_600,1001_30,10016|10/10,10001_3|10002_5|20001_1,0.2
+11,任务11,Task11,击杀所有敌军,Kill all the enemy troops,map3,1,0.3,1001_650,1001_50,100014|1/10,10001_3|10002_5,0.2
+12,任务12,Task12,击杀所有敌军,Kill all the enemy troops,map3,2,0.3,1001_700,1001_50,100014|2/10,10001_3|10002_4|10003_1,0.2
+13,任务13,Task13,击杀所有敌军,Kill all the enemy troops,map3,3,0.3,1001_750,1001_50,100014|3/10,10001_3|10002_4|10003_2,0.2
+14,任务14,Task14,击杀所有敌军,Kill all the enemy troops,map3,4,0.4,1001_800,1001_50,100014|4/10,10001_3|10002_5|10003_2,0.2
+15,任务15,Task15,击杀所有敌军,Kill all the enemy troops,map3,5,0.4,1001_850,1001_50,100014|5/10,10001_4|10002_4|10003_2,0.2
+16,任务16,Task16,击杀所有敌军,Kill all the enemy troops,map4,1,0.4,1001_900,1001_50,100014|6/10,10001_5|10002_3|10003_2,0.2
+17,任务17,Task17,击杀所有敌军,Kill all the enemy troops,map4,2,0.5,1001_950,1001_50,100014|7/10,10001_6|10002_3|10003_3,0.2
+18,任务18,Task18,击杀所有敌军,Kill all the enemy troops,map4,3,0.5,1001_1000,1001_50,100014|8/10,10001_6|10002_4|10003_3,0.2
+19,任务19,Task19,击杀所有敌军,Kill all the enemy troops,map4,4,0.5,1001_1050,1001_50,100014|9/10,10001_6|10002_5|10003_2,0.2
+20,任务20,Task20,击杀所有敌军,Kill all the enemy troops,map4,5,0.5,1001_1100,1001_50,100014|10/10,10002_7|10003_3|20002_1,0.2
+21,任务21,Task21,击杀所有敌军,Kill all the enemy troops,map5,1,0.6,1001_1150,1001_100,100011|1/10,10002_5|10003_3,0.2
+22,任务22,Task22,击杀所有敌军,Kill all the enemy troops,map5,2,0.6,1001_1200,1001_100,100011|2/10,10002_6|10003_4,0.2
+23,任务23,Task23,击杀所有敌军,Kill all the enemy troops,map5,3,0.6,1001_1250,1001_100,100011|3/10,10001_3|10002_5|10003_3,0.2
+24,任务24,Task24,击杀所有敌军,Kill all the enemy troops,map5,4,0.7,1001_1300,1001_100,100011|4/10,10001_5|10002_3|10003_3,0.2
+25,任务25,Task25,击杀所有敌军,Kill all the enemy troops,map5,5,0.7,1001_1350,1001_100,100011|5/10,10001_3|10002_5|10003_5,0.2
+26,任务26,Task26,击杀所有敌军,Kill all the enemy troops,map6,1,0.7,1001_1400,1001_100,100011|6/10,10001_5|10002_5|10003_6,0.3
+27,任务27,Task27,击杀所有敌军,Kill all the enemy troops,map6,2,0.8,1001_1450,1001_100,100011|7/10,10001_3|10002_3|10003_8,0.3
+28,任务28,Task28,击杀所有敌军,Kill all the enemy troops,map6,3,0.8,1001_1500,1001_100,100011|8/10,10001_3|10002_5|10003_8,0.3
+29,任务29,Task29,击杀所有敌军,Kill all the enemy troops,map6,4,0.8,1001_1550,1001_100,100011|9/10,10001_4|10002_4|10003_9,0.3
+30,任务30,Task30,击杀所有敌军,Kill all the enemy troops,map6,5,0.9,1001_1600,1001_100,100011|10/10,10001_5|10002_3|10003_3|20003_1,0.3
+31,任务31,Task31,击杀所有敌军,Kill all the enemy troops,map7,1,0.9,1001_1650,1001_150,100015|1/20,10001_6|10002_3|10003_2,0.3
+32,任务32,Task32,击杀所有敌军,Kill all the enemy troops,map7,2,0.9,1001_1700,1001_150,100015|2/20,10001_7|10002_4|10003_2,0.3
+33,任务33,Task33,击杀所有敌军,Kill all the enemy troops,map7,3,1,1001_1750,1001_150,100015|3/20,10001_8|10002_4|10003_3,0.3
+34,任务34,Task34,击杀所有敌军,Kill all the enemy troops,map7,4,1,1001_1800,1001_150,100015|4/20,10001_7|10002_4|10003_4,0.3
+35,任务35,Task35,击杀所有敌军,Kill all the enemy troops,map7,5,1,1001_1850,1001_150,100015|5/20,10001_8|10002_4|10003_5,0.3
+36,任务36,Task36,击杀所有敌军,Kill all the enemy troops,map8,1,1.1,1001_1900,1001_150,100015|6/20,10001_9|10002_4|10003_5,0.3
+37,任务37,Task37,击杀所有敌军,Kill all the enemy troops,map8,2,1.1,1001_1950,1001_150,100015|7/20,10001_8|10002_5|10003_5,0.3
+38,任务38,Task38,击杀所有敌军,Kill all the enemy troops,map8,3,1.1,1001_2000,1001_150,100015|8/20,10001_8|10002_6|10003_5,0.3
+39,任务39,Task39,击杀所有敌军,Kill all the enemy troops,map8,4,1.2,1001_2050,1001_150,100015|9/20,10001_7|10002_6|10003_6,0.3
+40,任务40,Task40,击杀所有敌军,Kill all the enemy troops,map8,5,1.2,1001_2100,1001_150,100015|10/20,10001_10|10002_2|10003_2|20004_1,0.3
+41,任务41,Task41,击杀所有敌军,Kill all the enemy troops,map9,1,1.2,1001_2150,1001_200,100015|11/20,10001_3|10002_8,0.3
+42,任务42,Task42,击杀所有敌军,Kill all the enemy troops,map9,2,1.3,1001_2200,1001_200,100015|12/20,10001_3|10002_6|10003_2,0.3
+43,任务43,Task43,击杀所有敌军,Kill all the enemy troops,map9,3,1.3,1001_2250,1001_200,100015|13/20,10001_3|10002_6|10003_3,0.3
+44,任务44,Task44,击杀所有敌军,Kill all the enemy troops,map9,4,1.3,1001_2300,1001_200,100015|14/20,10001_3|10002_8|10003_3,0.3
+45,任务45,Task45,击杀所有敌军,Kill all the enemy troops,map9,5,1.4,1001_2350,1001_200,100015|15/20,10001_5|10002_8|10003_6,0.3
+46,任务46,Task46,击杀所有敌军,Kill all the enemy troops,map10,1,1.4,1001_2400,1001_200,100015|16/20,10001_5|10002_8|10003_4,0.3
+47,任务47,Task47,击杀所有敌军,Kill all the enemy troops,map10,2,1.4,1001_2450,1001_200,100015|17/20,10001_5|10002_8|10003_5,0.3
+48,任务48,Task48,击杀所有敌军,Kill all the enemy troops,map10,3,1.5,1001_2500,1001_200,100015|18/20,10001_3|10002_10|10003_5,0.3
+49,任务49,Task49,击杀所有敌军,Kill all the enemy troops,map10,4,1.5,1001_2550,1001_200,100015|19/20,10001_5|10002_8|10003_5,0.3
+50,任务50,Task50,击杀所有敌军,Kill all the enemy troops,map10,5,1.5,1001_2600,1001_200,100015|20/20,10001_3|10002_5|10003_3|20001_1|20002_1,0.3
+51,任务51,Task51,击杀所有敌军,Kill all the enemy troops,map1,1,1.6,1001_2650,1001_250,100012|1/20,10001_5|10002_6|10003_2,0.3
+52,任务52,Task52,击杀所有敌军,Kill all the enemy troops,map1,2,1.6,1001_2700,1001_250,100012|2/20,10001_3|10002_6|10003_5,0.3
+53,任务53,Task53,击杀所有敌军,Kill all the enemy troops,map1,3,1.6,1001_2750,1001_250,100012|3/20,10001_3|10002_6|10003_6,0.3
+54,任务54,Task54,击杀所有敌军,Kill all the enemy troops,map1,4,1.7,1001_2800,1001_250,100012|4/20,10001_5|10002_8|10003_4,0.3
+55,任务55,Task55,击杀所有敌军,Kill all the enemy troops,map1,5,1.7,1001_2850,1001_250,100012|5/20,10001_3|10002_8|10003_5,0.3
+56,任务56,Task56,击杀所有敌军,Kill all the enemy troops,map2,1,1.7,1001_2900,1001_250,100012|6/20,10001_5|10002_6|10003_6,0.3
+57,任务57,Task57,击杀所有敌军,Kill all the enemy troops,map2,2,1.8,1001_2950,1001_250,100012|7/20,10001_5|10002_8|10003_5,0.3
+58,任务58,Task58,击杀所有敌军,Kill all the enemy troops,map2,3,1.8,1001_3000,1001_250,100012|8/20,10001_5|10002_10|10003_5,0.3
+59,任务59,Task59,击杀所有敌军,Kill all the enemy troops,map2,4,1.8,1001_3050,1001_250,100012|9/20,10001_5|10002_8|10003_8,0.3
+60,任务60,Task60,击杀所有敌军,Kill all the enemy troops,map2,5,2,1001_3100,1001_250,100012|10/20,10001_6|10002_3|10003_2|20003_1|20004_1,0.3
+61,任务61,Task61,击杀所有敌军,Kill all the enemy troops,map3,1,2,1001_3150,1001_300,100012|11/20,10001_5|10002_6|10003_2,0.3
+62,任务62,Task62,击杀所有敌军,Kill all the enemy troops,map3,2,2,1001_3200,1001_300,100012|12/20,10001_3|10002_6|10003_5,0.3
+63,任务63,Task63,击杀所有敌军,Kill all the enemy troops,map3,3,2.2,1001_3250,1001_300,100012|13/20,10001_3|10002_6|10003_6,0.3
+64,任务64,Task64,击杀所有敌军,Kill all the enemy troops,map3,4,2.2,1001_3300,1001_300,100012|14/20,10001_5|10002_8|10003_4,0.3
+65,任务65,Task65,击杀所有敌军,Kill all the enemy troops,map3,5,2.2,1001_3350,1001_300,100012|15/20,10001_3|10002_8|10003_5,0.3
+66,任务66,Task66,击杀所有敌军,Kill all the enemy troops,map4,1,2.4,1001_3400,1001_300,100012|16/20,10001_5|10002_6|10003_6,0.3
+67,任务67,Task67,击杀所有敌军,Kill all the enemy troops,map4,2,2.4,1001_3450,1001_300,100012|17/20,10001_5|10002_8|10003_5,0.3
+68,任务68,Task68,击杀所有敌军,Kill all the enemy troops,map4,3,2.4,1001_3500,1001_300,100012|18/20,10001_5|10002_10|10003_5,0.3
+69,任务69,Task69,击杀所有敌军,Kill all the enemy troops,map4,4,2.6,1001_3550,1001_300,100012|19/20,10001_5|10002_8|10003_8,0.3
+70,任务70,Task70,击杀所有敌军,Kill all the enemy troops,map4,5,2.6,1001_3600,1001_300,100012|20/20,10001_6|10002_3|10003_2|20003_1|20004_1,0.3
+71,任务71,Task71,击杀所有敌军,Kill all the enemy troops,map5,1,2.6,1001_3650,1001_350,100017|1/20,10001_5|10002_5|10003_2,0.3
+72,任务72,Task72,击杀所有敌军,Kill all the enemy troops,map5,2,2.8,1001_3700,1001_350,100017|2/20,10001_6|10002_4|10003_3,0.3
+73,任务73,Task73,击杀所有敌军,Kill all the enemy troops,map5,3,2.8,1001_3750,1001_350,100017|3/20,10001_6|10002_5|10003_3,0.3
+74,任务74,Task74,击杀所有敌军,Kill all the enemy troops,map5,4,2.8,1001_3800,1001_350,100017|4/20,10001_7|10002_5|10003_3,0.3
+75,任务75,Task75,击杀所有敌军,Kill all the enemy troops,map5,5,3,1001_3850,1001_350,100017|5/20,10001_7|10002_5|10003_5,0.3
+76,任务76,Task76,击杀所有敌军,Kill all the enemy troops,map6,1,3,1001_3900,1001_350,100017|6/20,10001_7|10002_6|10003_5,0.3
+77,任务77,Task77,击杀所有敌军,Kill all the enemy troops,map6,2,3,1001_3950,1001_350,100017|7/20,10001_8|10002_6|10003_5,0.3
+78,任务78,Task78,击杀所有敌军,Kill all the enemy troops,map6,3,3.2,1001_4000,1001_350,100017|8/20,10001_8|10002_6|10003_6,0.3
+79,任务79,Task79,击杀所有敌军,Kill all the enemy troops,map6,4,3.2,1001_4050,1001_350,100017|9/20,10001_6|10002_8|10003_6,0.3
+80,任务80,Task80,击杀所有敌军,Kill all the enemy troops,map6,5,3.2,1001_4100,1001_350,100017|10/20,10001_5|10002_3|10003_3|20001_1|20002_1|20003_1,0.3
+81,任务81,Task81,击杀所有敌军,Kill all the enemy troops,map7,1,3.4,1001_4150,1001_400,100017|11/20,10001_5|10002_7|10003_2,0.3
+82,任务82,Task82,击杀所有敌军,Kill all the enemy troops,map7,2,3.4,1001_4200,1001_400,100017|12/20,10001_4|10002_8|10003_3,0.3
+83,任务83,Task83,击杀所有敌军,Kill all the enemy troops,map7,3,3.4,1001_4250,1001_400,100017|13/20,10001_5|10002_6|10003_4,0.3
+84,任务84,Task84,击杀所有敌军,Kill all the enemy troops,map7,4,3.6,1001_4300,1001_400,100017|14/20,10001_5|10002_6|10003_5,0.3
+85,任务85,Task85,击杀所有敌军,Kill all the enemy troops,map7,5,3.6,1001_4350,1001_400,100017|15/20,10001_3|10002_8|10003_5,0.3
+86,任务86,Task86,击杀所有敌军,Kill all the enemy troops,map8,1,3.6,1001_4400,1001_400,100017|16/20,10001_3|10002_8|10003_6,0.3
+87,任务87,Task87,击杀所有敌军,Kill all the enemy troops,map8,2,3.8,1001_4450,1001_400,100017|17/20,10001_5|10002_8|10003_5,0.3
+88,任务88,Task88,击杀所有敌军,Kill all the enemy troops,map8,3,3.8,1001_4500,1001_400,100017|18/20,10001_5|10002_10|10003_5,0.3
+89,任务89,Task89,击杀所有敌军,Kill all the enemy troops,map8,4,3.8,1001_4550,1001_400,100017|19/20,10001_6|10002_8|10003_6,0.3
+90,任务90,Task90,击杀所有敌军,Kill all the enemy troops,map8,5,4,1001_4600,1001_400,100017|20/20,10001_3|10002_6|10003_3|20002_1|20003_1|20004_1,0.3
+91,任务91,Task91,击杀所有敌军,Kill all the enemy troops,map9,1,4,1001_4650,1001_450,100013|1/20,10001_3|10002_5|10003_5,0.3
+92,任务92,Task92,击杀所有敌军,Kill all the enemy troops,map9,2,4,1001_4700,1001_450,100013|2/20,10001_3|10002_6|10003_6,0.3
+93,任务93,Task93,击杀所有敌军,Kill all the enemy troops,map9,3,4.3,1001_4750,1001_450,100013|3/20,10001_5|10002_6|10003_6,0.3
+94,任务94,Task94,击杀所有敌军,Kill all the enemy troops,map9,4,4.3,1001_4800,1001_450,100013|4/20,10001_5|10002_8|10003_5,0.3
+95,任务95,Task95,击杀所有敌军,Kill all the enemy troops,map9,5,4.3,1001_4850,1001_450,100013|5/20,10001_5|10002_8|10003_6,0.3
+96,任务96,Task96,击杀所有敌军,Kill all the enemy troops,map10,1,4.6,1001_4900,1001_450,100013|6/20,10001_6|10002_6|10003_8,0.3
+97,任务97,Task97,击杀所有敌军,Kill all the enemy troops,map10,2,4.6,1001_4950,1001_450,100013|7/20,10001_6|10002_8|10003_8,0.3
+98,任务98,Task98,击杀所有敌军,Kill all the enemy troops,map10,3,4.6,1001_5000,1001_450,100013|8/20,10001_5|10002_10|10003_6,0.3
+99,任务99,Task99,击杀所有敌军,Kill all the enemy troops,map10,4,4.9,1001_5050,1001_450,100013|9/20,10001_5|10002_8|10003_8,0.3
+100,任务100,Task100,击杀所有敌军,Kill all the enemy troops,map10,5,4.9,1001_5100,1001_450,100013|10/20,10001_5|10002_3|10003_2|20001_1|20003_1|20004_1,0.3
+101,任务101,Task101,击杀所有敌军,Kill all the enemy troops,map1,1,4.9,1001_5150,1001_500,100013|11/20,10001_3|10002_5|10003_5,0.3
+102,任务102,Task102,击杀所有敌军,Kill all the enemy troops,map1,2,5.2,1001_5200,1001_500,100013|12/20,10001_3|10002_3|10003_8,0.3
+103,任务103,Task103,击杀所有敌军,Kill all the enemy troops,map1,3,5.2,1001_5250,1001_500,100013|13/20,10001_8|10002_4|10003_3,0.3
+104,任务104,Task104,击杀所有敌军,Kill all the enemy troops,map1,4,5.2,1001_5300,1001_500,100013|14/20,10001_7|10002_5|10003_5,0.3
+105,任务105,Task105,击杀所有敌军,Kill all the enemy troops,map1,5,5.5,1001_5350,1001_500,100013|15/20,10001_7|10002_7|10003_5,0.3
+106,任务106,Task106,击杀所有敌军,Kill all the enemy troops,map2,1,5.5,1001_5400,1001_500,100013|16/20,10001_8|10002_6|10003_6,0.3
+107,任务107,Task107,击杀所有敌军,Kill all the enemy troops,map2,2,5.5,1001_5450,1001_500,100013|17/20,10001_8|10002_6|10003_8,0.3
+108,任务108,Task108,击杀所有敌军,Kill all the enemy troops,map2,3,5.8,1001_5500,1001_500,100013|18/20,10001_6|10002_8|10003_8,0.3
+109,任务109,Task109,击杀所有敌军,Kill all the enemy troops,map2,4,5.8,1001_5550,1001_500,100013|19/20,10001_6|10002_8|10003_9,0.3
+110,任务110,Task110,击杀所有敌军,Kill all the enemy troops,map2,5,5.8,1001_5600,1001_500,100013|20/20,10001_3|10002_5|10003_2|20001_1|20002_1|20003_1|20004_1,0.3
 111,任务111,Task111,击杀所有敌军,Kill all the enemy troops,map3,1,6.1,1001_5650,1001_550,,10001_5|10002_5|10003_5,0.3
 112,任务112,Task112,击杀所有敌军,Kill all the enemy troops,map3,2,6.1,1001_5700,1001_550,,10001_5|10002_4|10003_8,0.3
 113,任务113,Task113,击杀所有敌军,Kill all the enemy troops,map3,3,6.1,1001_5750,1001_550,,10001_5|10002_8|10003_3,0.3

BIN
assets/model/.DS_Store


+ 2 - 2
assets/model/all soldier.fbx.meta

@@ -57,7 +57,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -142,7 +142,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 9 - 39
assets/model/enemy_weapon.fbx.meta

@@ -5,22 +5,6 @@
   "uuid": "e5efb64c-9936-43c1-b0c9-c1cf4fced520",
   "files": [],
   "subMetas": {
-    "55094": {
-      "importer": "gltf-material",
-      "uuid": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
-      "displayName": "",
-      "id": "55094",
-      "name": "tietu.material",
-      "userData": {
-        "gltfIndex": 0
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "c42ea": {
       "importer": "gltf-mesh",
       "uuid": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@c42ea",
@@ -233,7 +217,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -256,7 +240,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -265,22 +249,6 @@
       ],
       "subMetas": {}
     },
-    "5e2b8": {
-      "importer": "gltf-material",
-      "uuid": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@5e2b8",
-      "displayName": "",
-      "id": "5e2b8",
-      "name": "tietu.001.material",
-      "userData": {
-        "gltfIndex": 1
-      },
-      "ver": "1.0.14",
-      "imported": true,
-      "files": [
-        ".json"
-      ],
-      "subMetas": {}
-    },
     "7b718": {
       "importer": "gltf-scene",
       "uuid": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@7b718",
@@ -302,11 +270,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {
@@ -350,8 +318,8 @@
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@05da8"
       ],
       "materials": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@5e2b8"
+        "6323bd2c-1ad9-496e-80db-6a17ee36062a",
+        "5ca63bc1-3427-4148-9313-2f631db17afb"
       ],
       "scenes": [
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@7b718"
@@ -447,6 +415,8 @@
           {}
         ]
       }
-    }
+    },
+    "dumpMaterials": true,
+    "materialDumpDir": "db://assets/model/Materials_enemy_weapon"
   }
 }

+ 2 - 2
assets/model/m24_98k_fix.fbx.meta

@@ -55,7 +55,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -101,7 +101,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 46 - 14
library/e5/e5efb64c-9936-43c1-b0c9-c1cf4fced520@5e2b8.json → assets/model/materials/base_tietu.mtl

@@ -1,6 +1,6 @@
 {
   "__type__": "cc.Material",
-  "_name": "tietu.001",
+  "_name": "",
   "_objFlags": 0,
   "__editorExtras__": {},
   "_native": "",
@@ -12,23 +12,57 @@
   "_defines": [
     {
       "DCC_APP_NAME": 2,
-      "HAS_EXPORTED_METALLIC": true,
-      "USE_ALBEDO_MAP": true
-    }
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
   ],
   "_states": [
     {
       "rasterizerState": {},
+      "depthStencilState": {},
       "blendState": {
         "targets": [
           {}
         ]
-      },
-      "depthStencilState": {}
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
     }
   ],
   "_props": [
     {
+      "mainTexture": {
+        "__uuid__": "6c926720-7ec2-4109-8daa-ab6469cefab8@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
       "mainColor": {
         "__type__": "cc.Color",
         "r": 231,
@@ -36,12 +70,6 @@
         "b": 231,
         "a": 255
       },
-      "mainTexture": {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@05da8",
-        "__expectedType__": "cc.Texture2D"
-      },
-      "shininessExponent": 25,
-      "emissiveScale": 0,
       "emissive": {
         "__type__": "cc.Color",
         "r": 255,
@@ -49,9 +77,13 @@
         "b": 255,
         "a": 255
       },
-      "metallic": 0,
+      "emissiveScale": 0,
+      "shininessExponent": 25,
       "specularFactor": 0.25,
       "transparencyFactor": 0
-    }
+    },
+    {},
+    {},
+    {}
   ]
 }

+ 1 - 0
assets/model/materials/base_tietu.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"18059aba-1f4c-4ae1-8307-85ef11c60e8a","files":[".json"],"subMetas":{},"userData":{}}

+ 0 - 0
assets/model/materials/ground.jpg → assets/model/materials/ground1.jpg


+ 2 - 2
assets/model/materials/ground.jpg.meta → assets/model/materials/ground1.jpg.meta

@@ -11,7 +11,7 @@
     "6c48a": {
       "importer": "texture",
       "uuid": "207978cc-c706-4831-8276-0b8242b27005@6c48a",
-      "displayName": "ground",
+      "displayName": "ground1",
       "id": "6c48a",
       "name": "texture",
       "userData": {
@@ -35,7 +35,7 @@
     "f9941": {
       "importer": "sprite-frame",
       "uuid": "207978cc-c706-4831-8276-0b8242b27005@f9941",
-      "displayName": "ground",
+      "displayName": "ground1",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {

+ 89 - 0
assets/model/materials/ground1.mtl

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "207978cc-c706-4831-8276-0b8242b27005@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 0
assets/model/materials/ground1.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"2eb8a682-0d23-4dac-9b6e-cb5eecc551a4","files":[".json"],"subMetas":{},"userData":{}}

+ 89 - 0
assets/model/materials/ground2.mtl

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 0
assets/model/materials/ground2.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"1b122012-461a-4092-bd94-d767b1741605","files":[".json"],"subMetas":{},"userData":{}}

BIN
assets/model/materials/ground2.png


+ 29 - 29
assets/textures/main/enemy_header.png.meta → assets/model/materials/ground2.png.meta

@@ -2,7 +2,7 @@
   "ver": "1.0.27",
   "importer": "image",
   "imported": true,
-  "uuid": "22ccf12e-038c-4dea-85e7-26bd81aadf2f",
+  "uuid": "5abfd478-82c1-4a47-8d0b-9618447bb565",
   "files": [
     ".json",
     ".png"
@@ -10,14 +10,14 @@
   "subMetas": {
     "6c48a": {
       "importer": "texture",
-      "uuid": "22ccf12e-038c-4dea-85e7-26bd81aadf2f@6c48a",
-      "displayName": "enemy_header",
+      "uuid": "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a",
+      "displayName": "ground2",
       "id": "6c48a",
       "name": "texture",
       "userData": {
         "wrapModeS": "clamp-to-edge",
         "wrapModeT": "clamp-to-edge",
-        "imageUuidOrDatabaseUri": "22ccf12e-038c-4dea-85e7-26bd81aadf2f",
+        "imageUuidOrDatabaseUri": "5abfd478-82c1-4a47-8d0b-9618447bb565",
         "isUuid": true,
         "visible": false,
         "minfilter": "linear",
@@ -34,8 +34,8 @@
     },
     "f9941": {
       "importer": "sprite-frame",
-      "uuid": "22ccf12e-038c-4dea-85e7-26bd81aadf2f@f9941",
-      "displayName": "enemy_header",
+      "uuid": "5abfd478-82c1-4a47-8d0b-9618447bb565@f9941",
+      "displayName": "ground2",
       "id": "f9941",
       "name": "spriteFrame",
       "userData": {
@@ -45,10 +45,10 @@
         "offsetY": 0,
         "trimX": 0,
         "trimY": 0,
-        "width": 53,
-        "height": 52,
-        "rawWidth": 53,
-        "rawHeight": 52,
+        "width": 1024,
+        "height": 1024,
+        "rawWidth": 1024,
+        "rawHeight": 1024,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -26.5,
-            -26,
+            -512,
+            -512,
             0,
-            26.5,
-            -26,
+            512,
+            -512,
             0,
-            -26.5,
-            26,
+            -512,
+            512,
             0,
-            26.5,
-            26,
+            512,
+            512,
             0
           ],
           "indexes": [
@@ -83,12 +83,12 @@
           ],
           "uv": [
             0,
-            52,
-            53,
-            52,
+            1024,
+            1024,
+            1024,
             0,
             0,
-            53,
+            1024,
             0
           ],
           "nuv": [
@@ -102,18 +102,18 @@
             1
           ],
           "minPos": [
-            -26.5,
-            -26,
+            -512,
+            -512,
             0
           ],
           "maxPos": [
-            26.5,
-            26,
+            512,
+            512,
             0
           ]
         },
         "isUuid": true,
-        "imageUuidOrDatabaseUri": "22ccf12e-038c-4dea-85e7-26bd81aadf2f@6c48a",
+        "imageUuidOrDatabaseUri": "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a",
         "atlasUuid": "",
         "trimType": "auto"
       },
@@ -127,8 +127,8 @@
   },
   "userData": {
     "type": "sprite-frame",
-    "hasAlpha": true,
+    "hasAlpha": false,
     "fixAlphaTransparencyArtifacts": false,
-    "redirect": "22ccf12e-038c-4dea-85e7-26bd81aadf2f@6c48a"
+    "redirect": "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a"
   }
 }

+ 89 - 0
assets/model/materials/ground3.mtl

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 0
assets/model/materials/ground3.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"e58971c4-b7ca-4170-9b45-9d0b2f56bb50","files":[".json"],"subMetas":{},"userData":{}}

BIN
assets/model/materials/ground3.png


+ 134 - 0
assets/model/materials/ground3.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c3ecabe8-ea47-4a3e-801f-389d32f531ee",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a",
+      "displayName": "ground3",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "c3ecabe8-ea47-4a3e-801f-389d32f531ee",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c3ecabe8-ea47-4a3e-801f-389d32f531ee@f9941",
+      "displayName": "ground3",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1024,
+        "height": 1024,
+        "rawWidth": 1024,
+        "rawHeight": 1024,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -512,
+            -512,
+            0,
+            512,
+            -512,
+            0,
+            -512,
+            512,
+            0,
+            512,
+            512,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1024,
+            1024,
+            1024,
+            0,
+            0,
+            1024,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -512,
+            -512,
+            0
+          ],
+          "maxPos": [
+            512,
+            512,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": false,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a"
+  }
+}

+ 89 - 0
assets/model/materials/ground4.mtl

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 0
assets/model/materials/ground4.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"551db8cd-55f2-46a5-8fe3-45ac60897095","files":[".json"],"subMetas":{},"userData":{}}

BIN
assets/model/materials/ground4.png


+ 134 - 0
assets/model/materials/ground4.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "6eb75307-c960-4ef6-b639-673bd75802c2",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a",
+      "displayName": "ground4",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "6eb75307-c960-4ef6-b639-673bd75802c2",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "6eb75307-c960-4ef6-b639-673bd75802c2@f9941",
+      "displayName": "ground4",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1024,
+        "height": 1024,
+        "rawWidth": 1024,
+        "rawHeight": 1024,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -512,
+            -512,
+            0,
+            512,
+            -512,
+            0,
+            -512,
+            512,
+            0,
+            512,
+            512,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1024,
+            1024,
+            1024,
+            0,
+            0,
+            1024,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -512,
+            -512,
+            0
+          ],
+          "maxPos": [
+            512,
+            512,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": false,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a"
+  }
+}

+ 89 - 0
assets/model/materials/ground5.mtl

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "362e3a3d-d908-472d-be07-7568e16049da@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 0
assets/model/materials/ground5.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"35e3e057-9803-483d-9c52-6f579aae83bc","files":[".json"],"subMetas":{},"userData":{}}

BIN
assets/model/materials/ground5.png


+ 134 - 0
assets/model/materials/ground5.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "362e3a3d-d908-472d-be07-7568e16049da",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "362e3a3d-d908-472d-be07-7568e16049da@6c48a",
+      "displayName": "ground5",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "362e3a3d-d908-472d-be07-7568e16049da",
+        "isUuid": true,
+        "visible": false,
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "362e3a3d-d908-472d-be07-7568e16049da@f9941",
+      "displayName": "ground5",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 1024,
+        "height": 1024,
+        "rawWidth": 1024,
+        "rawHeight": 1024,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -512,
+            -512,
+            0,
+            512,
+            -512,
+            0,
+            -512,
+            512,
+            0,
+            512,
+            512,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            1024,
+            1024,
+            1024,
+            0,
+            0,
+            1024,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -512,
+            -512,
+            0
+          ],
+          "maxPos": [
+            512,
+            512,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "362e3a3d-d908-472d-be07-7568e16049da@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": false,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "362e3a3d-d908-472d-be07-7568e16049da@6c48a"
+  }
+}

+ 2 - 2
assets/model/player_die.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/player_huandan.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/player_idle.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/player_weapon.fbx.meta

@@ -179,7 +179,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -209,7 +209,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 396 - 120
assets/model/scenePrb.scene


+ 2 - 2
assets/model/shabao.fbx.meta

@@ -332,7 +332,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -378,7 +378,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 2 - 2
assets/model/yuansu.fbx.meta

@@ -525,7 +525,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -626,7 +626,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/坦克动画/tank.fbx.meta

@@ -102,26 +102,6 @@
       ],
       "subMetas": {}
     },
-    "48b02": {
-      "importer": "gltf-embeded-image",
-      "uuid": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02",
-      "displayName": "",
-      "id": "48b02",
-      "name": "base_color_texture.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "7d6ab": {
       "importer": "texture",
       "uuid": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@7d6ab",
@@ -135,8 +115,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -198,7 +178,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 3 - 23
assets/model/士兵动画/1_die.fbx.meta

@@ -65,26 +65,6 @@
       ],
       "subMetas": {}
     },
-    "48b02": {
-      "importer": "gltf-embeded-image",
-      "uuid": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02",
-      "displayName": "",
-      "id": "48b02",
-      "name": "base_color_texture.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "7d6ab": {
       "importer": "texture",
       "uuid": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@7d6ab",
@@ -98,8 +78,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +125,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 3 - 23
assets/model/士兵动画/1_run.fbx.meta

@@ -65,26 +65,6 @@
       ],
       "subMetas": {}
     },
-    "48b02": {
-      "importer": "gltf-embeded-image",
-      "uuid": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02",
-      "displayName": "",
-      "id": "48b02",
-      "name": "base_color_texture.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "7d6ab": {
       "importer": "texture",
       "uuid": "939c54f0-d721-4dc6-aa3c-715a7b30c615@7d6ab",
@@ -98,8 +78,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +125,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 3 - 23
assets/model/士兵动画/1_shoot.fbx.meta

@@ -65,26 +65,6 @@
       ],
       "subMetas": {}
     },
-    "48b02": {
-      "importer": "gltf-embeded-image",
-      "uuid": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02",
-      "displayName": "",
-      "id": "48b02",
-      "name": "base_color_texture.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "7d6ab": {
       "importer": "texture",
       "uuid": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@7d6ab",
@@ -98,8 +78,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +125,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 3 - 23
assets/model/士兵动画/1_walk.fbx.meta

@@ -65,26 +65,6 @@
       ],
       "subMetas": {}
     },
-    "48b02": {
-      "importer": "gltf-embeded-image",
-      "uuid": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02",
-      "displayName": "",
-      "id": "48b02",
-      "name": "base_color_texture.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "7d6ab": {
       "importer": "texture",
       "uuid": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@7d6ab",
@@ -98,8 +78,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +125,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       }
     ],
     "fbx": {

+ 2 - 2
assets/model/士兵动画/2_die.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -152,7 +152,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/2_run.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/2_shoot.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/2_walk.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/3_die.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/3_run.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/3_shoot.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/3walk.fbx.meta

@@ -115,7 +115,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/4_die.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/4_run.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/4_shoot.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 2 - 2
assets/model/士兵动画/4_walk.fbx.meta

@@ -99,7 +99,7 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
-        "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/5_die.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/5_run.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "5720177b-c452-4582-9d4e-cd8df46c9002@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/5_shoot.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "9545a762-eb79-469c-b9d1-c4f979c9d18d@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/5_walk.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/6_die.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "443f175e-e78a-4372-833e-50831dd7a84f@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/6_run.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "a4e875b6-8345-4870-ab5a-cc074210a617@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/6_shoot.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 3 - 23
assets/model/士兵动画/6_walk.fbx.meta

@@ -81,26 +81,6 @@
       ],
       "subMetas": {}
     },
-    "5e49e": {
-      "importer": "gltf-embeded-image",
-      "uuid": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e",
-      "displayName": "",
-      "id": "5e49e",
-      "name": "base_color_texture-0.image",
-      "userData": {
-        "gltfIndex": 0,
-        "fixAlphaTransparencyArtifacts": true,
-        "hasAlpha": true,
-        "type": "texture"
-      },
-      "ver": "1.0.3",
-      "imported": true,
-      "files": [
-        ".json",
-        ".png"
-      ],
-      "subMetas": {}
-    },
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "99ce5da9-0b8f-496d-b194-5302747d9083@ef396",
@@ -134,8 +114,8 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
-        "isUuid": true,
-        "imageUuidOrDatabaseUri": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e"
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +184,7 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
-        "uri": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e"
+        "uri": "db://assets/model/materials/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",

+ 37 - 10
assets/prefabs/enemy/pistol.prefab

@@ -130,7 +130,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "__uuid__": "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2607,7 +2607,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -3560,7 +3563,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -4359,7 +4365,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "17a130d0-8f0b-45c1-9699-71ea8b4265ed@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -6593,7 +6602,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -7398,7 +7410,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -8203,7 +8218,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "f39bf30a-ed7e-4592-88b9-6af73bc6cb03@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -9001,7 +9019,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "ce77cefe-b8b4-40f3-90f4-3506ef585369@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -10508,7 +10529,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "71c497af-5d19-4249-82f7-e68a245a1f5f@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -11287,7 +11311,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "bf12c942-252f-4a30-9d1e-d6474ab78511@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },

+ 1 - 1
assets/prefabs/enemy/scatter.prefab

@@ -130,7 +130,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "__uuid__": "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "__expectedType__": "cc.Material"
       }
     ],

+ 5 - 2
assets/prefabs/enemy/shield.prefab

@@ -124,7 +124,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "__uuid__": "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2550,7 +2550,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },

+ 37 - 10
assets/prefabs/enemy/sniper_rifle.prefab

@@ -130,7 +130,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "__uuid__": "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2607,7 +2607,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -3560,7 +3563,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -4359,7 +4365,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "17a130d0-8f0b-45c1-9699-71ea8b4265ed@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -6593,7 +6602,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -7398,7 +7410,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -8203,7 +8218,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "f39bf30a-ed7e-4592-88b9-6af73bc6cb03@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -9001,7 +9019,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "ce77cefe-b8b4-40f3-90f4-3506ef585369@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -10508,7 +10529,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "71c497af-5d19-4249-82f7-e68a245a1f5f@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -11287,7 +11311,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "bf12c942-252f-4a30-9d1e-d6474ab78511@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },

+ 1 - 1
assets/prefabs/enemy/tank_pao.prefab

@@ -78,7 +78,7 @@
       "__id__": 1
     },
     "_children": [],
-    "_active": false,
+    "_active": true,
     "_components": [],
     "_prefab": {
       "__id__": 3

+ 1 - 1
assets/prefabs/map/map1.prefab

@@ -70285,7 +70285,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
+        "__uuid__": "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4",
         "__expectedType__": "cc.Material"
       }
     ],

BIN
assets/prefabs/texture/generalPistol.png


+ 134 - 0
assets/prefabs/texture/generalPistol.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "81a2f059-b27a-41ea-9c34-062de984692a",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "81a2f059-b27a-41ea-9c34-062de984692a@6c48a",
+      "displayName": "generalPistol",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "81a2f059-b27a-41ea-9c34-062de984692a",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "81a2f059-b27a-41ea-9c34-062de984692a@f9941",
+      "displayName": "generalPistol",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 109,
+        "height": 148,
+        "rawWidth": 109,
+        "rawHeight": 148,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -54.5,
+            -74,
+            0,
+            54.5,
+            -74,
+            0,
+            -54.5,
+            74,
+            0,
+            54.5,
+            74,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            148,
+            109,
+            148,
+            0,
+            0,
+            109,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -54.5,
+            -74,
+            0
+          ],
+          "maxPos": [
+            54.5,
+            74,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "81a2f059-b27a-41ea-9c34-062de984692a@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "81a2f059-b27a-41ea-9c34-062de984692a@6c48a"
+  }
+}

BIN
assets/prefabs/texture/scatterCaptain.png


+ 134 - 0
assets/prefabs/texture/scatterCaptain.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@6c48a",
+      "displayName": "scatterCaptain",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@f9941",
+      "displayName": "scatterCaptain",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 111,
+        "height": 144,
+        "rawWidth": 111,
+        "rawHeight": 144,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -55.5,
+            -72,
+            0,
+            55.5,
+            -72,
+            0,
+            -55.5,
+            72,
+            0,
+            55.5,
+            72,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            144,
+            111,
+            144,
+            0,
+            0,
+            111,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -55.5,
+            -72,
+            0
+          ],
+          "maxPos": [
+            55.5,
+            72,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@6c48a"
+  }
+}

BIN
assets/prefabs/texture/shieldSoldier.png


+ 134 - 0
assets/prefabs/texture/shieldSoldier.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "8ca10489-350e-429c-9e8c-c14d265883f8",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "8ca10489-350e-429c-9e8c-c14d265883f8@6c48a",
+      "displayName": "shieldSoldier",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8ca10489-350e-429c-9e8c-c14d265883f8",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "8ca10489-350e-429c-9e8c-c14d265883f8@f9941",
+      "displayName": "shieldSoldier",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 115,
+        "height": 141,
+        "rawWidth": 115,
+        "rawHeight": 141,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -57.5,
+            -70.5,
+            0,
+            57.5,
+            -70.5,
+            0,
+            -57.5,
+            70.5,
+            0,
+            57.5,
+            70.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            141,
+            115,
+            141,
+            0,
+            0,
+            115,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -57.5,
+            -70.5,
+            0
+          ],
+          "maxPos": [
+            57.5,
+            70.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "8ca10489-350e-429c-9e8c-c14d265883f8@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "8ca10489-350e-429c-9e8c-c14d265883f8@6c48a"
+  }
+}

BIN
assets/prefabs/texture/snipeCaptain.png


+ 134 - 0
assets/prefabs/texture/snipeCaptain.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@6c48a",
+      "displayName": "snipeCaptain",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@f9941",
+      "displayName": "snipeCaptain",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 118,
+        "height": 150,
+        "rawWidth": 118,
+        "rawHeight": 150,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -59,
+            -75,
+            0,
+            59,
+            -75,
+            0,
+            -59,
+            75,
+            0,
+            59,
+            75,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            150,
+            118,
+            150,
+            0,
+            0,
+            118,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -59,
+            -75,
+            0
+          ],
+          "maxPos": [
+            59,
+            75,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@6c48a"
+  }
+}

BIN
assets/prefabs/texture/sniperSoldier.png


+ 134 - 0
assets/prefabs/texture/sniperSoldier.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@6c48a",
+      "displayName": "sniperSoldier",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@f9941",
+      "displayName": "sniperSoldier",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 93,
+        "height": 141,
+        "rawWidth": 93,
+        "rawHeight": 141,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -46.5,
+            -70.5,
+            0,
+            46.5,
+            -70.5,
+            0,
+            -46.5,
+            70.5,
+            0,
+            46.5,
+            70.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            141,
+            93,
+            141,
+            0,
+            0,
+            93,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -46.5,
+            -70.5,
+            0
+          ],
+          "maxPos": [
+            46.5,
+            70.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@6c48a"
+  }
+}

BIN
assets/prefabs/texture/soldierPistol.png


+ 134 - 0
assets/prefabs/texture/soldierPistol.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "f7248350-27f5-448b-a109-08ea52bbd0ca",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "f7248350-27f5-448b-a109-08ea52bbd0ca@6c48a",
+      "displayName": "soldierPistol",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f7248350-27f5-448b-a109-08ea52bbd0ca",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "f7248350-27f5-448b-a109-08ea52bbd0ca@f9941",
+      "displayName": "soldierPistol",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 93,
+        "height": 152,
+        "rawWidth": 93,
+        "rawHeight": 152,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -46.5,
+            -76,
+            0,
+            46.5,
+            -76,
+            0,
+            -46.5,
+            76,
+            0,
+            46.5,
+            76,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            152,
+            93,
+            152,
+            0,
+            0,
+            93,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -46.5,
+            -76,
+            0
+          ],
+          "maxPos": [
+            46.5,
+            76,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "f7248350-27f5-448b-a109-08ea52bbd0ca@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "f7248350-27f5-448b-a109-08ea52bbd0ca@6c48a"
+  }
+}

BIN
assets/prefabs/texture/tank_enemy.png


+ 134 - 0
assets/prefabs/texture/tank_enemy.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "32154cbf-0b9d-4537-8b5a-effc8b6255e8",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "32154cbf-0b9d-4537-8b5a-effc8b6255e8@6c48a",
+      "displayName": "tank_enemy",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "minfilter": "linear",
+        "magfilter": "linear",
+        "mipfilter": "none",
+        "anisotropy": 0,
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "32154cbf-0b9d-4537-8b5a-effc8b6255e8",
+        "visible": false
+      },
+      "ver": "1.0.22",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
+    "f9941": {
+      "importer": "sprite-frame",
+      "uuid": "32154cbf-0b9d-4537-8b5a-effc8b6255e8@f9941",
+      "displayName": "tank_enemy",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 111,
+        "height": 144,
+        "rawWidth": 111,
+        "rawHeight": 144,
+        "borderTop": 0,
+        "borderBottom": 0,
+        "borderLeft": 0,
+        "borderRight": 0,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -55.5,
+            -72,
+            0,
+            55.5,
+            -72,
+            0,
+            -55.5,
+            72,
+            0,
+            55.5,
+            72,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            144,
+            111,
+            144,
+            0,
+            0,
+            111,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -55.5,
+            -72,
+            0
+          ],
+          "maxPos": [
+            55.5,
+            72,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "32154cbf-0b9d-4537-8b5a-effc8b6255e8@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "32154cbf-0b9d-4537-8b5a-effc8b6255e8@6c48a"
+  }
+}

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 352 - 120
assets/prefabs/ui/gunfightShootUI.prefab


파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 341 - 122
assets/scenes/game.scene


+ 6 - 1
assets/scripts/items/item/TaskEnemyItem.ts

@@ -1,5 +1,6 @@
 import { _decorator, Vec3,Node, Sprite, Label} from 'cc';
 import ListItem from '../../third/ListItem';
+import { ResUtil } from '../../utils/ResUtil';
 const { ccclass, property } = _decorator;
 
 //射击界面的任务Item数据
@@ -9,6 +10,8 @@ export class TaskEnemyItem extends ListItem {
     public enemy_header: Sprite;
     @property({ type: Label, tooltip: "剩余敌人数量" })
     public num_label: Label;
+    @property({ type: Label, tooltip: "敌人名字" })
+    public enemy_name_label: Label;
 
     public data: any = null;
 
@@ -21,8 +24,10 @@ export class TaskEnemyItem extends ListItem {
         if(!data)return;
         this.data = data;
         //敌人头像
-        //ResUtil.setSpriteFrame(data.icon,this.enemy_header);
+        ResUtil.setSpriteFrame(data.headshot,this.enemy_header);
         //剩余敌人数量
         this.num_label.string = `${data.killCount} / ${data.count}`;
+        //敌人名字
+        this.enemy_name_label.string = data.name_lang;
     }
 }

+ 7 - 2
assets/scripts/items/item/TaskItem.ts

@@ -1,5 +1,6 @@
 import { _decorator, Vec3,Node, Sprite, Label, EventTouch, tween, easing } from 'cc';
 import ListItem from '../../third/ListItem';
+import { ResUtil } from '../../utils/ResUtil';
 const { ccclass, property } = _decorator;
 
 //任务数据
@@ -9,6 +10,8 @@ export class TaskItem extends ListItem {
     public enemy_header: Sprite;
     @property({ type: Label, tooltip: "敌人数量" })
     public num_label: Label;
+    @property({ type: Label, tooltip: "敌人名字" })
+    public enemy_name_label: Label;
 
     public data: any = null;
     public cb?: Function = null;
@@ -46,9 +49,11 @@ export class TaskItem extends ListItem {
         if(!data)return;
         this.data = data;
         this.cb = cb;
-        //敌人投降
-        //ResUtil.setSpriteFrame(data.icon,this.enemy_header);
+        //敌人头像
+        ResUtil.setSpriteFrame(data.headshot,this.enemy_header);
         //敌人数量
         this.num_label.string = `x${data.count}`;
+        //敌人名字
+        this.enemy_name_label.string = data.name_lang;
     }
 }

BIN
assets/textures/main/enemy_header.png


+ 425 - 51
library/.assets-data.json

@@ -875,7 +875,7 @@
     "versionCode": 1
   },
   "207978cc-c706-4831-8276-0b8242b27005": {
-    "url": "db://assets/model/materials/ground.jpg",
+    "url": "db://assets/model/materials/ground1.jpg",
     "value": {
       "depends": []
     },
@@ -900,7 +900,7 @@
     "versionCode": 1
   },
   "207978cc-c706-4831-8276-0b8242b27005@6c48a": {
-    "url": "db://assets/model/materials/ground.jpg@6c48a",
+    "url": "db://assets/model/materials/ground1.jpg@6c48a",
     "value": {
       "depends": [
         "207978cc-c706-4831-8276-0b8242b27005"
@@ -937,7 +937,7 @@
     "versionCode": 1
   },
   "207978cc-c706-4831-8276-0b8242b27005@f9941": {
-    "url": "db://assets/model/materials/ground.jpg@f9941",
+    "url": "db://assets/model/materials/ground1.jpg@f9941",
     "value": {
       "depends": [
         "207978cc-c706-4831-8276-0b8242b27005@6c48a"
@@ -1006,7 +1006,7 @@
     "url": "db://assets/model/all soldier.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -1015,7 +1015,7 @@
     "url": "db://assets/model/m24_98k_fix.fbx@7d6ab",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -1182,7 +1182,7 @@
     "url": "db://assets/model/enemy_weapon.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -1191,7 +1191,7 @@
     "url": "db://assets/model/enemy_weapon.fbx@05da8",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -1210,12 +1210,12 @@
     "url": "db://assets/model/enemy_weapon.fbx@7b718",
     "value": {
       "depends": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "6323bd2c-1ad9-496e-80db-6a17ee36062a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@c42ea",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@778f5",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@57f8b",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@41ac8",
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@5e2b8",
+        "5ca63bc1-3427-4148-9313-2f631db17afb",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@5b587",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@07d75",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@9d07e",
@@ -1255,8 +1255,10 @@
         "43b80103-bb28-42b6-957d-565281c3d499",
         "a32165fa-9398-401a-ad18-6092d3dfd927@5e001",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@d6409",
+        "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4",
         "339b909a-fbbe-405c-a832-9a878efd4990@a289a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@7b718",
+        "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "5e79a769-355c-4a4f-8a53-88e6bfdddd01@baf27",
         "f6ee8912-f09d-4784-9a9e-427d080053e1@fda76",
         "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@8ac71",
@@ -1439,7 +1441,7 @@
     "url": "db://assets/model/shabao.fbx@7d6ab",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -1604,7 +1606,6 @@
         "74e54b3a-592c-4eea-a5ab-09611e3f6f2d@f9941",
         "0c7b2c7e-04b9-4e0c-a52d-f68a55ee6413@f9941",
         "95670ff2-ea22-4b79-a7a3-6e0074c6f7dc@f9941",
-        "22ccf12e-038c-4dea-85e7-26bd81aadf2f@f9941",
         "9f19464d-bc5d-4efb-a4eb-90981b755802@f9941",
         "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
         "44cabf90-d936-4127-888d-920486df4b72@f9941",
@@ -2328,7 +2329,7 @@
     "url": "db://assets/model/yuansu.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5332,7 +5333,7 @@
     "url": "db://assets/model/坦克动画/tank.fbx@7d6ab",
     "value": {
       "depends": [
-        "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5601,7 +5602,7 @@
     "url": "db://assets/model/士兵动画/1_run.fbx@7d6ab",
     "value": {
       "depends": [
-        "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5610,7 +5611,8 @@
     "url": "db://assets/model/士兵动画/1_run.fbx@1043e",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "939c54f0-d721-4dc6-aa3c-715a7b30c615@7d6ab"
       ]
     },
     "versionCode": 1
@@ -5736,7 +5738,7 @@
     "url": "db://assets/model/士兵动画/1_die.fbx@7d6ab",
     "value": {
       "depends": [
-        "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5803,7 +5805,7 @@
     "url": "db://assets/model/士兵动画/1_shoot.fbx@7d6ab",
     "value": {
       "depends": [
-        "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5812,7 +5814,8 @@
     "url": "db://assets/model/士兵动画/1_shoot.fbx@1043e",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@7d6ab"
       ]
     },
     "versionCode": 1
@@ -5869,7 +5872,7 @@
     "url": "db://assets/model/士兵动画/1_walk.fbx@7d6ab",
     "value": {
       "depends": [
-        "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -5885,7 +5888,8 @@
     "url": "db://assets/model/士兵动画/1_walk.fbx@1043e",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@7d6ab"
       ]
     },
     "versionCode": 1
@@ -6937,7 +6941,8 @@
     "url": "db://assets/model/士兵动画/5_run.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "5720177b-c452-4582-9d4e-cd8df46c9002@0a1ef"
       ]
     },
     "versionCode": 1
@@ -6997,7 +7002,7 @@
     "url": "db://assets/model/士兵动画/5_run.fbx@0a1ef",
     "value": {
       "depends": [
-        "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7125,7 +7130,8 @@
     "url": "db://assets/model/士兵动画/5_shoot.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "9545a762-eb79-469c-b9d1-c4f979c9d18d@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7171,7 +7177,7 @@
     "url": "db://assets/model/士兵动画/5_shoot.fbx@0a1ef",
     "value": {
       "depends": [
-        "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7218,7 +7224,8 @@
     "url": "db://assets/model/士兵动画/5_die.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7227,7 +7234,8 @@
     "url": "db://assets/model/士兵动画/5_walk.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "f6db1fe2-f996-483f-b30e-61b9d8ad028f@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7310,7 +7318,7 @@
     "url": "db://assets/model/士兵动画/5_die.fbx@0a1ef",
     "value": {
       "depends": [
-        "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7328,7 +7336,7 @@
     "url": "db://assets/model/士兵动画/5_walk.fbx@0a1ef",
     "value": {
       "depends": [
-        "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7402,7 +7410,8 @@
     "url": "db://assets/model/士兵动画/6_run.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "a4e875b6-8345-4870-ab5a-cc074210a617@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7448,7 +7457,7 @@
     "url": "db://assets/model/士兵动画/6_run.fbx@0a1ef",
     "value": {
       "depends": [
-        "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7493,7 +7502,8 @@
     "url": "db://assets/model/士兵动画/6_die.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "443f175e-e78a-4372-833e-50831dd7a84f@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7531,7 +7541,8 @@
     "url": "db://assets/model/士兵动画/6_shoot.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "875d95cc-3a76-4998-8daf-f9e52dff3cf0@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7562,7 +7573,7 @@
     "url": "db://assets/model/士兵动画/6_die.fbx@0a1ef",
     "value": {
       "depends": [
-        "443f175e-e78a-4372-833e-50831dd7a84f@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7647,7 +7658,8 @@
     "url": "db://assets/model/士兵动画/6_walk.fbx@99380",
     "value": {
       "depends": [
-        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "99ce5da9-0b8f-496d-b194-5302747d9083@0a1ef"
       ]
     },
     "versionCode": 1
@@ -7740,7 +7752,7 @@
     "url": "db://assets/model/士兵动画/6_shoot.fbx@0a1ef",
     "value": {
       "depends": [
-        "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -7792,19 +7804,25 @@
     "url": "db://assets/prefabs/enemy/pistol.prefab",
     "value": {
       "depends": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@c42ea",
         "ea7478b0-408d-4052-b703-f0d2355e095f",
         "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
         "ee340c9b-aecc-4932-86a9-94d3ddee7d0c",
         "c991cca4-c576-4b40-81a9-1c1e6fed69c8@38fd2",
+        "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
         "8c5cb97d-2b3a-4f05-87c9-488bb5945f28",
         "4958506c-713d-4f07-ad5e-e89e92880979@8c2fb",
+        "17a130d0-8f0b-45c1-9699-71ea8b4265ed@6c48a",
         "a52d69b7-54ad-4817-8b0a-5ad5d7a4fd9c",
+        "f39bf30a-ed7e-4592-88b9-6af73bc6cb03@6c48a",
         "c60f1242-179a-4588-b1f2-6ae6bf1ef20f",
+        "ce77cefe-b8b4-40f3-90f4-3506ef585369@6c48a",
         "19963a34-ea7f-4c5c-a99c-c82794609547",
         "1263d74c-8167-4928-91a6-4e2672411f47@fc873",
-        "0326563b-841f-48e7-8b9f-0b8790639e7a"
+        "71c497af-5d19-4249-82f7-e68a245a1f5f@6c48a",
+        "0326563b-841f-48e7-8b9f-0b8790639e7a",
+        "bf12c942-252f-4a30-9d1e-d6474ab78511@6c48a"
       ],
       "dependScripts": [
         "d795ae3a-d1d2-4221-a9f0-71948e2e62e3",
@@ -7830,7 +7848,7 @@
     "url": "db://assets/prefabs/enemy/scatter.prefab",
     "value": {
       "depends": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@41ac8",
         "ea7478b0-408d-4052-b703-f0d2355e095f",
         "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
@@ -7869,12 +7887,13 @@
     "url": "db://assets/prefabs/enemy/shield.prefab",
     "value": {
       "depends": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@57f8b",
         "ea7478b0-408d-4052-b703-f0d2355e095f",
         "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
         "ee340c9b-aecc-4932-86a9-94d3ddee7d0c",
-        "c991cca4-c576-4b40-81a9-1c1e6fed69c8@38fd2"
+        "c991cca4-c576-4b40-81a9-1c1e6fed69c8@38fd2",
+        "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a"
       ],
       "dependScripts": [
         "63695eee-8a75-4198-a046-6994951532a9"
@@ -7886,19 +7905,25 @@
     "url": "db://assets/prefabs/enemy/sniper_rifle.prefab",
     "value": {
       "depends": [
-        "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "e5efb64c-9936-43c1-b0c9-c1cf4fced520@778f5",
         "ea7478b0-408d-4052-b703-f0d2355e095f",
         "b5b27ab1-e740-4398-b407-848fc2b2c897@6c48a",
         "ee340c9b-aecc-4932-86a9-94d3ddee7d0c",
         "c991cca4-c576-4b40-81a9-1c1e6fed69c8@38fd2",
+        "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
         "8c5cb97d-2b3a-4f05-87c9-488bb5945f28",
         "4958506c-713d-4f07-ad5e-e89e92880979@8c2fb",
+        "17a130d0-8f0b-45c1-9699-71ea8b4265ed@6c48a",
         "a52d69b7-54ad-4817-8b0a-5ad5d7a4fd9c",
+        "f39bf30a-ed7e-4592-88b9-6af73bc6cb03@6c48a",
         "c60f1242-179a-4588-b1f2-6ae6bf1ef20f",
+        "ce77cefe-b8b4-40f3-90f4-3506ef585369@6c48a",
         "19963a34-ea7f-4c5c-a99c-c82794609547",
         "1263d74c-8167-4928-91a6-4e2672411f47@fc873",
-        "0326563b-841f-48e7-8b9f-0b8790639e7a"
+        "71c497af-5d19-4249-82f7-e68a245a1f5f@6c48a",
+        "0326563b-841f-48e7-8b9f-0b8790639e7a",
+        "bf12c942-252f-4a30-9d1e-d6474ab78511@6c48a"
       ],
       "dependScripts": [
         "d795ae3a-d1d2-4221-a9f0-71948e2e62e3",
@@ -7958,7 +7983,7 @@
     "url": "db://assets/model/士兵动画/6_walk.fbx@0a1ef",
     "value": {
       "depends": [
-        "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -9330,7 +9355,7 @@
       "depends": [
         "9097eb8a-bdd8-4608-9531-93ec1626635a@f9941",
         "d2eec8aa-eb87-4069-97d1-cdefce1fe602",
-        "22ccf12e-038c-4dea-85e7-26bd81aadf2f@f9941",
+        "81a2f059-b27a-41ea-9c34-062de984692a@f9941",
         "6583003c-d741-4693-af08-8dde616359d9@f9941",
         "1d22285a-cc43-4254-b825-f54b5d9b6d63@f9941",
         "b730527c-3233-41c2-aaf7-7cdab58f9749@f9941",
@@ -10676,9 +10701,7 @@
   },
   "22ccf12e-038c-4dea-85e7-26bd81aadf2f": {
     "url": "db://assets/textures/main/enemy_header.png",
-    "value": {
-      "depends": []
-    },
+    "value": {},
     "versionCode": 1
   },
   "44cabf90-d936-4127-888d-920486df4b72@6c48a": {
@@ -13382,7 +13405,7 @@
     "url": "db://assets/model/player_huandan.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -13475,7 +13498,7 @@
     "url": "db://assets/model/player_die.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -13554,7 +13577,7 @@
     "url": "db://assets/model/player_idle.fbx@0a1ef",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -13818,7 +13841,7 @@
     "url": "db://assets/model/player_weapon.fbx@7d6ab",
     "value": {
       "depends": [
-        "36f4230d-6875-42c6-9d9b-c1089a93c018"
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
       ]
     },
     "versionCode": 1
@@ -13912,6 +13935,7 @@
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f",
+        "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@9a84c",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@1e35a",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6",
@@ -14131,5 +14155,355 @@
       "depends": []
     },
     "versionCode": 1
+  },
+  "f7248350-27f5-448b-a109-08ea52bbd0ca": {
+    "url": "db://assets/prefabs/texture/soldierPistol.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "f7248350-27f5-448b-a109-08ea52bbd0ca@6c48a": {
+    "url": "db://assets/prefabs/texture/soldierPistol.png@6c48a",
+    "value": {
+      "depends": [
+        "f7248350-27f5-448b-a109-08ea52bbd0ca"
+      ]
+    },
+    "versionCode": 1
+  },
+  "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e": {
+    "url": "db://assets/prefabs/texture/scatterCaptain.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@6c48a": {
+    "url": "db://assets/prefabs/texture/scatterCaptain.png@6c48a",
+    "value": {
+      "depends": [
+        "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e"
+      ]
+    },
+    "versionCode": 1
+  },
+  "d43526ae-a17c-449e-9c5c-e46c0d79fbf6": {
+    "url": "db://assets/prefabs/texture/sniperSoldier.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@6c48a": {
+    "url": "db://assets/prefabs/texture/sniperSoldier.png@6c48a",
+    "value": {
+      "depends": [
+        "d43526ae-a17c-449e-9c5c-e46c0d79fbf6"
+      ]
+    },
+    "versionCode": 1
+  },
+  "8ca10489-350e-429c-9e8c-c14d265883f8": {
+    "url": "db://assets/prefabs/texture/shieldSoldier.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "8ca10489-350e-429c-9e8c-c14d265883f8@6c48a": {
+    "url": "db://assets/prefabs/texture/shieldSoldier.png@6c48a",
+    "value": {
+      "depends": [
+        "8ca10489-350e-429c-9e8c-c14d265883f8"
+      ]
+    },
+    "versionCode": 1
+  },
+  "2d1d8ec3-c70e-4df4-aa6f-74df047b2657": {
+    "url": "db://assets/prefabs/texture/snipeCaptain.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@6c48a": {
+    "url": "db://assets/prefabs/texture/snipeCaptain.png@6c48a",
+    "value": {
+      "depends": [
+        "2d1d8ec3-c70e-4df4-aa6f-74df047b2657"
+      ]
+    },
+    "versionCode": 1
+  },
+  "81a2f059-b27a-41ea-9c34-062de984692a": {
+    "url": "db://assets/prefabs/texture/generalPistol.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "81a2f059-b27a-41ea-9c34-062de984692a@6c48a": {
+    "url": "db://assets/prefabs/texture/generalPistol.png@6c48a",
+    "value": {
+      "depends": [
+        "81a2f059-b27a-41ea-9c34-062de984692a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "32154cbf-0b9d-4537-8b5a-effc8b6255e8": {
+    "url": "db://assets/prefabs/texture/tank_enemy.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "32154cbf-0b9d-4537-8b5a-effc8b6255e8@6c48a": {
+    "url": "db://assets/prefabs/texture/tank_enemy.png@6c48a",
+    "value": {
+      "depends": [
+        "32154cbf-0b9d-4537-8b5a-effc8b6255e8"
+      ]
+    },
+    "versionCode": 1
+  },
+  "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@f9941": {
+    "url": "db://assets/prefabs/texture/scatterCaptain.png@f9941",
+    "value": {
+      "depends": [
+        "c1b02cd3-5074-4f1a-ae6a-6ae63eafe75e@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@f9941": {
+    "url": "db://assets/prefabs/texture/snipeCaptain.png@f9941",
+    "value": {
+      "depends": [
+        "2d1d8ec3-c70e-4df4-aa6f-74df047b2657@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "8ca10489-350e-429c-9e8c-c14d265883f8@f9941": {
+    "url": "db://assets/prefabs/texture/shieldSoldier.png@f9941",
+    "value": {
+      "depends": [
+        "8ca10489-350e-429c-9e8c-c14d265883f8@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@f9941": {
+    "url": "db://assets/prefabs/texture/sniperSoldier.png@f9941",
+    "value": {
+      "depends": [
+        "d43526ae-a17c-449e-9c5c-e46c0d79fbf6@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "f7248350-27f5-448b-a109-08ea52bbd0ca@f9941": {
+    "url": "db://assets/prefabs/texture/soldierPistol.png@f9941",
+    "value": {
+      "depends": [
+        "f7248350-27f5-448b-a109-08ea52bbd0ca@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "32154cbf-0b9d-4537-8b5a-effc8b6255e8@f9941": {
+    "url": "db://assets/prefabs/texture/tank_enemy.png@f9941",
+    "value": {
+      "depends": [
+        "32154cbf-0b9d-4537-8b5a-effc8b6255e8@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "81a2f059-b27a-41ea-9c34-062de984692a@f9941": {
+    "url": "db://assets/prefabs/texture/generalPistol.png@f9941",
+    "value": {
+      "depends": [
+        "81a2f059-b27a-41ea-9c34-062de984692a@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "5abfd478-82c1-4a47-8d0b-9618447bb565": {
+    "url": "db://assets/model/materials/ground2.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a": {
+    "url": "db://assets/model/materials/ground2.png@6c48a",
+    "value": {
+      "depends": [
+        "5abfd478-82c1-4a47-8d0b-9618447bb565"
+      ]
+    },
+    "versionCode": 1
+  },
+  "5abfd478-82c1-4a47-8d0b-9618447bb565@f9941": {
+    "url": "db://assets/model/materials/ground2.png@f9941",
+    "value": {
+      "depends": [
+        "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "c3ecabe8-ea47-4a3e-801f-389d32f531ee": {
+    "url": "db://assets/model/materials/ground3.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a": {
+    "url": "db://assets/model/materials/ground3.png@6c48a",
+    "value": {
+      "depends": [
+        "c3ecabe8-ea47-4a3e-801f-389d32f531ee"
+      ]
+    },
+    "versionCode": 1
+  },
+  "c3ecabe8-ea47-4a3e-801f-389d32f531ee@f9941": {
+    "url": "db://assets/model/materials/ground3.png@f9941",
+    "value": {
+      "depends": [
+        "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "362e3a3d-d908-472d-be07-7568e16049da": {
+    "url": "db://assets/model/materials/ground5.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "362e3a3d-d908-472d-be07-7568e16049da@6c48a": {
+    "url": "db://assets/model/materials/ground5.png@6c48a",
+    "value": {
+      "depends": [
+        "362e3a3d-d908-472d-be07-7568e16049da"
+      ]
+    },
+    "versionCode": 1
+  },
+  "362e3a3d-d908-472d-be07-7568e16049da@f9941": {
+    "url": "db://assets/model/materials/ground5.png@f9941",
+    "value": {
+      "depends": [
+        "362e3a3d-d908-472d-be07-7568e16049da@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "6eb75307-c960-4ef6-b639-673bd75802c2": {
+    "url": "db://assets/model/materials/ground4.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a": {
+    "url": "db://assets/model/materials/ground4.png@6c48a",
+    "value": {
+      "depends": [
+        "6eb75307-c960-4ef6-b639-673bd75802c2"
+      ]
+    },
+    "versionCode": 1
+  },
+  "6eb75307-c960-4ef6-b639-673bd75802c2@f9941": {
+    "url": "db://assets/model/materials/ground4.png@f9941",
+    "value": {
+      "depends": [
+        "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "6323bd2c-1ad9-496e-80db-6a17ee36062a": {
+    "url": "db://assets/model/Materials_enemy_weapon/tietu.mtl",
+    "value": {},
+    "versionCode": 1
+  },
+  "5ca63bc1-3427-4148-9313-2f631db17afb": {
+    "url": "db://assets/model/Materials_enemy_weapon/tietu.001.mtl",
+    "value": {},
+    "versionCode": 1
+  },
+  "47e61c3e-ada5-4bff-a5d3-46aec1e7f00f": {
+    "url": "db://assets/model/Materials_enemy_weapon",
+    "value": {},
+    "versionCode": 1
+  },
+  "18059aba-1f4c-4ae1-8307-85ef11c60e8a": {
+    "url": "db://assets/model/materials/base_tietu.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "6c926720-7ec2-4109-8daa-ab6469cefab8@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4": {
+    "url": "db://assets/model/materials/ground1.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "207978cc-c706-4831-8276-0b8242b27005@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "1b122012-461a-4092-bd94-d767b1741605": {
+    "url": "db://assets/model/materials/ground2.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "e58971c4-b7ca-4170-9b45-9d0b2f56bb50": {
+    "url": "db://assets/model/materials/ground3.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "c3ecabe8-ea47-4a3e-801f-389d32f531ee@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "551db8cd-55f2-46a5-8fe3-45ac60897095": {
+    "url": "db://assets/model/materials/ground4.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "6eb75307-c960-4ef6-b639-673bd75802c2@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "35e3e057-9803-483d-9c52-6f579aae83bc": {
+    "url": "db://assets/model/materials/ground5.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "362e3a3d-d908-472d-be07-7568e16049da@6c48a"
+      ]
+    },
+    "versionCode": 1
   }
 }

+ 106 - 37
library/.assets-dependency.json

@@ -1,75 +1,114 @@
 {
   "path": {
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/all soldier.fbx@0a1ef": [
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/player_weapon.fbx@7d6ab": [
       "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/m24_98k_fix.fbx@7d6ab": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
-    ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/enemy_weapon.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/enemy_weapon.fbx@05da8": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/all soldier.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/shabao.fbx@7d6ab": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_weapon.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/yuansu.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_die.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/坦克动画/tank_gongji.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/坦克动画/tank.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_huandan.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/1_run.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_die.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/1_die.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_idle.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/2_run.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/1_walk.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_run.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/1_shoot.fbx@7d6ab": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/2_run.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/2_shoot.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/2_die.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
-    ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_die.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/2_walk.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_shoot.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_run.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_shoot.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_die.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3_shoot.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/3walk.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_run.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_die.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/5_run.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_shoot.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_walk.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/4_die.fbx@0a1ef": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/materials/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/5_shoot.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/player_weapon.fbx@7d6ab": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/5_die.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/player_weapon.fbx@7d6ab": [
-      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/skybox/Texture/TextureColor.jpg"
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/5_walk.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
-    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/坦克动画/tank_gongji.fbx@7d6ab": [
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/6_die.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/6_run.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/6_walk.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/士兵动画/6_shoot.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/enemy_weapon.fbx@0a1ef": [
+      "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/enemy_weapon.fbx@05da8": [
       "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ]
   },
@@ -203,6 +242,36 @@
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/material_clothe_02.mtl": [
       "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/Materials_enemy_weapon/tietu.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/Materials_enemy_weapon/tietu.001.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/tietu.001.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/tietu.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/ground1.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/ground2.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/ground3.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/ground4.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/ground5.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/base_tietu.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
     ]
   }
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 1124 - 1012
library/.assets-info1.0.0.json


+ 1 - 1
library/01/018a74cb-0fed-4096-af33-fef3cc3e4be0.json

@@ -70285,7 +70285,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
+        "__uuid__": "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4",
         "__expectedType__": "cc.Material"
       }
     ],

+ 1 - 1
library/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@7d6ab.json

@@ -3,7 +3,7 @@
   "content": {
     "base": "2,2,0,0,0,0",
     "mipmaps": [
-      "36f4230d-6875-42c6-9d9b-c1089a93c018"
+      "6c926720-7ec2-4109-8daa-ab6469cefab8"
     ]
   }
 }

파일 크기가 너무 크기때문에 변경 상태를 표시하지 않습니다.
+ 341 - 122
library/10/10795865-5525-41fc-8bf7-0e8d6983b214.json


+ 89 - 0
library/18/18059aba-1f4c-4ae1-8307-85ef11c60e8a.json

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "base_tietu",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "6c926720-7ec2-4109-8daa-ab6469cefab8@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 89 - 0
library/1b/1b122012-461a-4092-bd94-d767b1741605.json

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "ground2",
+  "_objFlags": 0,
+  "__editorExtras__": {},
+  "_native": "",
+  "_effectAsset": {
+    "__uuid__": "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+    "__expectedType__": "cc.EffectAsset"
+  },
+  "_techIdx": 0,
+  "_defines": [
+    {
+      "DCC_APP_NAME": 2,
+      "USE_ALBEDO_MAP": true,
+      "HAS_EXPORTED_METALLIC": true
+    },
+    {},
+    {},
+    {}
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    },
+    {
+      "rasterizerState": {},
+      "depthStencilState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      }
+    }
+  ],
+  "_props": [
+    {
+      "mainTexture": {
+        "__uuid__": "5abfd478-82c1-4a47-8d0b-9618447bb565@6c48a",
+        "__expectedType__": "cc.Texture2D"
+      },
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "emissiveScale": 0,
+      "shininessExponent": 25,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 1 - 1
library/20/207978cc-c706-4831-8276-0b8242b27005@f9941.json

@@ -1,7 +1,7 @@
 {
   "__type__": "cc.SpriteFrame",
   "content": {
-    "name": "ground",
+    "name": "ground1",
     "atlas": "",
     "rect": {
       "x": 0,

BIN
library/22/22ccf12e-038c-4dea-85e7-26bd81aadf2f.png


BIN
library/22/22ccf12e-038c-4dea-85e7-26bd81aadf2f@f9941_sprite_trim_.png


+ 37 - 10
library/28/28a9f61c-c9ee-4b56-acdd-86ed85c7d066.json

@@ -130,7 +130,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "e5efb64c-9936-43c1-b0c9-c1cf4fced520@55094",
+        "__uuid__": "18059aba-1f4c-4ae1-8307-85ef11c60e8a",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2607,7 +2607,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -3560,7 +3563,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -4359,7 +4365,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "17a130d0-8f0b-45c1-9699-71ea8b4265ed@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -6593,7 +6602,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -7398,7 +7410,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "39df499e-fce3-406f-b8bd-364f7bbadc56@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -8203,7 +8218,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "f39bf30a-ed7e-4592-88b9-6af73bc6cb03@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -9001,7 +9019,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "ce77cefe-b8b4-40f3-90f4-3506ef585369@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 2
   },
@@ -10508,7 +10529,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "71c497af-5d19-4249-82f7-e68a245a1f5f@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },
@@ -11287,7 +11311,10 @@
       "__expectedType__": "cc.Material"
     },
     "_gpuMaterial": null,
-    "_mainTexture": null,
+    "_mainTexture": {
+      "__uuid__": "bf12c942-252f-4a30-9d1e-d6474ab78511@6c48a",
+      "__expectedType__": "cc.Texture2D"
+    },
     "_useGPU": false,
     "_alignSpace": 0
   },

+ 0 - 0
library/22/22ccf12e-038c-4dea-85e7-26bd81aadf2f.json → library/2d/2d1d8ec3-c70e-4df4-aa6f-74df047b2657.json


이 변경점에서 너무 많은 파일들이 변경되어 몇몇 파일들은 표시되지 않았습니다.