Parcourir la source

修改材质

修改材质
Kziwws il y a 1 semaine
Parent
commit
d7e469f10b
100 fichiers modifiés avec 8111 ajouts et 1346 suppressions
  1. 2 2
      assets/data/csv/player.csv
  2. BIN
      assets/model/materials/wall_td.png
  3. 134 0
      assets/model/materials/wall_td.png.meta
  4. 89 0
      assets/model/materials/wall_tietu.mtl
  5. 1 0
      assets/model/materials/wall_tietu.mtl.meta
  6. 146 127
      assets/model/scenePrb.scene
  7. BIN
      assets/model/yuansu.fbx
  8. 28 11
      assets/model/yuansu.fbx.meta
  9. 140 132
      assets/prefabs/map/map1.prefab
  10. BIN
      assets/prefabs/texture/gun_icon.png
  11. 28 28
      assets/prefabs/texture/gun_icon.png.meta
  12. 2930 259
      assets/prefabs/ui/failUI.prefab
  13. 4 2
      assets/scripts/items/player/Bullet1.ts
  14. 5 3
      assets/scripts/items/player/Bullet2.ts
  15. 5 3
      assets/scripts/items/player/Bullet3.ts
  16. 20 5
      assets/scripts/items/player/Bullet4.ts
  17. 5 61
      assets/scripts/ui/FailUI.ts
  18. BIN
      assets/textures/settle/WuQiJieSuoJinDuTiao.png
  19. 134 0
      assets/textures/settle/WuQiJieSuoJinDuTiao.png.meta
  20. BIN
      assets/textures/settle/WuQiJinDuTiao_Wai.png
  21. 134 0
      assets/textures/settle/WuQiJinDuTiao_Wai.png.meta
  22. 219 5
      library/.assets-data.json
  23. 12 6
      library/.assets-dependency.json
  24. 63 20
      library/.assets-info1.0.0.json
  25. 140 132
      library/01/018a74cb-0fed-4096-af33-fef3cc3e4be0.json
  26. 8 0
      library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32.json
  27. BIN
      library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32.png
  28. 9 0
      library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a.json
  29. 90 0
      library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941.json
  30. BIN
      library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941_sprite_trim_.png
  31. 8 0
      library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23.json
  32. BIN
      library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23.png
  33. 9 0
      library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a.json
  34. 90 0
      library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@f9941.json
  35. 1 1
      library/37/37af602f-ceeb-46f6-8251-cfce46b1d07a.json
  36. 0 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae.json
  37. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@305a7.bin
  38. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@305a7.json
  39. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f.bin
  40. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f.json
  41. 52 0
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e.json
  42. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@750ed.bin
  43. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@750ed.json
  44. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6.bin
  45. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6.json
  46. 52 0
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0.json
  47. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.bin
  48. 11 11
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.json
  49. 0 0
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260.json
  50. 24 24
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d6409.json
  51. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d8ac4.bin
  52. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d8ac4.json
  53. BIN
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7.bin
  54. 1 1
      library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7.json
  55. BIN
      library/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43.png
  56. 28 28
      library/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43@f9941.json
  57. 89 0
      library/77/773a178a-91b0-4c04-81a6-a68cba19d818.json
  58. 8 0
      library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f.json
  59. BIN
      library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f.png
  60. 9 0
      library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a.json
  61. 90 0
      library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941.json
  62. BIN
      library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941_sprite_trim_.png
  63. 146 127
      library/b2/b27497b3-42c4-4a2b-8bcf-8c0b7aac8559.json
  64. 2930 259
      library/ea/ea775253-49d0-4ed3-b61d-b95637b22a14.json
  65. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0360f/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0360f.png
  66. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75.png
  67. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75/thumbnail-small.png
  68. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0c074/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0c074.png
  69. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0f76c/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0f76c.png
  70. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@26657/0eb565d6-76ca-4395-9d4c-34fb10a057a3@26657.png
  71. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@39a7f/0eb565d6-76ca-4395-9d4c-34fb10a057a3@39a7f.png
  72. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@4e0b5/0eb565d6-76ca-4395-9d4c-34fb10a057a3@4e0b5.png
  73. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587.png
  74. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587/thumbnail-small.png
  75. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@69dc9/0eb565d6-76ca-4395-9d4c-34fb10a057a3@69dc9.png
  76. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@769bf/0eb565d6-76ca-4395-9d4c-34fb10a057a3@769bf.png
  77. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@7d6ab/thumbnail-small.png
  78. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@81124/0eb565d6-76ca-4395-9d4c-34fb10a057a3@81124.png
  79. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@95362/0eb565d6-76ca-4395-9d4c-34fb10a057a3@95362.png
  80. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@c85de/0eb565d6-76ca-4395-9d4c-34fb10a057a3@c85de.png
  81. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8.png
  82. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8/thumbnail-small.png
  83. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6.png
  84. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6/thumbnail-small.png
  85. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d.png
  86. BIN
      temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d/thumbnail-small.png
  87. BIN
      temp/asset-db/assets/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32/thumbnail-small.png
  88. BIN
      temp/asset-db/assets/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941/thumbnail-small.png
  89. BIN
      temp/asset-db/assets/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23/thumbnail-small.png
  90. BIN
      temp/asset-db/assets/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.png
  91. BIN
      temp/asset-db/assets/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17/thumbnail-small.png
  92. BIN
      temp/asset-db/assets/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43/thumbnail-small.png
  93. BIN
      temp/asset-db/assets/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f/thumbnail-small.png
  94. BIN
      temp/asset-db/assets/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941/thumbnail-small.png
  95. 4 4
      temp/asset-db/assets/fbx.FBX-glTF-conv/0eb565d6-76ca-4395-9d4c-34fb10a057a3/status.json
  96. BIN
      temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/output/out.bin
  97. 198 85
      temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/output/out.gltf
  98. 4 4
      temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/status.json
  99. 6 0
      temp/asset-db/assets/fbx.FBX-glTF-conv/96e6dd63-5bde-4621-831b-2a8b0e832ce9/output/log.json
  100. BIN
      temp/asset-db/assets/fbx.FBX-glTF-conv/96e6dd63-5bde-4621-831b-2a8b0e832ce9/output/out.bin

+ 2 - 2
assets/data/csv/player.csv

@@ -1,4 +1,4 @@
 ID,狙击枪瞄准镜开镜放大倍率,步枪瞄准后镜头放大倍率,游玩3到5次强制出现弹窗广告,关卡失败点击重新开始弹窗广告的概率,单位百分比,主页无广告功能解锁关卡,主页武器功能解锁关卡,玩家默认解锁武器(默认98k的id),爆头伤害系数,敌人刷新间隔区间,单位秒,爆头奖励,爆头数*参数,单位金币,玩家生命值,下一关按钮点击弹窗广告的概率,单位百分比
-number,number,number,string,number,number,number,string,number,string,number,number,number
+number,number,number,string,number,number,number,string,number,string,string,number,number
 id,scopeZoom,rifleZoom,adForceShow,adFailRate,noAdUnlockLv,weaponUnlockLv,defaultWeapon,headshotDmgMul,enemySpawnIntv,headshotReward,hp,adforceShow2
-20001,5,1.5,3_5,30,5,3,100010,2,0.3_1.5,1001|20,100,25
+20001,5,1.5,3_5,25,5,3,100010,2,0.3_1.5,1001_20,100,25

BIN
assets/model/materials/wall_td.png


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

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a",
+      "displayName": "wall_td",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23",
+        "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": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@f9941",
+      "displayName": "wall_td",
+      "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": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a"
+  }
+}

+ 89 - 0
assets/model/materials/wall_tietu.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__": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@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/wall_tietu.mtl.meta

@@ -0,0 +1 @@
+{"ver":"1.0.21","importer":"material","imported":true,"uuid":"773a178a-91b0-4c04-81a6-a68cba19d818","files":[".json"],"subMetas":{},"userData":{}}

Fichier diff supprimé car celui-ci est trop grand
+ 146 - 127
assets/model/scenePrb.scene


BIN
assets/model/yuansu.fbx


+ 28 - 11
assets/model/yuansu.fbx.meta

@@ -103,7 +103,7 @@
       "name": "网格.022.mesh",
       "userData": {
         "gltfIndex": 3,
-        "triangleCount": 2654
+        "triangleCount": 1608
       },
       "ver": "1.1.1",
       "imported": true,
@@ -573,12 +573,12 @@
       ],
       "subMetas": {}
     },
-    "6b844": {
+    "a6ea0": {
       "importer": "gltf-material",
-      "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+      "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
       "displayName": "",
-      "id": "6b844",
-      "name": "caizhi-1.material",
+      "id": "a6ea0",
+      "name": "墙面-1.material",
       "userData": {
         "gltfIndex": 1
       },
@@ -589,12 +589,12 @@
       ],
       "subMetas": {}
     },
-    "1d5ae": {
+    "d3260": {
       "importer": "gltf-material",
-      "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
+      "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
       "displayName": "",
-      "id": "1d5ae",
-      "name": "地面-2.material",
+      "id": "d3260",
+      "name": "caizhi-2.material",
       "userData": {
         "gltfIndex": 2
       },
@@ -605,6 +605,22 @@
       ],
       "subMetas": {}
     },
