dushes/Run-and-capture
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
155 Commits 12 Branches 0 Tags
Commit Graph

117 Commits

Author SHA1 Message Date
DyatelO
03df16d0c5 Отключена реклама. 2022-01-19 21:32:30 +03:00
DyatelO
73b9ad95e8 Добавлен 3Д звук на некоторые можели. 
Отображается прицел во время предвижения.
 2022-01-19 21:31:29 +03:00
DyatelO
88a0e09a9c Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Scripts/Controller/GameInit.cs
 2022-01-19 13:20:07 +03:00
dddushesss
dbcc62d965 added capture ability. fixes 2022-01-18 22:43:19 +03:00
DyatelO
b6510c0d30 Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Heureka.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Packages/manifest.json
#	Packages/packages-lock.json
 2022-01-18 02:54:59 +03:00
dddushesss
e8fdc6c5b5 optimization. fixed mana regen, towers only on own territory, destroing buildings, changed bar canvas look at camera, fixed move(cannot move to hex, where is another character). fixed spawn. fixed random weapon to enemies 2022-01-18 02:48:30 +03:00
dddushesss
2183deb840 ai settings, autoaim, 2022-01-17 13:01:19 +03:00
dddushesss
3304c858d0 fixes shaders. fixed ai. fixed project size 2022-01-17 11:26:35 +03:00
dddushesss
74af3ab42d resources optimized 2022-01-16 05:40:49 +03:00
DyatelO
05910d57d7 Рабочий билд. без рекламы. 2022-01-14 10:57:41 +03:00
dddushesss
9a20f44447 cleaned branch 2022-01-13 23:23:11 +03:00
dddushesss
2c2fae3b58 Merge remote-tracking branch 'origin/Alexei' into Alexei 
# Conflicts:
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab
#	Assets/Resources/1/Crystal/Prefab/Crystal.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Mana.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Power.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Attack/Replace.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Magnet.prefab.meta
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab
#	Assets/Resources/1/VFX/Bonus/Protection/Shield.prefab.meta
#	Assets/Resources/Data/ItemData.asset
#	Assets/Scripts/Items/Bonus.cs.meta
#	Assets/Scripts/Items/Building.cs.meta
 2022-01-13 22:59:27 +03:00
dddushesss
03960d7d0b fixes/ latest ai version 2022-01-13 22:58:54 +03:00
dddushesss
6f3baa5a97 AI. Build does not work 2022-01-13 18:56:24 +03:00
dddushesss
cac61cfdd7 item fixes 2022-01-11 07:02:07 +03:00
dddushesss
d7424ed972 refactored items 2022-01-11 06:36:00 +03:00
dddushesss
2528c3e4dd paint fix, tower fix 2022-01-11 04:57:05 +03:00
dddushesss
7c5979e6a9 vfx controller, fire method in weapon 2022-01-10 23:26:07 +03:00
dddushesss
6224ac3354 changed tower view and prefab 2022-01-10 22:25:25 +03:00
dddushesss
564d85ae6f mana regen fix. hardcapture fix. mana limit capture 2022-01-10 17:37:20 +03:00
dddushesss
ff5bdd180a movement fix. ai movement 2022-01-10 17:11:07 +03:00
dddushesss
722b8da02b spawn, adsmob, ai, respawn 2022-01-09 00:37:09 +03:00
DyatelO
b197f6d8b2 Лёгкие исправления. 2022-01-08 15:50:03 +03:00
DyatelO
a6c79ba3aa Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/Scripts/Units/Unit.cs
#	Assets/add.cs
 2022-01-08 15:07:40 +03:00
