Skip to content

Commit

Permalink
Merge branch 'nazy00-dev' into cy-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
@cybardev
cybardev committed Apr 2, 2024
2 parents 204f3e7 + adb29b8 commit 68f8b55
Show file tree
Hide file tree
Showing 6 changed files with 242 additions and 477 deletions.
Binary file modified Assets/Images/Sprites/Enemies/gecho.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
56 changes: 53 additions & 3 deletions Assets/Images/Sprites/Enemies/gecho.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified Assets/Images/Sprites/Enemies/pishach.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 66 additions & 3 deletions Assets/Images/Sprites/Enemies/pishach.png.meta
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

212 changes: 68 additions & 144 deletions Assets/Prefabs/BtmEnemy.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ GameObject:
m_Component:
- component: {fileID: 3124158825450182878}
- component: {fileID: 2390987794050176093}
- component: {fileID: 8962563904436670936}
- component: {fileID: 1777422775414658685}
m_Layer: 7
m_Name: Sprite
m_TagString: Untagged
Expand Down Expand Up @@ -139,13 +139,13 @@ SpriteRenderer:
m_FlipX: 0
m_FlipY: 0
m_DrawMode: 0
m_Size: {x: 4.89, y: 5.77}
m_Size: {x: 5.9, y: 6}
m_AdaptiveModeThreshold: 0.5
m_SpriteTileMode: 0
m_WasSpriteAssigned: 1
m_MaskInteraction: 0
m_SpriteSortPoint: 0
--- !u!60 &8962563904436670936
--- !u!60 &1777422775414658685
PolygonCollider2D:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
Expand Down Expand Up @@ -181,151 +181,75 @@ PolygonCollider2D:
m_SpriteTilingProperty:
border: {x: 0, y: 0, z: 0, w: 0}
pivot: {x: 0.5, y: 0.5}
oldSize: {x: 4.89, y: 5.77}
newSize: {x: 4.89, y: 5.77}
oldSize: {x: 5.9, y: 6}
newSize: {x: 5.9, y: 6}
adaptiveTilingThreshold: 0.5
drawMode: 0
adaptiveTiling: 0
m_AutoTiling: 0
m_Points:
m_Paths:
- - {x: 2.200039, y: -2.400425}
- {x: 2.2175884, y: -2.0880933}
- {x: 2.2845404, y: -1.9666616}
- {x: 2.2656927, y: -1.7106766}
- {x: 2.2548356, y: -1.6386536}
- {x: 2.248219, y: -1.3412912}
- {x: 2.2198822, y: -1.2462962}
- {x: 2.132275, y: -1.0432974}
- {x: 1.9886591, y: -0.69968235}
- {x: 1.932721, y: -0.55336076}
- {x: 1.8868645, y: -0.4160978}
- {x: 1.8113142, y: -0.319667}
- {x: 1.7809756, y: -0.20348702}
- {x: 1.8162838, y: -0.06547478}
- {x: 1.9835855, y: 0.43461215}
- {x: 2.0787418, y: 0.65440834}
- {x: 2.1404014, y: 0.870591}
- {x: 2.2692728, y: 1.1114954}
- {x: 2.2609963, y: 1.2538469}
- {x: 2.173114, y: 1.3091141}
- {x: 2.0182755, y: 1.4024273}
- {x: 1.8194435, y: 1.5295426}
- {x: 1.5495461, y: 1.6651156}
- {x: 1.3732789, y: 1.7467664}
- {x: 1.0901272, y: 1.9101909}
- {x: 0.89034784, y: 2.0479517}
- {x: 0.6097225, y: 2.2452822}
- {x: 0.40140745, y: 2.4996731}
- {x: 0.14646946, y: 2.6985047}
- {x: -0.01122351, y: 2.7314458}
- {x: -0.122028865, y: 2.698468}
- {x: -0.2692213, y: 2.678579}
- {x: -0.31015164, y: 2.5351067}
- {x: -0.518945, y: 2.5067065}
- {x: -0.580619, y: 2.3737788}
- {x: -0.48597562, y: 2.2437894}
- {x: -0.6045631, y: 2.111704}
- {x: -0.5921693, y: 2.0197093}
- {x: -0.49529293, y: 1.9673729}
- {x: -0.43485767, y: 1.90508}
- {x: -0.3132007, y: 1.8013165}
- {x: -0.17235783, y: 1.7125479}
- {x: -0.048248038, y: 1.6432301}
- {x: 0.1271378, y: 1.7033483}
- {x: 0.30343655, y: 1.7995392}
- {x: 0.38388085, y: 1.8153903}
- {x: 0.49768627, y: 1.8880731}
- {x: 0.515, y: 1.6949999}
- {x: 1.005, y: 1.375}
- {x: 1.095, y: 1.285}
- {x: 1.375, y: 1.025}
- {x: 1.485, y: 0.895}
- {x: 1.475, y: 0.745}
- {x: 1.255, y: 0.53499997}
- {x: 1.0649999, y: 0.345}
- {x: 0.875, y: 0.385}
- {x: 0.895, y: 0.515}
- {x: 0.895, y: 0.72499996}
- {x: 0.85499996, y: 0.91499996}
- {x: 0.72499996, y: 1.095}
- {x: 0.615, y: 1.2049999}
- {x: 0.435, y: 1.3349999}
- {x: 0.265, y: 1.415}
- {x: 0.114999995, y: 1.435}
- {x: -0.065, y: 1.435}
- {x: -0.255, y: 1.385}
- {x: -0.36499998, y: 1.3249999}
- {x: -0.49499997, y: 1.175}
- {x: -0.675, y: 0.91499996}
- {x: -0.78499997, y: 0.695}
- {x: -0.825, y: 0.565}
- {x: -0.835, y: 0.465}
- {x: -0.72499996, y: 0.065}
- {x: -0.685, y: -0.015}
- {x: -0.475, y: -0.345}
- {x: -0.33499998, y: -0.525}
- {x: -0.42499998, y: -0.645}
- {x: -0.565, y: -0.745}
- {x: -0.645, y: -0.755}
- {x: -0.695, y: -0.655}
- {x: -0.7081955, y: -0.44896576}
- {x: -0.71990544, y: -0.3057393}
- {x: -0.8021156, y: -0.10741171}
- {x: -0.8738115, y: 0.14462727}
- {x: -0.9646422, y: 0.29827517}
- {x: -1.0677121, y: 0.39538574}
- {x: -1.1551367, y: 0.52327025}
- {x: -1.1952701, y: 0.72642356}
- {x: -1.2187322, y: 0.911324}
- {x: -1.280405, y: 1.0379875}
- {x: -1.3730602, y: 1.1019006}
- {x: -1.5018301, y: 1.1687952}
- {x: -1.7566363, y: 1.1322522}
- {x: -1.7534906, y: 1.0684075}
- {x: -1.7792655, y: 0.95732397}
- {x: -1.9382657, y: 0.922451}
- {x: -2.1041567, y: 0.8893785}
- {x: -2.2067018, y: 0.79657835}
- {x: -2.2634637, y: 0.73990524}
- {x: -2.2626348, y: 0.6395328}
- {x: -2.2943277, y: 0.48869255}
- {x: -2.2347374, y: 0.40832055}
- {x: -2.0567024, y: 0.38683155}
- {x: -1.7938527, y: 0.35415882}
- {x: -1.6282463, y: 0.17929924}
- {x: -1.4728888, y: 0.023122668}
- {x: -1.3508285, y: -0.012781948}
- {x: -1.2714746, y: -0.30680388}
- {x: -1.2885077, y: -0.66617215}
- {x: -1.2809411, y: -0.86712825}
- {x: -1.2258457, y: -1.0638452}
- {x: -1.1756736, y: -1.212126}
- {x: -1.1402969, y: -1.5090381}
- {x: -1.0056982, y: -1.54471}
- {x: -0.9261639, y: -1.5912895}
- {x: -0.73499995, y: -1.7249999}
- {x: -0.515, y: -1.7049999}
- {x: -0.415, y: -1.685}
- {x: -0.36499998, y: -1.665}
- {x: -0.185, y: -1.555}
- {x: -0.125, y: -1.505}
- {x: 0.065, y: -1.415}
- {x: 0.24499999, y: -1.485}
- {x: 0.325, y: -1.505}
- {x: 0.36499998, y: -1.665}
- {x: 0.465, y: -1.8549999}
- {x: 0.585, y: -2.085}
- {x: 0.73499995, y: -2.205}
- {x: 0.775, y: -2.435}
- {x: 0.805, y: -2.5049999}
- {x: 0.865, y: -2.615}
- {x: 1.0749999, y: -2.7849998}
- {x: 1.185, y: -2.825}
- {x: 1.405, y: -2.865}
- {x: 1.435, y: -2.865}
- {x: 1.635, y: -2.855}
- {x: 1.8349999, y: -2.7949998}
- {x: 2.115, y: -2.645}
- {x: 2.355, y: -2.5049999}
- - {x: 1.3399999, y: -0.13}
- {x: 1.48, y: -0.45999998}
- {x: 1.73, y: -1.05}
- {x: 1.78, y: -1.4399999}
- {x: 1.79, y: -2.25}
- {x: 1.63, y: -2.5}
- {x: 0.98999995, y: -2.56}
- {x: 0.76, y: -2.55}
- {x: 0.53999996, y: -2.32}
- {x: 0.45999998, y: -2.02}
- {x: 0.14, y: -1.66}
- {x: 0.02, y: -1.27}
- {x: -0.35999998, y: -1.06}
- {x: -0.84999996, y: -1.36}
- {x: -1.5799999, y: -1.42}
- {x: -1.6999999, y: -0.83}
- {x: -1.76, y: 0.01}
- {x: -2.05, y: 0.19999999}
- {x: -2.29, y: 0.5}
- {x: -2.53, y: 0.45999998}
- {x: -2.71, y: 0.52}
- {x: -2.6799998, y: 0.84999996}
- {x: -2.49, y: 1.04}
- {x: -2.1599998, y: 1.04}
- {x: -2.2, y: 1.18}
- {x: -1.9, y: 1.25}
- {x: -1.7099999, y: 1.0799999}
- {x: -1.64, y: 0.64}
- {x: -1.42, y: 0.29}
- {x: -1.22, y: -0.94}
- {x: -0.78, y: -0.77}
- {x: -0.52, y: -0.35}
- {x: -0.81, y: -0.12}
- {x: -0.96999997, y: 0.17999999}
- {x: -0.94, y: 0.32999998}
- {x: -1.11, y: 0.62}
- {x: -0.97999996, y: 0.96}
- {x: -0.65999997, y: 1.28}
- {x: -0.31, y: 1.35}
- {x: 0.12, y: 1.14}
- {x: 0.32999998, y: 0.87}
- {x: 0.22999999, y: 0.39}
- {x: 0.71, y: 0.22999999}
- {x: 1.11, y: 0.65999997}
- {x: 1.25, y: 1.04}
- {x: 0, y: 1.9699999}
- {x: -0.48, y: 1.74}
- {x: -0.78, y: 1.91}
- {x: -1.06, y: 2.1699998}
- {x: -0.94, y: 2.32}
- {x: -1.01, y: 2.47}
- {x: -0.93, y: 2.62}
- {x: -0.75, y: 2.6399999}
- {x: -0.65999997, y: 2.81}
- {x: -0.35, y: 2.79}
- {x: -0.07, y: 2.6599998}
- {x: 0.26999998, y: 2.23}
- {x: 0.74, y: 1.9399999}
- {x: 1.2190619, y: 1.6828954}
- {x: 1.62, y: 1.4}
- {x: 1.8499999, y: 1.3399999}
- {x: 1.6899999, y: 0.96999997}
- {x: 1.4599999, y: 0.34}
m_UseDelaunayMesh: 0
Loading

0 comments on commit 68f8b55

Please sign in to comment.