2 Commits bcccf9faf6 ... 41f4c82910

Author SHA1 Message Date
  xiejing 41f4c82910 Merge branch 'master' of http://120.92.132.192:23541/StarRacing10005/StarRacingClient 4 years ago
  xiejing 1d323c499b 1111 4 years ago

+ 2 - 2
assets/res/mainPackage/scenes/Fighting.fire

@@ -171,7 +171,7 @@
       "array": [
         0,
         0,
-        365.46272039703314,
+        428.67487583280007,
         0,
         0,
         0,
@@ -456,7 +456,7 @@
       "array": [
         0,
         0,
-        10,
+        -10,
         0,
         0,
         0,

BIN
assets/res/polygons/polygon001/Tunnel_101.png


+ 3 - 3
assets/res/polygons/polygon001/texture001.jpg.meta → assets/res/polygons/polygon001/Tunnel_101.png.meta

@@ -1,14 +1,14 @@
 {
   "ver": "2.3.5",
-  "uuid": "bb20cbb0-c037-4d78-a206-6c3f2e92ca95",
+  "uuid": "a36e38c8-446a-483d-9249-c03fda4b5718",
   "type": "raw",
   "wrapMode": "clamp",
   "filterMode": "bilinear",
   "premultiplyAlpha": false,
   "genMipmaps": false,
   "packable": true,
-  "width": 918,
-  "height": 917,
+  "width": 512,
+  "height": 512,
   "platformSettings": {},
   "subMetas": {}
 }

BIN
assets/res/polygons/polygon001/dimian.fbx


+ 6 - 6
assets/res/polygons/polygon001/dimian.fbx.meta

@@ -16,7 +16,7 @@
       "ver": "1.0.1",
       "uuid": "e5984cc9-4954-459b-b0a5-8f708e8e58f6",
       "verts": 744,
-      "tris": 650,
+      "tris": 648,
       "submeshes": 1,
       "attributes": [
         [
@@ -28,12 +28,12 @@
       "minPos": {
         "x": -19.3185157775879,
         "y": -19.3185157775879,
-        "z": 0.00158792734146118
+        "z": 0
       },
       "maxPos": {
         "x": 19.3185157775879,
         "y": 19.3185157775879,
-        "z": 320.001586914063
+        "z": 320
       },
       "name": "dimian_001.mesh",
       "subMetas": {}
@@ -156,11 +156,11 @@
       "name": "dimian.prefab",
       "subMetas": {}
     },
-    "lambert1.mtl": {
+    "lambert2.mtl": {
       "ver": "1.0.3",
       "uuid": "972b9d3b-cc10-4b45-8cc7-1be4e95aea71",
-      "dataAsSubAsset": "{\n  \"__type__\": \"cc.Material\",\n  \"_name\": \"\",\n  \"_objFlags\": 0,\n  \"_native\": \"\",\n  \"_effectAsset\": {\n    \"__uuid__\": \"6d91e591-4ce0-465c-809f-610ec95019c6\"\n  },\n  \"_techniqueIndex\": 0,\n  \"_techniqueData\": {\n    \"0\": {\n      \"props\": {\n        \"diffuseColor\": {\n          \"__type__\": \"cc.Color\",\n          \"r\": 255,\n          \"g\": 255,\n          \"b\": 255,\n          \"a\": 255\n        },\n        \"diffuseTexture\": {\n          \"__uuid__\": \"bb20cbb0-c037-4d78-a206-6c3f2e92ca95\"\n        }\n      },\n      \"defines\": {\n        \"USE_DIFFUSE_TEXTURE\": true\n      }\n    }\n  }\n}",
-      "name": "lambert1.mtl",
+      "dataAsSubAsset": "{\n  \"__type__\": \"cc.Material\",\n  \"_name\": \"\",\n  \"_objFlags\": 0,\n  \"_native\": \"\",\n  \"_effectAsset\": {\n    \"__uuid__\": \"6d91e591-4ce0-465c-809f-610ec95019c6\"\n  },\n  \"_techniqueIndex\": 0,\n  \"_techniqueData\": {\n    \"0\": {\n      \"props\": {\n        \"diffuseColor\": {\n          \"__type__\": \"cc.Color\",\n          \"r\": 255,\n          \"g\": 255,\n          \"b\": 255,\n          \"a\": 255\n        },\n        \"diffuseTexture\": {\n          \"__uuid__\": \"a36e38c8-446a-483d-9249-c03fda4b5718\"\n        }\n      },\n      \"defines\": {\n        \"USE_DIFFUSE_TEXTURE\": true\n      }\n    }\n  }\n}",
+      "name": "lambert2.mtl",
       "subMetas": {}
     }
   }

BIN
assets/res/polygons/polygon001/texture001.jpg


+ 0 - 12
assets/res/polygons/polygon002.meta

@@ -1,12 +0,0 @@
-{
-  "ver": "1.1.2",
-  "uuid": "ef4c0d50-50c3-4d71-b1db-8d7e9363caea",
-  "isBundle": false,
-  "bundleName": "",
-  "priority": 1,
-  "compressionType": {},
-  "optimizeHotUpdate": {},
-  "inlineSpriteFrames": {},
-  "isRemoteBundle": {},
-  "subMetas": {}
-}