Skip to content

Commit 6118c96

Browse files
committed
3.2.1
1 parent f7acdd6 commit 6118c96

33 files changed

+7771
-7182
lines changed

assets/csv_client/client_globals.csv

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -288,6 +288,8 @@
288288
,,,,"clashroyale.scinbox.qq.com",
289289
,,,,"video.qq.com",
290290
,,,,"v.qq.com",
291+
,,,,"tesports-clashroyale.scinbox.qq.com",
292+
,,,,"esports-clashroyale.scinbox.qq.com",
291293
"ROYAL_BOX_URL_PARAM_USER_AGENT",,,"supercell-in-game",,
292294
"ROYAL_BOX_PASS_ALL_EVENT_TIMES",,"TRUE",,,
293295
"LOAD_ONLY_LOWRES_TEX",,"FALSE",,,
@@ -407,7 +409,7 @@
407409
"MANDATORY_CONTENT_MAX_RETRY_COUNT_BEFORE_ERROR",6,,,,
408410
"SHOW_ACHIEVEMENT_REMOVAL_NOTICE",,"TRUE",,,
409411
"CLASH_ROYALE_MIN_PLATFORM_VERSION",,,"8,2",,
410-
"CLASH_ROYALE_MIN_PLATFORM_VERSION_ANDROID",,,4.2,,
412+
"CLASH_ROYALE_MIN_PLATFORM_VERSION_ANDROID",,,"4.2",,
411413
"WEB_VIEW_LOADING_INDICATOR_SHOW_AFTER_MS",0,,,,
412414
"BATTLE_CANCEL_COOLDOWN_S",10,,,,
413415
"ENABLE_JOINING_2V2_CLAN_SURVIVAL_WHEN_NOT_JOINED",,"TRUE",,,
@@ -442,7 +444,7 @@
442444
"SHOW_CLAN_WAR_LEADERBOARDS",,"TRUE",,,
443445
"CLAN_WAR_NAME_AMOUNT_A",37,,,,
444446
"CLAN_WAR_NAME_AMOUNT_B",3,,,,
445-
"CLAN_WAR_NAME_AMOUNT_C",26,,,,
447+
"CLAN_WAR_NAME_AMOUNT_C",32,,,,
446448
"DISABLE_IPHONE_X_BLUR_CLAN_RESULTS",,"TRUE",,,
447449
"DISABLE_IPHONE_X_BLUR_CLAN_COLLECTION",,"FALSE",,,
448450
"ENABLE_CSE_TO_SSE_EVENTS",,"TRUE",,,
@@ -496,10 +498,15 @@
496498
"EMOTES_ENABLED_SPELL_PAGE",,"TRUE",,,
497499
"EMOTES_ENABLED_INGAME_SPECTATOR",,"TRUE",,,
498500
"EMOTES_ENABLED_INGAME_PLAYER",,"TRUE",,,
499-
"ESPORTS_TAB_ENABLED",,FALSE,,,
500-
"ENABLE_OLD_HELPSHIFT",,"TRUE",,,
501+
"ESPORTS_TAB_ENABLED",,"TRUE",,,
502+
"ENABLE_OLD_HELPSHIFT",,"FALSE",,,
501503
"XP_TO_SHOW_NEW_EMOTES",8,,,,
502504
"DOUBLE_TAP_TO_TOGGLE_WAR",,"TRUE",,,
503505
"DOUBLE_TAP_TO_TOGGLE_SPELL",,"TRUE",,,
504506
"HIDE_SHOP_OFFERS_ONCE_FULLY_PURCHASED",,"TRUE",,,
505507
"SHOW_API_TOKEN_IN_SETTINGS",,"TRUE",,,
508+
"USE_VI_FALLBACK_FONT",,"TRUE",,,
509+
"USE_SAME_LEVELS_FOR_ALL_CARDS",,"TRUE",,,
510+
"ENABLE_RANDOM_DECK_BUTTON_SPELL_PAGE",,"FALSE",,,
511+
"EMOTE_CHAT_MIN_TIME_CYCLE_MS",5000,,,,
512+
"EMOTE_CHAT_MAX_TIME_CYCLE_MS",30000,,,,

assets/csv_client/credits.csv

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
"Brice Laville Saint-Martin",
2222
"Lassi Leppinen",
2323
"Jani Lintunen",
24+
"Matt Millwood",
2425
"Taneli Oksama",
2526
"Martin Schjøler",
2627
"Jarno Seppänen",

assets/csv_client/effects.csv