+    "66e3e": {
+      "importer": "gltf-material",
+      "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e",
+      "displayName": "",
+      "id": "66e3e",
+      "name": "地面-3.material",
+      "userData": {
+        "gltfIndex": 3
+      },
+      "ver": "1.0.14",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    },
     "d6409": {
       "importer": "gltf-scene",
       "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d6409",
@@ -691,8 +707,9 @@
       ],
       "materials": [
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@3192d",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae"
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e"
       ],
       "scenes": [
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@d6409"

Fichier diff supprimé car celui-ci est trop grand
+ 140 - 132
assets/prefabs/map/map1.prefab


BIN
assets/prefabs/texture/gun_icon.png


+ 28 - 28
assets/prefabs/texture/gun_icon.png.meta

@@ -41,14 +41,14 @@
       "userData": {
         "trimThreshold": 1,
         "rotated": false,
-        "offsetX": 1.5,
-        "offsetY": 0,
-        "trimX": 3,
+        "offsetX": 0,
+        "offsetY": 0.5,
+        "trimX": 0,
         "trimY": 0,
-        "width": 129,
-        "height": 65,
-        "rawWidth": 132,
-        "rawHeight": 65,
+        "width": 371,
+        "height": 169,
+        "rawWidth": 371,
+        "rawHeight": 170,
         "borderTop": 0,
         "borderBottom": 0,
         "borderLeft": 0,
@@ -60,17 +60,17 @@
         "meshType": 0,
         "vertices": {
           "rawPosition": [
-            -64.5,
-            -32.5,
+            -185.5,
+            -84.5,
             0,
-            64.5,
-            -32.5,
+            185.5,
+            -84.5,
             0,
-            -64.5,
-            32.5,
+            -185.5,
+            84.5,
             0,
-            64.5,
-            32.5,
+            185.5,
+            84.5,
             0
           ],
           "indexes": [
@@ -82,33 +82,33 @@
             3
           ],
           "uv": [
-            3,
-            65,
-            132,
-            65,
-            3,
             0,
-            132,
-            0
+            170,
+            371,
+            170,
+            0,
+            1,
+            371,
+            1
           ],
           "nuv": [
-            0.022727272727272728,
             0,
+            0.0058823529411764705,
             1,
+            0.0058823529411764705,
             0,
-            0.022727272727272728,
             1,
             1,
             1
           ],
           "minPos": [
-            -64.5,
-            -32.5,
+            -185.5,
+            -84.5,
             0
           ],
           "maxPos": [
-            64.5,
-            32.5,
+            185.5,
+            84.5,
             0
           ]
         },

Fichier diff supprimé car celui-ci est trop grand
+ 2930 - 259
assets/prefabs/ui/failUI.prefab


+ 4 - 2
assets/scripts/items/player/Bullet1.ts

@@ -87,17 +87,19 @@ export class Bullet1 extends BulletBase {
             const name: string = result.collider.name;
             let e: Enemy = result.collider.node.parent.getComponent(Enemy);
             if(e){
+                let attack: number = this.gunBase.data.attack;
                 //爆头击杀
                 if(name == EPartType.head){
                    Game.I.player.headShotNum += 1;
+                   attack = Game.I.player.pData.headshotDmgMul * attack;
                 }
                 //坦克是单独的碰撞体
                 if(e.isTank()){
                     if(name == EPartType.tank){
-                      e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                      e.subHP(attack,this.gunBase.data);
                     }
                 }else{
-                    e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                    e.subHP(attack,this.gunBase.data);
                 }
             }
             //自动回收了子弹

+ 5 - 3
assets/scripts/items/player/Bullet2.ts

@@ -87,17 +87,19 @@ export class Bullet2 extends BulletBase {
             const name: string = result.collider.name;
             let e: Enemy = result.collider.node.parent.getComponent(Enemy);
             if(e){
+                let attack: number = this.gunBase.data.attack;
                 //爆头击杀
                 if(name == EPartType.head){
-                    Game.I.player.headShotNum += 1;
+                   Game.I.player.headShotNum += 1;
+                   attack = Game.I.player.pData.headshotDmgMul * attack;
                 }
                 //坦克是单独的碰撞体
                 if(e.isTank()){
                     if(name == EPartType.tank){
-                        e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                        e.subHP(attack,this.gunBase.data);
                     }
                 }else{
-                    e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                    e.subHP(attack,this.gunBase.data);
                 }
             }
             //自动回收了子弹

+ 5 - 3
assets/scripts/items/player/Bullet3.ts

@@ -86,17 +86,19 @@ export class Bullet3 extends BulletBase {
             const name: string = result.collider.name;
             let e: Enemy = result.collider.node.parent.getComponent(Enemy);
             if(e){
+                let attack: number = this.gunBase.data.attack;
                 //爆头击杀
                 if(name == EPartType.head){
-                    Game.I.player.headShotNum += 1;
+                   Game.I.player.headShotNum += 1;
+                   attack = Game.I.player.pData.headshotDmgMul * attack;
                 }
                 //坦克是单独的碰撞体
                 if(e.isTank()){
                     if(name == EPartType.tank){
-                        e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                        e.subHP(attack,this.gunBase.data);
                     }
                 }else{
-                    e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                    e.subHP(attack,this.gunBase.data);
                 }
             }
             //自动回收了子弹

+ 20 - 5
assets/scripts/items/player/Bullet4.ts

@@ -1,7 +1,7 @@
 import { _decorator, Vec3,Node, geometry, PhysicsSystem, PhysicsRayResult, RigidBody } from 'cc';
 import { PoolManager } from '../../core/manager/PoolManager';
 import { Game } from '../../game/Game';
-import { Enemy } from '../../game/Enemy';
+import { Enemy, EPartType } from '../../game/Enemy';
 import { Gun4 } from './Gun4';
 import { BulletBase } from '../base/BulletBase';
 import { GunBase } from '../base/GunBase';
@@ -77,14 +77,29 @@ export class Bullet4 extends BulletBase {
         const phy:PhysicsSystem = PhysicsSystem.instance;
         const isHit = phy.raycast(ray, 0xffffff, len);
         if (isHit && phy.raycastResults.length > 0) {
-            let result:PhysicsRayResult = phy.raycastResults[0];    
+            let result:PhysicsRayResult = phy.raycastResults[0];   
             this.addImpact(result);
+            /*MsgHints.show(`打中了: ${result.collider.name}`);
             if(result.collider.getComponent(RigidBody)) {
-               result.collider.getComponent(RigidBody).applyForce(this.vector, result.hitPoint);
-            }
+                result.collider.getComponent(RigidBody).applyForce(this.vector, result.hitPoint);
+            }*/
+            const name: string = result.collider.name;
             let e: Enemy = result.collider.node.parent.getComponent(Enemy);
             if(e){
-               e.subHP(this.gunBase.data.attack,this.gunBase.data);
+                let attack: number = this.gunBase.data.attack;
+                //爆头击杀
+                if(name == EPartType.head){
+                    Game.I.player.headShotNum += 1;
+                    attack = Game.I.player.pData.headshotDmgMul * attack;
+                }
+                //坦克是单独的碰撞体
+                if(e.isTank()){
+                    if(name == EPartType.tank){
+                        e.subHP(attack,this.gunBase.data);
+                    }
+                }else{
+                    e.subHP(attack,this.gunBase.data);
+                }
             }
             //自动回收了子弹
             this.autoRecycle();

+ 5 - 61
assets/scripts/ui/FailUI.ts

@@ -14,35 +14,16 @@ const { ccclass, property } = _decorator;
 
 @ccclass('FailUI')
 export class FailUI extends BaseExp {
-    @autoBind({ type: Node, tooltip: "旋转光节点" })
-    public rotation_light: Node;
-    @autoBind({ type: Sprite, tooltip: "获得的物品图片" })
-    public obtain_good: Sprite;
-    @autoBind({ type: Sprite, tooltip: "获得的物品图片缩影" })
-    public good_sy_sp: Sprite;
-    @autoBind({ type: Label, tooltip: "获得的物品的名字" })
-    public name_lable: Label;
-    @autoBind({ type: Label, tooltip: "描述文字" })
-    public dec_lable: Label;
-    @autoBind({ type: Node, tooltip: "底部提交确认按钮" })
-    public confim_btn: Node;
-    @autoBind({ type: Node, tooltip: "拥有状态" })
-    public owned_lable: Node;
+    @autoBind({ type: Label, tooltip: "关卡等级" })
+    public task_num_lable: Node;
 
-    //奖励的数据
-    private data: any = null;
-    //奖励的id
-    private id: string = '';
     //回调函数
     private cb:Function = null;
-
     start() {
         this.closeOnBlank = false;
     }
     
     public show(...args: any[]){
-        this.id = args[0];
-        this.cb = args[1];
         this.hasAnim = true;
         //加载数据ui
         this.ui();
@@ -52,42 +33,7 @@ export class FailUI extends BaseExp {
      * 加载数据ui
      */
     public ui(){
-        //获得的光圈一直旋转
-        Tween.stopAllByTarget(this.rotation_light);
-        tween(this.rotation_light)
-            .by(2, { eulerAngles: new Vec3(0, 0, -360) })
-            .repeatForever()
-            .start();
-
-        this.data = userIns.boomerangTable.find(e=>e.id == this.id);
-        //设置图片
-        ResUtil.setSpriteFrame(this.data.icon,this.obtain_good);
-        //设置图片缩影
-        ResUtil.setSpriteFrame(this.data.s_icon,this.good_sy_sp);
-        //设置名字
-        this.name_lable.string = i18n.isZh ? this.data.name : this.data.name_lang;
-        //设置描述
-        this.dec_lable.string = i18n.isZh? this.data.description : this.data.dec_lang;
-        const [gun_id,num] = this.data.quantity.split('_');
-        if(gun_id == 1001 || gun_id == 1002){//金币和钻石
-            this.owned_lable.active = false;
-            this.confim_btn.active = false;
-            //是金币和钻石自动关闭
-            this.scheduleOnce(()=>{
-               uiMgr.hide(Constants.popUIs.obtainUI,this.cb);
-            },2);
-        }else{
-            this.confim_btn.active = true;
-            //是解锁的枪 这儿需要判断是否已经拥有的了这把枪 如果已经拥有了这把枪 就转换成钻石和金币
-            if(userIns.isHasGun(gun_id)){//拥有这把枪转换成金币
-               this.owned_lable.active = true;
-               const [good_id,amount] = this.data.value.split('_');
-               const sData:any = userIns.itemTable.find(e=>e.id == good_id);
-               this.dec_lable.string = `Already owned ${this.data.name_lang}, converted ${amount} ${sData.name_lang}`;
-            }else{
-                this.owned_lable.active = false;
-            }
-        }
+        
     }
 
 
@@ -98,10 +44,8 @@ export class FailUI extends BaseExp {
      */
     override onBtnClicked(event:EventTouch, param:any) {
         let btnName = event.target.name;
-        if(btnName === 'confim_btn' 
-            || btnName === 'close_btn'){
-            this.unscheduleAllCallbacks();
-            uiMgr.hide(Constants.popUIs.obtainUI,this.cb);
+        if(btnName === 'restart_btn'){//重新开始
+            uiMgr.hide(Constants.popUIs.failUI,this.cb);
         }
     }
 }

BIN
assets/textures/settle/WuQiJieSuoJinDuTiao.png


+ 134 - 0
assets/textures/settle/WuQiJieSuoJinDuTiao.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a",
+      "displayName": "WuQiJieSuoJinDuTiao",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f",
+        "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": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941",
+      "displayName": "WuQiJieSuoJinDuTiao",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 140,
+        "height": 43,
+        "rawWidth": 140,
+        "rawHeight": 43,
+        "borderTop": 12,
+        "borderBottom": 12,
+        "borderLeft": 22,
+        "borderRight": 28,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -70,
+            -21.5,
+            0,
+            70,
+            -21.5,
+            0,
+            -70,
+            21.5,
+            0,
+            70,
+            21.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            43,
+            140,
+            43,
+            0,
+            0,
+            140,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -70,
+            -21.5,
+            0
+          ],
+          "maxPos": [
+            70,
+            21.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a"
+  }
+}

BIN
assets/textures/settle/WuQiJinDuTiao_Wai.png


+ 134 - 0
assets/textures/settle/WuQiJinDuTiao_Wai.png.meta

@@ -0,0 +1,134 @@
+{
+  "ver": "1.0.27",
+  "importer": "image",
+  "imported": true,
+  "uuid": "1c0c9385-c43e-4d74-b464-71e04ae46b32",
+  "files": [
+    ".json",
+    ".png"
+  ],
+  "subMetas": {
+    "6c48a": {
+      "importer": "texture",
+      "uuid": "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a",
+      "displayName": "WuQiJinDuTiao_Wai",
+      "id": "6c48a",
+      "name": "texture",
+      "userData": {
+        "wrapModeS": "clamp-to-edge",
+        "wrapModeT": "clamp-to-edge",
+        "imageUuidOrDatabaseUri": "1c0c9385-c43e-4d74-b464-71e04ae46b32",
+        "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": "1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941",
+      "displayName": "WuQiJinDuTiao_Wai",
+      "id": "f9941",
+      "name": "spriteFrame",
+      "userData": {
+        "trimThreshold": 1,
+        "rotated": false,
+        "offsetX": 0,
+        "offsetY": 0,
+        "trimX": 0,
+        "trimY": 0,
+        "width": 140,
+        "height": 43,
+        "rawWidth": 140,
+        "rawHeight": 43,
+        "borderTop": 12,
+        "borderBottom": 13,
+        "borderLeft": 24,
+        "borderRight": 27,
+        "packable": true,
+        "pixelsToUnit": 100,
+        "pivotX": 0.5,
+        "pivotY": 0.5,
+        "meshType": 0,
+        "vertices": {
+          "rawPosition": [
+            -70,
+            -21.5,
+            0,
+            70,
+            -21.5,
+            0,
+            -70,
+            21.5,
+            0,
+            70,
+            21.5,
+            0
+          ],
+          "indexes": [
+            0,
+            1,
+            2,
+            2,
+            1,
+            3
+          ],
+          "uv": [
+            0,
+            43,
+            140,
+            43,
+            0,
+            0,
+            140,
+            0
+          ],
+          "nuv": [
+            0,
+            0,
+            1,
+            0,
+            0,
+            1,
+            1,
+            1
+          ],
+          "minPos": [
+            -70,
+            -21.5,
+            0
+          ],
+          "maxPos": [
+            70,
+            21.5,
+            0
+          ]
+        },
+        "isUuid": true,
+        "imageUuidOrDatabaseUri": "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a",
+        "atlasUuid": "",
+        "trimType": "auto"
+      },
+      "ver": "1.0.12",
+      "imported": true,
+      "files": [
+        ".json"
+      ],
+      "subMetas": {}
+    }
+  },
+  "userData": {
+    "type": "sprite-frame",
+    "hasAlpha": true,
+    "fixAlphaTransparencyArtifacts": false,
+    "redirect": "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a"
+  }
+}

+ 219 - 5
library/.assets-data.json

@@ -2380,15 +2380,16 @@
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@3192d",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@0b4a2",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@0bd78",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@d8ac4",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@1c5ac",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@e78f9",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@585d5",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@9a84c",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@9d07e",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@24899",
@@ -13907,7 +13908,7 @@
         "f78111dd-6822-4f53-8c21-9b6bbd170b00",
         "1263d74c-8167-4928-91a6-4e2672411f47@2e76e",
         "249bdabd-103e-4c0d-b012-c6794ddc6f3e",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "50a1cc93-13ad-4239-b53e-795a93b757f4",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@f051b",
         "0eb565d6-76ca-4395-9d4c-34fb10a057a3@bc407",
         "0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6",
@@ -13928,14 +13929,14 @@
         "0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8",
         "0eb565d6-76ca-4395-9d4c-34fb10a057a3@cbc2b",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@9d07e",
-        "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@0b4a2",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@3192d",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@0bd78",
+        "773a178a-91b0-4c04-81a6-a68cba19d818",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f",
-        "2eb8a682-0d23-4dac-9b6e-cb5eecc551a4",
+        "551db8cd-55f2-46a5-8fe3-45ac60897095",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@9a84c",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@1e35a",
         "421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6",
@@ -14514,6 +14515,9 @@
         "d2eec8aa-eb87-4069-97d1-cdefce1fe602",
         "6197cf07-d5f9-403c-a8e9-8d0a81293efb@f9941",
         "6e4de0a4-6afb-4820-98e0-13add85b62fe@f9941",
+        "54e3b324-9576-4968-aba1-6fc9ee3e3e43@f9941",
+        "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941",
+        "179afc17-3700-42ef-82ec-5cdf6c172978@f9941",
         "b9ecbf3e-ec83-4d12-875d-202033b4c908@f9941"
       ],
       "dependScripts": [
@@ -14636,5 +14640,215 @@
       ]
     },
     "versionCode": 1
+  },
+  "99ad366e-3bd8-4dfa-a192-bd9756b1f91f": {
+    "url": "db://assets/textures/settle/WuQiJieSuoJinDuTiao.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a": {
+    "url": "db://assets/textures/settle/WuQiJieSuoJinDuTiao.png@6c48a",
+    "value": {
+      "depends": [
+        "99ad366e-3bd8-4dfa-a192-bd9756b1f91f"
+      ]
+    },
+    "versionCode": 1
+  },
+  "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941": {
+    "url": "db://assets/textures/settle/WuQiJieSuoJinDuTiao.png@f9941",
+    "value": {
+      "depends": [
+        "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "1c0c9385-c43e-4d74-b464-71e04ae46b32": {
+    "url": "db://assets/textures/settle/WuQiJinDuTiao_Wai.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a": {
+    "url": "db://assets/textures/settle/WuQiJinDuTiao_Wai.png@6c48a",
+    "value": {
+      "depends": [
+        "1c0c9385-c43e-4d74-b464-71e04ae46b32"
+      ]
+    },
+    "versionCode": 1
+  },
+  "1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941": {
+    "url": "db://assets/textures/settle/WuQiJinDuTiao_Wai.png@f9941",
+    "value": {
+      "depends": [
+        "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9": {
+    "url": "db://assets/model/qiang.fbx",
+    "value": {},
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@e0cd7": {
+    "url": "db://assets/model/qiang.fbx@e0cd7",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@d8ac4": {
+    "url": "db://assets/model/qiang.fbx@d8ac4",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@4af7f": {
+    "url": "db://assets/model/qiang.fbx@4af7f",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@930f6": {
+    "url": "db://assets/model/qiang.fbx@930f6",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@411ff": {
+    "url": "db://assets/model/qiang.fbx@411ff",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "96e6dd63-5bde-4621-831b-2a8b0e832ce9@58b64": {
+    "url": "db://assets/model/qiang.fbx@58b64",
+    "value": {
+      "depends": [
+        "96e6dd63-5bde-4621-831b-2a8b0e832ce9@411ff",
+        "96e6dd63-5bde-4621-831b-2a8b0e832ce9@e0cd7",
+        "96e6dd63-5bde-4621-831b-2a8b0e832ce9@d8ac4",
+        "96e6dd63-5bde-4621-831b-2a8b0e832ce9@4af7f",
+        "96e6dd63-5bde-4621-831b-2a8b0e832ce9@930f6"
+      ]
+    },
+    "versionCode": 1
+  },
+  "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23": {
+    "url": "db://assets/model/materials/wall_td.png",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a": {
+    "url": "db://assets/model/materials/wall_td.png@6c48a",
+    "value": {
+      "depends": [
+        "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23"
+      ]
+    },
+    "versionCode": 1
+  },
+  "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@f9941": {
+    "url": "db://assets/model/materials/wall_td.png@f9941",
+    "value": {
+      "depends": [
+        "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "773a178a-91b0-4c04-81a6-a68cba19d818": {
+    "url": "db://assets/model/materials/wall_tietu.mtl",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a"
+      ]
+    },
+    "versionCode": 1
+  },
+  "e24a6c06-8bda-46b2-934b-aabbd79de5f6": {
+    "url": "db://assets/model/tashao.fbx",
+    "value": {},
+    "versionCode": 1
+  },
+  "e24a6c06-8bda-46b2-934b-aabbd79de5f6@c4f17": {
+    "url": "db://assets/model/tashao.fbx@c4f17",
+    "value": {
+      "depends": []
+    },
+    "versionCode": 1
+  },
+  "e24a6c06-8bda-46b2-934b-aabbd79de5f6@7d6ab": {
+    "url": "db://assets/model/tashao.fbx@7d6ab",
+    "value": {
+      "depends": [
+        "6c926720-7ec2-4109-8daa-ab6469cefab8"
+      ]
+    },
+    "versionCode": 1
+  },
+  "e24a6c06-8bda-46b2-934b-aabbd79de5f6@bc407": {
+    "url": "db://assets/model/tashao.fbx@bc407",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "e24a6c06-8bda-46b2-934b-aabbd79de5f6@7d6ab"
+      ]
+    },
+    "versionCode": 1
+  },
+  "e24a6c06-8bda-46b2-934b-aabbd79de5f6@f3429": {
+    "url": "db://assets/model/tashao.fbx@f3429",
+    "value": {
+      "depends": [
+        "e24a6c06-8bda-46b2-934b-aabbd79de5f6@bc407",
+        "e24a6c06-8bda-46b2-934b-aabbd79de5f6@c4f17"
+      ]
+    },
+    "versionCode": 1
+  },
+  "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0": {
+    "url": "db://assets/model/yuansu.fbx@a6ea0",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+      ]
+    },
+    "versionCode": 1
+  },
+  "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260": {
+    "url": "db://assets/model/yuansu.fbx@d3260",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b",
+        "421760e1-1a4b-4f19-aa7f-4adb5f818580@0a1ef"
+      ]
+    },
+    "versionCode": 1
+  },
+  "421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e": {
+    "url": "db://assets/model/yuansu.fbx@66e3e",
+    "value": {
+      "depends": [
+        "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+      ]
+    },
+    "versionCode": 1
   }
 }

+ 12 - 6
library/.assets-dependency.json

@@ -9,15 +9,9 @@
     "/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/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/materials/TextureColor.jpg"
-    ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/坦克动画/tank_gongji.fbx@7d6ab": [
       "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
     ],
@@ -110,6 +104,12 @@
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/enemy_weapon.fbx@05da8": [
       "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/TextureColor.jpg"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/shabao.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/materials/TextureColor.jpg"
     ]
   },
   "uuid": {
@@ -272,6 +272,12 @@
     ],
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/base_tietu.mtl": [
       "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/base_tietu-001.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
+    ],
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/wall_tietu.mtl": [
+      "f648964e-8d32-41fc-9ac9-7a1e714dd17b"
     ]
   }
 }

+ 63 - 20
library/.assets-info1.0.0.json

@@ -22,7 +22,7 @@
       "uuid": "44751037-356f-4957-a91f-e75716fa044f"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model": {
-      "time": 1748235117871.3528,
+      "time": 1748243759239.4934,
       "uuid": "4ccb7c4b-3a30-46f5-abbf-ac1948aa1f01"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs": {
@@ -94,7 +94,7 @@
       "uuid": "9e0d7066-6fc3-474c-8599-1b8521787db4"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/map": {
-      "time": 1748188753000,
+      "time": 1748242802412.8586,
       "uuid": "12b897ee-bc9f-4373-98c2-646c13eb80aa"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/page": {
@@ -110,7 +110,7 @@
       "uuid": "b9cf7892-c51d-4166-ae02-6aee66509edc"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/texture": {
-      "time": 1748230933316.6682,
+      "time": 1748240141329.6584,
       "uuid": "c46915dc-e39a-4d00-9d9f-79ab3bdd7a5c"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/ui": {
@@ -598,19 +598,19 @@
       "uuid": "581195db-d90e-470c-99b7-0626e8117758"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/items/player/Bullet1.ts": {
-      "time": 1748188753000,
+      "time": 1748243584734.0427,
       "uuid": "f3ea835b-ca23-477a-855b-59b3bce67ae6"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/items/player/Bullet2.ts": {
-      "time": 1748188753000,
+      "time": 1748243601997.2002,
       "uuid": "a110b018-9548-43a4-b17a-31bbc1797edd"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/items/player/Bullet3.ts": {
-      "time": 1748188753000,
+      "time": 1748243620710.6028,
       "uuid": "49ae7521-bf70-4283-ab0b-d5ad7ab55727"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/items/player/Bullet4.ts": {
-      "time": 1748188753000,
+      "time": 1748243655532.0286,
       "uuid": "5730fef7-bdb3-445d-9c14-d2e2c8fd7d6f"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/items/player/Gun1.ts": {
@@ -1167,15 +1167,15 @@
       "uuid": "339b909a-fbbe-405c-a832-9a878efd4990"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/scenePrb.scene": {
-      "time": 1748235359437.388,
+      "time": 1748243785720.735,
       "uuid": "b27497b3-42c4-4a2b-8bcf-8c0b7aac8559"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/shabao.fbx": {
-      "time": 1748188753000,
+      "time": 1748241653162.5107,
       "uuid": "0eb565d6-76ca-4395-9d4c-34fb10a057a3"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/yuansu.fbx": {
-      "time": 1748188753000,
+      "time": 1748243738110.6655,
       "uuid": "421760e1-1a4b-4f19-aa7f-4adb5f818580"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/renderTexture/modelRenderTexture.rt": {
@@ -1211,11 +1211,11 @@
       "uuid": "c5d812c3-b2b6-4c63-ad0a-0ea4015e5e7d"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/data/csv/levels.csv": {
-      "time": 1748231277620.5366,
+      "time": 1748243165087.083,
       "uuid": "91ef0149-a9b0-4517-8fc5-897b97ae5b39"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/data/csv/player.csv": {
-      "time": 1748188753000,
+      "time": 1748243416163.127,
       "uuid": "37af602f-ceeb-46f6-8251-cfce46b1d07a"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/data/csv/player_guns.csv": {
@@ -1495,7 +1495,7 @@
       "uuid": "c0ba5421-5e99-446b-bf0b-bf35ac80b4ae"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/texture/gun_icon.png": {
-      "time": 1748188753000,
+      "time": 1748240141329.859,
       "uuid": "54e3b324-9576-4968-aba1-6fc9ee3e3e43"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/texture/magazine_icon.png": {
@@ -2383,7 +2383,7 @@
       "time": 1748188753000
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/yuansu.fbx.meta": {
-      "time": 1748230388745.2427
+      "time": 1748243739041.6348
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/fbx/map/finish_point.fbx.meta": {
       "time": 1748188753000
@@ -2572,7 +2572,7 @@
       "time": 1748188753000
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/texture/gun_icon.png.meta": {
-      "time": 1748188753000
+      "time": 1748240141379.143
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/texture/magazine_icon.png.meta": {
       "time": 1748188753000
@@ -3267,7 +3267,7 @@
       "time": 1748188753000
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials": {
-      "time": 1748235172715.8003,
+      "time": 1748241391202.8987,
       "uuid": "76c03093-5108-4614-a01a-04af552b5da8"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/general_texture.mtl.meta": {
@@ -3316,7 +3316,7 @@
       "time": 1748188753000
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/map/map1.prefab": {
-      "time": 1748238986516.6455,
+      "time": 1748244542314.268,
       "uuid": "018a74cb-0fed-4096-af33-fef3cc3e4be0"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/game/GMap.ts.meta": {
@@ -3624,14 +3624,14 @@
       "time": 1748237577699.6372
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/prefabs/ui/failUI.prefab": {
-      "time": 1748238491689.349,
+      "time": 1748243682047.6987,
       "uuid": "ea775253-49d0-4ed3-b61d-b95637b22a14"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/ui/FailUI.ts.meta": {
       "time": 1748237596201.571
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/ui/FailUI.ts": {
-      "time": 1748238249263.283,
+      "time": 1748243677051.7615,
       "uuid": "1e3f5312-e15f-47ed-bf66-9ec089d252ee"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/ui/SuccessUI.ts.meta": {
@@ -3645,7 +3645,7 @@
       "time": 1748237769111.1858
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle": {
-      "time": 1748237805537.3376,
+      "time": 1748240654087.855,
       "uuid": "179c1cf9-b0da-4452-8153-6d210bfcce5b"
     },
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/BiaoTiKuang.png.meta": {
@@ -3675,6 +3675,34 @@
     "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/标注.png": {
       "time": 1748237805535.9097,
       "uuid": "5b0a99b9-19cf-46de-967d-a88f5d9f968c"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/WuQiJieSuoJinDuTiao.png.meta": {
+      "time": 1748240400618.2612
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/WuQiJieSuoJinDuTiao.png": {
+      "time": 1748240239774.156,
+      "uuid": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/WuQiJinDuTiao_Wai.png.meta": {
+      "time": 1748240742836.6484
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/textures/settle/WuQiJinDuTiao_Wai.png": {
+      "time": 1748240654086.6638,
+      "uuid": "1c0c9385-c43e-4d74-b464-71e04ae46b32"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/wall_td.png.meta": {
+      "time": 1748241379746.1597
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/wall_td.png": {
+      "time": 1748241379678.4878,
+      "uuid": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23"
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/wall_tietu.mtl.meta": {
+      "time": 1748241383929.3325
+    },
+    "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/wall_tietu.mtl": {
+      "time": 1748241399824.6035,
+      "uuid": "773a178a-91b0-4c04-81a6-a68cba19d818"
     }
   },
   "missing": {
@@ -4022,6 +4050,21 @@
       "path": "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/scripts/ui/successUI.ts",
       "time": 1748237691631.4707,
       "removeTime": 1748237705478
+    },
+    "773a178a-91b0-4c04-81a6-a68cba19d818": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/materials/base_tietu-001.mtl",
+      "time": 1748241383930.4514,
+      "removeTime": 1748241391203
+    },
+    "e24a6c06-8bda-46b2-934b-aabbd79de5f6": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/tashao.fbx",
+      "time": 1748241726382.4524,
+      "removeTime": 1748243755892
+    },
+    "96e6dd63-5bde-4621-831b-2a8b0e832ce9": {
+      "path": "/Users/wenshuang/Desktop/公司游戏/GunfightShoot/assets/model/qiang.fbx",
+      "time": 1748241275598.6553,
+      "removeTime": 1748243759240
     }
   }
 }

