动画删减修改

assets/module_take_goblet/Audio/bgm.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "6dd5969e-624f-47bd-a1a5-1e84de9e4a37",
+=======
+  "uuid": "f2b2903f-7e29-4d04-a5a7-09596e32ea95",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/daoman.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "d8d5406a-e9c6-4ea6-8809-a79f925dbd29",
+=======
+  "uuid": "24c07f6b-a86a-4ebf-92fc-73d5bf3797b0",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/daoshui.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "e608265b-529c-4009-ab40-65bd43c2b522",
+=======
+  "uuid": "11c289ac-33d3-4d22-9287-bb6cc57e6813",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/dianji.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "582a055b-a7fc-4c6e-9542-52bdd1ea248d",
+=======
+  "uuid": "5b7167f2-8351-444e-8b16-9d49458f98cc",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/dianjiliangbei.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "346aa6c0-9b91-4b5e-abb1-90ad137e1ecb",
+=======
+  "uuid": "482be671-045f-4b5d-ab60-b48e757673d0",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/shengli.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "54f614c1-4d22-436d-9e8c-ade484773141",
+=======
+  "uuid": "81a541df-8fdd-4979-99d4-66582f1bb215",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/shibai.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "09619acb-56c4-4548-9d7b-ff9be4db876f",
+=======
+  "uuid": "911bdb3f-6339-4166-98c6-c1fad8347d87",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/shuaxin.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "bf8796f7-fec3-48d7-b635-5d38694d3f66",
+=======
+  "uuid": "366fb6b1-a5f1-4d3b-b4a0-f63de8042a46",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"

assets/module_take_goblet/Audio/suilie.mp3.meta

@@ -2,7 +2,11 @@
   "ver": "1.0.0",
   "importer": "audio-clip",
   "imported": true,
+<<<<<<< HEAD
   "uuid": "a42dc1ee-766a-4a84-aaed-38868c17abaf",
+=======
+  "uuid": "0e2ec774-c5ad-4bea-aa98-21570928ecbe",
+>>>>>>> 14a1a97d198f476d416f87b60fb1dd214e5e4606
   "files": [
     ".json",
     ".mp3"