mbunch_kascope 2 лет назад
Родитель
Сommit
01bbefe99d

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Digimon/Lopmon-ST17-03.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:fff9d37d19f91dd412f72dbdd1ae5e9b560572b786d085c2cfe232329b38fe0e
-size 1457
+oid sha256:08a1677b1b3014a541b038c12d60ba2281e2ef43a39ae48c5eee10e62d8e7ee5
+size 1453

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Digimon/Lopmon-ST17-03_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:c771427770670875b788acd0cf9ec7d6c5b6313672ae31be0c8dd406d3e39565
-size 1463
+oid sha256:3c0c44810abce7deebaf66a454ae6e2928ca7a34642b997af7df4ee17d098907
+size 1459

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Digimon/Terriermon-ST17-02.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:66bbedea14cdde420f9eb8d5c22e72a24230f80a1d5147265a95ddc4576b8e2a
-size 1566
+oid sha256:1985d099d8156ef7b25920cf3bc22107220ccc19f1d55eb24b54746156938c98
+size 1562

+ 2 - 2
Assets/CardBaseEntity/ST17/Green/Digimon/Terriermon-ST17-02_P1.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:cfde0d3f00332c51b3bb1019cbac0d4491fba2857cfaf496e23b522ea5edda83
-size 1572
+oid sha256:b6f2fa3570f4d538683f56eb71490cc85fa422686af7a343d1dfea63a6fc2123
+size 1568

+ 66 - 0
Assets/Scenes/ContinuousControllerScene.unity

@@ -1476,6 +1476,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: bf9699cc3e3133a44bc641b50e68489c, type: 2}
   - {fileID: 11400000, guid: 1bf18171efb821b4db3315f8060956ac, type: 2}
   - {fileID: 11400000, guid: 356663cd0ce7686489689a908705d234, type: 2}
+  - {fileID: 11400000, guid: de300b70cf7e428498f1c1108de32494, type: 2}
   - {fileID: 11400000, guid: 4743393d8422b3849b1fa3d4683fe2ed, type: 2}
   - {fileID: 11400000, guid: be33f47f8cfc8034884228a69982c1f7, type: 2}
   - {fileID: 11400000, guid: cc6ae1106a4465b4c9d1a3cc7a456aef, type: 2}
@@ -1511,6 +1512,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: d0ad8e372c695774ba8c9d495880d735, type: 2}
   - {fileID: 11400000, guid: 798a5c6cfa05efc418216ab27de98547, type: 2}
   - {fileID: 11400000, guid: 889d4346d9a68ab4980254d9ff664809, type: 2}
+  - {fileID: 11400000, guid: 734d3c5795f437f4ea759f6d6640c088, type: 2}
   - {fileID: 11400000, guid: e22d373e9f0788e4c8d6249625f20231, type: 2}
   - {fileID: 11400000, guid: 5ba0828b533d3284eaebeac7a0cc13f6, type: 2}
   - {fileID: 11400000, guid: a44445581d136354394e21a9e09dab34, type: 2}
@@ -1557,6 +1559,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: a49c8040c5c6d0e44afa928b6655eee6, type: 2}
   - {fileID: 11400000, guid: 2b0194b7dedd4394e948cc342425c15e, type: 2}
   - {fileID: 11400000, guid: 9b4f501bfe5548745931a6832849ee52, type: 2}
+  - {fileID: 11400000, guid: 597229b3fa6cdba48b7b56e18f46df25, type: 2}
   - {fileID: 11400000, guid: b67c3eb26266bc34984d40be9982a822, type: 2}
   - {fileID: 11400000, guid: db17258b4444a3844bb658ad29cf99fa, type: 2}
   - {fileID: 11400000, guid: 0e1a93bfdf426f04296fd75de995198d, type: 2}
@@ -1694,6 +1697,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 1e4f0e5573fe1da4783e3cac1b6f21fd, type: 2}
   - {fileID: 11400000, guid: d7327383448a1ae42b0188a14369d84c, type: 2}
   - {fileID: 11400000, guid: 68ca7ae19ccbf0a439283b7f22675906, type: 2}
+  - {fileID: 11400000, guid: 95effb5dea2ad674abbf55d4bc60ff3b, type: 2}
   - {fileID: 11400000, guid: 398356aab0a8d934bb88505ffdb20407, type: 2}
   - {fileID: 11400000, guid: 8b1536b497a486542a9feddd332fd617, type: 2}
   - {fileID: 11400000, guid: de9167298cb3d0e4d839a7c2418dcc8e, type: 2}