Fichier diff supprimé car celui-ci est trop grand
+ 140 - 132
library/01/018a74cb-0fed-4096-af33-fef3cc3e4be0.json


+ 8 - 0
library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32.json

@@ -0,0 +1,8 @@
+{
+  "__type__": "cc.ImageAsset",
+  "content": {
+    "fmt": "0",
+    "w": 0,
+    "h": 0
+  }
+}

BIN
library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32.png


+ 9 - 0
library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a.json

@@ -0,0 +1,9 @@
+{
+  "__type__": "cc.Texture2D",
+  "content": {
+    "base": "2,2,2,2,0,0",
+    "mipmaps": [
+      "1c0c9385-c43e-4d74-b464-71e04ae46b32"
+    ]
+  }
+}

+ 90 - 0
library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941.json

@@ -0,0 +1,90 @@
+{
+  "__type__": "cc.SpriteFrame",
+  "content": {
+    "name": "WuQiJinDuTiao_Wai",
+    "atlas": "",
+    "rect": {
+      "x": 0,
+      "y": 0,
+      "width": 140,
+      "height": 43
+    },
+    "offset": {
+      "x": 0,
+      "y": 0
+    },
+    "originalSize": {
+      "width": 140,
+      "height": 43
+    },
+    "rotated": false,
+    "capInsets": [
+      24,
+      12,
+      27,
+      13
+    ],
+    "vertices": {
+      "rawPosition": [
+        -70,
+        -21.5,
+        0,
+        70,
+        -21.5,
+        0,
+        -70,
+        21.5,
+        0,
+        70,
+        21.5,
+        0
+      ],
+      "indexes": [
+        0,
+        1,
+        2,
+        2,
+        1,
+        3
+      ],
+      "uv": [
+        0,
+        43,
+        140,
+        43,
+        0,
+        0,
+        140,
+        0
+      ],
+      "nuv": [
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        1,
+        1
+      ],
+      "minPos": {
+        "x": -70,
+        "y": -21.5,
+        "z": 0
+      },
+      "maxPos": {
+        "x": 70,
+        "y": 21.5,
+        "z": 0
+      }
+    },
+    "texture": "1c0c9385-c43e-4d74-b464-71e04ae46b32@6c48a",
+    "packable": true,
+    "pixelsToUnit": 100,
+    "pivot": {
+      "x": 0.5,
+      "y": 0.5
+    },
+    "meshType": 0
+  }
+}

