1

1

assets/model/all soldier.fbx.meta

@@ -57,7 +57,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -142,7 +146,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/enemy_weapon.fbx.meta

@@ -233,7 +233,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -256,7 +260,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -302,11 +310,19 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
       },
       {
         "name": "base_color_texture",
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+      },
+      {
+        "name": "base_color_texture",
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/m24_98k_fix.fbx.meta

@@ -55,7 +55,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -101,7 +105,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/player_die.fbx.meta

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/player_huandan.fbx.meta

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/player_idle.fbx.meta

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/player_weapon.fbx.meta

@@ -179,7 +179,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -209,7 +213,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/shabao.fbx.meta

@@ -332,7 +332,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -378,7 +382,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/yuansu.fbx.meta

@@ -525,7 +525,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -626,7 +630,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/skybox/Texture/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/坦克动画/tank.fbx.meta

@@ -102,6 +102,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "48b02": {
       "importer": "gltf-embeded-image",
       "uuid": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02",
@@ -122,6 +123,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "7d6ab": {
       "importer": "texture",
       "uuid": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@7d6ab",
@@ -135,8 +138,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -198,7 +206,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "cfc5204f-3f2f-46cb-8cbf-f31e3df63e25@48b02"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/士兵动画/1_die.fbx.meta

@@ -65,6 +65,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "48b02": {
       "importer": "gltf-embeded-image",
       "uuid": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02",
@@ -85,6 +86,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "7d6ab": {
       "importer": "texture",
       "uuid": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@7d6ab",
@@ -98,8 +101,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +153,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "4a56f53b-2c9a-4bf9-879e-ca4ede82a4f4@48b02"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/士兵动画/1_run.fbx.meta

@@ -65,6 +65,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "48b02": {
       "importer": "gltf-embeded-image",
       "uuid": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02",
@@ -85,6 +86,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "7d6ab": {
       "importer": "texture",
       "uuid": "939c54f0-d721-4dc6-aa3c-715a7b30c615@7d6ab",
@@ -98,8 +101,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +153,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "939c54f0-d721-4dc6-aa3c-715a7b30c615@48b02"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/士兵动画/1_shoot.fbx.meta

@@ -65,6 +65,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "48b02": {
       "importer": "gltf-embeded-image",
       "uuid": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02",
@@ -85,6 +86,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "7d6ab": {
       "importer": "texture",
       "uuid": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@7d6ab",
@@ -98,8 +101,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +153,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "d384a614-aaf9-4e90-8bf2-b08f3d66dd62@48b02"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

assets/model/士兵动画/1_walk.fbx.meta

@@ -65,6 +65,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "48b02": {
       "importer": "gltf-embeded-image",
       "uuid": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02",
@@ -85,6 +86,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "7d6ab": {
       "importer": "texture",
       "uuid": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@7d6ab",
@@ -98,8 +101,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -145,7 +153,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "b6ebbf25-f21b-4d8b-87f5-a7bbc1a3fd5d@48b02"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       }
     ],
     "fbx": {

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -152,7 +156,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -115,7 +115,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

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

@@ -99,7 +99,11 @@
         "mipfilter": "none",
         "anisotropy": 0,
         "isUuid": false,
+<<<<<<< HEAD
         "imageUuidOrDatabaseUri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -184,7 +188,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "db://assets/model/士兵动画/materials/TextureColor.jpg"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/5_die.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "b83bd60e-6b60-4cdb-b9e5-0abf1201f6e5@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/5_run.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "5720177b-c452-4582-9d4e-cd8df46c9002@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "5720177b-c452-4582-9d4e-cd8df46c9002@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/5_shoot.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "9545a762-eb79-469c-b9d1-c4f979c9d18d@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "9545a762-eb79-469c-b9d1-c4f979c9d18d@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/5_walk.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "f6db1fe2-f996-483f-b30e-61b9d8ad028f@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/6_die.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "443f175e-e78a-4372-833e-50831dd7a84f@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "443f175e-e78a-4372-833e-50831dd7a84f@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/6_run.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "a4e875b6-8345-4870-ab5a-cc074210a617@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "a4e875b6-8345-4870-ab5a-cc074210a617@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/6_shoot.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "875d95cc-3a76-4998-8daf-f9e52dff3cf0@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

assets/model/士兵动画/6_walk.fbx.meta

@@ -81,6 +81,7 @@
       ],
       "subMetas": {}
     },
+<<<<<<< HEAD
     "5e49e": {
       "importer": "gltf-embeded-image",
       "uuid": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e",
@@ -101,6 +102,8 @@
       ],
       "subMetas": {}
     },
+=======
+>>>>>>> 17741a0 (1)
     "ef396": {
       "importer": "gltf-embeded-image",
       "uuid": "99ce5da9-0b8f-496d-b194-5302747d9083@ef396",
@@ -134,8 +137,13 @@
         "magfilter": "linear",
         "mipfilter": "none",
         "anisotropy": 0,
+<<<<<<< HEAD
         "isUuid": true,
         "imageUuidOrDatabaseUri": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e"
+=======
+        "isUuid": false,
+        "imageUuidOrDatabaseUri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       "ver": "1.0.22",
       "imported": true,
@@ -204,7 +212,11 @@
     "imageMetas": [
       {
         "name": "base_color_texture",
+<<<<<<< HEAD
         "uri": "99ce5da9-0b8f-496d-b194-5302747d9083@5e49e"
+=======
+        "uri": "db://assets/model/materials/TextureColor.jpg"
+>>>>>>> 17741a0 (1)
       },
       {
         "name": "base_color_texture",

profiles/v2/packages/scene.json

@@ -1291,9 +1291,15 @@
     },
     "10795865-5525-41fc-8bf7-0e8d6983b214": {
       "position": {
+<<<<<<< HEAD
         "x": 271.69626631053734,
         "y": 807.5917237108588,
         "z": 5918.515902477645
+=======
+        "x": 647,
+        "y": 475,
+        "z": 5000
+>>>>>>> 17741a0 (1)
       },
       "rotation": {
         "x": 0,