DyatelO
d5242af927 no message 2022-01-08 15:06:14 +03:00
DyatelO
99bd500107 Добавлен респавн игрока после просмотра рекламы. (Нет спавна гексов цвета игрока при репавне.) 2022-01-08 03:57:28 +03:00
DyatelO
832807ae6d Добавлена кнопка повторной попытки. 2022-01-08 01:29:43 +03:00
DyatelO
e4a5948115 Класс add переименован в AdsMob 2022-01-07 22:31:39 +03:00
dddushesss
443845a35c ai start 2022-01-07 19:39:47 +03:00
DyatelO
ce6d0f8d10 Заменена анимация атаки. 2022-01-06 22:10:25 +03:00
DyatelO
2f1c81b4d6 Исправлена ошибка закрытия окна рекламы. 2022-01-06 20:24:34 +03:00
DyatelO
458bd6d67e no message 2022-01-06 19:56:02 +03:00
DyatelO
b5a80f14dd Merge branch 'Alexei' into Zakhar 
# Conflicts:
#	Assets/ExternalDependencyManager.meta
#	Assets/ExternalDependencyManager/Editor.meta
#	Assets/ExternalDependencyManager/Editor/1.2.167.meta
#	Assets/GoogleMobileAds.meta
#	Assets/GoogleMobileAds/Editor.meta
#	Assets/GoogleMobileAds/Editor/Resources.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/AdImages.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/AppOpen.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Banners.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Interstitials.meta
#	Assets/GoogleMobileAds/Editor/Resources/DummyAds/Rewarded.meta
#	Assets/Plugins/Android.meta
#	Assets/Plugins/Android/GoogleMobileAdsPlugin.androidlib.meta
#	Assets/Plugins/Android/androidx.annotation.annotation-1.1.0.jar.meta
#	Assets/Plugins/Android/androidx.arch.core.core-common-2.0.1.jar.meta
#	Assets/Plugins/Android/androidx.arch.core.core-runtime-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.asynclayoutinflater.asynclayoutinflater-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.browser.browser-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.collection.collection-1.0.0.jar.meta
#	Assets/Plugins/Android/androidx.coordinatorlayout.coordinatorlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.core.core-1.2.0.aar.meta
#	Assets/Plugins/Android/androidx.cursoradapter.cursoradapter-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.customview.customview-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.documentfile.documentfile-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.drawerlayout.drawerlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.fragment.fragment-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.interpolator.interpolator-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.legacy.legacy-support-core-ui-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.legacy.legacy-support-core-utils-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-common-2.0.0.jar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-livedata-core-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-runtime-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-service-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.lifecycle.lifecycle-viewmodel-2.0.0.aar.meta
#	Assets/Plugins/Android/androidx.loader.loader-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.localbroadcastmanager.localbroadcastmanager-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.print.print-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.room.room-common-2.1.0.jar.meta
#	Assets/Plugins/Android/androidx.room.room-runtime-2.1.0.aar.meta
#	Assets/Plugins/Android/androidx.slidingpanelayout.slidingpanelayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.sqlite.sqlite-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.sqlite.sqlite-framework-2.0.1.aar.meta
#	Assets/Plugins/Android/androidx.swiperefreshlayout.swiperefreshlayout-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.versionedparcelable.versionedparcelable-1.1.0.aar.meta
#	Assets/Plugins/Android/androidx.viewpager.viewpager-1.0.0.aar.meta
#	Assets/Plugins/Android/androidx.work.work-runtime-2.1.0.aar
#	Assets/Plugins/Android/androidx.work.work-runtime-2.1.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-base-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-identifier-17.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-20.2.0.aar
#	Assets/Plugins/Android/com.google.android.gms.play-services-ads-lite-20.2.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-basement-17.6.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-measurement-base-18.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-measurement-sdk-api-18.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.gms.play-services-tasks-17.0.0.aar.meta
#	Assets/Plugins/Android/com.google.android.ump.user-messaging-platform-1.0.0.aar.meta
#	Assets/Plugins/Android/com.google.guava.listenablefuture-1.0.jar.meta
#	ProjectSettings/GvhProjectSettings.xml
 2022-01-06 19:24:57 +03:00
dddushesss
315d54a56e add added 2022-01-06 16:17:20 +03:00
dddushesss
6eb981cf59 effect for rounding 2022-01-06 12:04:20 +03:00
dddushesss
43993fb918 fixed rounding 2022-01-06 10:59:47 +03:00
DyatelO
15986ccb0e Фикс перед настройкой AdMob 2022-01-06 06:25:04 +03:00
dddushesss
b298adec90 final item fixes 2022-01-05 22:36:27 +03:00
dddushesss
ea32692481 minor fixes 2022-01-05 21:43:53 +03:00
dddushesss
5f0c2b0446 Merge branch 'Prod' into Alexei 
# Conflicts:
#	Assets/Resources/Data/ItemData.asset
 2022-01-05 21:36:39 +03:00
dddushesss
95f941abb8 weapon fixes 2022-01-05 21:33:46 +03:00
dddushesss
732e184c22 Merge branch 'Alexei' into Prod 2022-01-05 17:55:30 +03:00
dddushesss
6ccb4723cb fixed weapon modified damage 2022-01-05 17:54:11 +03:00
dddushesss
0585266d8d merge fixes 2022-01-05 17:48:27 +03:00
dddushesss
2d87148a09 Merge branch 'Alexei' into Prod 
# Conflicts:
#	Assets/Scenes/NewMainMenu.unity
#	Assets/Scripts/Units/Unit.cs
 2022-01-05 17:44:03 +03:00
dddushesss
482a8371a3 fixes item 2022-01-05 17:39:00 +03:00
dddushesss
c87a906d97 items finished 2022-01-05 15:43:08 +03:00
DyatelO
ff63e72172 Баг с перезарядкой. (Дополнение.) 2022-01-05 05:11:30 +03:00
DyatelO
b85aae35d4 Скорректирован баг с перезарядкой. 2022-01-05 03:41:23 +03:00
DyatelO
e196974851 Merge branch 'Zakhar' of https://github.com/BG-Games/S_Jump-and-grub into Zakhar 
# Conflicts:
#	Assets/Scripts/HexFiled/PaintedController.cs
 2022-01-05 02:49:07 +03:00