BIN
library/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941_sprite_trim_.png


+ 8 - 0
library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23.json

@@ -0,0 +1,8 @@
+{
+  "__type__": "cc.ImageAsset",
+  "content": {
+    "fmt": "0",
+    "w": 0,
+    "h": 0
+  }
+}

BIN
library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23.png


+ 9 - 0
library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a.json

@@ -0,0 +1,9 @@
+{
+  "__type__": "cc.Texture2D",
+  "content": {
+    "base": "2,2,2,2,0,0",
+    "mipmaps": [
+      "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23"
+    ]
+  }
+}

+ 90 - 0
library/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@f9941.json

@@ -0,0 +1,90 @@
+{
+  "__type__": "cc.SpriteFrame",
+  "content": {
+    "name": "wall_td",
+    "atlas": "",
+    "rect": {
+      "x": 0,
+      "y": 0,
+      "width": 1024,
+      "height": 1024
+    },
+    "offset": {
+      "x": 0,
+      "y": 0
+    },
+    "originalSize": {
+      "width": 1024,
+      "height": 1024
+    },
+    "rotated": false,
+    "capInsets": [
+      0,
+      0,
+      0,
+      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": {
+        "x": -512,
+        "y": -512,
+        "z": 0
+      },
+      "maxPos": {
+        "x": 512,
+        "y": 512,
+        "z": 0
+      }
+    },
+    "texture": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@6c48a",
+    "packable": true,
+    "pixelsToUnit": 100,
+    "pivot": {
+      "x": 0.5,
+      "y": 0.5
+    },
+    "meshType": 0
+  }
+}

