소스 검색

1.12.5 build

mbunch_kascope 8 달 전
부모
커밋
4260401c0f
30개의 변경된 파일172개의 추가작업 그리고 3개의 파일을 삭제
  1. 1 1
      Assets/CardBaseEntity/CardEntity_JSONLoader.asset
  2. 3 0
      Assets/CardBaseEntity/P/Black/Digimon/P_216.asset
  3. 8 0
      Assets/CardBaseEntity/P/Black/Digimon/P_216.asset.meta
  4. 3 0
      Assets/CardBaseEntity/P/Black/Digimon/P_216_P1.asset
  5. 8 0
      Assets/CardBaseEntity/P/Black/Digimon/P_216_P1.asset.meta
  6. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_214.asset
  7. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_214.asset.meta
  8. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_214_P1.asset
  9. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_214_P1.asset.meta
  10. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_215.asset
  11. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_215.asset.meta
  12. 3 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_215_P1.asset
  13. 8 0
      Assets/CardBaseEntity/P/Blue/Digimon/P_215_P1.asset.meta
  14. 3 0
      Assets/CardBaseEntity/P/Purple/Option/P_219.asset
  15. 8 0
      Assets/CardBaseEntity/P/Purple/Option/P_219.asset.meta
  16. 3 0
      Assets/CardBaseEntity/P/Purple/Option/P_219_P1.asset
  17. 8 0
      Assets/CardBaseEntity/P/Purple/Option/P_219_P1.asset.meta
  18. 3 0
      Assets/CardBaseEntity/P/Red/Digimon/P_213.asset
  19. 8 0
      Assets/CardBaseEntity/P/Red/Digimon/P_213.asset.meta
  20. 3 0
      Assets/CardBaseEntity/P/Red/Tamer/P_217.asset
  21. 8 0
      Assets/CardBaseEntity/P/Red/Tamer/P_217.asset.meta
  22. 3 0
      Assets/CardBaseEntity/P/Red/Tamer/P_217_P1.asset
  23. 8 0
      Assets/CardBaseEntity/P/Red/Tamer/P_217_P1.asset.meta
  24. 3 0
      Assets/CardBaseEntity/P/Yellow/Tamer/P_218.asset
  25. 8 0
      Assets/CardBaseEntity/P/Yellow/Tamer/P_218.asset.meta
  26. 3 0
      Assets/CardBaseEntity/P/Yellow/Tamer/P_218_P1.asset
  27. 8 0
      Assets/CardBaseEntity/P/Yellow/Tamer/P_218_P1.asset.meta
  28. 26 0
      Assets/Scenes/ContinuousControllerScene.unity
  29. 1 1
      Assets/Scripts
  30. 1 1
      ProjectSettings/ProjectSettings.asset

+ 1 - 1
Assets/CardBaseEntity/CardEntity_JSONLoader.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:b5c6470b2ea497561d1abfad567062e98afdca8f11ab8a232ea7db09d0a683ad
+oid sha256:99a24079f0ca64c851bbcb2c93ea6d5725a4eedb3d8fad90acbc725f8c501fc0
 size 477

+ 3 - 0
Assets/CardBaseEntity/P/Black/Digimon/P_216.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:dc9259569ce2f2995209addc9d7abae80ad5d8d0bedbddaefa1580c310108a0e
+size 1507

+ 8 - 0
Assets/CardBaseEntity/P/Black/Digimon/P_216.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7dcf7346226cd4643957e148701b67ea
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Black/Digimon/P_216_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:226104f085554acef49a539368c8978199bbe0cf4202eb94ac405a8461bf29fc
+size 1513

+ 8 - 0
Assets/CardBaseEntity/P/Black/Digimon/P_216_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 10757b08b2efb33478634dfedac6fefa
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_214.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:25a207a9c64b5e98555c94a6b824fecd28c7f9d05e34a472de440d054f9bd6f0
+size 1891

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_214.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 7660a44a16cc7704ab1ee8d5566b99c6
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_214_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:21244e2f9d9edc83de5c1b0c3cadb9230d8bde6a6bd8c7801f889e035d1238a9
+size 1897

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_214_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 1d44c251f3d19954c95131216606f951
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_215.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:7ee22590ddc24156fd900ee772397ada4e545b7e4168a9df43136b18fb961014
+size 1625

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_215.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 45a3634bac7650745ae1cab2d7af52d8
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_215_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:b3a0a7c1731d7ff8b1a21e16dc0e297d7df40f8bca58f5c459ea6798ded0aaed
+size 1631

+ 8 - 0
Assets/CardBaseEntity/P/Blue/Digimon/P_215_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 9ec2e255e45ce92448a5fd1942f28a6f
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Purple/Option/P_219.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:61600c5f5fca57e0ea34d3f90ecdbc773800ac737bd24f0a9dcb6903732fd4f7
+size 1537