@@ -2157,6 +2161,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 86e11b193fd185e49920c83e9f2a474c, type: 2}
   - {fileID: 11400000, guid: 7a1608a8471493242840d83355384d60, type: 2}
   - {fileID: 11400000, guid: 2f0b38a7a05afd44281b8a975c0eff3b, type: 2}
+  - {fileID: 11400000, guid: c88492cd133ee4241b124bc56038a2f1, type: 2}
   - {fileID: 11400000, guid: 5d1cbcfd7faff64409c3dea4c1da5f0b, type: 2}
   - {fileID: 11400000, guid: 1425543375850044d9a77bc4a2c19439, type: 2}
   - {fileID: 11400000, guid: 9c568b9682e55074f8c8decaad3fe1ec, type: 2}
@@ -2927,10 +2932,14 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0a3769f22a65b2e47897c96b274eeaec, type: 2}
   - {fileID: 11400000, guid: c4ea8cdb6fe388349b69ea357470dee7, type: 2}
   - {fileID: 11400000, guid: 6f1530315b007934b8a466c1c66c33f7, type: 2}
+  - {fileID: 11400000, guid: 4ead75624cced0c45aa23d4504b954af, type: 2}
   - {fileID: 11400000, guid: ee9c050750d639e4aaa075bf50e27826, type: 2}
+  - {fileID: 11400000, guid: cce148959fe0af14abf4cc6f4b643ca9, type: 2}
   - {fileID: 11400000, guid: 5e03b32b757b0b148ad1707781f6276f, type: 2}
   - {fileID: 11400000, guid: ae07ecf0d7072d34d853cd8aaf29492a, type: 2}
+  - {fileID: 11400000, guid: 2524c144ebe61974d99636ff1295762f, type: 2}
   - {fileID: 11400000, guid: c42e855518724514eb50e10a6b0f5a61, type: 2}
+  - {fileID: 11400000, guid: 5797fe1d15dfab44092a48d3b840c670, type: 2}
   - {fileID: 11400000, guid: c5bb1fb03180b264db9edde0a97c8fcb, type: 2}
   - {fileID: 11400000, guid: c08893c6d4cfbf9469aa453042d4a3cd, type: 2}
   - {fileID: 11400000, guid: fe3b705168066644fbdad464a0b8a1eb, type: 2}
@@ -2967,6 +2976,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 93747da8d4ab4d046a42cac705766ab4, type: 2}
   - {fileID: 11400000, guid: d7b15678312a0d24789a82feec96e36a, type: 2}
   - {fileID: 11400000, guid: 65b1618be5eb66e42b491bc94e059821, type: 2}
+  - {fileID: 11400000, guid: fc2e75dcc923953419c180c7afb0f3d8, type: 2}
   - {fileID: 11400000, guid: 5425497023238bd419e0cbcab1d48136, type: 2}
   - {fileID: 11400000, guid: f0d036123c40d664ea5923b24d4f2e77, type: 2}
   - {fileID: 11400000, guid: 17dd3141ea27749429da05ebc8d11aef, type: 2}
@@ -3098,6 +3108,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: da182138ba3d1b642aa0eab5ccaa3527, type: 2}
   - {fileID: 11400000, guid: 71d4c3dbb45c5274180ae9cf853d9ff2, type: 2}
   - {fileID: 11400000, guid: 21bb7e0bd75edf846932a9b5abf56f9b, type: 2}
+  - {fileID: 11400000, guid: 505e5dd79508f3b4a8b69765821cb04d, type: 2}
   - {fileID: 11400000, guid: 3ec3c044f5fef914b86771b3fc06cb76, type: 2}
   - {fileID: 11400000, guid: 85b2cd965a9703944a06dac11ef57ad1, type: 2}
   - {fileID: 11400000, guid: 7085ab701f4b3894ba16034834ca4d9a, type: 2}
@@ -3143,6 +3154,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: f96636ed05ecee94894880f2a29c9918, type: 2}
   - {fileID: 11400000, guid: e2c81faeca8ba8845b19967cc4fbe6e7, type: 2}
   - {fileID: 11400000, guid: fddf1890a3cbecb47b54409a459cef25, type: 2}
+  - {fileID: 11400000, guid: 4c829f089319fb74ea381ff344c57215, type: 2}
   - {fileID: 11400000, guid: 07f4538b71ca1cf40bdb1df78e6aeece, type: 2}
   - {fileID: 11400000, guid: c29e9abc3c55fa24ca9f635cd63134bf, type: 2}
   - {fileID: 11400000, guid: cf9c13ec2c675054ebe9835675b3ec57, type: 2}
@@ -3365,6 +3377,26 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 62e764372598a3e46b82f97bbc15e1e7, type: 2}
   - {fileID: 11400000, guid: 26216b7332c27de4083d227d14524cee, type: 2}
   - {fileID: 11400000, guid: 74835cf575207e749a4787ba69ad9adc, type: 2}