+ 1 - 1
library/37/37af602f-ceeb-46f6-8251-cfce46b1d07a.json

@@ -4,5 +4,5 @@
   "_objFlags": 0,
   "__editorExtras__": {},
   "_native": "",
-  "text": "ID,狙击枪瞄准镜开镜放大倍率,步枪瞄准后镜头放大倍率,游玩3到5次强制出现弹窗广告,关卡失败点击重新开始弹窗广告的概率,单位百分比,主页无广告功能解锁关卡,主页武器功能解锁关卡,玩家默认解锁武器(默认98k的id),爆头伤害系数,敌人刷新间隔区间,单位秒,爆头奖励,爆头数*参数,单位金币,玩家生命值,下一关按钮点击弹窗广告的概率,单位百分比\r\nnumber,number,number,string,number,number,number,string,number,string,number,number,number\r\nid,scopeZoom,rifleZoom,adForceShow,adFailRate,noAdUnlockLv,weaponUnlockLv,defaultWeapon,headshotDmgMul,enemySpawnIntv,headshotReward,hp,adforceShow2\r\n20001,5,1.5,3_5,30,5,3,100010,2,0.3_1.5,1001|20,100,25\r\n"
+  "text": "ID,狙击枪瞄准镜开镜放大倍率,步枪瞄准后镜头放大倍率,游玩3到5次强制出现弹窗广告,关卡失败点击重新开始弹窗广告的概率,单位百分比,主页无广告功能解锁关卡,主页武器功能解锁关卡,玩家默认解锁武器(默认98k的id),爆头伤害系数,敌人刷新间隔区间,单位秒,爆头奖励,爆头数*参数,单位金币,玩家生命值,下一关按钮点击弹窗广告的概率,单位百分比\r\nnumber,number,number,string,number,number,number,string,number,string,string,number,number\r\nid,scopeZoom,rifleZoom,adForceShow,adFailRate,noAdUnlockLv,weaponUnlockLv,defaultWeapon,headshotDmgMul,enemySpawnIntv,headshotReward,hp,adforceShow2\r\n20001,5,1.5,3_5,25,5,3,100010,2,0.3_1.5,1001_20,100,25\r\n"
 }

+ 0 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae.json

@@ -1 +0,0 @@
-{"__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},{},{},{}]}

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@305a7.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@305a7.json

@@ -64,6 +64,6 @@
       "z": 0.010461485013365746
     }
   },
-  "_hash": 181655879,
+  "_hash": 2910026228,
   "_allowDataAccess": true
 }

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@4af7f.json

@@ -64,6 +64,6 @@
       "z": 0.02362794801592827
     }
   },
-  "_hash": 3181953663,
+  "_hash": 876698759,
   "_allowDataAccess": true
 }

+ 52 - 0
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e.json

@@ -0,0 +1,52 @@
+{
+  "__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,
+      "HAS_EXPORTED_METALLIC": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      },
+      "depthStencilState": {}
+    }
+  ],
+  "_props": [
+    {
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "shininessExponent": 25,
+      "emissiveScale": 0,
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "metallic": 0,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    }
+  ]
+}

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@750ed.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@750ed.json

@@ -64,6 +64,6 @@
       "z": 0.010461485013365746
     }
   },
-  "_hash": 3272184262,
+  "_hash": 1592039482,
   "_allowDataAccess": true
 }

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@930f6.json

@@ -64,6 +64,6 @@
       "z": 0.028671368956565857
     }
   },
-  "_hash": 3451354073,
+  "_hash": 4106359780,
   "_allowDataAccess": true
 }

+ 52 - 0
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0.json