+ 8 - 0
Assets/CardBaseEntity/P/Purple/Option/P_219.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: b24ede72a1d9c3b47acbf189dd3ee1c4
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Purple/Option/P_219_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:e39da424aa390d8b4f75a7a93e2596069615de75d0cf17f841e9c94eeb877b96
+size 1543

+ 8 - 0
Assets/CardBaseEntity/P/Purple/Option/P_219_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 0076338724712084aa020f526ed83513
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Red/Digimon/P_213.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:9aa1b95ee34bb9fa8d7d3ebd92262e38d6688161f8aab9e8c60aea6a43f9f25d
+size 1735

+ 8 - 0
Assets/CardBaseEntity/P/Red/Digimon/P_213.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 53fe8cda2e9e0844e9f5d941c3dc8072
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Red/Tamer/P_217.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:0f91fec5ad6abc4b492921926278a8fb9c2abc1886e786b671b8f1af214ee336
+size 1447

+ 8 - 0
Assets/CardBaseEntity/P/Red/Tamer/P_217.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: a097862b49f4a4b4ba4c1885435a21c2
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Red/Tamer/P_217_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:24379e4d2f121564422fa10e5592d621bf5b269622ee6307b1d2e7b50dd87b04
+size 1453

+ 8 - 0
Assets/CardBaseEntity/P/Red/Tamer/P_217_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 40a96a6583b82054eaf5c11fc0f80ce1
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Yellow/Tamer/P_218.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:3c05abd48fa90657f6cd7d479bf935578b2d7028a320bbd92aa716dcec2f2728
+size 1452

+ 8 - 0
Assets/CardBaseEntity/P/Yellow/Tamer/P_218.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: 75f13a0e1895c3d498815158a56fb553
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 3 - 0
Assets/CardBaseEntity/P/Yellow/Tamer/P_218_P1.asset

@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:4a31ade96f7702b22d1c8832fdbcb4b0f346bcbb67cf0cbe3394210b78b079fe
+size 1458

+ 8 - 0
Assets/CardBaseEntity/P/Yellow/Tamer/P_218_P1.asset.meta

@@ -0,0 +1,8 @@
+fileFormatVersion: 2
+guid: c21c366536bc869429c14578d675876c
+NativeFormatImporter:
+  externalObjects: {}
+  mainObjectFileID: 11400000
+  userData: 
+  assetBundleName: 
+  assetBundleVariant: 

+ 26 - 0
Assets/Scenes/ContinuousControllerScene.unity

@@ -6490,6 +6490,9 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 49d9363f5511fdf41827e8b062d4ef91, type: 2}
   - {fileID: 11400000, guid: 64739be0d53e1bb42b8413e8c7c4a645, type: 2}
   - {fileID: 11400000, guid: 7a47edad9b177514788ebcc9de05269e, type: 2}
+  - {fileID: 11400000, guid: 53fe8cda2e9e0844e9f5d941c3dc8072, type: 2}
+  - {fileID: 11400000, guid: a097862b49f4a4b4ba4c1885435a21c2, type: 2}
+  - {fileID: 11400000, guid: 40a96a6583b82054eaf5c11fc0f80ce1, type: 2}
   - {fileID: 11400000, guid: d592dc908760e46428f7effd8beeae5b, type: 2}
   - {fileID: 11400000, guid: be19ebe3b1538c642b77284f50a7b38a, type: 2}
   - {fileID: 11400000, guid: 38b97d0cb38130c4aa3a278de1832b48, type: 2}
@@ -6564,6 +6567,10 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 74625a4cdcafd6c45a7580f7160ffe4a, type: 2}
   - {fileID: 11400000, guid: 0d63bc0a71b6d21409a7238720f4d458, type: 2}
   - {fileID: 11400000, guid: f08724d689a4e734db0b60158c40ca47, type: 2}
+  - {fileID: 11400000, guid: 7660a44a16cc7704ab1ee8d5566b99c6, type: 2}
+  - {fileID: 11400000, guid: 1d44c251f3d19954c95131216606f951, type: 2}
+  - {fileID: 11400000, guid: 45a3634bac7650745ae1cab2d7af52d8, type: 2}
+  - {fileID: 11400000, guid: 9ec2e255e45ce92448a5fd1942f28a6f, type: 2}
   - {fileID: 11400000, guid: e62260a9dd14a3743bc1d559e88d18aa, type: 2}
   - {fileID: 11400000, guid: 609da9d18f186944b8e9710db96f3e3a, type: 2}
   - {fileID: 11400000, guid: 62cff5a349c37904f99c1f861e5ac90c, type: 2}
@@ -6630,6 +6637,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: aa4ebd5f4c80a8a4bb1a3780a243a8c3, type: 2}
   - {fileID: 11400000, guid: 77b2ffa9f853a8940b2f69b6384ee74b, type: 2}
   - {fileID: 11400000, guid: 9d66fd98c1e72034da60b85e52dc7c06, type: 2}
