ソースを参照

地图1传送门

zenghaowei 3 年 前
コミット
43f1280c72
2 ファイル変更1889 行追加562 行削除
  1. 1880 540
      assets/resources/prefab/map/map1.prefab
  2. 9 22
      local/local.json

ファイルの差分が大きいため隠しています
+ 1880 - 540
assets/resources/prefab/map/map1.prefab


+ 9 - 22
local/local.json

@@ -1,8 +1,6 @@
 {
-  "last-edit": null,
+  "last-edit": "2d2f792f-a40c-49bb-a189-ed176a246e49",
   "recent-items": [
-<<<<<<< HEAD
-=======
     "c9487f27-70f0-4012-bf79-ce48f9814dcb",
     "9fb099ea-142d-418f-a1e8-f5a46e4f27ee",
     "b20fa46e-e493-40ba-a335-7379ec86a2cb",
@@ -40,36 +38,25 @@
     "165d9521-f2fa-40d9-bbe9-1d4f4c5d4775",
     "54e0cd76-2c63-4e23-b81c-97efe2699791",
     "51a7178b-1133-44d1-92b5-5f5e1e2348a4",
->>>>>>> ae23f3346e0710d38f11c57b7277d107f594c70f
     "81823765-7aef-47ac-b793-287673d47aa3",
     "c1fa2217-e454-46ca-ad7b-31c2afa8adc4",
     "1cc87fa7-097b-4f10-aecb-49dcb1713bac",
     "4445850f-898f-47e8-a574-c2c63a1e36a7",
-<<<<<<< HEAD
+    "af111354-8962-48b7-93db-eee87d40b1fe",
     "35b14081-9e0f-45a5-a804-a787c942ff47",
     "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
-    "147ce141-b17c-4434-87f7-2b12cb885bb7",
-    "5eed60eb-caad-45d3-b9cd-25f678a2ebad",
-    "891e36f9-7931-427e-b549-e16b827a1fb2",
-    "b35d96ee-2781-46d3-b7a3-75407c00d8eb",
+    "4fa20b44-a925-4cf5-b13a-14c21e455b02",
     "d109550d-0d11-4e32-90e1-bf0c2e80f637",
-    "165d9521-f2fa-40d9-bbe9-1d4f4c5d4775"
-=======
-    "af111354-8962-48b7-93db-eee87d40b1fe",
+    "b35d96ee-2781-46d3-b7a3-75407c00d8eb",
+    "9ae25294-b58f-4060-a268-785d5e039fd2",
+    "2777c629-901f-467d-b9c5-838129207240",
     "147ce141-b17c-4434-87f7-2b12cb885bb7",
+    "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb",
+    "45502707-7b13-4ee2-934a-1eaf3254b1c1",
     "fb1460ea-e74b-47b2-8467-efbbba57a4ca",
     "686bd299-de37-43fe-b735-f5a6dd1f9e13",
     "39a60824-c678-4b33-a8e7-c5c2f8f7bb9e",
     "949937c7-bc7c-4a3e-9ac5-10b8c12ff78c",
-    "2777c629-901f-467d-b9c5-838129207240",
-    "35b14081-9e0f-45a5-a804-a787c942ff47",
-    "69b3a8ee-9d9c-4120-8fa0-0e9aba59b472",
-    "13452eaf-a0d0-4b0a-82d2-f5fc7cf793bb",
-    "45502707-7b13-4ee2-934a-1eaf3254b1c1",
-    "4fa20b44-a925-4cf5-b13a-14c21e455b02",
-    "891e36f9-7931-427e-b549-e16b827a1fb2",
-    "d109550d-0d11-4e32-90e1-bf0c2e80f637",
-    "9ae25294-b58f-4060-a268-785d5e039fd2"
->>>>>>> ae23f3346e0710d38f11c57b7277d107f594c70f
+    "891e36f9-7931-427e-b549-e16b827a1fb2"
   ]
 }