@@ -0,0 +1,52 @@
+{
+  "__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,
+      "HAS_EXPORTED_METALLIC": true
+    }
+  ],
+  "_states": [
+    {
+      "rasterizerState": {},
+      "blendState": {
+        "targets": [
+          {}
+        ]
+      },
+      "depthStencilState": {}
+    }
+  ],
+  "_props": [
+    {
+      "mainColor": {
+        "__type__": "cc.Color",
+        "r": 231,
+        "g": 231,
+        "b": 231,
+        "a": 255
+      },
+      "shininessExponent": 1.6454102781896296,
+      "emissiveScale": 0,
+      "emissive": {
+        "__type__": "cc.Color",
+        "r": 255,
+        "g": 255,
+        "b": 255,
+        "a": 255
+      },
+      "metallic": 0,
+      "specularFactor": 0.25,
+      "transparencyFactor": 0
+    }
+  ]
+}

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.bin


+ 11 - 11
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.json

@@ -12,9 +12,9 @@
           0
         ],
         "indexView": {
-          "offset": 235872,
-          "length": 15924,
-          "count": 7962,
+          "offset": 136248,
+          "length": 9648,
+          "count": 4824,
           "stride": 2
         }
       }
@@ -23,8 +23,8 @@
       {
         "view": {
           "offset": 0,
-          "length": 235872,
-          "count": 4212,
+          "length": 136248,
+          "count": 2433,
           "stride": 56
         },
         "attributes": [
@@ -58,17 +58,17 @@
     ],
     "minPosition": {
       "__type__": "cc.Vec3",
-      "x": -0.009653130546212196,
-      "y": -0.009388154372572899,
+      "x": -0.008699547499418259,
+      "y": -0.008917354047298431,
       "z": -0.000079457757237833
     },
     "maxPosition": {
       "__type__": "cc.Vec3",
-      "x": 0.008380554616451263,
-      "y": 0.008050738833844662,
-      "z": 0.047519341111183167
+      "x": 0.007756768260151148,
+      "y": 0.007765063084661961,
+      "z": 0.03853146731853485
     }
   },
-  "_hash": 3871919594,
+  "_hash": 2687539293,
   "_allowDataAccess": true
 }

+ 0 - 0
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844.json → library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260.json


+ 24 - 24
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d6409.json

@@ -446,7 +446,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@3192d",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -567,7 +567,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -688,7 +688,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -809,7 +809,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -930,7 +930,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1051,7 +1051,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1228,7 +1228,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1405,7 +1405,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@1d5ae",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@66e3e",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1526,7 +1526,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1647,7 +1647,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1768,7 +1768,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -1889,7 +1889,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2010,7 +2010,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2131,7 +2131,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2373,7 +2373,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2494,7 +2494,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2615,7 +2615,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@a6ea0",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2736,7 +2736,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2857,7 +2857,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -2978,7 +2978,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -3099,7 +3099,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -3220,7 +3220,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -3397,7 +3397,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],
@@ -3518,7 +3518,7 @@
     },
     "_materials": [
       {
-        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@6b844",
+        "__uuid__": "421760e1-1a4b-4f19-aa7f-4adb5f818580@d3260",
         "__expectedType__": "cc.Material"
       }
     ],

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d8ac4.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@d8ac4.json

@@ -64,6 +64,6 @@
       "z": 0.008864437229931355
     }
   },
-  "_hash": 2368606084,
+  "_hash": 396971165,
   "_allowDataAccess": true
 }

BIN
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7.bin


+ 1 - 1
library/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@e0cd7.json

@@ -64,6 +64,6 @@
       "z": 0.015372722409665585
     }
   },
-  "_hash": 2090865417,
+  "_hash": 3926705266,
   "_allowDataAccess": true
 }

BIN
library/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43.png


+ 28 - 28
library/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43@f9941.json

@@ -4,18 +4,18 @@
     "name": "gun_icon",
     "atlas": "",
     "rect": {
-      "x": 3,
+      "x": 0,
       "y": 0,
-      "width": 129,
-      "height": 65
+      "width": 371,
+      "height": 169
     },
     "offset": {
-      "x": 1.5,
-      "y": 0
+      "x": 0,
+      "y": 0.5
     },
     "originalSize": {
-      "width": 132,
-      "height": 65
+      "width": 371,
+      "height": 170
     },
     "rotated": false,
     "capInsets": [
@@ -26,17 +26,17 @@
     ],
     "vertices": {
       "rawPosition": [
-        -64.5,
-        -32.5,
+        -185.5,
+        -84.5,
         0,
-        64.5,
-        -32.5,
+        185.5,
+        -84.5,
         0,
-        -64.5,
-        32.5,
+        -185.5,
+        84.5,
         0,
-        64.5,
-        32.5,
+        185.5,
+        84.5,
         0
       ],
       "indexes": [
@@ -48,33 +48,33 @@
         3
       ],
       "uv": [
-        3,
-        65,
-        132,
-        65,
-        3,
         0,
-        132,
-        0
+        170,
+        371,
+        170,
+        0,
+        1,
+        371,
+        1
       ],
       "nuv": [
-        0.022727272727272728,
         0,
+        0.0058823529411764705,
         1,
+        0.0058823529411764705,
         0,
-        0.022727272727272728,
         1,
         1,
         1
       ],
       "minPos": {
-        "x": -64.5,
-        "y": -32.5,
+        "x": -185.5,
+        "y": -84.5,
         "z": 0
       },
       "maxPos": {
-        "x": 64.5,
-        "y": 32.5,
+        "x": 185.5,
+        "y": 84.5,
         "z": 0
       }
     },

+ 89 - 0
library/77/773a178a-91b0-4c04-81a6-a68cba19d818.json

@@ -0,0 +1,89 @@
+{
+  "__type__": "cc.Material",
+  "_name": "wall_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__": "1f5ce94b-a6ec-4919-a022-4f7b0abbaa23@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
+    },
+    {},
+    {},
+    {}
+  ]
+}

+ 8 - 0
library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f.json

@@ -0,0 +1,8 @@
+{
+  "__type__": "cc.ImageAsset",
+  "content": {
+    "fmt": "0",
+    "w": 0,
+    "h": 0
+  }
+}

BIN
library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f.png


+ 9 - 0
library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a.json

@@ -0,0 +1,9 @@
+{
+  "__type__": "cc.Texture2D",
+  "content": {
+    "base": "2,2,2,2,0,0",
+    "mipmaps": [
+      "99ad366e-3bd8-4dfa-a192-bd9756b1f91f"
+    ]
+  }
+}

+ 90 - 0
library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941.json

@@ -0,0 +1,90 @@
+{
+  "__type__": "cc.SpriteFrame",
+  "content": {
+    "name": "WuQiJieSuoJinDuTiao",
+    "atlas": "",
+    "rect": {
+      "x": 0,
+      "y": 0,
+      "width": 140,
+      "height": 43
+    },
+    "offset": {
+      "x": 0,
+      "y": 0
+    },
+    "originalSize": {
+      "width": 140,
+      "height": 43
+    },
+    "rotated": false,
+    "capInsets": [
+      22,
+      12,
+      28,
+      12
+    ],
+    "vertices": {
+      "rawPosition": [
+        -70,
+        -21.5,
+        0,
+        70,
+        -21.5,
+        0,
+        -70,
+        21.5,
+        0,
+        70,
+        21.5,
+        0
+      ],
+      "indexes": [
+        0,
+        1,
+        2,
+        2,
+        1,
+        3
+      ],
+      "uv": [
+        0,
+        43,
+        140,
+        43,
+        0,
+        0,
+        140,
+        0
+      ],
+      "nuv": [
+        0,
+        0,
+        1,
+        0,
+        0,
+        1,
+        1,
+        1
+      ],
+      "minPos": {
+        "x": -70,
+        "y": -21.5,
+        "z": 0
+      },
+      "maxPos": {
+        "x": 70,
+        "y": 21.5,
+        "z": 0
+      }
+    },
+    "texture": "99ad366e-3bd8-4dfa-a192-bd9756b1f91f@6c48a",
+    "packable": true,
+    "pixelsToUnit": 100,
+    "pivot": {
+      "x": 0.5,
+      "y": 0.5
+    },
+    "meshType": 0
+  }
+}

BIN
library/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941_sprite_trim_.png


Fichier diff supprimé car celui-ci est trop grand
+ 146 - 127
library/b2/b27497b3-42c4-4a2b-8bcf-8c0b7aac8559.json


Fichier diff supprimé car celui-ci est trop grand
+ 2930 - 259
library/ea/ea775253-49d0-4ed3-b61d-b95637b22a14.json


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0360f/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0360f.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@07d75/thumbnail-small.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0c074/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0c074.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0f76c/0eb565d6-76ca-4395-9d4c-34fb10a057a3@0f76c.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@26657/0eb565d6-76ca-4395-9d4c-34fb10a057a3@26657.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@39a7f/0eb565d6-76ca-4395-9d4c-34fb10a057a3@39a7f.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@4e0b5/0eb565d6-76ca-4395-9d4c-34fb10a057a3@4e0b5.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@5b587/thumbnail-small.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@69dc9/0eb565d6-76ca-4395-9d4c-34fb10a057a3@69dc9.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@769bf/0eb565d6-76ca-4395-9d4c-34fb10a057a3@769bf.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@7d6ab/thumbnail-small.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@81124/0eb565d6-76ca-4395-9d4c-34fb10a057a3@81124.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@95362/0eb565d6-76ca-4395-9d4c-34fb10a057a3@95362.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@c85de/0eb565d6-76ca-4395-9d4c-34fb10a057a3@c85de.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@e6af8/thumbnail-small.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fa0d6/thumbnail-small.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d.png