+  - {fileID: 11400000, guid: 35cd8a4ba0d069d4fa27fc2c7476462e, type: 2}
+  - {fileID: 11400000, guid: 39346664c5783f44d8e473aaae0e43ac, type: 2}
+  - {fileID: 11400000, guid: eba2acff0e491224bbf54648cbc6de95, type: 2}
+  - {fileID: 11400000, guid: 1e8befb8949d80b45ae50f0b4433550c, type: 2}
+  - {fileID: 11400000, guid: cb8a25aca8546214885410c4dc6cfbf5, type: 2}
+  - {fileID: 11400000, guid: 7beca125d70ce0f43becf5d72abf9526, type: 2}
+  - {fileID: 11400000, guid: 0f092204ddc495a48a8e609256b4cf43, type: 2}
+  - {fileID: 11400000, guid: 7d09d69201a2c1844beea5b6d7312fa4, type: 2}
+  - {fileID: 11400000, guid: e19fccaa78552fe4ba28030faaad8acd, type: 2}
+  - {fileID: 11400000, guid: af8cf925dbe18e94aace41802f4bf406, type: 2}
+  - {fileID: 11400000, guid: cbbea026d19880a4abc2b9a1c980c549, type: 2}
+  - {fileID: 11400000, guid: 7513145ac88b00e45842e987dc669f5f, type: 2}
+  - {fileID: 11400000, guid: b85b20c1913a0194293abdf09b339eb6, type: 2}
+  - {fileID: 11400000, guid: d638605251607ab47b46d22f118ee169, type: 2}
+  - {fileID: 11400000, guid: d1d062755aa61e2459045a393be2fb2c, type: 2}
+  - {fileID: 11400000, guid: 1c842d3223a45ab4aa4d07c8dcff501c, type: 2}
+  - {fileID: 11400000, guid: db1b0b8ae6a8e474b914d015d9fa94d1, type: 2}
+  - {fileID: 11400000, guid: ca98082718245284aa22b4a1cf1fcb40, type: 2}
+  - {fileID: 11400000, guid: 6a8f1d1d2341e8e43b37e3b642672683, type: 2}
+  - {fileID: 11400000, guid: 289d7f21d85eecb41bbe81d22fd36a01, type: 2}
   - {fileID: 11400000, guid: 8804ffd806f9e54428109c709f1c66e8, type: 2}
   - {fileID: 11400000, guid: bb8edb0f841e0e642b10d97b25b2c9a7, type: 2}
   - {fileID: 11400000, guid: 6c26e69e10ce714418658e02855edd8b, type: 2}
@@ -3655,6 +3687,7 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 94d2335dd166a254d8a57a829f267793, type: 2}
   - {fileID: 11400000, guid: 16b00dd3f57e53f4b81e359fc73d6e5f, type: 2}
   - {fileID: 11400000, guid: cda435e42d32dc841807ed2cdf544735, type: 2}
+  - {fileID: 11400000, guid: 756dbb5472dcb404ab6559ee1e723f8f, type: 2}
   - {fileID: 11400000, guid: 01207b9514991364b9b9b1ebf7282224, type: 2}
   - {fileID: 11400000, guid: 57c6b63fbb5ecd440b42dcabcb39836d, type: 2}
   - {fileID: 11400000, guid: edac72d655468b24090e4bfce9f3c9ea, type: 2}
@@ -7143,6 +7176,39 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 0d527c58e69886e4e814876b68158415, type: 2}
   - {fileID: 11400000, guid: 384cbeced540f9242907b9e15cd9cbf5, type: 2}
   - {fileID: 11400000, guid: da57c33b8bf198e43a444fd2efd8fd2f, type: 2}