+  - {fileID: 11400000, guid: 75f13a0e1895c3d498815158a56fb553, type: 2}
+  - {fileID: 11400000, guid: c21c366536bc869429c14578d675876c, type: 2}
   - {fileID: 11400000, guid: 99de8b57fc534a740a455255aad17046, type: 2}
   - {fileID: 11400000, guid: dcbf45052e02194418adbe47efa87dee, type: 2}
   - {fileID: 11400000, guid: edf2c4f510f612d428c5a72b96202290, type: 2}
@@ -6764,6 +6773,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 499abd65203cc0f4db29df225abca91a, type: 2}
   - {fileID: 11400000, guid: 565083db81505a04d913a19593d928ad, type: 2}
   - {fileID: 11400000, guid: faa23915bbf08734898fe1b056ba841e, type: 2}
+  - {fileID: 11400000, guid: 7dcf7346226cd4643957e148701b67ea, type: 2}
+  - {fileID: 11400000, guid: 10757b08b2efb33478634dfedac6fefa, type: 2}
   - {fileID: 11400000, guid: eabf1c609de718c42a5ce2d0ed2c3f66, type: 2}
   - {fileID: 11400000, guid: 3177390918038b942894bff607f18385, type: 2}
   - {fileID: 11400000, guid: 60d73225a93ad3241b36dae2d75b2a70, type: 2}
@@ -6814,6 +6825,8 @@ MonoBehaviour:
   - {fileID: 11400000, guid: 4f60f5611c4562e408752bce7be73bb3, type: 2}
   - {fileID: 11400000, guid: c3daa121ac1c0d44d92263ec923433c5, type: 2}
   - {fileID: 11400000, guid: b15ded8bf0d387e43a6a81e28f9d1408, type: 2}
+  - {fileID: 11400000, guid: b24ede72a1d9c3b47acbf189dd3ee1c4, type: 2}
+  - {fileID: 11400000, guid: 0076338724712084aa020f526ed83513, type: 2}
   - {fileID: 11400000, guid: a1bd8e0a9746ee142bf2b76e8b2da7a7, type: 2}
   - {fileID: 11400000, guid: e8a79deb2fbbdee4fb06295c5fcd171f, type: 2}
   - {fileID: 11400000, guid: 94a5e6198e6f2eb428716d49b81d3c56, type: 2}
@@ -13050,6 +13063,19 @@ MonoBehaviour:
   - {fileID: 11400000, guid: a200df331ac7f8c47a657a352527aa8b, type: 2}
   - {fileID: 11400000, guid: 538a7ada1d20dc34a870ae68fba58fb9, type: 2}
   - {fileID: 11400000, guid: c0d8d0101a35eef498d45afb4c5dda79, type: 2}
+  - {fileID: 11400000, guid: 53fe8cda2e9e0844e9f5d941c3dc8072, type: 2}
+  - {fileID: 11400000, guid: 7660a44a16cc7704ab1ee8d5566b99c6, type: 2}
+  - {fileID: 11400000, guid: 1d44c251f3d19954c95131216606f951, type: 2}
+  - {fileID: 11400000, guid: 45a3634bac7650745ae1cab2d7af52d8, type: 2}
+  - {fileID: 11400000, guid: 9ec2e255e45ce92448a5fd1942f28a6f, type: 2}
+  - {fileID: 11400000, guid: 7dcf7346226cd4643957e148701b67ea, type: 2}
+  - {fileID: 11400000, guid: 10757b08b2efb33478634dfedac6fefa, type: 2}
+  - {fileID: 11400000, guid: a097862b49f4a4b4ba4c1885435a21c2, type: 2}
+  - {fileID: 11400000, guid: 40a96a6583b82054eaf5c11fc0f80ce1, type: 2}
+  - {fileID: 11400000, guid: 75f13a0e1895c3d498815158a56fb553, type: 2}
+  - {fileID: 11400000, guid: c21c366536bc869429c14578d675876c, type: 2}
+  - {fileID: 11400000, guid: b24ede72a1d9c3b47acbf189dd3ee1c4, type: 2}
+  - {fileID: 11400000, guid: 0076338724712084aa020f526ed83513, type: 2}
   - {fileID: 11400000, guid: b00372efcf5658c42ad76bf91c5df4c3, type: 2}
   - {fileID: 11400000, guid: 35c6ca847a511834abee752dd8e012f5, type: 2}
   - {fileID: 11400000, guid: ede9619666b7b9e42885a1e9736445c5, type: 2}

+ 1 - 1
Assets/Scripts

@@ -1 +1 @@
-Subproject commit 11046fe658a2fcc9a70a80fc2b0f06e77afa06fa
+Subproject commit f57f8b0a5719e398b137d5c3d7a1129069a89b83

+ 1 - 1
ProjectSettings/ProjectSettings.asset

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:9f601f755613b68173c48d0d3ba65cfc06866a5244ae1e1ec151893006140bb7
+oid sha256:26b7ed5ef6dd254e67a74c80c79f859c91f9f79fa0138682035c768011e1e493
 size 20167