BIN
temp/asset-db/assets/0e/0eb565d6-76ca-4395-9d4c-34fb10a057a3@fe48d/thumbnail-small.png


BIN
temp/asset-db/assets/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32/thumbnail-small.png


BIN
temp/asset-db/assets/1c/1c0c9385-c43e-4d74-b464-71e04ae46b32@f9941/thumbnail-small.png


BIN
temp/asset-db/assets/1f/1f5ce94b-a6ec-4919-a022-4f7b0abbaa23/thumbnail-small.png


BIN
temp/asset-db/assets/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17.png


BIN
temp/asset-db/assets/42/421760e1-1a4b-4f19-aa7f-4adb5f818580@c4f17/thumbnail-small.png


BIN
temp/asset-db/assets/54/54e3b324-9576-4968-aba1-6fc9ee3e3e43/thumbnail-small.png


BIN
temp/asset-db/assets/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f/thumbnail-small.png


BIN
temp/asset-db/assets/99/99ad366e-3bd8-4dfa-a192-bd9756b1f91f@f9941/thumbnail-small.png


+ 4 - 4
temp/asset-db/assets/fbx.FBX-glTF-conv/0eb565d6-76ca-4395-9d4c-34fb10a057a3/status.json

@@ -1,10 +1,10 @@
 {
   "version": "2.3.13",
-  "sourceTimeStamp": 1748188753000,
+  "sourceTimeStamp": 1748241653162.5107,
   "outputTimeStamps": {
-    "out.bin": 1748230387167.9353,
-    "log.json": 1748230387172.5803,
-    "out.gltf": 1748230387172.0078
+    "log.json": 1748241653280.6006,
+    "out.bin": 1748241653276.4395,
+    "out.gltf": 1748241653279.9998
   },
   "options": {
     "smartMaterialEnabled": true,

BIN
temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/output/out.bin


+ 198 - 85
temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/output/out.gltf

@@ -123,15 +123,15 @@
     {
       "bufferView": 6,
       "componentType": 5126,
-      "count": 4212,
+      "count": 2433,
       "max": [
-        0.008380554616451263,
-        0.008050738833844662,
-        0.047519341111183167
+        0.007756768260151148,
+        0.007765063084661961,
+        0.03853146731853485
       ],
       "min": [
-        -0.009653130546212196,
-        -0.009388154372572899,
+        -0.008699547499418259,
+        -0.008917354047298431,
         -7.9457757237833e-05
       ],
       "name": "网格.022/POSITION",
@@ -141,7 +141,7 @@
       "bufferView": 6,
       "byteOffset": 12,
       "componentType": 5126,
-      "count": 4212,
+      "count": 2433,
       "name": "网格.022/NORMAL",
       "type": "VEC3"
     },
@@ -149,7 +149,7 @@
       "bufferView": 6,
       "byteOffset": 24,
       "componentType": 5126,
-      "count": 4212,
+      "count": 2433,
       "name": "网格.022/TEXCOORD_0",
       "type": "VEC2"
     },
@@ -157,14 +157,14 @@
       "bufferView": 6,
       "byteOffset": 32,
       "componentType": 5126,
-      "count": 4212,
+      "count": 2433,
       "name": "网格.022/TEXCOORD_1",
       "type": "VEC2"
     },
     {
       "bufferView": 7,
       "componentType": 5123,
-      "count": 7962,
+      "count": 4824,
       "name": "网格.022/INDICES",
       "type": "SCALAR"
     },