+  - {fileID: 11400000, guid: 35cd8a4ba0d069d4fa27fc2c7476462e, type: 2}
+  - {fileID: 11400000, guid: 39346664c5783f44d8e473aaae0e43ac, type: 2}
+  - {fileID: 11400000, guid: eba2acff0e491224bbf54648cbc6de95, type: 2}
+  - {fileID: 11400000, guid: 1e8befb8949d80b45ae50f0b4433550c, type: 2}
+  - {fileID: 11400000, guid: cb8a25aca8546214885410c4dc6cfbf5, type: 2}
+  - {fileID: 11400000, guid: 7beca125d70ce0f43becf5d72abf9526, type: 2}
+  - {fileID: 11400000, guid: 0f092204ddc495a48a8e609256b4cf43, type: 2}
+  - {fileID: 11400000, guid: 7d09d69201a2c1844beea5b6d7312fa4, type: 2}
+  - {fileID: 11400000, guid: e19fccaa78552fe4ba28030faaad8acd, type: 2}
+  - {fileID: 11400000, guid: af8cf925dbe18e94aace41802f4bf406, type: 2}
+  - {fileID: 11400000, guid: cbbea026d19880a4abc2b9a1c980c549, type: 2}
+  - {fileID: 11400000, guid: 7513145ac88b00e45842e987dc669f5f, type: 2}
+  - {fileID: 11400000, guid: b85b20c1913a0194293abdf09b339eb6, type: 2}
+  - {fileID: 11400000, guid: d638605251607ab47b46d22f118ee169, type: 2}
+  - {fileID: 11400000, guid: d1d062755aa61e2459045a393be2fb2c, type: 2}
+  - {fileID: 11400000, guid: 1c842d3223a45ab4aa4d07c8dcff501c, type: 2}
+  - {fileID: 11400000, guid: db1b0b8ae6a8e474b914d015d9fa94d1, type: 2}
+  - {fileID: 11400000, guid: ca98082718245284aa22b4a1cf1fcb40, type: 2}
+  - {fileID: 11400000, guid: 6a8f1d1d2341e8e43b37e3b642672683, type: 2}
+  - {fileID: 11400000, guid: 289d7f21d85eecb41bbe81d22fd36a01, type: 2}
+  - {fileID: 11400000, guid: 756dbb5472dcb404ab6559ee1e723f8f, type: 2}
+  - {fileID: 11400000, guid: c88492cd133ee4241b124bc56038a2f1, type: 2}
+  - {fileID: 11400000, guid: 95effb5dea2ad674abbf55d4bc60ff3b, type: 2}
+  - {fileID: 11400000, guid: de300b70cf7e428498f1c1108de32494, type: 2}
+  - {fileID: 11400000, guid: 734d3c5795f437f4ea759f6d6640c088, type: 2}
+  - {fileID: 11400000, guid: 597229b3fa6cdba48b7b56e18f46df25, type: 2}
+  - {fileID: 11400000, guid: 4c829f089319fb74ea381ff344c57215, type: 2}
+  - {fileID: 11400000, guid: 505e5dd79508f3b4a8b69765821cb04d, type: 2}
+  - {fileID: 11400000, guid: 4ead75624cced0c45aa23d4504b954af, type: 2}
+  - {fileID: 11400000, guid: cce148959fe0af14abf4cc6f4b643ca9, type: 2}
+  - {fileID: 11400000, guid: 2524c144ebe61974d99636ff1295762f, type: 2}
+  - {fileID: 11400000, guid: 5797fe1d15dfab44092a48d3b840c670, type: 2}
+  - {fileID: 11400000, guid: fc2e75dcc923953419c180c7afb0f3d8, type: 2}
   - {fileID: 11400000, guid: 03f5e14579a633043a99437490dfef8d, type: 2}
   - {fileID: 11400000, guid: f722aa20dbee0824b9b2638096816697, type: 2}
   - {fileID: 11400000, guid: e085fbfb0bc42744f9eb98b5afffaac0, type: 2}

+ 1 - 1
ProjectSettings/EditorBuildSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:d8c89e3cb39fb551e383029728839919c6ba3c63de9c829919d9f1c2384b6ba7
+oid sha256:1f7eefd30354e4b01bd03e2fcabb59cc2efef8c7954ded67a463c975c182b36b
 size 702

+ 23 - 0
lfs/objects/1f/7e/1f7eefd30354e4b01bd03e2fcabb59cc2efef8c7954ded67a463c975c182b36b

@@ -0,0 +1,23 @@
+%YAML 1.1
+%TAG !u! tag:unity3d.com,2011:
+--- !u!1045 &1
+EditorBuildSettings:
+  m_ObjectHideFlags: 0
+  serializedVersion: 2
+  m_Scenes:
+  - enabled: 0
+    path: Assets/MHLab/Patch/Launcher/Scenes/PreGame.unity
+    guid: 98697cd740c1eb148b123f3c1128479b
+  - enabled: 1
+    path: Assets/Scenes/Opening.unity
+    guid: 2052019c32fc89249a05dc24915c059b
+  - enabled: 1
+    path: Assets/Scenes/BattleScene.unity
+    guid: b819af92189f3774a9966b660362514e
+  - enabled: 1
+    path: Assets/Scenes/ContinuousControllerScene.unity
+    guid: 3c40e7b0dacbcdc48b8af2f0798c208d
+  - enabled: 0
+    path: Assets/MHLab/Patch/Launcher/Scenes/Launcher.unity
+    guid: 62bbf456ac1f00d47a1374cb8f720350
+  m_configObjects: {}