Lines changed: 46 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1353,13 +1353,13 @@
13531353
,,,,,,,,"ParticleEmitter",,,"heal_ground_ring_short",,"Base",,,,,,,,,,
13541354
,,,,,,,,"ParticleEmitter",,,"heal_particle_lines_short",,"Object",,,,,,,,,,
13551355
,,,,,10,,,"ParticleEmitter",,,"heal_border_burst_short",,"Base",,,,,,,,,,
1356-
"Zap2_effect",,,250,,150,,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
1357-
,,,,,200,,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
1358-
,,,,,200,,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
1359-
,,,,,50,,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
1360-
,,,,,50,,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
1361-
,,,,,,,,"ParticleEmitter",,,"Zap_hit_area",,"Base",,,,,,,,,,
1362-
,,,,,,,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
1356+
"Zap2_effect",,,200,,150,50,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
1357+
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
1358+
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
1359+
,,,,,50,50,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
1360+
,,,,,50,50,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
1361+
,,,,,,50,,"ParticleEmitter",,,"Zap_hit_area",,"Base",,,,,,,,,,
1362+
,,,,,,50,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
13631363
"challenge_unlock",,,,,,,,"SWF",,,,,"Above",,,,,,,,,,
13641364
,,,,,,,,"ParticleEmitter",,,"chest_landing_puff_giant",,"Above",,,,,,,,,,
13651365
,,,,,,,,"ParticleEmitter",,,"chest_landing_giantBurst",,"Base",,,,,,,,,,
@@ -1707,3 +1707,42 @@
17071707
,,,,,,,,"ParticleEmitter",,,"royal_hog_dustPuff",,"Ground",,,,,,,,,,
17081708
,,,,,,,,,,,,,,60,,,,,,,,,
17091709
,,,,,,,,,,,,,,60,,,,,,,,,
1710+
"goblin_giant_deploy",,,,,,,"sound_goblin_giant_deploy","SWF",,,"giant_deploy_dustPuff",,"Object",100,,,"giant_deploy_enemy",,,,,,
1711+
,,,,,,,,"Effect",,,,"Deploy_ground_fx_largeSize","Base",,,,,,,,,,
1712+
"goblin_giant_steps",,,,,,,"sound_goblin_giant_steps","SWF",,,,,"Ground",100,,,,,,,,,
1713+
"goblin_giant_attack_start",,,,,,,"sound_goblin_giant_attack_start","SWF",,,,,"Object",100,,,,,,,,,
1714+
"goblin_giant_hit",,,,,,,"sound_goblin_giant_hit","SWF",,,,,"Object",100,,,,,,,,,
1715+
,,,,,,,,"ParticleEmitter",,,"giant_hit_sparks",,"Above",,,,,,,,,,
1716+
,,,,,25,,,"ParticleEmitter",,,"giant_hit_puff1",,"Object",,,,,,,,,,
1717+
,,,,,,,,"ParticleEmitter","sc/effects.sc","giant_hit_blow","giant_hitpuff2",,"Object",,,,,,,,,,
1718+
"goblin_giant_die",,,,,,,"sound_goblin_giant_die","Effect","sc/effects.sc","RoundExplosion","Death_sparkle_still1","death_giant1","Object",100,,,"giant_die_enemy",,,,,,
1719+
"giant_sparks","true",,,,,,,"ParticleEmitter",,,"giant_sparks",,"Object",,,,,,,,,,
1720+
,,,,,,,,"ParticleEmitter",,,"electro_wizard_hit_burst",,"Object",,,,,,,,,,
1721+
"Zap3_effect",,,200,,150,50,"sound_spell_zap","ParticleEmitter",,,"Spell_zap_smoke1",,"Object",,,,,,,,,,
1722+
,,,,,150,50,,"ParticleEmitter",,,"Spell_zap_hitSpot",,"Ground",,,,,,,,,,
1723+
,,,,,200,50,,"ParticleEmitter",,,"Spell_zap_hitSpot2",,"Ground",,,,,,,,,,
1724+
,,,,,50,100,,"ParticleEmitter",,,"Spell_zap_sparks",,"Object",,,,,,,,,,
1725+
,,,,,50,100,,"ParticleEmitter",,,"Spell_zap_Flash",,"Ground",,,,,,,,,,
1726+
,,,,,,75,,"Filter","sc/effects.sc","filter_target",,,"Base",,,,,,,,,,
1727+
"DragonRingEmitter","true","true",,,,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",50,,,,,,,,,
1728+
,,,,,100,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1729+
,,,,,200,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1730+
,,,,,300,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1731+
,,,,,400,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1732+
,,,,,500,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1733+
,,,,,600,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1734+
,,,,,700,,,"ParticleEmitter",,,"DragonRingTrail",,"Object",,,,,,,,,,
1735+
"root_effect",,,,,,100,,"SWF","sc/effects.sc","spell_root_base","IceGolem_snowPile1",,"Ground",,,,,,,,,,
1736+
,,,,,,100,,"SWF","sc/effects.sc","spell_root_front","IceGolem_ground_area",,"Object",,,,,,,,,,
1737+
,,,,,,100,,"ParticleEmitter","sc/effects.sc","spell_root_front","magic_archer_arrow_die_sparks_blue",,"Object",,,,,,,,,,
1738+
"mystery_tease",,,500,,,,"Card_bonus_reveal","ParticleEmitter",,,"mystery_tease",,"Above",,,,,,,"BlueLighning",,,
1739+
,,,,,,,,"ParticleEmitter",,,"mystery_particles",,"Above",,,,,,,"RedLightning",,,
1740+
"electro_dragon_load_weapon_1",,,,,,,"sound_electro_dragon_load_1","SWF",,,,,"Above",,,,,,,,,,
1741+
"electro_dragon_load_weapon_2",,,,,,,"sound_electro_dragon_load_2","SWF",,,,,"Above",,,,,,,,,,
1742+
"electro_dragon_load_weapon_3",,,,,,,"sound_electro_dragon_load_3","SWF",,,,,"Above",,,,,,,,,,
1743+
"electro_dragon_attack",,,,,,,"sound_electro_dragon_attack","SWF",,,,,"Above",,,,,,,,,,
1744+
"openSack_effect",,,,,,,,"SWF",,,,,"Above",,,,,,,,,,
1745+
,,,,,,,,"ParticleEmitter",,,"openSack",,"Object",,,,,,,,,,
1746+
,,,,,,,,"ParticleEmitter",,,"openSack_smoke",,"Base",,,,,,,,,,
1747+
,,,,,,,,"ParticleEmitter",,,"openSack_goldDust",,"Base",,,,,,,,,,
1748+
"trade_complete_confetti",,,,,,,,"ParticleEmitter",,,"trade_complete_confetti",,"Above",,,,"win_battle_confetti_red",,,,,,

0 commit comments

Comments
 (0)