@@ -1146,7 +1146,7 @@
     },
     {
       "buffer": 0,
-      "byteLength": 168480,
+      "byteLength": 97320,
       "byteOffset": 116528,
       "byteStride": 40,
       "name": "网格.022",
@@ -1154,14 +1154,14 @@
     },
     {
       "buffer": 0,
-      "byteLength": 15924,
-      "byteOffset": 285008,
+      "byteLength": 9648,
+      "byteOffset": 213848,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 9792,
-      "byteOffset": 300932,
+      "byteOffset": 223496,
       "byteStride": 32,
       "name": "网格.024",
       "target": 34962
@@ -1169,13 +1169,13 @@
     {
       "buffer": 0,
       "byteLength": 1152,
-      "byteOffset": 310724,
+      "byteOffset": 233288,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 55200,
-      "byteOffset": 311876,
+      "byteOffset": 234440,
       "byteStride": 32,
       "name": "网格.032",
       "target": 34962
@@ -1183,13 +1183,13 @@
     {
       "buffer": 0,
       "byteLength": 5856,
-      "byteOffset": 367076,
+      "byteOffset": 289640,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 125024,
-      "byteOffset": 372932,
+      "byteOffset": 295496,
       "byteStride": 32,
       "name": "building8",
       "target": 34962
@@ -1197,13 +1197,13 @@
     {
       "buffer": 0,
       "byteLength": 19728,
-      "byteOffset": 497956,
+      "byteOffset": 420520,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 114400,
-      "byteOffset": 517684,
+      "byteOffset": 440248,
       "byteStride": 32,
       "name": "building7",
       "target": 34962
@@ -1211,13 +1211,13 @@
     {
       "buffer": 0,
       "byteLength": 13260,
-      "byteOffset": 632084,
+      "byteOffset": 554648,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 951104,
-      "byteOffset": 645344,
+      "byteOffset": 567908,
       "byteStride": 32,
       "name": "网格.112",
       "target": 34962
@@ -1225,13 +1225,13 @@
     {
       "buffer": 0,
       "byteLength": 144144,
-      "byteOffset": 1596448,
+      "byteOffset": 1519012,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 2048,
-      "byteOffset": 1740592,
+      "byteOffset": 1663156,
       "byteStride": 32,
       "name": "平面",
       "target": 34962
@@ -1239,13 +1239,13 @@
     {
       "buffer": 0,
       "byteLength": 588,
-      "byteOffset": 1742640,
+      "byteOffset": 1665204,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12096,
-      "byteOffset": 1743228,
+      "byteOffset": 1665792,
       "byteStride": 32,
       "name": "柱体.003",
       "target": 34962
@@ -1253,13 +1253,13 @@
     {
       "buffer": 0,
       "byteLength": 2088,
-      "byteOffset": 1755324,
+      "byteOffset": 1677888,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 105240,
-      "byteOffset": 1757412,
+      "byteOffset": 1679976,
       "byteStride": 40,
       "name": "building10",
       "target": 34962
@@ -1267,13 +1267,13 @@
     {
       "buffer": 0,
       "byteLength": 12750,
-      "byteOffset": 1862652,
+      "byteOffset": 1785216,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 6816,
-      "byteOffset": 1875402,
+      "byteOffset": 1797966,
       "byteStride": 32,
       "name": "Cube.019",
       "target": 34962
@@ -1281,13 +1281,13 @@
     {
       "buffer": 0,
       "byteLength": 996,
-      "byteOffset": 1882218,
+      "byteOffset": 1804782,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 2144,
-      "byteOffset": 1883214,
+      "byteOffset": 1805778,
       "byteStride": 32,
       "name": "Cube.020",
       "target": 34962
@@ -1295,13 +1295,13 @@
     {
       "buffer": 0,
       "byteLength": 300,
-      "byteOffset": 1885358,
+      "byteOffset": 1807922,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 2400,
-      "byteOffset": 1885658,
+      "byteOffset": 1808222,
       "byteStride": 32,
       "name": "Cube.023",
       "target": 34962
@@ -1309,13 +1309,13 @@
     {
       "buffer": 0,
       "byteLength": 336,
-      "byteOffset": 1888058,
+      "byteOffset": 1810622,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 18240,
-      "byteOffset": 1888394,
+      "byteOffset": 1810958,
       "byteStride": 32,
       "name": "conifer5_Cylinder.004",
       "target": 34962
@@ -1323,13 +1323,13 @@
     {
       "buffer": 0,
       "byteLength": 1644,
-      "byteOffset": 1906634,
+      "byteOffset": 1829198,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 58272,
-      "byteOffset": 1908278,
+      "byteOffset": 1830842,
       "byteStride": 32,
       "name": "网格.038",
       "target": 34962
@@ -1337,13 +1337,13 @@
     {
       "buffer": 0,
       "byteLength": 17556,
-      "byteOffset": 1966550,
+      "byteOffset": 1889114,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12352,
-      "byteOffset": 1984106,
+      "byteOffset": 1906670,
       "byteStride": 32,
       "name": "网格.039",
       "target": 34962
@@ -1351,13 +1351,13 @@
     {
       "buffer": 0,
       "byteLength": 1872,
-      "byteOffset": 1996458,
+      "byteOffset": 1919022,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12352,
-      "byteOffset": 1998330,
+      "byteOffset": 1920894,
       "byteStride": 32,
       "name": "网格.040",
       "target": 34962
@@ -1365,13 +1365,13 @@
     {
       "buffer": 0,
       "byteLength": 1872,
-      "byteOffset": 2010682,
+      "byteOffset": 1933246,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12352,
-      "byteOffset": 2012554,
+      "byteOffset": 1935118,
       "byteStride": 32,
       "name": "网格.041",
       "target": 34962
@@ -1379,13 +1379,13 @@
     {
       "buffer": 0,
       "byteLength": 1872,
-      "byteOffset": 2024906,
+      "byteOffset": 1947470,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 4512,
-      "byteOffset": 2026778,
+      "byteOffset": 1949342,
       "byteStride": 32,
       "name": "立方体.003",
       "target": 34962
@@ -1393,13 +1393,13 @@
     {
       "buffer": 0,
       "byteLength": 1056,
-      "byteOffset": 2031290,
+      "byteOffset": 1953854,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 39232,
-      "byteOffset": 2032346,
+      "byteOffset": 1954910,
       "byteStride": 32,
       "name": "Cube.016",
       "target": 34962
@@ -1407,13 +1407,13 @@
     {
       "buffer": 0,
       "byteLength": 4176,
-      "byteOffset": 2071578,
+      "byteOffset": 1994142,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 97760,
-      "byteOffset": 2075754,
+      "byteOffset": 1998318,
       "byteStride": 32,
       "name": "Plane.001",
       "target": 34962
@@ -1421,13 +1421,13 @@
     {
       "buffer": 0,
       "byteLength": 6144,
-      "byteOffset": 2173514,
+      "byteOffset": 2096078,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 66656,
-      "byteOffset": 2179658,
+      "byteOffset": 2102222,
       "byteStride": 32,
       "name": "Plane",
       "target": 34962
@@ -1435,13 +1435,13 @@
     {
       "buffer": 0,
       "byteLength": 6144,
-      "byteOffset": 2246314,
+      "byteOffset": 2168878,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12096,
-      "byteOffset": 2252458,
+      "byteOffset": 2175022,
       "byteStride": 32,
       "name": "Cylinder.007",
       "target": 34962
@@ -1449,13 +1449,13 @@
     {
       "buffer": 0,
       "byteLength": 2064,
-      "byteOffset": 2264554,
+      "byteOffset": 2187118,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 12096,
-      "byteOffset": 2266618,
+      "byteOffset": 2189182,
       "byteStride": 32,
       "name": "Cylinder.003",
       "target": 34962
@@ -1463,13 +1463,13 @@
     {
       "buffer": 0,
       "byteLength": 2064,
-      "byteOffset": 2278714,
+      "byteOffset": 2201278,
       "target": 34963
     },
     {
       "buffer": 0,
       "byteLength": 33152,
-      "byteOffset": 2280778,
+      "byteOffset": 2203342,
       "byteStride": 32,
       "name": "Cube.001",
       "target": 34962
@@ -1477,13 +1477,13 @@
     {
       "buffer": 0,
       "byteLength": 4050,
-      "byteOffset": 2313930,
+      "byteOffset": 2236494,
       "target": 34963
     }
   ],
   "buffers": [
     {
-      "byteLength": 2317980,
+      "byteLength": 2240544,
       "uri": "out.bin"
     }
   ],
@@ -1492,12 +1492,12 @@
       "animationFrameRate": 24.0,
       "fbxFileHeaderInfo": {
         "creationTimeStamp": {
-          "day": 22,
+          "day": 26,
           "hour": 15,
-          "millisecond": 715,
-          "minute": 46,
+          "millisecond": 888,
+          "minute": 3,
           "month": 5,
-          "second": 15,
+          "second": 34,
           "year": 2025
         },
         "creator": "Blender (stable FBX IO) - 4.0.2 - 5.8.13",
@@ -1533,8 +1533,8 @@
     {
       "extras": {
         "FBX-glTF-conv": {
-          "fileName": "E:\\A公司文件\\游戏项目\\保卫基地\\1.png",
-          "relativeFileName": "E:\\A公司文件\\游戏项目\\保卫基地\\1.png"
+          "fileName": "E:\\A公司文件\\游戏项目\\保卫基地\\dimian4.png",
+          "relativeFileName": "E:\\A公司文件\\游戏项目\\保卫基地\\dimian4.png"
         }
       },
       "name": "base_color_texture",
@@ -1658,6 +1658,119 @@
       },
       "name": "caizhi"
     },
+    {
+      "extras": {
+        "FBX-glTF-conv": {
+          "raw": {
+            "properties": {
+              "ambient": {
+                "value": [
+                  0.05087608844041824,
+                  0.05087608844041824,
+                  0.05087608844041824
+                ]
+              },
+              "ambientFactor": {
+                "value": 0.0
+              },
+              "bump": {
+                "value": [
+                  0.0,
+                  0.0,
+                  0.0
+                ]
+              },
+              "bumpFactor": {
+                "value": 0.0
+              },
+              "diffuse": {
+                "value": [
+                  0.800000011920929,
+                  0.800000011920929,
+                  0.800000011920929
+                ]
+              },
+              "diffuseFactor": {
+                "value": 1.0
+              },
+              "displacementColor": {
+                "value": [
+                  0.0,
+                  0.0,
+                  0.0
+                ]
+              },
+              "displacementFactor": {
+                "value": 1.0
+              },
+              "emissive": {
+                "value": [
+                  1.0,
+                  1.0,
+                  1.0
+                ]
+              },
+              "emissiveFactor": {
+                "value": 0.0
+              },
+              "normalMap": {
+                "value": [
+                  0.0,
+                  0.0,
+                  0.0
+                ]
+              },
+              "reflection": {
+                "value": [
+                  0.800000011920929,
+                  0.800000011920929,
+                  0.800000011920929
+                ]
+              },
+              "reflectionFactor": {
+                "value": 0.0
+              },
+              "shadingModel": "Phong",
+              "shininess": {
+                "value": 1.6454102781896296
+              },
+              "specular": {
+                "value": [
+                  0.800000011920929,
+                  0.800000011920929,
+                  0.800000011920929
+                ]
+              },
+              "specularFactor": {
+                "value": 0.25
+              },
+              "transparencyFactor": {
+                "value": 0.0
+              },
+              "transparentColor": {
+                "value": [
+                  0.0,
+                  0.0,
+                  0.0
+                ]
+              },
+              "vectorDisplacementColor": {
+                "value": [
+                  0.0,
+                  0.0,
+                  0.0
+                ]
+              },
+              "vectorDisplacementFactor": {
+                "value": 1.0
+              }
+            },
+            "type": "phong"
+          }
+        }
+      },
+      "name": "墙面"
+    },
     {
       "extras": {
         "FBX-glTF-conv": {
@@ -1930,7 +2043,7 @@
             "TEXCOORD_0": 10
           },
           "indices": 11,
-          "material": 0
+          "material": 1
         }
       ]
     },
@@ -1945,7 +2058,7 @@
             "TEXCOORD_1": 15
           },
           "indices": 16,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -1973,7 +2086,7 @@
             "TEXCOORD_0": 23
           },
           "indices": 24,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -1987,7 +2100,7 @@
             "TEXCOORD_0": 27
           },
           "indices": 28,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2001,7 +2114,7 @@
             "TEXCOORD_0": 31
           },
           "indices": 32,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2029,7 +2142,7 @@
             "TEXCOORD_0": 39
           },
           "indices": 40,
-          "material": 2
+          "material": 3
         }
       ]
     },
@@ -2043,7 +2156,7 @@
             "TEXCOORD_0": 43
           },
           "indices": 44,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2058,7 +2171,7 @@
             "TEXCOORD_1": 48
           },
           "indices": 49,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2072,7 +2185,7 @@
             "TEXCOORD_0": 52
           },
           "indices": 53,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2086,7 +2199,7 @@
             "TEXCOORD_0": 56
           },
           "indices": 57,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2100,7 +2213,7 @@
             "TEXCOORD_0": 60
           },
           "indices": 61,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2114,7 +2227,7 @@
             "TEXCOORD_0": 64
           },
           "indices": 65,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2184,7 +2297,7 @@
             "TEXCOORD_0": 84
           },
           "indices": 85,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2198,7 +2311,7 @@
             "TEXCOORD_0": 88
           },
           "indices": 89,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2212,7 +2325,7 @@
             "TEXCOORD_0": 92
           },
           "indices": 93,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2226,7 +2339,7 @@
             "TEXCOORD_0": 96
           },
           "indices": 97,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2240,7 +2353,7 @@
             "TEXCOORD_0": 100
           },
           "indices": 101,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2254,7 +2367,7 @@
             "TEXCOORD_0": 104
           },
           "indices": 105,
-          "material": 1
+          "material": 2
         }
       ]
     },
@@ -2268,7 +2381,7 @@
             "TEXCOORD_0": 108
           },
           "indices": 109,
-          "material": 1
+          "material": 2
         }
       ]
     }

+ 4 - 4
temp/asset-db/assets/fbx.FBX-glTF-conv/421760e1-1a4b-4f19-aa7f-4adb5f818580/status.json

@@ -1,10 +1,10 @@
 {
   "version": "2.3.13",
-  "sourceTimeStamp": 1748188753000,
+  "sourceTimeStamp": 1748243738110.6655,
   "outputTimeStamps": {
-    "log.json": 1748230388233.877,
-    "out.bin": 1748230388222.6929,
-    "out.gltf": 1748230388232.608
+    "log.json": 1748243738616.9087,
+    "out.bin": 1748243738609.089,
+    "out.gltf": 1748243738616.2615
   },
   "options": {
     "smartMaterialEnabled": true,

+ 6 - 0
temp/asset-db/assets/fbx.FBX-glTF-conv/96e6dd63-5bde-4621-831b-2a8b0e832ce9/output/log.json

@@ -0,0 +1,6 @@
+[
+  {
+    "level": 0,
+    "message": "Frame rate: 24"
+  }
+]

BIN
temp/asset-db/assets/fbx.FBX-glTF-conv/96e6dd63-5bde-4621-831b-2a8b0e832ce9/output/out.bin


Certains fichiers n'ont pas été affichés car il y a eu trop de fichiers modifiés dans ce diff