Преглед на файлове

Updating project to latest

Signed-off-by: Mike Chang <[email protected]>
Mike Chang преди 3 години
родител
ревизия
41a9612bb4

+ 2 - 1
.gitignore

@@ -1,4 +1,5 @@
 [Bb]uild/
 [Cc]ache/
 [Uu]ser/
-[Uu]ser_test*/
+[Uu]ser_test*/
+_savebackup/

+ 5 - 1
JOSHUAS-ASSETS/GameJam2021/badguy2_badguy1.material

@@ -11,9 +11,13 @@
                 0.800000011920929,
                 1.0
             ],
-            "textureBlendMode": "Overlay",
+            "textureBlendMode": "Lerp",
             "textureMap": "JOSHUAS-ASSETS/GameJam2021/textures/badguy_U1.png"
         },
+        "clearCoat": {
+            "enable": true,
+            "factor": 0.3700000047683716
+        },
         "emissive": {
             "color": [
                 0.0,

+ 8 - 4
JOSHUAS-ASSETS/GameJam2021/badguy2_badguy2.material

@@ -8,13 +8,17 @@
             "textureBlendMode": "Lerp",
             "textureMap": "JOSHUAS-ASSETS/GameJam2021/textures/badguy_U2.png"
         },
+        "clearCoat": {
+            "factor": 0.75
+        },
         "emissive": {
             "color": [
-                0.0,
-                0.0,
-                0.0,
+                0.00553902518004179,
+                0.21661707758903503,
+                0.47861447930336,
                 1.0
-            ]
+            ],
+            "intensity": -0.05999999865889549
         },
         "opacity": {
             "factor": 1.0,

+ 4 - 1
JOSHUAS-ASSETS/GameJam2021/mushroom2.material

@@ -8,7 +8,7 @@
             "color": [
                 1.0,
                 0.8758373260498047,
-                0.08336003869771958,
+                0.08336003869771957,
                 1.0
             ],
             "textureBlendMode": "LinearLight",
@@ -24,6 +24,9 @@
         },
         "opacity": {
             "factor": 1.0
+        },
+        "specularF0": {
+            "factor": 0.0
         }
     }
 }

+ 2 - 2
JOSHUAS-ASSETS/GameJam2021/textures/badguy_U2.png

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:74c0f491b34a5ef3d3662899abc030c449b3a32d6f3c269eaa6738772d3bcdba
-size 2023165
+oid sha256:9e5bd7acfbaca09c869bd836dc1207fea2b7f39b05059473f7d708914bc39fbe
+size 2312078

Файловите разлики са ограничени, защото са твърде много
+ 910 - 4
Levels/GnomebodysHome/GnomebodysHome.prefab


+ 72 - 0
Prefabs/tombstone.prefab

@@ -122,6 +122,36 @@
                         }
                     },
                     "materialSlots": [
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 3100309799
+                            }
+                        },
+                        {
+                            "id": {
+                                "materialSlotStableId": 2081885851
+                            }
+                        },
                         {
                             "id": {
                                 "materialSlotStableId": 3100309799
@@ -134,6 +164,48 @@
                         }
                     ],
                     "materialSlotsByLod": [
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
+                        [
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 3100309799
+                                }
+                            },
+                            {
+                                "id": {
+                                    "lodIndex": 0,
+                                    "materialSlotStableId": 2081885851
+                                }
+                            }
+                        ],
                         [
                             {
                                 "id": {

Някои файлове не бяха показани, защото твърде много файлове са промени