From f4ccd731bdbdcb4e8c4c677d847bd0c3f3459987 Mon Sep 17 00:00:00 2001 From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com> Date: Tue, 1 Mar 2022 20:50:59 +0530 Subject: [PATCH 1/4] game params for learning phase --- packages/map-designer/src/Parameters.ts | 2 +- packages/map-designer/src/config/TowerConfig.ts | 4 ++-- packages/renderer/src/config/TowerConfig.ts | 8 ++++---- packages/renderer/src/config/TroopConfig.ts | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/map-designer/src/Parameters.ts b/packages/map-designer/src/Parameters.ts index fd09a39f..7ab3ba6c 100644 --- a/packages/map-designer/src/Parameters.ts +++ b/packages/map-designer/src/Parameters.ts @@ -19,7 +19,7 @@ export class Parameters { static mapTileOffsetY = 256; - static totalCoins = 10000; + static totalCoins = 5000; static mapLocalStorageKey = 'cc-map-designer-map'; } diff --git a/packages/map-designer/src/config/TowerConfig.ts b/packages/map-designer/src/config/TowerConfig.ts index 5661efb6..610ea9c5 100644 --- a/packages/map-designer/src/config/TowerConfig.ts +++ b/packages/map-designer/src/config/TowerConfig.ts @@ -8,14 +8,14 @@ export default class TowerConfig { 'tower1', 'tower_round.png', 'tower_round_thumbnail.png', - 100, + 25, ), new TowerType( 3, 'tower2', 'tower_square.png', 'tower_square_thumbnail.png', - 200, + 50, ), ]; } diff --git a/packages/renderer/src/config/TowerConfig.ts b/packages/renderer/src/config/TowerConfig.ts index 0ebcef42..8b77de64 100644 --- a/packages/renderer/src/config/TowerConfig.ts +++ b/packages/renderer/src/config/TowerConfig.ts @@ -8,18 +8,18 @@ export default class TowerConfig { 'tower1', 'tower_round.png', 'tower_round_thumbnail.png', - 100, + 400, 4, - 100, + 25, ), new TowerType( 3, 'tower2', 'tower_square.png', 'tower_square_thumbnail.png', - 100, + 600, 6, - 100, + 50, ), ]; } diff --git a/packages/renderer/src/config/TroopConfig.ts b/packages/renderer/src/config/TroopConfig.ts index 4c2209f5..bbf92559 100644 --- a/packages/renderer/src/config/TroopConfig.ts +++ b/packages/renderer/src/config/TroopConfig.ts @@ -2,7 +2,7 @@ import TroopType from './TroopType.js'; export default class TroopConfig { static readonly troops: Array = [ - new TroopType(10, 3), - new TroopType(10, 3), + new TroopType(10, 2), + new TroopType(20, 4), ]; } From 4a4d3220fe79102ca0f16f8958f236941a8fa7b9 Mon Sep 17 00:00:00 2001 From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:09:36 +0530 Subject: [PATCH 2/4] merge --- src/assets/codes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/codes b/src/assets/codes index 68f3cb96..2627998d 160000 --- a/src/assets/codes +++ b/src/assets/codes @@ -1 +1 @@ -Subproject commit 68f3cb96752fa2dc9511f4fbe50ccace6f5f7c3d +Subproject commit 2627998d75cf4c4ccec8ea79af69168b09d55d48 From 25a023a1f5f9d9cd1be8e76748a82e9ae73f108c Mon Sep 17 00:00:00 2001 From: CaptainIRS <36656347+CaptainIRS@users.noreply.github.com> Date: Tue, 1 Mar 2022 21:10:47 +0530 Subject: [PATCH 3/4] update submodule --- src/assets/codes | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/assets/codes b/src/assets/codes index 2627998d..68f3cb96 160000 --- a/src/assets/codes +++ b/src/assets/codes @@ -1 +1 @@ -Subproject commit 2627998d75cf4c4ccec8ea79af69168b09d55d48 +Subproject commit 68f3cb96752fa2dc9511f4fbe50ccace6f5f7c3d From d8a0f8be97a2c4bb8d009bf86b6e1159707d671c Mon Sep 17 00:00:00 2001 From: Dipesh Kafle Date: Tue, 8 Mar 2022 11:52:35 +0545 Subject: [PATCH 4/4] fix: fetch battletv only once --- src/components/BattleTV/BattleTV.tsx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/BattleTV/BattleTV.tsx b/src/components/BattleTV/BattleTV.tsx index f2df26dd..38a1ad54 100644 --- a/src/components/BattleTV/BattleTV.tsx +++ b/src/components/BattleTV/BattleTV.tsx @@ -45,17 +45,17 @@ function PaginatedItems() { const itemsPerPage = 4; - const { battletv, loading, hasbeenFetched, hasErrors } = - useAppSelector(battleTvSelector); + const { battletv, loading, hasErrors } = useAppSelector(battleTvSelector); const loggedInUser = useAppSelector(user); // initialize the redux hook const dispatch = useAppDispatch(); - if (!hasbeenFetched) { - dispatch(fetchBattleTv()); - } + useEffect(() => dispatch(fetchBattleTv()), []); + // if (!hasbeenFetched) { + // dispatch(fetchBattleTv()); + // } useEffect(() => { const endOffset = itemOffset + itemsPerPage;