Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

维修子机目标问题修复 #9

Merged
merged 3 commits into from
Feb 19, 2025
Merged

维修子机目标问题修复 #9

merged 3 commits into from
Feb 19, 2025

Conversation

TaranDahl
Copy link

@TaranDahl TaranDahl commented Feb 19, 2025 •
edited
Loading

原本游戏中，用子机对目标进行维修的单位在修理完毕后不会自动重设维修目标，这使得子机会一直盘旋在目标周围。
现在我们修复了这个问题。
无ini，强制开启。

@github-actions github-actions bot added the Minor label Feb 19, 2025
@TaranDahl TaranDahl changed the title impl Repair spawner target fix Feb 19, 2025
@TaranDahl TaranDahl changed the title Repair spawner target fix 维修子机目标问题修复 Feb 19, 2025
@github-actions GitHub Actions
Copy link

github-actions bot commented Feb 19, 2025 •
edited
Loading

Nightly build for this pull request:

This comment is automatic and is meant to allow guests to get latest nightly builds for this pull request without registering. It is updated on every successful build.

@CrimRecya CrimRecya merged commit 1d0fa6d into CrimRecya:develop-Mix4ECpack Feb 19, 2025
4 checks passed
CrimRecya added a commit that referenced this pull request Feb 24, 2025
@CrimRecya
Squashed commit of the following:
bfd31f3 
commit b103391c630512598ff27ab6636ea277f3499ab4
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:12:11 2025 +0800

    Squashed commit of the following:

    commit 2182e831aeae7f8938303721c6a2e937dd6ff067
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 02:06:36 2025 +0800

        小改位置

    commit 056a7ab1a82e11ba5b37b0c17613f927eb8fb66a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:19:11 2025 +0800

        改动说明

    commit 545f6088d35b9b32543e9db7dc371a464fa90ce1
    Merge: 7d3c131d cf69a711
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:18:22 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cf69a7111ae2070728de5f3cb40a399e203ac7be
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:18:17 2025 +0800

        功能说明

    commit af44f3f6182cb97eed0824fe9bcd40408b1f81be
    Merge: 49dfd0ae 886cd122
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:15:47 2025 +0800

        Merge branch 'develop-newinfotype' into develop-Mix4BEtest

    commit 886cd122a666ced42f990f3c4107bc5532ebe829
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:15:40 2025 +0800

        New `ValueAsTimer`

    commit 7d3c131ddda6ba5efad94b3f8c196d325bcf35d5
    Merge: 57eaa340 49dfd0ae
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:30:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 49dfd0aea1d60c88b270ba43d0182690da411a7d
    Merge: 4c7d1cc9 a954c838
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:29:55 2025 +0800

        Merge branch 'develop-newinfotype' into develop-Mix4BEtest

    commit a954c83885f29a2af9da6c10224f5ef27064be06
    Merge: 83debb74 13cdc0cc
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:28:34 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

    commit 57eaa3401b39d0159ed082c23fab4a911b3d50dc
    Merge: 9166eec1 4c7d1cc9
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:27:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4c7d1cc9f25259335cbd95f9590b421982c406eb
    Merge: 052ce1e4 13cdc0cc
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:24:12 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 052ce1e469faa7b7d92ea6f4fb41957f29840afd
    Merge: 59007c82 00752e41
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:17:17 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 9166eec198d7f1e4d4691f05f4002a3c3bd9f5c7
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 21:04:39 2025 +0800

        修复侵略模式按钮

    commit 241479932e0fa9c9b9327d8aff51827e64e944a7
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:41:54 2025 +0800

        更新改动说明

    commit eed20f690ed6a5ff57f3da7cb6eacde3f7e3eac1
    Merge: 4d9ab456 59007c82
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:38:07 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 59007c8205df4cb35345a2f1a89b12d3d2c5cd76
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:38:02 2025 +0800

        小改动

    commit 4d9ab456f6285d7476be2d06aa56d8baad5eb2be
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:36:50 2025 +0800

        合并功能

    commit a3965d3d37a6195f226d3c3c9ecb025562f970fd
    Merge: 6342450f d1cda617
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:31:45 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d1cda6171fce116c5195e64ba6c83270ac6b5a80
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:31:11 2025 +0800

        功能说明

    commit 6342450f45e7c0e4b791a9fa81de957c0601817c
    Merge: dc523103 3456e138
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:10:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3456e138f8a480d8f83f82749d9b2b2419bee65b
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:10:23 2025 +0800

        完成所有基本底边栏功能

    commit eb2d35e49e57f285e81adbe0befc88138c9c8976
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 03:01:09 2025 +0800

        底边栏功能继续完善

    commit ac74b4c14b9891f351d2d27a043edbc06c560475
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 00:02:03 2025 +0800

        全新的底边选择栏底层

    commit dc523103555d09cd4ded6779e7d805a49f61bfda
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 01:47:54 2025 +0800

        更新改动说明

    commit c8ebd98339f9671164c901f7c9ce354de8e374d5
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 01:47:39 2025 +0800

        修改玩家自动修理

    commit 94ea4577332bdc7e08416d9fcce6d3e0bbc83d85
    Merge: 16ff7f60 9180ff46
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:54:34 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 9180ff46ca477872b8697d73191bc9f0f6a48f58
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:54:15 2025 +0800

        更新说明书

    commit 16ff7f60b4cca7e9bfa94e41416798f7dde98550
    Merge: 2d01a403 8be46a13
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:47:51 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8be46a13c08a209a148dcea48ad29c74ff3fe51e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:47:46 2025 +0800

        增加自动建筑快捷键初始默认值

    commit 2d01a40324ab5868d6638b2c48b3a5aa26358b48
    Merge: 23a3d9ca 40a71e5b
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 23:02:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 40a71e5b2e56a5788b1ed55fdd909cab972d4ccc
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 23:02:24 2025 +0800

        补充独特单位显示的完整开关

    commit 23a3d9ca3e099433a52ba4ffa5cedf6336aebfd1
    Merge: 7b831b56 87b20441
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 22:52:49 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 87b20441dd94d225559b13f7dcff3bc1ccb954df
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 22:52:16 2025 +0800

        彻底修复超武侧栏的开关点击问题

    commit 7b831b56de380bda032adbe852adb798ed353e9f
    Merge: 4d99159a b2adb3c2
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:58:27 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b2adb3c2b382c116d529d62a1bb0409dd7f87e00
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:58:23 2025 +0800

        Fix typo

    commit 4d99159ab6cd325251152b9ed7bed1044b9709af
    Merge: a9f01889 7053fae2
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:24:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 7053fae23ecb17efa368c4258c891a1723e6e9a7
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:24:15 2025 +0800

        修复最后一个点击问题并优化科技树图标检查

    commit a9f018895c06b6922e2a8d61a7be73a837829a66
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:06:18 2025 +0800

        更新改动说明

    commit 4d9f7580e1709d0fcbd2bc4369d65591cf50da96
    Merge: da3e0c4d 8e57d2e0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:01:38 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8e57d2e03698dfb5a9f7493af0ad2636ba8bced0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:01:33 2025 +0800

        修复超武侧栏的一些点击类问题

    commit da3e0c4d64d79bf080d775e7cfa1477d0948c0da
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 14:01:31 2025 +0800

        更新改动说明

    commit 0e782d6afa7b9391d75600d7f3272246d60faa12
    Merge: f49ceee6 1ce0f217
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 13:51:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1ce0f217a579170a63981e30b4604350b3487349
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 13:51:08 2025 +0800

        超武侧栏的更新和修复

    commit 504b88e6f16be5ff25174e77605918306f97bd9c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 12:14:33 2025 +0800

        修一下说明书

    commit f49ceee64f2fe71d3d8194726fc6761ae2b40d61
    Merge: 1eb3ccdc 8e4b0a24
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:21:55 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8e4b0a24461f040ed07b42e6cf0153785fd58977
    Merge: 3cb24f21 2d9f9c4c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:18:43 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 3cb24f21da43fc59c75fd830b766ede418fb6345
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:14:52 2025 +0800

        修改一些超武栏的钩子并重做英雄栏底层

    commit 1eb3ccdc534ccfe4de3b89a40e2997dd38313788
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:47:17 2025 +0800

        版本号更新

    commit 7c0c86202cb3a2d0a777f7aab5bc3181b7fa08ca
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:46:24 2025 +0800

        改动说明

    commit e0e8ab1372852d65035d7206873eb5669926c655
    Merge: c35b5f5d 97849d3d
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:42:11 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 97849d3debd3f109cc47ba88d954255a5b35d45a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:42:06 2025 +0800

        功能说明

    commit 7cf6b28f7916afb292b94fd6cb6ffdabd11d252b
    Merge: cad44713 86e3aa61
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:41:07 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 86e3aa611d574da3186af9b41a782f3175af6ee8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:40:59 2025 +0800

        Fix

    commit c35b5f5db8b5cf947e89bc6d6a89afd7643f5459
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:22:35 2025 +0800

        更新改动说明

    commit be5597d2de4cf4445e370652e4fa962a335302e6
    Merge: 81cd401a cad44713
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:19:10 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cad44713188639146629b4642c38171569b882dd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:19:04 2025 +0800

        额外功能说明

    commit 394fd6962496aeaf9c4aac259cacf27393fa1cb4
    Merge: c6f6c2be 1b984b03
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:17:41 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 1b984b034eff04c81e8fe02f8b4ec23f0743912b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:17:32 2025 +0800

        New `BuildingSell.IgnoreUnsellable`

    commit 81cd401aa6796a2187130c16f90bf86d968fd973
    Merge: 998455e6 c6f6c2be
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:10:12 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c6f6c2be2f8fb2121f4f1afc67caa7c5726a1b5c
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:10:07 2025 +0800

        播一下声音写一下字

    commit 998455e6c74f9fe1c0ee2d4359ad8d63d7dafafe
    Merge: e8ed0b99 01e4b330
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:47 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 01e4b3304dcbe182ce0b12188d02f2934e2c7a6f
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:44 2025 +0800

        修一下注释的位置

    commit e8ed0b99e1bcd5694b2522b3ae476b6f3bd34064
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:06 2025 +0800

        更新改动说明

    commit 6daf0a89ee309b2e88dc88e32c62ee8be8aabe5b
    Merge: 3875c084 0c03bdf8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:17:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 0c03bdf88d763d51726fda78cd74315cbb276a43
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:17:18 2025 +0800

        新增滚轮功能

    commit 83debb7474efde6b3f4c0a40eeffd51d0fd48a10
    Merge: f260915c aa4e9525
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 17:44:55 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

    commit 3875c0848646ba8dab39c47ada5bed002f5ae0cb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 17:42:54 2025 +0800

        更新说明

    commit 79109419c4c74892cd030f0bb664aa7b2908dfe4
    Merge: b6197722 2d6f3384
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 15:19:52 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2d6f33849a6633a83490833481a6ceb5efde3fe8
    Merge: bb7ada15 aa4e9525
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 15:19:29 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit aa4e9525a3929c07e19957a76536c222c5d69b9a
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 20 15:18:14 2025 +0800

        [Minor] Disallow other actions for building in planning mode (#1524)

        <!-- Please add [Minor] to the title or the description if this change
        should not be mentioned in documentation, what's new and no credit needs
        to be given. -->

        ---------

        Co-authored-by: 绯红热茶 <[email protected]>

    commit 06664e94f92e68f8ad22554354f7160eea64e8d4
    Author: Fryone <[email protected]>
    Date:   Thu Feb 20 09:57:57 2025 +0300

        [Minor] Fix Ammo features and tank bunkers. (#1420)

        - fixing ammo block inside tank bunkers;
         - partially fixing ammo adding/substracting inside tank bunkers

        still problems with converters

        ---------

        Co-authored-by: Coronia <[email protected]>

    commit b619772284613a317851bc3ac38c56fd5f4a460b
    Merge: 65ea625a bb7ada15
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:35 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit bb7ada15bb756d6fd9d4d6cef6b8ffecb0d7eb56
    Merge: eb2d49cf ee1f0eae
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:26 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit ee1f0eaee296465d335ed4a42ccd0577c6ea284b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:06 2025 +0800

        More check

    commit 65ea625af75da45d2717ca242b73174ffdb79f3d
    Merge: 0596116c eb2d49cf
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:29:46 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit eb2d49cfe5c66d917c8395e2f19311ac7a2a24d5
    Merge: 7aef8ff6 9e33e4dd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:29:21 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 9e33e4dde4d3a2efc695e0f02b5e0e47e5705369
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:26:56 2025 +0800

        Comment

    commit da46faa83f5e3ff68dc5b09c8b3366b5347f18fd
    Merge: a6291514 3b8e0e32
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:03:15 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-UndeployBuilding

    commit 0596116c970a15360bfa6fe88fd8d63fe514f50c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:10:38 2025 +0800

        更新改动说明

    commit 5939c3c6da9e30d2a02c6bf49e3128e491aa85aa
    Merge: 5d71a343 7aef8ff6
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:07:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 7aef8ff684e8a754bb445fafe197218330a537bb
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:07:54 2025 +0800

        修复超长距离

    commit 5d71a343e534a465a5b347dc43ee4c44bc0c162e
    Merge: 81b6cefb b420e139
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 18:28:13 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b420e1398cc022a8ba1513ab74a27044fbaa2228
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 18:28:09 2025 +0800

        扩散没目标的时候重新看一眼原目标

    commit 81b6cefbb0c63a27fd09e1969d482e16379d4801
    Merge: 5a47a9af 240efea7
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:14:22 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 240efea7905c407d0356ddbe39d12806186652a5
    Merge: 17f81446 fac6abb9
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:14:03 2025 +0800

        Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

    commit 17f814461f680b5d0b8216e61abe9a32ce2d17e1
    Merge: 54dc20f5 3b8e0e32
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:13:32 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 54dc20f545236f66f1cf5cbe2e7aadacbccac554
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:13:22 2025 +0800

        先移除重复

    commit fac6abb918b429de2031cf01876b48f16a75f85d
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:08:56 2025 +0800

        Core

    commit 5a47a9af68f05e6170764e0d7277e608d54d335f
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:40:33 2025 +0800

        更新改动说明

    commit 3b8e0e32fa9bafb3d5c954ac5419b8897beea316
    Merge: e14ffa83 93b5f068
    Author: Coronia <[email protected]>
    Date:   Wed Feb 19 16:40:13 2025 +0800

        [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

        - Fix an issue where a unit will leave an impassable invisible barrier
        in its original position when it is teleported by ChronoSphere onto an
        uncrushable unit and self destruct.

        Thx to @NetsuNegi .

    commit 5542bc84d8e46bfa0e0d20e76b6f5afb284e0174
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:36:34 2025 +0800

        说明书

    commit 041cc26812d1bdcf6eff7741fc8e5cfb83acefe1
    Merge: f44f3336 1d0fa6d5
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:34:45 2025 +0800

        Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

    commit 1d0fa6d57a05c1ed61cc207a09265250021d5764
    Author: 航味麻酱 <[email protected]>
    Date:   Wed Feb 19 16:34:16 2025 +0800

        维修子机目标问题修复 (#9)

        * impl

        * Update Hooks.Misc.cpp

        * Update Hooks.Misc.cpp

    commit f44f333623b7cd216c001e543c22dd3b62d2a9cd
    Merge: 94b12f5b 5e07847c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:31:02 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5e07847ce7c0117fb32bd557c08fd264fa07f81e
    Merge: cce26bca bed1e2e7
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:30:58 2025 +0800

        Merge branch 'develop-KeepTargetFix' into develop-Mix4BEtest

    commit bed1e2e72a1d21069e45fcafa6c29080dce7aaa0
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:30:51 2025 +0800

        Core

    commit 94b12f5b0d953b0acb468eea0bc115f501eef200
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:05:40 2025 +0800

        更新改动说明

    commit 5ae70982f60bb122a63ba07a5c6a0a1f26639437
    Merge: 79bb3743 cce26bca
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:03:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cce26bca9813068de56eb66d8a99e70acbfc69ad
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:03:12 2025 +0800

        小修复

    commit 79bb37432e6d99e9722bdf8d6ecf4bedb2d4b938
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:50:15 2025 +0800

        更新改动说明

    commit 9414b022f9316b929df2b03a85cd57599632cfc9
    Merge: ccbdee2f 5677c8ca
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:48:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5677c8cad1f7b94f1e3b2f310059c1260bac64a8
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:48:13 2025 +0800

        修复读取错误

    commit ccbdee2f5cf1d8edc4ef33d341ea20b7f6783d9b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:48:45 2025 +0800

        更新改动说明

    commit 903ac37c6367042347db5d090d178d8f14e32f26
    Merge: 1bab85db 04c2f22c
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:44:43 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 04c2f22c1b8a05cbd864398e585b1eda2d114b5c
    Merge: 6ebe050b e14ffa83
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:43:54 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 1bab85db2a31b40d6e656aaa8a170d16cf590dc0
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 16:05:53 2025 +0800

        更新改动说明

    commit 83c8f7c6ec11449f470fe383af5196fcf135bf88
    Merge: 853630d8 6ebe050b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:54:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6ebe050b7e0695dfc82d2231eae8a3b5065164f4
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:54:26 2025 +0800

        小修复

    commit 853630d8a87fc0fb3beb42dbfc4aacb11b07ae27
    Merge: 5dc93d25 2520485a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:48:10 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2520485af31c094c1a143e3ed6e8cdb673deb2c5
    Merge: be0c165a 646224b2
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:48:06 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 5dc93d25d753530bf43030fba100dcaadb516079
    Merge: 73f17e1c be0c165a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:47:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit be0c165ab70ff45cdf664214518f160ef48c1b96
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:47:16 2025 +0800

        修复变量名

    commit 73f17e1c875fc1dd516f451120ea7d5b3ab8ea96
    Merge: 735fa1d1 eb018bf6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:39:50 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit eb018bf69e76a18596001b6f58bdecccfdbd3d92
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:39:45 2025 +0800

        允许切割和追踪抛体在嵌套载具内正确开火

    commit 735fa1d129ebc251b27a13dc646e5f93e4ace24f
    Merge: 72997cf1 c8945094
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 13:29:02 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c894509457dbad06a6578c99f8766c5753dfc112
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 13:28:57 2025 +0800

        不同步处在追踪抛体本身不能攻击位置的目标

    commit 72997cf124a1159087c43eaa6df4ecc2360d00b5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:32:12 2025 +0800

        更新改动说明

    commit a427d8454083e29aedfb95e48c8ef0cea9676119
    Merge: f832903d 94c53c7e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:31:28 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 94c53c7e72c3470f87a41be5237cb586868d1685
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:31:23 2025 +0800

        扩散抛体速度无上限

    commit f832903d93d16c26ca5509e397c755750c33f8d7
    Merge: b044babb cea68ec7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:03:18 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cea68ec70847c4260e41b17413536bfd49ba45d7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:03:04 2025 +0800

        补充遗漏2

    commit b044babbf380ed07eda7dd358131872182052889
    Merge: ccf64cdf c189c933
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 02:42:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c189c9331f0538a855872b7a84d7b7d842200cab
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 02:42:28 2025 +0800

        补充遗漏

    commit ccf64cdfef71e49bf2eb4763ed0f193597249268
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:33:37 2025 +0800

        版本号更新

    commit 2b1d135cc30ad5d7356fb7542bac963ca8c6d7e1
    Merge: ec56b0bc 46d6502d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:32:37 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 46d6502d4bfa62c39ea2244defc2a52f235cc318
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:32:31 2025 +0800

        改一下说明书

    commit ec56b0bc06b0cb5d0444fee3186c758014a8b00b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:27:30 2025 +0800

        改动说明

    commit b7549cb26375bf2bb6bf27991b2326791bb7e7c1
    Merge: f8b4f354 4f6a5bcf
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:59 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4f6a5bcf286cfdd91b239b0e0ee23200e7b4a204
    Merge: c8c57a02 7e2ed962
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:44 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit f8b4f3544a837da16f24e55ebd2affabd4c85a71
    Merge: ba34d6f3 c8c57a02
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c8c57a020fcaa8d58dfd9f907ef4e8cc7eb2e6f5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:35 2025 +0800

        漏掉的默认值

    commit ba34d6f317253da611271a28e9b25d85b5b0e035
    Merge: 5d1850be 4c0b70a7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:06:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4c0b70a7ecc151b1ba2dd38dda71a22f770189f7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:06:28 2025 +0800

        扩散抛体提高速度上限重写转向机制

    commit 5d1850be73ce2d36bd2429c408ae8584cd9ffb3f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:05:21 2025 +0800

        改动说明

    commit 63707f0bc79bc8710a06c6d675b8f7afb3a6ba37
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 23:27:39 2025 +0800

        案例修改

    commit 3bca71600a0edf40cec3de3807bc741a63c88128
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:33:38 2025 +0800

        更新改动说明

    commit a03a51507f74270b1f59b1bd844f6f6c0e32ccce
    Merge: 5d1c68c6 626da19c
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:29:33 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 626da19c65a53a1fe8f2ead078935f163166541c
    Merge: 025275da e1fec541
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:26:38 2025 +0800

        Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

    commit e1fec541e66a1268fb8247063a8a2f3995e49c36
    Merge: 6c5d4e0e 8a418392
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:25:25 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-MergeAOEDamage

    commit 6c5d4e0ecdee39506bfbdc8d7796175336383c5d
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:25:15 2025 +0800

        Fix a potential risk

    commit 5d1c68c6ecef1a52c5f34e0cb9f6c42495b8beb9
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 19:12:15 2025 +0800

        修复默认值

    commit b82aecc5ad8d0445e4b2f3aa7d8ea669f028d801
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:47:33 2025 +0800

        增加矿车搜矿的微观定义

    commit 8f4e8fd23a4e0e8517aae67c8adc2018ac9816b5
    Merge: 8ed1abbd 025275da
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:39:53 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 025275daa9824c2944aca3247ef6abc97e4bb588
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:39:48 2025 +0800

        简化代码

    commit 8ed1abbdf9c7fb23ae25a8870d2a3075195b9752
    Merge: 20317b22 6a240f5b
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:15:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6a240f5ba4beede561ccdc1d621c07eee67b3152
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:15:28 2025 +0800

        修复原版两栖矿车的问题

    commit 20317b2278e1f0835e854e8a2fe2ae91df185ad9
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:39:58 2025 +0800

        版本号更新

    commit c39d58d7345166890ea2f20b49c703c2af978593
    Merge: 526cd28a 2fa5a2fc
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:37:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2fa5a2fc0e74daa1bc941067d25a762f1008307a
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:37:09 2025 +0800

        只给本人播

    commit 526cd28a2b8df7476ffe74e54c0e34a9914b5a8d
    Merge: c6e21098 4a07b40c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:35:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4a07b40c0cba3a5520dc8bfaea762cfe734603be
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:35:19 2025 +0800

        修复显示不同步问题

    commit c6e21098fdefe316be29fc2023e2a322ea68190c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:33:15 2025 +0800

        更新改动说明

    commit 283686a7957b5c384b0c71b18ab51dcae52e305c
    Merge: ee49a6a0 cf35ecf6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:30:15 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cf35ecf6a271de22fd382e54c1972303a6f2ae1c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:30:11 2025 +0800

        修复钻地矿车

    commit ee49a6a084f05850782d50b634a5a2801e7ff3b1
    Merge: e6081a95 05b0c575
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:26:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 05b0c575468a00ca0001ac239b82a552978f5c2a
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:26:11 2025 +0800

        同步

    commit e6081a95a04b86f2349a87947e7dbcc8a04c795d
    Merge: 20a63b3a c4a50f30
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:14:40 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c4a50f305535c9582bf3092923ceec10072d6bb6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:14:26 2025 +0800

        更新代码

    commit 20a63b3a80f895a1e10364037272d5c33248a202
    Merge: 06b2d6bb 1b8d6a21
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:53:51 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1b8d6a21dbd17d965479f902a830151b887ac769
    Merge: efb8caa6 04fa9ebc
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:53:16 2025 +0800

        Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

    commit 04fa9ebc7eb4e92ecdc0ef2c4c2ebb106b8c124d
    Merge: 47cb2632 dbf7f74e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:52:11 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-ScorllSidebar

    commit 47cb2632cd17896baedde162ac94541da3d1c107
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:51:59 2025 +0800

        Split

    commit 06b2d6bb5e126deaa1652c261cd77a66260e7c29
    Merge: 8981b3e2 efb8caa6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:32:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit efb8caa618ca9d7fda59e697066ee87b010e1bba
    Merge: f32dc9bf d64702b7
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:31:28 2025 +0800

        Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

    commit d64702b75862227d6c875128b55887a4445dabd9
    Merge: 228908a6 dbf7f74e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:30:46 2025 +0800

        Merge branch 'develop' into develop-MergeAOEDamage

    commit 228908a69271db3a2d87020e8f0104208d91cd9f
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:30:11 2025 +0800

        Optimize

    commit 8981b3e295531fcb3251ed4c61ea598b5158c695
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:20:17 2025 +0800

        退回

    commit 42399e76228b8553091db7ca28d3f19cefcb5707
    Merge: fe268719 f32dc9bf
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:44 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit f32dc9bf917d408d945d46013193fdd5df19be37
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:39 2025 +0800

        移除重复

    commit fe268719db7940d13c463d4a75f2581f960cb0fe
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:18 2025 +0800

        移除重复

    commit 4d89ee46e1245dab1c9c06193bd834928f52f884
    Merge: a02b670f e7651bf3
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:54:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit e7651bf3c0e8e3385e7da8837f66edb556d0e6e0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:54:43 2025 +0800

        额外功能说明

    commit a02b670fd7c4082ef515b9b6830a3c11a858199c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:52:34 2025 +0800

        改动说明

    commit 01aa3543cf2033fed0956cb15fee67f5b8bb7880
    Merge: 21f239a2 c17ceb46
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:40:47 2025 +0800

        Merge branch 'pr/1535' into develop-Mix4ECpack

    commit 21f239a26fabc56dad955c9491328ffc4ac088cd
    Merge: e4e72611 1037d128
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:38:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1037d1281c9993613ce054a4c774555d3b73cd9a
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:37:59 2025 +0800

        修复头文件

    commit e4e72611e825b8a14353ee96931a3d1c42c00ee2
    Merge: 667f68eb d89c1e3b
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:32:47 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d89c1e3bd99b169ffa5587b77f0e400e835b7e3c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:32:42 2025 +0800

        换一下文件夹

    commit c17ceb466319e8dd3381ad497a041ac0d6fe2006
    Author: Starkku <[email protected]>
    Date:   Mon Aug 26 00:37:09 2024 +0300

        Fix subterranean harvester pathfinding

    commit 667f68eb77a8ce4cddf8e3b15816f6ac02190fea
    Merge: 5bdbeeef aec443d9
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 22:01:54 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit aec443d99a74531fcee76044629b1b01193950eb
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 22:01:46 2025 +0800

        优化判断

    commit 5bdbeeef70dfe4ef821cdb3d25a0a54acc3030a8
    Merge: 96aaf03f 5b01c419
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:37:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5b01c4197bd15740618eff1233a5e3efb020d2cb
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:37:27 2025 +0800

        修复不同步问题但保存单人游戏时的做法

    commit 96aaf03f7e2b44da5cbb100c937d96c554d6b58c
    Merge: 81048e41 3b02c099
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:11:28 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3b02c099cba9e3669bd5204bab9cf8afe720bb05
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:11:23 2025 +0800

        修复占据位输出

    commit 81048e41174283b8cc266ed22285dea2656f23e3
    Merge: e4acf759 b32de91d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:32:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b32de91dd49517750c60b4d4859f7de13e46e24b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:32:09 2025 +0800

        播个声音提示一下

    commit e4acf759a55a1fe891fa3aa16c4a5dedd539c86a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:59 2025 +0800

        更新改动说明

    commit 589ea561b005d0bc5167e8c014ab58c43d853d76
    Merge: b79be0b6 b2277f7a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:05 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b2277f7a74b1138922b9a8457049d76d563c7e10
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:00 2025 +0800

        优化并考虑图标变灰时取消

    commit b79be0b6f2e512dd6c7543c8c3c554991485b821
    Merge: 44f3938d afa171c5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:17:30 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit afa171c5d130177239c7891d773cc6f036350264
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:17:25 2025 +0800

        优化并考虑图标变灰时取消

    commit 44f3938d22db7b76d852a5772bd0f5081f026866
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:59:14 2025 +0800

        更新改动说明

    commit a2be6c0d429cae3e4dcfda487a9dd08e1665f725
    Merge: 9f20961b a93bd00d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:52:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit a93bd00d85520080fca51f372237abb275d62524
    Merge: 468b5538 0694629b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:52:44 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 0694629be5356f900a4461f70aee18010fa05ca2
    Merge: 108d160a 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:51:41 2025 +0800

        Merge branch 'develop' into develop-AirburstWeapon

    commit 108d160a38a0985e6344a0b56fd6895093e53ba3
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:51:29 2025 +0800

        Fix

    commit 9f20961bda6c1967fea043003ed4291abe745e4a
    Merge: 6b5b16e5 468b5538
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 468b5538b13a57e05866a8d6802c395c17c47446
    Merge: d17f606a 5f5e93e7
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:37 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 5f5e93e7ab37a2ca93e76d7ae8cd5bf6a6a23af5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:30 2025 +0800

        Fix

    commit 6b5b16e511098c5c052c9bb528dac00c0402b632
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:44:53 2025 +0800

        更新改动说明

    commit e8c916edd163590765bc71b32c3c2bbb5860a03a
    Merge: 719e5361 d17f606a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:42:46 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d17f606a1d7683b64da816da7761f37f56f961bc
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:42:04 2025 +0800

        额外功能说明

    commit 7ddd551ef5b46e03204a4fda9746ee38c4844435
    Merge: f1dd19b2 2ec36e0e
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:41:56 2025 +0800

        Merge branch 'develop-NoTurretTurn' into develop-Mix4BEtest

    commit f1dd19b2c97884dd69e0a7e79df77e61d71ca0db
    Merge: 78b26694 620e03ba
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:38:28 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 620e03ba36f77fa5450f43274135620c5770539b
    Merge: 6482e262 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:37:52 2025 +0800

        Merge branch 'develop' into develop-AirburstWeapon

    commit 6482e2628177e4567d23caebbcb86bad9cd618e5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:37:39 2025 +0800

        Fix

    commit 2ec36e0e5e9d5323c17da8f1091ceb6ccaca32c6
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:08:35 2025 +0800

        Per unit define

    commit a70db4a602354d6e33da904bbb22163b453b8fad
    Merge: ee583c3f 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:58:46 2025 +0800

        Merge branch 'develop' into develop-NoTurretTurn

    commit 719e536189f535ebcbf1a7bc332ee4293eb67715
    Merge: 89f777ed 78b26694
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:36:18 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 78b26694afe72e2a1c2f41dae5588efe1d70d9b8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:33:05 2025 +0800

        小修正

    commit 89f777ed879d3cd329e6a3a4ca5cbfa7ef9527cd
    Merge: 0b346360 93b5f437
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:10:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 93b5f437f322d3f447247e483e8553b6b2760d5f
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:10:27 2025 +0800

        全面优化建筑疏散逻辑并支持防御和科技分离

    commit 0b3463602107f493bfc17100c95e035a2dd349cd
    Merge: 44bf8054 48372a9a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:19 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 48372a9aade5802c8a5dd73457bce8650c536759
    Merge: e33e31a7 2eecf70d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:14 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit 2eecf70d6939bb1f74ce4488e57fede401bd922d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:01 2025 +0800

        Simplify `PassengerKickOutLocation` code

    commit 44bf805475644c2ca923cad64f78598ec0cd6d42
    Merge: 1e47207b e33e31a7
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit e33e31a7e66da8b837042b7e6ed410f0f274a814
    Merge: 6d558d5a 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:03 2025 +0800

        Merge branch 'develop' into develop-Mix4BEtest

    commit 6d558d5aa5fa245ba1da37b69d995bf9ecb87101
    Merge: 6b554915 93b5f068
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:01 2025 +0800

        Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

    commit 6b5549155b4b84326e6fdd10350b859218bf4a4e
    Merge: 861e6d39 a4cd22e1
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:22:57 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit a4cd22e1908088414eed9a7bd46e7d5638e91b92
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:53:08 2025 +0800

        Adjust `PassengerKickOutLocation` code

    commit eb891592721de736c5c493c77e0f550a3facd1b5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:20:35 2025 +0800

        Also correct GetCell

    commit 93b5f0689d120d0891a59ffa0ff11c2574b78ef8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:10:33 2025 +0800

        Check InLimbo

    commit 1e47207b2d8cc5aadbbd2ff5e690c61d3b5886c8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:42:59 2025 +0800

        版本号更新

    commit 12c7c3956104ff638f10be7379b3c423c970b9b2
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:34:06 2025 +0800

        更新改动说明

    commit 35df5d5a5f2f28593109c603241f85ec456cb9a5
    Merge: a92ef1d1 861e6d39
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:32:56 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 861e6d3903ba071452981a66fa43e3882208fb47
    Merge: cb5cd347 3285b762
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:31:52 2025 +0800

        Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

    commit 3285b762af85d5ddfc9950f09d40f673d13c5020
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:27:51 2025 +0800

        Core

        Co-Authored-By: Netsu_Negi <[email protected]>

    commit a92ef1d16e741850713c7880d8090fb7907af037
    Merge: 7599529c cb5cd347
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:47:11 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cb5cd3479267d8fbaddf4f7947ab4a5ab957697a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:47:06 2025 +0800

        修复移动中的单位可能导致的建筑问题

    commit 7599529cf299d9734598470168db573d9afae701
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:46:20 2025 +0800

        改动说明

    commit e436015da5b2e02ec052bd43876f41761836bd9c
    Merge: 27d09200 88752d8e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:26:09 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 88752d8e02fbff4c5b84f2a2ab946a8684cd4dda
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:26:02 2025 +0800

        正确输出格子占据位

    commit a2a06915711340c4934c10e158247e7fbb3b7dfd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:23:52 2025 +0800

        更换钩子位置

    commit 8bca6f3c83991b4ca80fa8ecaa4e4a13f8a20b6b
    Merge: 4e1b950a 6de8fbeb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:02:57 2025 +0800

        Merge branch 'develop-DeployDesyncFix' into develop-Mix4BEtest

    commit 4e1b950a838cc4cbbfccf3c38ecc5729f0d03579
    Merge: 59a6bff0 596bbaf7
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:02:13 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit 596bbaf7d8c135eac784b6615b4d5b013dc03cde
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:11:46 2025 +0800

        Core

    commit 27d09200f893cbe6f64dd718aee1fdbe93073620
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:11:01 2025 +0800

        小修复

    commit cb4fd42c3e1301c406920fdb1cc8a52fd92c1833
    Merge: 9b244d27 59a6bff0
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:08:55 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 59a6bff05bd1d20584c39d890777435fe9ec4dd8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:08:49 2025 +0800

        移除无用过度判断

    commit 9b244d27c4abb10f4ab10f1deae547cb6d7d3f6d
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:00:20 2025 +0800

        小修复

    commit e82c8e52649a21ecadb3c54a7ba76b244ce36a2c
    Merge: b5a251d3 63b33d87
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:45:36 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 63b33d87d8f3012e5defde6598bc16d6fc4c2601
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:45:31 2025 +0800

        修复一个小问题

    commit a6291514645aeeb3026d9b9f31be27243310a562
    Merge: 53530b0a c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:44:42 2025 +0800

        Merge branch 'develop' into develop-UndeployBuilding

    commit 53530b0a240c141c820f1817f9070f0621a9d168
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:43:58 2025 +0800

        Fix a typo

    commit b5a251d30cc646950a55c17b875d5595e4325c34
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:23:13 2025 +0800

        更新改动说明

    commit e592c36ebcb7aaa5a9123d31f193f5c81aeb74ec
    Merge: 7f3d3759 28556e66
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:21:25 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 28556e661ce2728062257a47283df72ef6545d6a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:21:21 2025 +0800

        额外功能说明

    commit 7f3d3759603283856dc62990644f7e5544135791
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:16:28 2025 +0800

        改动说明

    commit 781138a0553c88b21d6e41db2f7cd5065906bdc5
    Merge: 226cb970 67324cee
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:14:21 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 67324cee4a40bc627eedd9b7a7ef0632eaeec3aa
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:14:17 2025 +0800

        功能说明

    commit 226cb970796bd1b9899f852281d5400c70648c91
    Merge: 2c1c82ad a818097e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:09:48 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit a818097e521fbd2ad9b55144ef9b406d7d68aca1
    Merge: c559e602 4fe6a682
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:09:33 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit 4fe6a682c50dcbfdb4d5cac90c7dac52e1cfe9fc
    Merge: 7f8c25a9 c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:07:32 2025 +0800

        Merge branch 'develop' into develop-JumpjetTilt

    commit 7f8c25a913d2efd59d7ddfd28b6cf7bda8092e91
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:07:22 2025 +0800

        Can be customized

    commit 2c1c82ad0b440f16568c0dfc6162445e573d0a82
    Merge: 5beab4b7 c559e602
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:43:01 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c559e602f54427f3d3909b2e13ff7408df097453
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:42:55 2025 +0800

        Fix a typo

    commit 5beab4b79a490996cba56bb6033dc2a44516ad94
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:07:24 2025 +0800

        优化一下

    commit 3a6728b4706f2911be0690e003a7cce639ac8ede
    Merge: 0df4587d 1b5034ff
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:15:35 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1b5034fff61845c1fe1070a268609536bb4c2bf4
    Merge: 54f4942e dab3385b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:15:07 2025 +0800

        Merge branch 'develop-Distribution' into develop-Mix4BEtest

    commit dab3385b47a8437b9151fa19428bd7c626591a1c
    Merge: 55723f3e c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:13:50 2025 +0800

        Merge branch 'develop' into develop-Distribution

    commit 55723f3e5b84b5396397a20ed4b9d0a473c99fbb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:13:34 2025 +0800

        Global toggle

    commit 0df4587d6c6f2c470b5b7d4aa606890af783cf06
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:56:28 2025 +0800

        小改一下

    commit 710e6c2667dbd88e3f9b2084c70ea147ab7f5d06
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:34:10 2025 +0800

        更新改动说明

    commit d66ec08d37a028fba9f1e19631e8da197c17976a
    Merge: bf5c73b1 54f4942e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:32:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 54f4942ef1ca42cf863f42f99bcf3b7c965308cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:32:34 2025 +0800

        新的抛体功能标签

    commit bf5c73b16c394590408c436e32f061fd2448c295
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:17:53 2025 +0800

        改动说明

    commit 74de16cdd1dd8fc0b8c3efcceaa5569a3a8221af
    Merge: 7f38c00e bb54a2f1
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:40 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit bb54a2f14dad62a61da9aaa98e30a81f9cdfa425
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:35 2025 +0800

        修复建筑疏散有时会卡住的问题

    commit 9a34988d18a692f96e32fbc731864d5785b0bbd0
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:15 2025 +0800

        输出任务更新计时器

    commit 7f38c00ef785d5ab8c836555c3cbe2b963186151
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:01:47 2025 +0800

        改动说明

    commit 582da465429b520117c5dab08198f008b08ab059
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:01:36 2025 +0800

        合并建筑路径点修正

    commit 15c0ea5e5e0aef85cdf6e992bad5300dea3c0f5f
    Merge: 5e6e7d46 a34cdece
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:38:45 2025 +0800

        Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

    commit a34cdece04d5f669f2c5602760c5598f5f42dc8a
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 13 14:38:18 2025 +0800

        Inviso fix (#7)

    commit 689e35922bc6d68439d3dfa327b3b4d07d393fcf
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 13 14:37:02 2025 +0800

        Update Hooks.Others.cpp (#8)

    commit 5e6e7d46e6fbb4aba21874bed483c3dfc042f3ef
    Merge: 142e45cd 0eded001
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:26:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 0eded00139467bebc679c3d1e3223bcc80f099f2
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:26:12 2025 +0800

        更换为正确的检查位置

    commit 142e45cd9f24276d4a3b1869d9c1bd95cc615778
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:52:25 2025 +0800

        更新改动说明

    commit fe6cc4accd39616d1f74ff22d2a146f75181b0b6
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:46:09 2025 +0800

        移除重复

    commit a81e006b98ba4190542bc8fc0747b623ebe0b1d0
    Merge: 05ff934b 3b84f610
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:43:37 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3b84f6103066d46614254b5ed2d360c118161d3c
    Merge: ea5e2466 c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:42:49 2025 +0800

        Merge branch 'develop' into develop-Mix4BEtest

    commit 05ff934b0a4966f3c43049e2eda8828f313bc54d
    Merge: 7bfb09f3 ea5e2466
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:56:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit ea5e246624795d42847cadd820a7d123579c856c
    Merge: 39d4009c 3c7f0ce2
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:56:08 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit 3c7f0ce234fa8c590be56c11f3ba594751a61139
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:55:59 2025 +0800

        Enhance readability

    commit 6de8fbebc1880886862790f5ba6a0aa6b4d647fe
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:19:57 2025 +0800

        Core

    commit 7bfb09f3b5c33f6e29dfd36f533c0ee47ebe06c1
    Merge: 673ed382 39d4009c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 16:48:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 39d4009cd21a156edf580d6ddad12fcebfda4225
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:53:35 2025 +0800

        恢复钩子

    commit 673ed3823e56a46dcf6e8e822f491ebbbb9f8dfb
    Merge: 459fc19b 6d6d05ff
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:52:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6d6d05ff922203e789e8d8c34a327c5ad6caf189
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:52:35 2025 +0800

        跳过动画拓展检查

    commit 459fc19b7185d3f920b7d6e447b991d101e4667e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:33:41 2025 +0800

        改动说明

    commit de5ddf598ada888ae3e6323f14d9a53c347c0f08
    Merge: 9297185b 466583d3
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:32:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 466583d3ba0cef3e33fff76c86d8d146c643231a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:32:26 2025 +0800

        更新说明

    commit 9297185b276fb0dc10f3968769911a26ddeca789
    Merge: bf5bf245 6ee8de6d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:30:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6ee8de6d4564c071cd939b7fa2e91217eda88af0
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:30:21 2025 +0800

        额外功能说明

    commit bf5bf24501f5433e19f0b953406c5f6070bb8e73
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:29:07 2025 +0800

        更新改动说明

    commit 471860645b7d336c6f84b6dc4dfa704f296da0c2
    Merge: 199c3298 ea67f57f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:28:08 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit ea67f57fe4ca6066ca54a91dc8d22995d5548602
    Merge: 3ce5a8bc a966bdc4
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:27:40 2025 +0800

        Merge branch 'develop-ExtendedRateDown' into develop-Mix4BEtest

    commit 199c329882f6042e00e9a5df9d97c201afcb8b31
    Merge: 79f454b9 3ce5a8bc
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:06:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3ce5a8bc47ee0f422b384ce196f3dfe637915447
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:06:16 2025 +0800

        移除合并后重复

    commit c8e560e9a7ba0ecf081d164366bb2d6703f5949c
    Merge: 9acf1324 6645df9a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:05:26 2025 +0800

        Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

    commit 6645df9aecde64954665fbf0bd5c7e4a0a7cf345
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:04:39 2025 +0800

        Core

    commit 79f454b95e26017bc9b30725846bc084971ad01b
    Merge: e959df48 9acf1324
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:37:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 9acf132427a13471080cc901e663c3a6fbc4ca1d
    Merge: b01d79b8 d7cc91d6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:37:34 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit d7cc91d6e98a1394110f27bba524dd46943783e6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:33:51 2025 +0800

        Fix doc

    commit e959df486119b85aaace7d82591818eea106bf3f
    Merge: da3012e9 b01d79b8
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:58:12 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b01d79b87f1de46235c5a0bd74531f967d26e09c
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:57:47 2025 +0800

        修复合并后地多余项

    commit 784a1877429f7eb82e3bf280dd735287e67151a7
    Merge: a94d6d50 ec4246b5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:57:35 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit ec4246b593b77157ef93d2b2daf56248345228fa
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:55:29 2025 +0800

        Core

    commit da3012e93b3560cca0a6e6779458dff55eecc2a7
    Merge: e301fe24 a94d6d50
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:38:44 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit a94d6d50367c73f0dbfbf9f15e18d7ce7029079e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:38:38 2025 +0800

        悬浮空军倾斜时判断活着的状态

    commit e301fe24b0d2ce5a57164f73737c0cdece252c8c
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:25:32 2025 +0800

        更新改动说明

    commit fc303074eb4e289ff69650ea6f98bcae936f789d
    Merge: 977a3d05 f822c26d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:18:00 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit f822c26d9d630cae3967d48f1eedd15b48976b2d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:17:41 2025 +0800

        修复合并

    commit 4bb17e0a6646bc1ef7cf226feb90b5a735aa2eac
    Merge: 20f28bdb f701344f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:16:07 2025 +0800

        Merge branch 'develop' into develop-Mix4BEtest

    commit 20f28bdb97c4b2a8d1a1fa81eb020d6798e03a6a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:14:01 2025 +0800

        小修正

    commit a966bdc4578aecb2d734dca1ad8d1e158bfad6e5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:08:36 2025 +0800

        Rename key

    commit cf934350d2f14a1c846e3844a42c1fe552198cc9
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:03:53 2025 +0800

        Fix merge

    commit 8fc7d60b1f2ea9fac469a5ce5b92e53b62f9cb07
    Merge: 93af5a8b f701344f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:03:40 2025 +0800

        Merge branch 'develop' into develop-ExtendedRateDown

    commit 977a3d05da5228e13a417f4e9920e9a04f7e773e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:01:32 2025 +0800

        更新案例

    commit a0788b0788dab1cf5fda04e144e019bdf7b716e4
    Merge: e1d1dbf2 4b59e78d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:01:00 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4b59e78d14ddf4c92d2dcf76d3ef11bc37bb466d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:00:54 2025 +0800

        键名更改

    commit e1d1dbf22097d245005e0b286eb8c985a79a4eb9
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 17:51:50 2025 +0800

        Optimize

    commit 0beb6cd8aa83063ef0287dcf5b8f577b32cd10a7
    Merge: 9379d8ad 340001b2
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 17:09:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 340001b23ed6e7dfb657d3e068d47edb9079a204
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 17:09:05 2025 +0800

        小修正

    commit 9379d8ad873aa489392d1ea8a084922c7c09b8a3
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 17:05:39 2025 +0800

        小移动

    commit 1413b4b358752ba3c49a882cf42666c16672f615
    Merge: 4e739875 1bd1b66d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 16:25:50 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1bd1b66d6d0866b2fbf885ee785541ab7a1f0c62
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 16:25:43 2025 +0800

        修复轰击无发射过程时过度计算提前量的问题

    commit f67c8d46b83f9f121fa2192c3947258e90ad91f0
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 16:25:03 2025 +0800

        小优化直线提前量计算时的判断

    commit ddf2e5051dad395543938c34d4efc3b10840e5f3
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 16:24:33 2025 +0800

        修复头文件顺序错误

    commit 4e739875f3f73aa66023c907d84cb43a2c60d048
    Merge: a27c5fc7 191cc82d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 15:00:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 191cc82dd196857fd8f8d526ba987797c2b48e2e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 15:00:27 2025 +0800

        简化代码

    commit a27c5fc7761bc7f3c680b649b55a709d05d2c0c6
    Merge: 83ca1603 20e1338d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 02:01:21 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 20e1338dcfd626a5cbbcb6e5cd6acc240b81cf07
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 02:01:16 2025 +0800

        抓取鼠标滚轮滚动

    commit 83ca160372ce705552640735e0c0c9b71a216501
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 10 14:27:58 2025 +0800

        更新改动说明

    commit c4806b422febba6…
CrimRecya added a commit that referenced this pull request Feb 24, 2025
@TaranDahl @CrimRecya
@NetsuNegi @Fryone @Coronia @Metadorius @chaserli @Multfinite @ZivDero @FS-21 @DeathFishAtEase
补个标签 (#10)
ddcd9de 
* impl

* Update Hooks.Misc.cpp

* Update Hooks.Misc.cpp

* flag

* [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

(Re-merge properly)

- Fix an issue where a unit will leave an impassable invisible barrier
in its original position when it is teleported by ChronoSphere onto an
uncrushable unit and self destruct.

Thx to @NetsuNegi .

Co-Authored-By: Netsu_Negi <[email protected]>

* [Minor] Fix Ammo features and tank bunkers. (#1420)

- fixing ammo block inside tank bunkers;
 - partially fixing ammo adding/substracting inside tank bunkers

still problems with converters

---------

Co-authored-by: Coronia <[email protected]>

* [Minor] Disallow other actions for building in planning mode (#1524)

<!-- Please add [Minor] to the title or the description if this change
should not be mentioned in documentation, what's new and no credit needs
to be given. -->

---------

Co-authored-by: 绯红热茶 <[email protected]>

* Add project maintenance structure and contribution types to docs

* Fix #1106 : Deployer = yes to no infantry conversion sequence update (#1315)

It's a bad design and thus does not worth a fix
in case someone really wants to, here's one way to it

* [Minor] Exception handler control via command line argument (#1231)

Just use command line argument `-DontSetExceptionHandler` to disable
game exception handler.

UPDATE:
`-EH-off` & `-EH-on` tags. 
For debug build default is **DISABLED**.

UPDATE2:
`-ExceptionHandler=boolean`

---------

Co-authored-by: Kirill Andriiashin <[email protected]>
Co-authored-by: Kerbiter <[email protected]>

* Avoid InvisibleInGame targets in new scripts (#1312)

Buildings with InvisibleInGame=yes should be ignored in the target
selection of the new attack/move actions.

I just found I forgot to send this time ago :-/
No credits or mention needed since it only fix a small bad behaviour.

* Fix contribution types docs a bit

* update docs and credits

* [Docs] a lot like [zh-cn]New-or-Enhanced-Logics

* [doc] $Include

Revise the description of disabling the Ares include feature and add the reasons.

* [Docs] a few

Handle errors (e.g., "applied to to TechnoTypes")
Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
Missing symbol
Missing type annotation
.etc

* [Minor] Fix Insignia.Weapon parsing (#1530)

Separate the fix from
https://github.com/Phobos-developers/Phobos/pull/1365 to a standalone
pull request, which should fix the issue in
https://github.com/Phobos-developers/Phobos/issues/1528.
- previous Insignia(.Frame/.Frames).WeaponN settings can't be read or
overridden from maps, which is fixed now

* [Vanilla Improvement] No turret unit turn to the target when rearming (#1465)

- Now vehicles (exclude jumpjets) without turret will attempt to turn to
the target while the weapon is cooling down, rather than after the
weapon has cooled down, by setting to `NoTurret.TrackTarget` true.

In `rulesmd.ini`:
```ini
[General]
NoTurret.TrackTarget=false   ; boolean

[SOMEUNIT]                   ; UnitType
NoTurret.TrackTarget=        ; boolean, defaults to [General]->NoTurret.TrackTarget
```

---------

Co-authored-by: 航味麻酱 <[email protected]>

* [Customized] Damage multiplier for different houses (#1307)

- Warheads are now able to define the extra damage multiplier for owner
house, ally houses and enemy houses. The values in warheads are default
to respective `[CombatDamage]` -> `DamageXXMultiplier`, which all
default to 1.0 .Note that this will not affect damage with ignore
defenses.

In `rulesmd.ini`:
```ini
[CombatDamage]
DamageOwnerMultiplier=1.0     ; floating point value
DamageAlliesMultiplier=1.0    ; floating point value
DamageEnemiesMultiplier=1.0   ; floating point value

[SOMEWARHEAD]                 ; Warhead
DamageOwnerMultiplier=        ; floating point value
DamageAlliesMultiplier=       ; floating point value
DamageEnemiesMultiplier=      ; floating point value
```

* Remove a useless variable and fix doc

* Squashed commit of the following:

commit 2182e831aeae7f8938303721c6a2e937dd6ff067
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 02:06:36 2025 +0800

    小改位置

commit 056a7ab1a82e11ba5b37b0c17613f927eb8fb66a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 01:19:11 2025 +0800

    改动说明

commit 545f6088d35b9b32543e9db7dc371a464fa90ce1
Merge: 7d3c131d cf69a711
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 01:18:22 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cf69a7111ae2070728de5f3cb40a399e203ac7be
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 01:18:17 2025 +0800

    功能说明

commit af44f3f6182cb97eed0824fe9bcd40408b1f81be
Merge: 49dfd0ae 886cd122
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 01:15:47 2025 +0800

    Merge branch 'develop-newinfotype' into develop-Mix4BEtest

commit 886cd122a666ced42f990f3c4107bc5532ebe829
Author: CrimRecya <[email protected]>
Date:   Tue Feb 25 01:15:40 2025 +0800

    New `ValueAsTimer`

commit 7d3c131ddda6ba5efad94b3f8c196d325bcf35d5
Merge: 57eaa340 49dfd0ae
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 23:30:29 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 49dfd0aea1d60c88b270ba43d0182690da411a7d
Merge: 4c7d1cc9 a954c838
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 23:29:55 2025 +0800

    Merge branch 'develop-newinfotype' into develop-Mix4BEtest

commit a954c83885f29a2af9da6c10224f5ef27064be06
Merge: 83debb74 13cdc0cc
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 23:28:34 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

commit 57eaa3401b39d0159ed082c23fab4a911b3d50dc
Merge: 9166eec1 4c7d1cc9
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 22:27:31 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4c7d1cc9f25259335cbd95f9590b421982c406eb
Merge: 052ce1e4 13cdc0cc
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 22:24:12 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 052ce1e469faa7b7d92ea6f4fb41957f29840afd
Merge: 59007c82 00752e41
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 22:17:17 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 9166eec198d7f1e4d4691f05f4002a3c3bd9f5c7
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 21:04:39 2025 +0800

    修复侵略模式按钮

commit 241479932e0fa9c9b9327d8aff51827e64e944a7
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:41:54 2025 +0800

    更新改动说明

commit eed20f690ed6a5ff57f3da7cb6eacde3f7e3eac1
Merge: 4d9ab456 59007c82
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:38:07 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 59007c8205df4cb35345a2f1a89b12d3d2c5cd76
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:38:02 2025 +0800

    小改动

commit 4d9ab456f6285d7476be2d06aa56d8baad5eb2be
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:36:50 2025 +0800

    合并功能

commit a3965d3d37a6195f226d3c3c9ecb025562f970fd
Merge: 6342450f d1cda617
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:31:45 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit d1cda6171fce116c5195e64ba6c83270ac6b5a80
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:31:11 2025 +0800

    功能说明

commit 6342450f45e7c0e4b791a9fa81de957c0601817c
Merge: dc523103 3456e138
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:10:29 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 3456e138f8a480d8f83f82749d9b2b2419bee65b
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 20:10:23 2025 +0800

    完成所有基本底边栏功能

commit eb2d35e49e57f285e81adbe0befc88138c9c8976
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 03:01:09 2025 +0800

    底边栏功能继续完善

commit ac74b4c14b9891f351d2d27a043edbc06c560475
Author: CrimRecya <[email protected]>
Date:   Mon Feb 24 00:02:03 2025 +0800

    全新的底边选择栏底层

commit dc523103555d09cd4ded6779e7d805a49f61bfda
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 01:47:54 2025 +0800

    更新改动说明

commit c8ebd98339f9671164c901f7c9ce354de8e374d5
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 01:47:39 2025 +0800

    修改玩家自动修理

commit 94ea4577332bdc7e08416d9fcce6d3e0bbc83d85
Merge: 16ff7f60 9180ff46
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 00:54:34 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 9180ff46ca477872b8697d73191bc9f0f6a48f58
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 00:54:15 2025 +0800

    更新说明书

commit 16ff7f60b4cca7e9bfa94e41416798f7dde98550
Merge: 2d01a403 8be46a13
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 00:47:51 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8be46a13c08a209a148dcea48ad29c74ff3fe51e
Author: CrimRecya <[email protected]>
Date:   Sun Feb 23 00:47:46 2025 +0800

    增加自动建筑快捷键初始默认值

commit 2d01a40324ab5868d6638b2c48b3a5aa26358b48
Merge: 23a3d9ca 40a71e5b
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 23:02:29 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 40a71e5b2e56a5788b1ed55fdd909cab972d4ccc
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 23:02:24 2025 +0800

    补充独特单位显示的完整开关

commit 23a3d9ca3e099433a52ba4ffa5cedf6336aebfd1
Merge: 7b831b56 87b20441
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 22:52:49 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 87b20441dd94d225559b13f7dcff3bc1ccb954df
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 22:52:16 2025 +0800

    彻底修复超武侧栏的开关点击问题

commit 7b831b56de380bda032adbe852adb798ed353e9f
Merge: 4d99159a b2adb3c2
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 20:58:27 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b2adb3c2b382c116d529d62a1bb0409dd7f87e00
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 20:58:23 2025 +0800

    Fix typo

commit 4d99159ab6cd325251152b9ed7bed1044b9709af
Merge: a9f01889 7053fae2
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 20:24:20 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 7053fae23ecb17efa368c4258c891a1723e6e9a7
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 20:24:15 2025 +0800

    修复最后一个点击问题并优化科技树图标检查

commit a9f018895c06b6922e2a8d61a7be73a837829a66
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 17:06:18 2025 +0800

    更新改动说明

commit 4d9f7580e1709d0fcbd2bc4369d65591cf50da96
Merge: da3e0c4d 8e57d2e0
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 17:01:38 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8e57d2e03698dfb5a9f7493af0ad2636ba8bced0
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 17:01:33 2025 +0800

    修复超武侧栏的一些点击类问题

commit da3e0c4d64d79bf080d775e7cfa1477d0948c0da
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 14:01:31 2025 +0800

    更新改动说明

commit 0e782d6afa7b9391d75600d7f3272246d60faa12
Merge: f49ceee6 1ce0f217
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 13:51:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1ce0f217a579170a63981e30b4604350b3487349
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 13:51:08 2025 +0800

    超武侧栏的更新和修复

commit 504b88e6f16be5ff25174e77605918306f97bd9c
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 12:14:33 2025 +0800

    修一下说明书

commit f49ceee64f2fe71d3d8194726fc6761ae2b40d61
Merge: 1eb3ccdc 8e4b0a24
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 05:21:55 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 8e4b0a24461f040ed07b42e6cf0153785fd58977
Merge: 3cb24f21 2d9f9c4c
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 05:18:43 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 3cb24f21da43fc59c75fd830b766ede418fb6345
Author: CrimRecya <[email protected]>
Date:   Sat Feb 22 05:14:52 2025 +0800

    修改一些超武栏的钩子并重做英雄栏底层

commit 1eb3ccdc534ccfe4de3b89a40e2997dd38313788
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:47:17 2025 +0800

    版本号更新

commit 7c0c86202cb3a2d0a777f7aab5bc3181b7fa08ca
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:46:24 2025 +0800

    改动说明

commit e0e8ab1372852d65035d7206873eb5669926c655
Merge: c35b5f5d 97849d3d
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:42:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 97849d3debd3f109cc47ba88d954255a5b35d45a
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:42:06 2025 +0800

    功能说明

commit 7cf6b28f7916afb292b94fd6cb6ffdabd11d252b
Merge: cad44713 86e3aa61
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:41:07 2025 +0800

    Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

commit 86e3aa611d574da3186af9b41a782f3175af6ee8
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:40:59 2025 +0800

    Fix

commit c35b5f5db8b5cf947e89bc6d6a89afd7643f5459
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:22:35 2025 +0800

    更新改动说明

commit be5597d2de4cf4445e370652e4fa962a335302e6
Merge: 81cd401a cad44713
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:19:10 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cad44713188639146629b4642c38171569b882dd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:19:04 2025 +0800

    额外功能说明

commit 394fd6962496aeaf9c4aac259cacf27393fa1cb4
Merge: c6f6c2be 1b984b03
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:17:41 2025 +0800

    Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

commit 1b984b034eff04c81e8fe02f8b4ec23f0743912b
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:17:32 2025 +0800

    New `BuildingSell.IgnoreUnsellable`

commit 81cd401aa6796a2187130c16f90bf86d968fd973
Merge: 998455e6 c6f6c2be
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:10:12 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c6f6c2be2f8fb2121f4f1afc67caa7c5726a1b5c
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 22:10:07 2025 +0800

    播一下声音写一下字

commit 998455e6c74f9fe1c0ee2d4359ad8d63d7dafafe
Merge: e8ed0b99 01e4b330
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 20:21:47 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 01e4b3304dcbe182ce0b12188d02f2934e2c7a6f
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 20:21:44 2025 +0800

    修一下注释的位置

commit e8ed0b99e1bcd5694b2522b3ae476b6f3bd34064
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 20:21:06 2025 +0800

    更新改动说明

commit 6daf0a89ee309b2e88dc88e32c62ee8be8aabe5b
Merge: 3875c084 0c03bdf8
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 20:17:23 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 0c03bdf88d763d51726fda78cd74315cbb276a43
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 20:17:18 2025 +0800

    新增滚轮功能

commit 83debb7474efde6b3f4c0a40eeffd51d0fd48a10
Merge: f260915c aa4e9525
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 17:44:55 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

commit 3875c0848646ba8dab39c47ada5bed002f5ae0cb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 17:42:54 2025 +0800

    更新说明

commit 79109419c4c74892cd030f0bb664aa7b2908dfe4
Merge: b6197722 2d6f3384
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 15:19:52 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 2d6f33849a6633a83490833481a6ceb5efde3fe8
Merge: bb7ada15 aa4e9525
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 15:19:29 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit aa4e9525a3929c07e19957a76536c222c5d69b9a
Author: 航味麻酱 <[email protected]>
Date:   Thu Feb 20 15:18:14 2025 +0800

    [Minor] Disallow other actions for building in planning mode (#1524)

    <!-- Please add [Minor] to the title or the description if this change
    should not be mentioned in documentation, what's new and no credit needs
    to be given. -->

    ---------

    Co-authored-by: 绯红热茶 <[email protected]>

commit 06664e94f92e68f8ad22554354f7160eea64e8d4
Author: Fryone <[email protected]>
Date:   Thu Feb 20 09:57:57 2025 +0300

    [Minor] Fix Ammo features and tank bunkers. (#1420)

    - fixing ammo block inside tank bunkers;
     - partially fixing ammo adding/substracting inside tank bunkers

    still problems with converters

    ---------

    Co-authored-by: Coronia <[email protected]>

commit b619772284613a317851bc3ac38c56fd5f4a460b
Merge: 65ea625a bb7ada15
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:32:35 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit bb7ada15bb756d6fd9d4d6cef6b8ffecb0d7eb56
Merge: eb2d49cf ee1f0eae
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:32:26 2025 +0800

    Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

commit ee1f0eaee296465d335ed4a42ccd0577c6ea284b
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:32:06 2025 +0800

    More check

commit 65ea625af75da45d2717ca242b73174ffdb79f3d
Merge: 0596116c eb2d49cf
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:29:46 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit eb2d49cfe5c66d917c8395e2f19311ac7a2a24d5
Merge: 7aef8ff6 9e33e4dd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:29:21 2025 +0800

    Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

commit 9e33e4dde4d3a2efc695e0f02b5e0e47e5705369
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:26:56 2025 +0800

    Comment

commit da46faa83f5e3ff68dc5b09c8b3366b5347f18fd
Merge: a6291514 3b8e0e32
Author: CrimRecya <[email protected]>
Date:   Thu Feb 20 13:03:15 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-UndeployBuilding

commit 0596116c970a15360bfa6fe88fd8d63fe514f50c
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 21:10:38 2025 +0800

    更新改动说明

commit 5939c3c6da9e30d2a02c6bf49e3128e491aa85aa
Merge: 5d71a343 7aef8ff6
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 21:07:58 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 7aef8ff684e8a754bb445fafe197218330a537bb
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 21:07:54 2025 +0800

    修复超长距离

commit 5d71a343e534a465a5b347dc43ee4c44bc0c162e
Merge: 81b6cefb b420e139
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 18:28:13 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b420e1398cc022a8ba1513ab74a27044fbaa2228
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 18:28:09 2025 +0800

    扩散没目标的时候重新看一眼原目标

commit 81b6cefbb0c63a27fd09e1969d482e16379d4801
Merge: 5a47a9af 240efea7
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 17:14:22 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 240efea7905c407d0356ddbe39d12806186652a5
Merge: 17f81446 fac6abb9
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 17:14:03 2025 +0800

    Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

commit 17f814461f680b5d0b8216e61abe9a32ce2d17e1
Merge: 54dc20f5 3b8e0e32
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 17:13:32 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 54dc20f545236f66f1cf5cbe2e7aadacbccac554
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 17:13:22 2025 +0800

    先移除重复

commit fac6abb918b429de2031cf01876b48f16a75f85d
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 17:08:56 2025 +0800

    Core

commit 5a47a9af68f05e6170764e0d7277e608d54d335f
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:40:33 2025 +0800

    更新改动说明

commit 3b8e0e32fa9bafb3d5c954ac5419b8897beea316
Merge: e14ffa83 93b5f068
Author: Coronia <[email protected]>
Date:   Wed Feb 19 16:40:13 2025 +0800

    [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

    - Fix an issue where a unit will leave an impassable invisible barrier
    in its original position when it is teleported by ChronoSphere onto an
    uncrushable unit and self destruct.

    Thx to @NetsuNegi .

commit 5542bc84d8e46bfa0e0d20e76b6f5afb284e0174
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:36:34 2025 +0800

    说明书

commit 041cc26812d1bdcf6eff7741fc8e5cfb83acefe1
Merge: f44f3336 1d0fa6d5
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:34:45 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit 1d0fa6d57a05c1ed61cc207a09265250021d5764
Author: 航味麻酱 <[email protected]>
Date:   Wed Feb 19 16:34:16 2025 +0800

    维修子机目标问题修复 (#9)

    * impl

    * Update Hooks.Misc.cpp

    * Update Hooks.Misc.cpp

commit f44f333623b7cd216c001e543c22dd3b62d2a9cd
Merge: 94b12f5b 5e07847c
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:31:02 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 5e07847ce7c0117fb32bd557c08fd264fa07f81e
Merge: cce26bca bed1e2e7
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:30:58 2025 +0800

    Merge branch 'develop-KeepTargetFix' into develop-Mix4BEtest

commit bed1e2e72a1d21069e45fcafa6c29080dce7aaa0
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 16:30:51 2025 +0800

    Core

commit 94b12f5b0d953b0acb468eea0bc115f501eef200
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 15:05:40 2025 +0800

    更新改动说明

commit 5ae70982f60bb122a63ba07a5c6a0a1f26639437
Merge: 79bb3743 cce26bca
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 15:03:16 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cce26bca9813068de56eb66d8a99e70acbfc69ad
Author: CrimRecya <[email protected]>
Date:   Wed Feb 19 15:03:12 2025 +0800

    小修复

commit 79bb37432e6d99e9722bdf8d6ecf4bedb2d4b938
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 23:50:15 2025 +0800

    更新改动说明

commit 9414b022f9316b929df2b03a85cd57599632cfc9
Merge: ccbdee2f 5677c8ca
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 23:48:23 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 5677c8cad1f7b94f1e3b2f310059c1260bac64a8
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 23:48:13 2025 +0800

    修复读取错误

commit ccbdee2f5cf1d8edc4ef33d341ea20b7f6783d9b
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 22:48:45 2025 +0800

    更新改动说明

commit 903ac37c6367042347db5d090d178d8f14e32f26
Merge: 1bab85db 04c2f22c
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 22:44:43 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 04c2f22c1b8a05cbd864398e585b1eda2d114b5c
Merge: 6ebe050b e14ffa83
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 22:43:54 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 1bab85db2a31b40d6e656aaa8a170d16cf590dc0
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 16:05:53 2025 +0800

    更新改动说明

commit 83c8f7c6ec11449f470fe383af5196fcf135bf88
Merge: 853630d8 6ebe050b
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:54:31 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 6ebe050b7e0695dfc82d2231eae8a3b5065164f4
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:54:26 2025 +0800

    小修复

commit 853630d8a87fc0fb3beb42dbfc4aacb11b07ae27
Merge: 5dc93d25 2520485a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:48:10 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 2520485af31c094c1a143e3ed6e8cdb673deb2c5
Merge: be0c165a 646224b2
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:48:06 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 5dc93d25d753530bf43030fba100dcaadb516079
Merge: 73f17e1c be0c165a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:47:20 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit be0c165ab70ff45cdf664214518f160ef48c1b96
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:47:16 2025 +0800

    修复变量名

commit 73f17e1c875fc1dd516f451120ea7d5b3ab8ea96
Merge: 735fa1d1 eb018bf6
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:39:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit eb018bf69e76a18596001b6f58bdecccfdbd3d92
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 15:39:45 2025 +0800

    允许切割和追踪抛体在嵌套载具内正确开火

commit 735fa1d129ebc251b27a13dc646e5f93e4ace24f
Merge: 72997cf1 c8945094
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 13:29:02 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c894509457dbad06a6578c99f8766c5753dfc112
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 13:28:57 2025 +0800

    不同步处在追踪抛体本身不能攻击位置的目标

commit 72997cf124a1159087c43eaa6df4ecc2360d00b5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 03:32:12 2025 +0800

    更新改动说明

commit a427d8454083e29aedfb95e48c8ef0cea9676119
Merge: f832903d 94c53c7e
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 03:31:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 94c53c7e72c3470f87a41be5237cb586868d1685
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 03:31:23 2025 +0800

    扩散抛体速度无上限

commit f832903d93d16c26ca5509e397c755750c33f8d7
Merge: b044babb cea68ec7
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 03:03:18 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cea68ec70847c4260e41b17413536bfd49ba45d7
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 03:03:04 2025 +0800

    补充遗漏2

commit b044babbf380ed07eda7dd358131872182052889
Merge: ccf64cdf c189c933
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 02:42:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c189c9331f0538a855872b7a84d7b7d842200cab
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 02:42:28 2025 +0800

    补充遗漏

commit ccf64cdfef71e49bf2eb4763ed0f193597249268
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:33:37 2025 +0800

    版本号更新

commit 2b1d135cc30ad5d7356fb7542bac963ca8c6d7e1
Merge: ec56b0bc 46d6502d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:32:37 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 46d6502d4bfa62c39ea2244defc2a52f235cc318
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:32:31 2025 +0800

    改一下说明书

commit ec56b0bc06b0cb5d0444fee3186c758014a8b00b
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:27:30 2025 +0800

    改动说明

commit b7549cb26375bf2bb6bf27991b2326791bb7e7c1
Merge: f8b4f354 4f6a5bcf
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:26:59 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4f6a5bcf286cfdd91b239b0e0ee23200e7b4a204
Merge: c8c57a02 7e2ed962
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:26:44 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit f8b4f3544a837da16f24e55ebd2affabd4c85a71
Merge: ba34d6f3 c8c57a02
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:26:39 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c8c57a020fcaa8d58dfd9f907ef4e8cc7eb2e6f5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:26:35 2025 +0800

    漏掉的默认值

commit ba34d6f317253da611271a28e9b25d85b5b0e035
Merge: 5d1850be 4c0b70a7
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:06:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4c0b70a7ecc151b1ba2dd38dda71a22f770189f7
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:06:28 2025 +0800

    扩散抛体提高速度上限重写转向机制

commit 5d1850be73ce2d36bd2429c408ae8584cd9ffb3f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 18 01:05:21 2025 +0800

    改动说明

commit 63707f0bc79bc8710a06c6d675b8f7afb3a6ba37
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 23:27:39 2025 +0800

    案例修改

commit 3bca71600a0edf40cec3de3807bc741a63c88128
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 22:33:38 2025 +0800

    更新改动说明

commit a03a51507f74270b1f59b1bd844f6f6c0e32ccce
Merge: 5d1c68c6 626da19c
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 22:29:33 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 626da19c65a53a1fe8f2ead078935f163166541c
Merge: 025275da e1fec541
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 22:26:38 2025 +0800

    Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

commit e1fec541e66a1268fb8247063a8a2f3995e49c36
Merge: 6c5d4e0e 8a418392
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 22:25:25 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-MergeAOEDamage

commit 6c5d4e0ecdee39506bfbdc8d7796175336383c5d
Author: CrimRecya <[email protected]>
Date:   Mon Feb 17 22:25:15 2025 +0800

    Fix a potential risk

commit 5d1c68c6ecef1a52c5f34e0cb9f6c42495b8beb9
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 19:12:15 2025 +0800

    修复默认值

commit b82aecc5ad8d0445e4b2f3aa7d8ea669f028d801
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 18:47:33 2025 +0800

    增加矿车搜矿的微观定义

commit 8f4e8fd23a4e0e8517aae67c8adc2018ac9816b5
Merge: 8ed1abbd 025275da
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 18:39:53 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 025275daa9824c2944aca3247ef6abc97e4bb588
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 18:39:48 2025 +0800

    简化代码

commit 8ed1abbdf9c7fb23ae25a8870d2a3075195b9752
Merge: 20317b22 6a240f5b
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 18:15:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 6a240f5ba4beede561ccdc1d621c07eee67b3152
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 18:15:28 2025 +0800

    修复原版两栖矿车的问题

commit 20317b2278e1f0835e854e8a2fe2ae91df185ad9
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:39:58 2025 +0800

    版本号更新

commit c39d58d7345166890ea2f20b49c703c2af978593
Merge: 526cd28a 2fa5a2fc
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:37:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 2fa5a2fc0e74daa1bc941067d25a762f1008307a
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:37:09 2025 +0800

    只给本人播

commit 526cd28a2b8df7476ffe74e54c0e34a9914b5a8d
Merge: c6e21098 4a07b40c
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:35:23 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4a07b40c0cba3a5520dc8bfaea762cfe734603be
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:35:19 2025 +0800

    修复显示不同步问题

commit c6e21098fdefe316be29fc2023e2a322ea68190c
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:33:15 2025 +0800

    更新改动说明

commit 283686a7957b5c384b0c71b18ab51dcae52e305c
Merge: ee49a6a0 cf35ecf6
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:30:15 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cf35ecf6a271de22fd382e54c1972303a6f2ae1c
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:30:11 2025 +0800

    修复钻地矿车

commit ee49a6a084f05850782d50b634a5a2801e7ff3b1
Merge: e6081a95 05b0c575
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:26:16 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 05b0c575468a00ca0001ac239b82a552978f5c2a
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:26:11 2025 +0800

    同步

commit e6081a95a04b86f2349a87947e7dbcc8a04c795d
Merge: 20a63b3a c4a50f30
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:14:40 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c4a50f305535c9582bf3092923ceec10072d6bb6
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 17:14:26 2025 +0800

    更新代码

commit 20a63b3a80f895a1e10364037272d5c33248a202
Merge: 06b2d6bb 1b8d6a21
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:53:51 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1b8d6a21dbd17d965479f902a830151b887ac769
Merge: efb8caa6 04fa9ebc
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:53:16 2025 +0800

    Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

commit 04fa9ebc7eb4e92ecdc0ef2c4c2ebb106b8c124d
Merge: 47cb2632 dbf7f74e
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:52:11 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-ScorllSidebar

commit 47cb2632cd17896baedde162ac94541da3d1c107
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:51:59 2025 +0800

    Split

commit 06b2d6bb5e126deaa1652c261cd77a66260e7c29
Merge: 8981b3e2 efb8caa6
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:32:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit efb8caa618ca9d7fda59e697066ee87b010e1bba
Merge: f32dc9bf d64702b7
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:31:28 2025 +0800

    Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

commit d64702b75862227d6c875128b55887a4445dabd9
Merge: 228908a6 dbf7f74e
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:30:46 2025 +0800

    Merge branch 'develop' into develop-MergeAOEDamage

commit 228908a69271db3a2d87020e8f0104208d91cd9f
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:30:11 2025 +0800

    Optimize

commit 8981b3e295531fcb3251ed4c61ea598b5158c695
Author: CrimRecya <[email protected]>
Date:   Sun Feb 16 14:20:17 2025 +0800

    退回

commit 42399e76228b8553091db7ca28d3f19cefcb5707
Merge: fe268719 f32dc9bf
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 14:07:44 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit f32dc9bf917d408d945d46013193fdd5df19be37
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 14:07:39 2025 +0800

    移除重复

commit fe268719db7940d13c463d4a75f2581f960cb0fe
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 14:07:18 2025 +0800

    移除重复

commit 4d89ee46e1245dab1c9c06193bd834928f52f884
Merge: a02b670f e7651bf3
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:54:58 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e7651bf3c0e8e3385e7da8837f66edb556d0e6e0
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:54:43 2025 +0800

    额外功能说明

commit a02b670fd7c4082ef515b9b6830a3c11a858199c
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:52:34 2025 +0800

    改动说明

commit 01aa3543cf2033fed0956cb15fee67f5b8bb7880
Merge: 21f239a2 c17ceb46
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:40:47 2025 +0800

    Merge branch 'pr/1535' into develop-Mix4ECpack

commit 21f239a26fabc56dad955c9491328ffc4ac088cd
Merge: e4e72611 1037d128
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:38:23 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1037d1281c9993613ce054a4c774555d3b73cd9a
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:37:59 2025 +0800

    修复头文件

commit e4e72611e825b8a14353ee96931a3d1c42c00ee2
Merge: 667f68eb d89c1e3b
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:32:47 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit d89c1e3bd99b169ffa5587b77f0e400e835b7e3c
Author: CrimRecya <[email protected]>
Date:   Sat Feb 15 13:32:42 2025 +0800

    换一下文件夹

commit c17ceb466319e8dd3381ad497a041ac0d6fe2006
Author: Starkku <[email protected]>
Date:   Mon Aug 26 00:37:09 2024 +0300

    Fix subterranean harvester pathfinding

commit 667f68eb77a8ce4cddf8e3b15816f6ac02190fea
Merge: 5bdbeeef aec443d9
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 22:01:54 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit aec443d99a74531fcee76044629b1b01193950eb
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 22:01:46 2025 +0800

    优化判断

commit 5bdbeeef70dfe4ef821cdb3d25a0a54acc3030a8
Merge: 96aaf03f 5b01c419
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 21:37:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 5b01c4197bd15740618eff1233a5e3efb020d2cb
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 21:37:27 2025 +0800

    修复不同步问题但保存单人游戏时的做法

commit 96aaf03f7e2b44da5cbb100c937d96c554d6b58c
Merge: 81048e41 3b02c099
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 21:11:28 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 3b02c099cba9e3669bd5204bab9cf8afe720bb05
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 21:11:23 2025 +0800

    修复占据位输出

commit 81048e41174283b8cc266ed22285dea2656f23e3
Merge: e4acf759 b32de91d
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:32:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b32de91dd49517750c60b4d4859f7de13e46e24b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:32:09 2025 +0800

    播个声音提示一下

commit e4acf759a55a1fe891fa3aa16c4a5dedd539c86a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:19:59 2025 +0800

    更新改动说明

commit 589ea561b005d0bc5167e8c014ab58c43d853d76
Merge: b79be0b6 b2277f7a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:19:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b2277f7a74b1138922b9a8457049d76d563c7e10
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:19:00 2025 +0800

    优化并考虑图标变灰时取消

commit b79be0b6f2e512dd6c7543c8c3c554991485b821
Merge: 44f3938d afa171c5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:17:30 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit afa171c5d130177239c7891d773cc6f036350264
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 20:17:25 2025 +0800

    优化并考虑图标变灰时取消

commit 44f3938d22db7b76d852a5772bd0f5081f026866
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 19:59:14 2025 +0800

    更新改动说明

commit a2be6c0d429cae3e4dcfda487a9dd08e1665f725
Merge: 9f20961b a93bd00d
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 19:52:58 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a93bd00d85520080fca51f372237abb275d62524
Merge: 468b5538 0694629b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 19:52:44 2025 +0800

    Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

commit 0694629be5356f900a4461f70aee18010fa05ca2
Merge: 108d160a 02da3f9b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 19:51:41 2025 +0800

    Merge branch 'develop' into develop-AirburstWeapon

commit 108d160a38a0985e6344a0b56fd6895093e53ba3
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 19:51:29 2025 +0800

    Fix

commit 9f20961bda6c1967fea043003ed4291abe745e4a
Merge: 6b5b16e5 468b5538
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:54:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 468b5538b13a57e05866a8d6802c395c17c47446
Merge: d17f606a 5f5e93e7
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:54:37 2025 +0800

    Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

commit 5f5e93e7ab37a2ca93e76d7ae8cd5bf6a6a23af5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:54:30 2025 +0800

    Fix

commit 6b5b16e511098c5c052c9bb528dac00c0402b632
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:44:53 2025 +0800

    更新改动说明

commit e8c916edd163590765bc71b32c3c2bbb5860a03a
Merge: 719e5361 d17f606a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:42:46 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit d17f606a1d7683b64da816da7761f37f56f961bc
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:42:04 2025 +0800

    额外功能说明

commit 7ddd551ef5b46e03204a4fda9746ee38c4844435
Merge: f1dd19b2 2ec36e0e
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:41:56 2025 +0800

    Merge branch 'develop-NoTurretTurn' into develop-Mix4BEtest

commit f1dd19b2c97884dd69e0a7e79df77e61d71ca0db
Merge: 78b26694 620e03ba
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:38:28 2025 +0800

    Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

commit 620e03ba36f77fa5450f43274135620c5770539b
Merge: 6482e262 02da3f9b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:37:52 2025 +0800

    Merge branch 'develop' into develop-AirburstWeapon

commit 6482e2628177e4567d23caebbcb86bad9cd618e5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:37:39 2025 +0800

    Fix

commit 2ec36e0e5e9d5323c17da8f1091ceb6ccaca32c6
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 18:08:35 2025 +0800

    Per unit define

commit a70db4a602354d6e33da904bbb22163b453b8fad
Merge: ee583c3f 02da3f9b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 17:58:46 2025 +0800

    Merge branch 'develop' into develop-NoTurretTurn

commit 719e536189f535ebcbf1a7bc332ee4293eb67715
Merge: 89f777ed 78b26694
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 17:36:18 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 78b26694afe72e2a1c2f41dae5588efe1d70d9b8
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 17:33:05 2025 +0800

    小修正

commit 89f777ed879d3cd329e6a3a4ca5cbfa7ef9527cd
Merge: 0b346360 93b5f437
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 17:10:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 93b5f437f322d3f447247e483e8553b6b2760d5f
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 17:10:27 2025 +0800

    全面优化建筑疏散逻辑并支持防御和科技分离

commit 0b3463602107f493bfc17100c95e035a2dd349cd
Merge: 44bf8054 48372a9a
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:55:19 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 48372a9aade5802c8a5dd73457bce8650c536759
Merge: e33e31a7 2eecf70d
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:55:14 2025 +0800

    Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

commit 2eecf70d6939bb1f74ce4488e57fede401bd922d
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:55:01 2025 +0800

    Simplify `PassengerKickOutLocation` code

commit 44bf805475644c2ca923cad64f78598ec0cd6d42
Merge: 1e47207b e33e31a7
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:23:20 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit e33e31a7e66da8b837042b7e6ed410f0f274a814
Merge: 6d558d5a 02da3f9b
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:23:03 2025 +0800

    Merge branch 'develop' into develop-Mix4BEtest

commit 6d558d5aa5fa245ba1da37b69d995bf9ecb87101
Merge: 6b554915 93b5f068
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:23:01 2025 +0800

    Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

commit 6b5549155b4b84326e6fdd10350b859218bf4a4e
Merge: 861e6d39 a4cd22e1
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 14:22:57 2025 +0800

    Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

commit a4cd22e1908088414eed9a7bd46e7d5638e91b92
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 13:53:08 2025 +0800

    Adjust `PassengerKickOutLocation` code

commit eb891592721de736c5c493c77e0f550a3facd1b5
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 13:20:35 2025 +0800

    Also correct GetCell

commit 93b5f0689d120d0891a59ffa0ff11c2574b78ef8
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 13:10:33 2025 +0800

    Check InLimbo

commit 1e47207b2d8cc5aadbbd2ff5e690c61d3b5886c8
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 00:42:59 2025 +0800

    版本号更新

commit 12c7c3956104ff638f10be7379b3c423c970b9b2
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 00:34:06 2025 +0800

    更新改动说明

commit 35df5d5a5f2f28593109c603241f85ec456cb9a5
Merge: a92ef1d1 861e6d39
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 00:32:56 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 861e6d3903ba071452981a66fa43e3882208fb47
Merge: cb5cd347 3285b762
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 00:31:52 2025 +0800

    Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

commit 3285b762af85d5ddfc9950f09d40f673d13c5020
Author: CrimRecya <[email protected]>
Date:   Fri Feb 14 00:27:51 2025 +0800

    Core

    Co-Authored-By: Netsu_Negi <[email protected]>

commit a92ef1d16e741850713c7880d8090fb7907af037
Merge: 7599529c cb5cd347
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:47:11 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit cb5cd3479267d8fbaddf4f7947ab4a5ab957697a
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:47:06 2025 +0800

    修复移动中的单位可能导致的建筑问题

commit 7599529cf299d9734598470168db573d9afae701
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:46:20 2025 +0800

    改动说明

commit e436015da5b2e02ec052bd43876f41761836bd9c
Merge: 27d09200 88752d8e
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:26:09 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 88752d8e02fbff4c5b84f2a2ab946a8684cd4dda
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:26:02 2025 +0800

    正确输出格子占据位

commit a2a06915711340c4934c10e158247e7fbb3b7dfd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:23:52 2025 +0800

    更换钩子位置

commit 8bca6f3c83991b4ca80fa8ecaa4e4a13f8a20b6b
Merge: 4e1b950a 6de8fbeb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:02:57 2025 +0800

    Merge branch 'develop-DeployDesyncFix' into develop-Mix4BEtest

commit 4e1b950a838cc4cbbfccf3c38ecc5729f0d03579
Merge: 59a6bff0 596bbaf7
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 23:02:13 2025 +0800

    Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

commit 596bbaf7d8c135eac784b6615b4d5b013dc03cde
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 22:11:46 2025 +0800

    Core

commit 27d09200f893cbe6f64dd718aee1fdbe93073620
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 22:11:01 2025 +0800

    小修复

commit cb4fd42c3e1301c406920fdb1cc8a52fd92c1833
Merge: 9b244d27 59a6bff0
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 22:08:55 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 59a6bff05bd1d20584c39d890777435fe9ec4dd8
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 22:08:49 2025 +0800

    移除无用过度判断

commit 9b244d27c4abb10f4ab10f1deae547cb6d7d3f6d
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 22:00:20 2025 +0800

    小修复

commit e82c8e52649a21ecadb3c54a7ba76b244ce36a2c
Merge: b5a251d3 63b33d87
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 21:45:36 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 63b33d87d8f3012e5defde6598bc16d6fc4c2601
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 21:45:31 2025 +0800

    修复一个小问题

commit a6291514645aeeb3026d9b9f31be27243310a562
Merge: 53530b0a c317e0cd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 21:44:42 2025 +0800

    Merge branch 'develop' into develop-UndeployBuilding

commit 53530b0a240c141c820f1817f9070f0621a9d168
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 21:43:58 2025 +0800

    Fix a typo

commit b5a251d30cc646950a55c17b875d5595e4325c34
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:23:13 2025 +0800

    更新改动说明

commit e592c36ebcb7aaa5a9123d31f193f5c81aeb74ec
Merge: 7f3d3759 28556e66
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:21:25 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 28556e661ce2728062257a47283df72ef6545d6a
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:21:21 2025 +0800

    额外功能说明

commit 7f3d3759603283856dc62990644f7e5544135791
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:16:28 2025 +0800

    改动说明

commit 781138a0553c88b21d6e41db2f7cd5065906bdc5
Merge: 226cb970 67324cee
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:14:21 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 67324cee4a40bc627eedd9b7a7ef0632eaeec3aa
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:14:17 2025 +0800

    功能说明

commit 226cb970796bd1b9899f852281d5400c70648c91
Merge: 2c1c82ad a818097e
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:09:48 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a818097e521fbd2ad9b55144ef9b406d7d68aca1
Merge: c559e602 4fe6a682
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:09:33 2025 +0800

    Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

commit 4fe6a682c50dcbfdb4d5cac90c7dac52e1cfe9fc
Merge: 7f8c25a9 c317e0cd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:07:32 2025 +0800

    Merge branch 'develop' into develop-JumpjetTilt

commit 7f8c25a913d2efd59d7ddfd28b6cf7bda8092e91
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 19:07:22 2025 +0800

    Can be customized

commit 2c1c82ad0b440f16568c0dfc6162445e573d0a82
Merge: 5beab4b7 c559e602
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 18:43:01 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c559e602f54427f3d3909b2e13ff7408df097453
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 18:42:55 2025 +0800

    Fix a typo

commit 5beab4b79a490996cba56bb6033dc2a44516ad94
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 18:07:24 2025 +0800

    优化一下

commit 3a6728b4706f2911be0690e003a7cce639ac8ede
Merge: 0df4587d 1b5034ff
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 17:15:35 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1b5034fff61845c1fe1070a268609536bb4c2bf4
Merge: 54f4942e dab3385b
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 17:15:07 2025 +0800

    Merge branch 'develop-Distribution' into develop-Mix4BEtest

commit dab3385b47a8437b9151fa19428bd7c626591a1c
Merge: 55723f3e c317e0cd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 17:13:50 2025 +0800

    Merge branch 'develop' into develop-Distribution

commit 55723f3e5b84b5396397a20ed4b9d0a473c99fbb
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 17:13:34 2025 +0800

    Global toggle

commit 0df4587d6c6f2c470b5b7d4aa606890af783cf06
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 16:56:28 2025 +0800

    小改一下

commit 710e6c2667dbd88e3f9b2084c70ea147ab7f5d06
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 16:34:10 2025 +0800

    更新改动说明

commit d66ec08d37a028fba9f1e19631e8da197c17976a
Merge: bf5c73b1 54f4942e
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 16:32:39 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 54f4942ef1ca42cf863f42f99bcf3b7c965308cd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 16:32:34 2025 +0800

    新的抛体功能标签

commit bf5c73b16c394590408c436e32f061fd2448c295
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 16:17:53 2025 +0800

    改动说明

commit 74de16cdd1dd8fc0b8c3efcceaa5569a3a8221af
Merge: 7f38c00e bb54a2f1
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 15:46:40 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit bb54a2f14dad62a61da9aaa98e30a81f9cdfa425
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 15:46:35 2025 +0800

    修复建筑疏散有时会卡住的问题

commit 9a34988d18a692f96e32fbc731864d5785b0bbd0
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 15:46:15 2025 +0800

    输出任务更新计时器

commit 7f38c00ef785d5ab8c836555c3cbe2b963186151
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 15:01:47 2025 +0800

    改动说明

commit 582da465429b520117c5dab08198f008b08ab059
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 15:01:36 2025 +0800

    合并建筑路径点修正

commit 15c0ea5e5e0aef85cdf6e992bad5300dea3c0f5f
Merge: 5e6e7d46 a34cdece
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 14:38:45 2025 +0800

    Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

commit a34cdece04d5f669f2c5602760c5598f5f42dc8a
Author: 航味麻酱 <[email protected]>
Date:   Thu Feb 13 14:38:18 2025 +0800

    Inviso fix (#7)

commit 689e35922bc6d68439d3dfa327b3b4d07d393fcf
Author: 航味麻酱 <[email protected]>
Date:   Thu Feb 13 14:37:02 2025 +0800

    Update Hooks.Others.cpp (#8)

commit 5e6e7d46e6fbb4aba21874bed483c3dfc042f3ef
Merge: 142e45cd 0eded001
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 14:26:16 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 0eded00139467bebc679c3d1e3223bcc80f099f2
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 14:26:12 2025 +0800

    更换为正确的检查位置

commit 142e45cd9f24276d4a3b1869d9c1bd95cc615778
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 02:52:25 2025 +0800

    更新改动说明

commit fe6cc4accd39616d1f74ff22d2a146f75181b0b6
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 02:46:09 2025 +0800

    移除重复

commit a81e006b98ba4190542bc8fc0747b623ebe0b1d0
Merge: 05ff934b 3b84f610
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 02:43:37 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 3b84f6103066d46614254b5ed2d360c118161d3c
Merge: ea5e2466 c317e0cd
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 02:42:49 2025 +0800

    Merge branch 'develop' into develop-Mix4BEtest

commit 05ff934b0a4966f3c43049e2eda8828f313bc54d
Merge: 7bfb09f3 ea5e2466
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 00:56:14 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ea5e246624795d42847cadd820a7d123579c856c
Merge: 39d4009c 3c7f0ce2
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 00:56:08 2025 +0800

    Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

commit 3c7f0ce234fa8c590be56c11f3ba594751a61139
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 00:55:59 2025 +0800

    Enhance readability

commit 6de8fbebc1880886862790f5ba6a0aa6b4d647fe
Author: CrimRecya <[email protected]>
Date:   Thu Feb 13 00:19:57 2025 +0800

    Core

commit 7bfb09f3b5c33f6e29dfd36f533c0ee47ebe06c1
Merge: 673ed382 39d4009c
Author: CrimRecya <[email protected]>
Date:   Wed Feb 12 16:48:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 39d4009cd21a156edf580d6ddad12fcebfda4225
Author: CrimRecya <[email protected]>
Date:   Wed Feb 12 14:53:35 2025 +0800

    恢复钩子

commit 673ed3823e56a46dcf6e8e822f491ebbbb9f8dfb
Merge: 459fc19b 6d6d05ff
Author: CrimRecya <[email protected]>
Date:   Wed Feb 12 14:52:41 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 6d6d05ff922203e789e8d8c34a327c5ad6caf189
Author: CrimRecya <[email protected]>
Date:   Wed Feb 12 14:52:35 2025 +0800

    跳过动画拓展检查

commit 459fc19b7185d3f920b7d6e447b991d101e4667e
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:33:41 2025 +0800

    改动说明

commit de5ddf598ada888ae3e6323f14d9a53c347c0f08
Merge: 9297185b 466583d3
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:32:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 466583d3ba0cef3e33fff76c86d8d146c643231a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:32:26 2025 +0800

    更新说明

commit 9297185b276fb0dc10f3968769911a26ddeca789
Merge: bf5bf245 6ee8de6d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:30:31 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 6ee8de6d4564c071cd939b7fa2e91217eda88af0
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:30:21 2025 +0800

    额外功能说明

commit bf5bf24501f5433e19f0b953406c5f6070bb8e73
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:29:07 2025 +0800

    更新改动说明

commit 471860645b7d336c6f84b6dc4dfa704f296da0c2
Merge: 199c3298 ea67f57f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:28:08 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit ea67f57fe4ca6066ca54a91dc8d22995d5548602
Merge: 3ce5a8bc a966bdc4
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:27:40 2025 +0800

    Merge branch 'develop-ExtendedRateDown' into develop-Mix4BEtest

commit 199c329882f6042e00e9a5df9d97c201afcb8b31
Merge: 79f454b9 3ce5a8bc
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:06:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 3ce5a8bc47ee0f422b384ce196f3dfe637915447
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:06:16 2025 +0800

    移除合并后重复

commit c8e560e9a7ba0ecf081d164366bb2d6703f5949c
Merge: 9acf1324 6645df9a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:05:26 2025 +0800

    Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

commit 6645df9aecde64954665fbf0bd5c7e4a0a7cf345
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 20:04:39 2025 +0800

    Core

commit 79f454b95e26017bc9b30725846bc084971ad01b
Merge: e959df48 9acf1324
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 19:37:39 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 9acf132427a13471080cc901e663c3a6fbc4ca1d
Merge: b01d79b8 d7cc91d6
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 19:37:34 2025 +0800

    Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

commit d7cc91d6e98a1394110f27bba524dd46943783e6
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 19:33:51 2025 +0800

    Fix doc

commit e959df486119b85aaace7d82591818eea106bf3f
Merge: da3012e9 b01d79b8
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:58:12 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit b01d79b87f1de46235c5a0bd74531f967d26e09c
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:57:47 2025 +0800

    修复合并后地多余项

commit 784a1877429f7eb82e3bf280dd735287e67151a7
Merge: a94d6d50 ec4246b5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:57:35 2025 +0800

    Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

commit ec4246b593b77157ef93d2b2daf56248345228fa
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:55:29 2025 +0800

    Core

commit da3012e93b3560cca0a6e6779458dff55eecc2a7
Merge: e301fe24 a94d6d50
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:38:44 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a94d6d50367c73f0dbfbf9f15e18d7ce7029079e
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:38:38 2025 +0800

    悬浮空军倾斜时判断活着的状态

commit e301fe24b0d2ce5a57164f73737c0cdece252c8c
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:25:32 2025 +0800

    更新改动说明

commit fc303074eb4e289ff69650ea6f98bcae936f789d
Merge: 977a3d05 f822c26d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:18:00 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit f822c26d9d630cae3967d48f1eedd15b48976b2d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:17:41 2025 +0800

    修复合并

commit 4bb17e0a6646bc1ef7cf226feb90b5a735aa2eac
Merge: 20f28bdb f701344f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:16:07 2025 +0800

    Merge branch 'develop' into develop-Mix4BEtest

commit 20f28bdb97c4b2a8d1a1fa81eb020d6798e03a6a
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:14:01 2025 +0800

    小修正

commit a966bdc4578aecb2d734dca1ad8d1e158bfad6e5
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:08:36 2025 +0800

    Rename key

commit cf934350d2f14a1c846e3844a42c1fe552198cc9
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:03:53 2025 +0800

    Fix merge

commit 8fc7d60b1f2ea9fac469a5ce5b92e53b62f9cb07
Merge: 93af5a8b f701344f
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:03:40 2025 +0800

    Merge branch 'develop' into develop-ExtendedRateDown

commit 977a3d05da5228e13a417f4e9920e9a04f7e773e
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:01:32 2025 +0800

    更新案例

commit a0788b0788dab1cf5fda04e144e019bdf7b716e4
Merge: e1d1dbf2 4b59e78d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:01:00 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 4b59e78d14ddf4c92d2dcf76d3ef11bc37bb466d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 18:00:54 2025 +0800

    键名更改

commit e1d1dbf22097d245005e0b286eb8c985a79a4eb9
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 17:51:50 2025 +0800

    Optimize

commit 0beb6cd8aa83063ef0287dcf5b8f577b32cd10a7
Merge: 9379d8ad 340001b2
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 17:09:20 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 340001b23ed6e7dfb657d3e068d47edb9079a204
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 17:09:05 2025 +0800

    小修正

commit 9379d8ad873aa489392d1ea8a084922c7c09b8a3
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 17:05:39 2025 +0800

    小移动

commit 1413b4b358752ba3c49a882cf42666c16672f615
Merge: 4e739875 1bd1b66d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 16:25:50 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1bd1b66d6d0866b2fbf885ee785541ab7a1f0c62
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 16:25:43 2025 +0800

    修复轰击无发射过程时过度计算提前量的问题

commit f67c8d46b83f9f121fa2192c3947258e90ad91f0
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 16:25:03 2025 +0800

    小优化直线提前量计算时的判断

commit ddf2e5051dad395543938c34d4efc3b10840e5f3
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 16:24:33 2025 +0800

    修复头文件顺序错误

commit 4e739875f3f73aa66023c907d84cb43a2c60d048
Merge: a27c5fc7 191cc82d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 15:00:32 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 191cc82dd196857fd8f8d526ba987797c2b48e2e
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 15:00:27 2025 +0800

    简化代码

commit a27c5fc7761bc7f3c680b649b55a709d05d2c0c6
Merge: 83ca1603 20e1338d
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 02:01:21 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 20e1338dcfd626a5cbbcb6e5cd6acc240b81cf07
Author: CrimRecya <[email protected]>
Date:   Tue Feb 11 02:01:16 2025 +0800

    抓取鼠标滚轮滚动

commit 83ca160372ce705552640735e0c0c9b71a216501
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 14:27:58 2025 +0800

    更新改动说明

commit c4806b422febba6eb4f6cbc217108f0f26e8f3b8
Merge: 460893ff 1c176117
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 13:20:16 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 1c17611793d393e34dd6a484f6ca6c081fd72f5d
Merge: a2d05207 0ee80905
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 13:20:08 2025 +0800

    Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

commit 460893ff2e3296f9b8d20fc33dc92937b0807a11
Merge: 4ff2cf0f a2d05207
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 12:50:59 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit a2d05207fc04c89bf53de58cffb04a218f937c98
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 12:50:33 2025 +0800

    简化格式

commit 4ff2cf0f37b54e06ef75be18ff8532d94ea923c5
Merge: e1df0bcd c722a4c1
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 12:33:31 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit c722a4c10358a9bdcdb31c3e964c528fbfd06610
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 12:33:22 2025 +0800

    简化判断

commit e1df0bcdc978af8d76f3721aa0e3a35a10e62567
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:40:01 2025 +0800

    漏了

commit ac03a3b0d7e93550279219d99057b4995a5426f2
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:31:44 2025 +0800

    清理额外功能说明

commit a407d845142e6baca0a75b83ea38e8c6a98e9df9
Merge: c754d6fc 6cb36b5a
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:24:05 2025 +0800

    Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

commit 6cb36b5aef0c977502e2eb7e7d76a09e4c506ffa
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:24:00 2025 +0800

    小优化

commit c754d6fc0929d349b7e160fee6774300fd69de3a
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:22:42 2025 +0800

    移除合并后多余的东西

commit f202d86b851f228b4d65fb3d91cf177df184363b
Merge: b62f8793 ca34bac5
Author: CrimRecya <[email protected]>
Date:   Mon Feb 10 00:15:46 2025 +0800

    M…
CrimRecya added a commit that referenced this pull request Feb 24, 2025
@TaranDahl @DeathFishAtEase @CrimRecya
Missile spawn exp (#11)
8ffd725 
* impl

* [Docs] a few

Handle errors (e.g., "applied to to TechnoTypes")
Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
Missing symbol
Missing type annotation
.etc

* Update Hooks.BugFixes.cpp

* Squashed commit of the following:

commit ddcd9de51e703e2eafc79c325877a87417f960ae
Author: 航味麻酱 <[email protected]>
Date:   Tue Feb 25 02:17:27 2025 +0800

    补个标签 (#10)

    * impl

    * Update Hooks.Misc.cpp

    * Update Hooks.Misc.cpp

    * flag

    * [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

    (Re-merge properly)

    - Fix an issue where a unit will leave an impassable invisible barrier
    in its original position when it is teleported by ChronoSphere onto an
    uncrushable unit and self destruct.

    Thx to @NetsuNegi .

    Co-Authored-By: Netsu_Negi <[email protected]>

    * [Minor] Fix Ammo features and tank bunkers. (#1420)

    - fixing ammo block inside tank bunkers;
     - partially fixing ammo adding/substracting inside tank bunkers

    still problems with converters

    ---------

    Co-authored-by: Coronia <[email protected]>

    * [Minor] Disallow other actions for building in planning mode (#1524)

    <!-- Please add [Minor] to the title or the description if this change
    should not be mentioned in documentation, what's new and no credit needs
    to be given. -->

    ---------

    Co-authored-by: 绯红热茶 <[email protected]>

    * Add project maintenance structure and contribution types to docs

    * Fix #1106 : Deployer = yes to no infantry conversion sequence update (#1315)

    It's a bad design and thus does not worth a fix
    in case someone really wants to, here's one way to it

    * [Minor] Exception handler control via command line argument (#1231)

    Just use command line argument `-DontSetExceptionHandler` to disable
    game exception handler.

    UPDATE:
    `-EH-off` & `-EH-on` tags.
    For debug build default is **DISABLED**.

    UPDATE2:
    `-ExceptionHandler=boolean`

    ---------

    Co-authored-by: Kirill Andriiashin <[email protected]>
    Co-authored-by: Kerbiter <[email protected]>

    * Avoid InvisibleInGame targets in new scripts (#1312)

    Buildings with InvisibleInGame=yes should be ignored in the target
    selection of the new attack/move actions.

    I just found I forgot to send this time ago :-/
    No credits or mention needed since it only fix a small bad behaviour.

    * Fix contribution types docs a bit

    * update docs and credits

    * [Docs] a lot like [zh-cn]New-or-Enhanced-Logics

    * [doc] $Include

    Revise the description of disabling the Ares include feature and add the reasons.

    * [Docs] a few

    Handle errors (e.g., "applied to to TechnoTypes")
    Standardize the names and formats of special terms, such as changing *.ini->[xxx] to *.ini -> [xxx] like the existing [xxx] -> key (and sometimes the two are used together)
    Missing symbol
    Missing type annotation
    .etc

    * [Minor] Fix Insignia.Weapon parsing (#1530)

    Separate the fix from
    https://github.com/Phobos-developers/Phobos/pull/1365 to a standalone
    pull request, which should fix the issue in
    https://github.com/Phobos-developers/Phobos/issues/1528.
    - previous Insignia(.Frame/.Frames).WeaponN settings can't be read or
    overridden from maps, which is fixed now

    * [Vanilla Improvement] No turret unit turn to the target when rearming (#1465)

    - Now vehicles (exclude jumpjets) without turret will attempt to turn to
    the target while the weapon is cooling down, rather than after the
    weapon has cooled down, by setting to `NoTurret.TrackTarget` true.

    In `rulesmd.ini`:
    ```ini
    [General]
    NoTurret.TrackTarget=false   ; boolean

    [SOMEUNIT]                   ; UnitType
    NoTurret.TrackTarget=        ; boolean, defaults to [General]->NoTurret.TrackTarget
    ```

    ---------

    Co-authored-by: 航味麻酱 <[email protected]>

    * [Customized] Damage multiplier for different houses (#1307)

    - Warheads are now able to define the extra damage multiplier for owner
    house, ally houses and enemy houses. The values in warheads are default
    to respective `[CombatDamage]` -> `DamageXXMultiplier`, which all
    default to 1.0 .Note that this will not affect damage with ignore
    defenses.

    In `rulesmd.ini`:
    ```ini
    [CombatDamage]
    DamageOwnerMultiplier=1.0     ; floating point value
    DamageAlliesMultiplier=1.0    ; floating point value
    DamageEnemiesMultiplier=1.0   ; floating point value

    [SOMEWARHEAD]                 ; Warhead
    DamageOwnerMultiplier=        ; floating point value
    DamageAlliesMultiplier=       ; floating point value
    DamageEnemiesMultiplier=      ; floating point value
    ```

    * Remove a useless variable and fix doc

    * Squashed commit of the following:

    commit 2182e831aeae7f8938303721c6a2e937dd6ff067
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 02:06:36 2025 +0800

        小改位置

    commit 056a7ab1a82e11ba5b37b0c17613f927eb8fb66a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:19:11 2025 +0800

        改动说明

    commit 545f6088d35b9b32543e9db7dc371a464fa90ce1
    Merge: 7d3c131d cf69a711
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:18:22 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cf69a7111ae2070728de5f3cb40a399e203ac7be
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:18:17 2025 +0800

        功能说明

    commit af44f3f6182cb97eed0824fe9bcd40408b1f81be
    Merge: 49dfd0ae 886cd122
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:15:47 2025 +0800

        Merge branch 'develop-newinfotype' into develop-Mix4BEtest

    commit 886cd122a666ced42f990f3c4107bc5532ebe829
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 25 01:15:40 2025 +0800

        New `ValueAsTimer`

    commit 7d3c131ddda6ba5efad94b3f8c196d325bcf35d5
    Merge: 57eaa340 49dfd0ae
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:30:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 49dfd0aea1d60c88b270ba43d0182690da411a7d
    Merge: 4c7d1cc9 a954c838
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:29:55 2025 +0800

        Merge branch 'develop-newinfotype' into develop-Mix4BEtest

    commit a954c83885f29a2af9da6c10224f5ef27064be06
    Merge: 83debb74 13cdc0cc
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 23:28:34 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

    commit 57eaa3401b39d0159ed082c23fab4a911b3d50dc
    Merge: 9166eec1 4c7d1cc9
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:27:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4c7d1cc9f25259335cbd95f9590b421982c406eb
    Merge: 052ce1e4 13cdc0cc
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:24:12 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 052ce1e469faa7b7d92ea6f4fb41957f29840afd
    Merge: 59007c82 00752e41
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 22:17:17 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 9166eec198d7f1e4d4691f05f4002a3c3bd9f5c7
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 21:04:39 2025 +0800

        修复侵略模式按钮

    commit 241479932e0fa9c9b9327d8aff51827e64e944a7
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:41:54 2025 +0800

        更新改动说明

    commit eed20f690ed6a5ff57f3da7cb6eacde3f7e3eac1
    Merge: 4d9ab456 59007c82
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:38:07 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 59007c8205df4cb35345a2f1a89b12d3d2c5cd76
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:38:02 2025 +0800

        小改动

    commit 4d9ab456f6285d7476be2d06aa56d8baad5eb2be
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:36:50 2025 +0800

        合并功能

    commit a3965d3d37a6195f226d3c3c9ecb025562f970fd
    Merge: 6342450f d1cda617
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:31:45 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d1cda6171fce116c5195e64ba6c83270ac6b5a80
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:31:11 2025 +0800

        功能说明

    commit 6342450f45e7c0e4b791a9fa81de957c0601817c
    Merge: dc523103 3456e138
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:10:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3456e138f8a480d8f83f82749d9b2b2419bee65b
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 20:10:23 2025 +0800

        完成所有基本底边栏功能

    commit eb2d35e49e57f285e81adbe0befc88138c9c8976
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 03:01:09 2025 +0800

        底边栏功能继续完善

    commit ac74b4c14b9891f351d2d27a043edbc06c560475
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 24 00:02:03 2025 +0800

        全新的底边选择栏底层

    commit dc523103555d09cd4ded6779e7d805a49f61bfda
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 01:47:54 2025 +0800

        更新改动说明

    commit c8ebd98339f9671164c901f7c9ce354de8e374d5
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 01:47:39 2025 +0800

        修改玩家自动修理

    commit 94ea4577332bdc7e08416d9fcce6d3e0bbc83d85
    Merge: 16ff7f60 9180ff46
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:54:34 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 9180ff46ca477872b8697d73191bc9f0f6a48f58
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:54:15 2025 +0800

        更新说明书

    commit 16ff7f60b4cca7e9bfa94e41416798f7dde98550
    Merge: 2d01a403 8be46a13
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:47:51 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8be46a13c08a209a148dcea48ad29c74ff3fe51e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 23 00:47:46 2025 +0800

        增加自动建筑快捷键初始默认值

    commit 2d01a40324ab5868d6638b2c48b3a5aa26358b48
    Merge: 23a3d9ca 40a71e5b
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 23:02:29 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 40a71e5b2e56a5788b1ed55fdd909cab972d4ccc
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 23:02:24 2025 +0800

        补充独特单位显示的完整开关

    commit 23a3d9ca3e099433a52ba4ffa5cedf6336aebfd1
    Merge: 7b831b56 87b20441
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 22:52:49 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 87b20441dd94d225559b13f7dcff3bc1ccb954df
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 22:52:16 2025 +0800

        彻底修复超武侧栏的开关点击问题

    commit 7b831b56de380bda032adbe852adb798ed353e9f
    Merge: 4d99159a b2adb3c2
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:58:27 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b2adb3c2b382c116d529d62a1bb0409dd7f87e00
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:58:23 2025 +0800

        Fix typo

    commit 4d99159ab6cd325251152b9ed7bed1044b9709af
    Merge: a9f01889 7053fae2
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:24:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 7053fae23ecb17efa368c4258c891a1723e6e9a7
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 20:24:15 2025 +0800

        修复最后一个点击问题并优化科技树图标检查

    commit a9f018895c06b6922e2a8d61a7be73a837829a66
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:06:18 2025 +0800

        更新改动说明

    commit 4d9f7580e1709d0fcbd2bc4369d65591cf50da96
    Merge: da3e0c4d 8e57d2e0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:01:38 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8e57d2e03698dfb5a9f7493af0ad2636ba8bced0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 17:01:33 2025 +0800

        修复超武侧栏的一些点击类问题

    commit da3e0c4d64d79bf080d775e7cfa1477d0948c0da
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 14:01:31 2025 +0800

        更新改动说明

    commit 0e782d6afa7b9391d75600d7f3272246d60faa12
    Merge: f49ceee6 1ce0f217
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 13:51:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1ce0f217a579170a63981e30b4604350b3487349
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 13:51:08 2025 +0800

        超武侧栏的更新和修复

    commit 504b88e6f16be5ff25174e77605918306f97bd9c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 12:14:33 2025 +0800

        修一下说明书

    commit f49ceee64f2fe71d3d8194726fc6761ae2b40d61
    Merge: 1eb3ccdc 8e4b0a24
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:21:55 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 8e4b0a24461f040ed07b42e6cf0153785fd58977
    Merge: 3cb24f21 2d9f9c4c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:18:43 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 3cb24f21da43fc59c75fd830b766ede418fb6345
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 22 05:14:52 2025 +0800

        修改一些超武栏的钩子并重做英雄栏底层

    commit 1eb3ccdc534ccfe4de3b89a40e2997dd38313788
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:47:17 2025 +0800

        版本号更新

    commit 7c0c86202cb3a2d0a777f7aab5bc3181b7fa08ca
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:46:24 2025 +0800

        改动说明

    commit e0e8ab1372852d65035d7206873eb5669926c655
    Merge: c35b5f5d 97849d3d
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:42:11 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 97849d3debd3f109cc47ba88d954255a5b35d45a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:42:06 2025 +0800

        功能说明

    commit 7cf6b28f7916afb292b94fd6cb6ffdabd11d252b
    Merge: cad44713 86e3aa61
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:41:07 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 86e3aa611d574da3186af9b41a782f3175af6ee8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:40:59 2025 +0800

        Fix

    commit c35b5f5db8b5cf947e89bc6d6a89afd7643f5459
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:22:35 2025 +0800

        更新改动说明

    commit be5597d2de4cf4445e370652e4fa962a335302e6
    Merge: 81cd401a cad44713
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:19:10 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cad44713188639146629b4642c38171569b882dd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:19:04 2025 +0800

        额外功能说明

    commit 394fd6962496aeaf9c4aac259cacf27393fa1cb4
    Merge: c6f6c2be 1b984b03
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:17:41 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 1b984b034eff04c81e8fe02f8b4ec23f0743912b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:17:32 2025 +0800

        New `BuildingSell.IgnoreUnsellable`

    commit 81cd401aa6796a2187130c16f90bf86d968fd973
    Merge: 998455e6 c6f6c2be
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:10:12 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c6f6c2be2f8fb2121f4f1afc67caa7c5726a1b5c
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 22:10:07 2025 +0800

        播一下声音写一下字

    commit 998455e6c74f9fe1c0ee2d4359ad8d63d7dafafe
    Merge: e8ed0b99 01e4b330
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:47 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 01e4b3304dcbe182ce0b12188d02f2934e2c7a6f
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:44 2025 +0800

        修一下注释的位置

    commit e8ed0b99e1bcd5694b2522b3ae476b6f3bd34064
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:21:06 2025 +0800

        更新改动说明

    commit 6daf0a89ee309b2e88dc88e32c62ee8be8aabe5b
    Merge: 3875c084 0c03bdf8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:17:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 0c03bdf88d763d51726fda78cd74315cbb276a43
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 20:17:18 2025 +0800

        新增滚轮功能

    commit 83debb7474efde6b3f4c0a40eeffd51d0fd48a10
    Merge: f260915c aa4e9525
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 17:44:55 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-newinfotype

    commit 3875c0848646ba8dab39c47ada5bed002f5ae0cb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 17:42:54 2025 +0800

        更新说明

    commit 79109419c4c74892cd030f0bb664aa7b2908dfe4
    Merge: b6197722 2d6f3384
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 15:19:52 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2d6f33849a6633a83490833481a6ceb5efde3fe8
    Merge: bb7ada15 aa4e9525
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 15:19:29 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit aa4e9525a3929c07e19957a76536c222c5d69b9a
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 20 15:18:14 2025 +0800

        [Minor] Disallow other actions for building in planning mode (#1524)

        <!-- Please add [Minor] to the title or the description if this change
        should not be mentioned in documentation, what's new and no credit needs
        to be given. -->

        ---------

        Co-authored-by: 绯红热茶 <[email protected]>

    commit 06664e94f92e68f8ad22554354f7160eea64e8d4
    Author: Fryone <[email protected]>
    Date:   Thu Feb 20 09:57:57 2025 +0300

        [Minor] Fix Ammo features and tank bunkers. (#1420)

        - fixing ammo block inside tank bunkers;
         - partially fixing ammo adding/substracting inside tank bunkers

        still problems with converters

        ---------

        Co-authored-by: Coronia <[email protected]>

    commit b619772284613a317851bc3ac38c56fd5f4a460b
    Merge: 65ea625a bb7ada15
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:35 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit bb7ada15bb756d6fd9d4d6cef6b8ffecb0d7eb56
    Merge: eb2d49cf ee1f0eae
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:26 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit ee1f0eaee296465d335ed4a42ccd0577c6ea284b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:32:06 2025 +0800

        More check

    commit 65ea625af75da45d2717ca242b73174ffdb79f3d
    Merge: 0596116c eb2d49cf
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:29:46 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit eb2d49cfe5c66d917c8395e2f19311ac7a2a24d5
    Merge: 7aef8ff6 9e33e4dd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:29:21 2025 +0800

        Merge branch 'develop-UndeployBuilding' into develop-Mix4BEtest

    commit 9e33e4dde4d3a2efc695e0f02b5e0e47e5705369
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:26:56 2025 +0800

        Comment

    commit da46faa83f5e3ff68dc5b09c8b3366b5347f18fd
    Merge: a6291514 3b8e0e32
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 20 13:03:15 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-UndeployBuilding

    commit 0596116c970a15360bfa6fe88fd8d63fe514f50c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:10:38 2025 +0800

        更新改动说明

    commit 5939c3c6da9e30d2a02c6bf49e3128e491aa85aa
    Merge: 5d71a343 7aef8ff6
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:07:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 7aef8ff684e8a754bb445fafe197218330a537bb
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 21:07:54 2025 +0800

        修复超长距离

    commit 5d71a343e534a465a5b347dc43ee4c44bc0c162e
    Merge: 81b6cefb b420e139
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 18:28:13 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b420e1398cc022a8ba1513ab74a27044fbaa2228
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 18:28:09 2025 +0800

        扩散没目标的时候重新看一眼原目标

    commit 81b6cefbb0c63a27fd09e1969d482e16379d4801
    Merge: 5a47a9af 240efea7
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:14:22 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 240efea7905c407d0356ddbe39d12806186652a5
    Merge: 17f81446 fac6abb9
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:14:03 2025 +0800

        Merge branch 'develop-FloatMinerPathFix' into develop-Mix4BEtest

    commit 17f814461f680b5d0b8216e61abe9a32ce2d17e1
    Merge: 54dc20f5 3b8e0e32
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:13:32 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 54dc20f545236f66f1cf5cbe2e7aadacbccac554
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:13:22 2025 +0800

        先移除重复

    commit fac6abb918b429de2031cf01876b48f16a75f85d
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 17:08:56 2025 +0800

        Core

    commit 5a47a9af68f05e6170764e0d7277e608d54d335f
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:40:33 2025 +0800

        更新改动说明

    commit 3b8e0e32fa9bafb3d5c954ac5419b8897beea316
    Merge: e14ffa83 93b5f068
    Author: Coronia <[email protected]>
    Date:   Wed Feb 19 16:40:13 2025 +0800

        [Vanilla Fix] Fix impassable invisible barrier created by chronosphere on uncrushable unit (#1529)

        - Fix an issue where a unit will leave an impassable invisible barrier
        in its original position when it is teleported by ChronoSphere onto an
        uncrushable unit and self destruct.

        Thx to @NetsuNegi .

    commit 5542bc84d8e46bfa0e0d20e76b6f5afb284e0174
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:36:34 2025 +0800

        说明书

    commit 041cc26812d1bdcf6eff7741fc8e5cfb83acefe1
    Merge: f44f3336 1d0fa6d5
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:34:45 2025 +0800

        Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

    commit 1d0fa6d57a05c1ed61cc207a09265250021d5764
    Author: 航味麻酱 <[email protected]>
    Date:   Wed Feb 19 16:34:16 2025 +0800

        维修子机目标问题修复 (#9)

        * impl

        * Update Hooks.Misc.cpp

        * Update Hooks.Misc.cpp

    commit f44f333623b7cd216c001e543c22dd3b62d2a9cd
    Merge: 94b12f5b 5e07847c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:31:02 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5e07847ce7c0117fb32bd557c08fd264fa07f81e
    Merge: cce26bca bed1e2e7
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:30:58 2025 +0800

        Merge branch 'develop-KeepTargetFix' into develop-Mix4BEtest

    commit bed1e2e72a1d21069e45fcafa6c29080dce7aaa0
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 16:30:51 2025 +0800

        Core

    commit 94b12f5b0d953b0acb468eea0bc115f501eef200
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:05:40 2025 +0800

        更新改动说明

    commit 5ae70982f60bb122a63ba07a5c6a0a1f26639437
    Merge: 79bb3743 cce26bca
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:03:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cce26bca9813068de56eb66d8a99e70acbfc69ad
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 19 15:03:12 2025 +0800

        小修复

    commit 79bb37432e6d99e9722bdf8d6ecf4bedb2d4b938
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:50:15 2025 +0800

        更新改动说明

    commit 9414b022f9316b929df2b03a85cd57599632cfc9
    Merge: ccbdee2f 5677c8ca
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:48:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5677c8cad1f7b94f1e3b2f310059c1260bac64a8
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 23:48:13 2025 +0800

        修复读取错误

    commit ccbdee2f5cf1d8edc4ef33d341ea20b7f6783d9b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:48:45 2025 +0800

        更新改动说明

    commit 903ac37c6367042347db5d090d178d8f14e32f26
    Merge: 1bab85db 04c2f22c
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:44:43 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 04c2f22c1b8a05cbd864398e585b1eda2d114b5c
    Merge: 6ebe050b e14ffa83
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 22:43:54 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 1bab85db2a31b40d6e656aaa8a170d16cf590dc0
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 16:05:53 2025 +0800

        更新改动说明

    commit 83c8f7c6ec11449f470fe383af5196fcf135bf88
    Merge: 853630d8 6ebe050b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:54:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6ebe050b7e0695dfc82d2231eae8a3b5065164f4
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:54:26 2025 +0800

        小修复

    commit 853630d8a87fc0fb3beb42dbfc4aacb11b07ae27
    Merge: 5dc93d25 2520485a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:48:10 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2520485af31c094c1a143e3ed6e8cdb673deb2c5
    Merge: be0c165a 646224b2
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:48:06 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit 5dc93d25d753530bf43030fba100dcaadb516079
    Merge: 73f17e1c be0c165a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:47:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit be0c165ab70ff45cdf664214518f160ef48c1b96
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:47:16 2025 +0800

        修复变量名

    commit 73f17e1c875fc1dd516f451120ea7d5b3ab8ea96
    Merge: 735fa1d1 eb018bf6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:39:50 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit eb018bf69e76a18596001b6f58bdecccfdbd3d92
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 15:39:45 2025 +0800

        允许切割和追踪抛体在嵌套载具内正确开火

    commit 735fa1d129ebc251b27a13dc646e5f93e4ace24f
    Merge: 72997cf1 c8945094
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 13:29:02 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c894509457dbad06a6578c99f8766c5753dfc112
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 13:28:57 2025 +0800

        不同步处在追踪抛体本身不能攻击位置的目标

    commit 72997cf124a1159087c43eaa6df4ecc2360d00b5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:32:12 2025 +0800

        更新改动说明

    commit a427d8454083e29aedfb95e48c8ef0cea9676119
    Merge: f832903d 94c53c7e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:31:28 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 94c53c7e72c3470f87a41be5237cb586868d1685
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:31:23 2025 +0800

        扩散抛体速度无上限

    commit f832903d93d16c26ca5509e397c755750c33f8d7
    Merge: b044babb cea68ec7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:03:18 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cea68ec70847c4260e41b17413536bfd49ba45d7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 03:03:04 2025 +0800

        补充遗漏2

    commit b044babbf380ed07eda7dd358131872182052889
    Merge: ccf64cdf c189c933
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 02:42:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c189c9331f0538a855872b7a84d7b7d842200cab
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 02:42:28 2025 +0800

        补充遗漏

    commit ccf64cdfef71e49bf2eb4763ed0f193597249268
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:33:37 2025 +0800

        版本号更新

    commit 2b1d135cc30ad5d7356fb7542bac963ca8c6d7e1
    Merge: ec56b0bc 46d6502d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:32:37 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 46d6502d4bfa62c39ea2244defc2a52f235cc318
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:32:31 2025 +0800

        改一下说明书

    commit ec56b0bc06b0cb5d0444fee3186c758014a8b00b
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:27:30 2025 +0800

        改动说明

    commit b7549cb26375bf2bb6bf27991b2326791bb7e7c1
    Merge: f8b4f354 4f6a5bcf
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:59 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4f6a5bcf286cfdd91b239b0e0ee23200e7b4a204
    Merge: c8c57a02 7e2ed962
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:44 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-Mix4BEtest

    commit f8b4f3544a837da16f24e55ebd2affabd4c85a71
    Merge: ba34d6f3 c8c57a02
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c8c57a020fcaa8d58dfd9f907ef4e8cc7eb2e6f5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:26:35 2025 +0800

        漏掉的默认值

    commit ba34d6f317253da611271a28e9b25d85b5b0e035
    Merge: 5d1850be 4c0b70a7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:06:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4c0b70a7ecc151b1ba2dd38dda71a22f770189f7
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:06:28 2025 +0800

        扩散抛体提高速度上限重写转向机制

    commit 5d1850be73ce2d36bd2429c408ae8584cd9ffb3f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 18 01:05:21 2025 +0800

        改动说明

    commit 63707f0bc79bc8710a06c6d675b8f7afb3a6ba37
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 23:27:39 2025 +0800

        案例修改

    commit 3bca71600a0edf40cec3de3807bc741a63c88128
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:33:38 2025 +0800

        更新改动说明

    commit a03a51507f74270b1f59b1bd844f6f6c0e32ccce
    Merge: 5d1c68c6 626da19c
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:29:33 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 626da19c65a53a1fe8f2ead078935f163166541c
    Merge: 025275da e1fec541
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:26:38 2025 +0800

        Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

    commit e1fec541e66a1268fb8247063a8a2f3995e49c36
    Merge: 6c5d4e0e 8a418392
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:25:25 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-MergeAOEDamage

    commit 6c5d4e0ecdee39506bfbdc8d7796175336383c5d
    Author: CrimRecya <[email protected]>
    Date:   Mon Feb 17 22:25:15 2025 +0800

        Fix a potential risk

    commit 5d1c68c6ecef1a52c5f34e0cb9f6c42495b8beb9
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 19:12:15 2025 +0800

        修复默认值

    commit b82aecc5ad8d0445e4b2f3aa7d8ea669f028d801
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:47:33 2025 +0800

        增加矿车搜矿的微观定义

    commit 8f4e8fd23a4e0e8517aae67c8adc2018ac9816b5
    Merge: 8ed1abbd 025275da
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:39:53 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 025275daa9824c2944aca3247ef6abc97e4bb588
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:39:48 2025 +0800

        简化代码

    commit 8ed1abbdf9c7fb23ae25a8870d2a3075195b9752
    Merge: 20317b22 6a240f5b
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:15:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6a240f5ba4beede561ccdc1d621c07eee67b3152
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 18:15:28 2025 +0800

        修复原版两栖矿车的问题

    commit 20317b2278e1f0835e854e8a2fe2ae91df185ad9
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:39:58 2025 +0800

        版本号更新

    commit c39d58d7345166890ea2f20b49c703c2af978593
    Merge: 526cd28a 2fa5a2fc
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:37:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 2fa5a2fc0e74daa1bc941067d25a762f1008307a
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:37:09 2025 +0800

        只给本人播

    commit 526cd28a2b8df7476ffe74e54c0e34a9914b5a8d
    Merge: c6e21098 4a07b40c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:35:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 4a07b40c0cba3a5520dc8bfaea762cfe734603be
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:35:19 2025 +0800

        修复显示不同步问题

    commit c6e21098fdefe316be29fc2023e2a322ea68190c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:33:15 2025 +0800

        更新改动说明

    commit 283686a7957b5c384b0c71b18ab51dcae52e305c
    Merge: ee49a6a0 cf35ecf6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:30:15 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cf35ecf6a271de22fd382e54c1972303a6f2ae1c
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:30:11 2025 +0800

        修复钻地矿车

    commit ee49a6a084f05850782d50b634a5a2801e7ff3b1
    Merge: e6081a95 05b0c575
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:26:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 05b0c575468a00ca0001ac239b82a552978f5c2a
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:26:11 2025 +0800

        同步

    commit e6081a95a04b86f2349a87947e7dbcc8a04c795d
    Merge: 20a63b3a c4a50f30
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:14:40 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c4a50f305535c9582bf3092923ceec10072d6bb6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 17:14:26 2025 +0800

        更新代码

    commit 20a63b3a80f895a1e10364037272d5c33248a202
    Merge: 06b2d6bb 1b8d6a21
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:53:51 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1b8d6a21dbd17d965479f902a830151b887ac769
    Merge: efb8caa6 04fa9ebc
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:53:16 2025 +0800

        Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

    commit 04fa9ebc7eb4e92ecdc0ef2c4c2ebb106b8c124d
    Merge: 47cb2632 dbf7f74e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:52:11 2025 +0800

        Merge remote-tracking branch 'upstream/develop' into develop-ScorllSidebar

    commit 47cb2632cd17896baedde162ac94541da3d1c107
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:51:59 2025 +0800

        Split

    commit 06b2d6bb5e126deaa1652c261cd77a66260e7c29
    Merge: 8981b3e2 efb8caa6
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:32:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit efb8caa618ca9d7fda59e697066ee87b010e1bba
    Merge: f32dc9bf d64702b7
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:31:28 2025 +0800

        Merge branch 'develop-MergeAOEDamage' into develop-Mix4BEtest

    commit d64702b75862227d6c875128b55887a4445dabd9
    Merge: 228908a6 dbf7f74e
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:30:46 2025 +0800

        Merge branch 'develop' into develop-MergeAOEDamage

    commit 228908a69271db3a2d87020e8f0104208d91cd9f
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:30:11 2025 +0800

        Optimize

    commit 8981b3e295531fcb3251ed4c61ea598b5158c695
    Author: CrimRecya <[email protected]>
    Date:   Sun Feb 16 14:20:17 2025 +0800

        退回

    commit 42399e76228b8553091db7ca28d3f19cefcb5707
    Merge: fe268719 f32dc9bf
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:44 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit f32dc9bf917d408d945d46013193fdd5df19be37
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:39 2025 +0800

        移除重复

    commit fe268719db7940d13c463d4a75f2581f960cb0fe
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 14:07:18 2025 +0800

        移除重复

    commit 4d89ee46e1245dab1c9c06193bd834928f52f884
    Merge: a02b670f e7651bf3
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:54:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit e7651bf3c0e8e3385e7da8837f66edb556d0e6e0
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:54:43 2025 +0800

        额外功能说明

    commit a02b670fd7c4082ef515b9b6830a3c11a858199c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:52:34 2025 +0800

        改动说明

    commit 01aa3543cf2033fed0956cb15fee67f5b8bb7880
    Merge: 21f239a2 c17ceb46
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:40:47 2025 +0800

        Merge branch 'pr/1535' into develop-Mix4ECpack

    commit 21f239a26fabc56dad955c9491328ffc4ac088cd
    Merge: e4e72611 1037d128
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:38:23 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1037d1281c9993613ce054a4c774555d3b73cd9a
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:37:59 2025 +0800

        修复头文件

    commit e4e72611e825b8a14353ee96931a3d1c42c00ee2
    Merge: 667f68eb d89c1e3b
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:32:47 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d89c1e3bd99b169ffa5587b77f0e400e835b7e3c
    Author: CrimRecya <[email protected]>
    Date:   Sat Feb 15 13:32:42 2025 +0800

        换一下文件夹

    commit c17ceb466319e8dd3381ad497a041ac0d6fe2006
    Author: Starkku <[email protected]>
    Date:   Mon Aug 26 00:37:09 2024 +0300

        Fix subterranean harvester pathfinding

    commit 667f68eb77a8ce4cddf8e3b15816f6ac02190fea
    Merge: 5bdbeeef aec443d9
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 22:01:54 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit aec443d99a74531fcee76044629b1b01193950eb
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 22:01:46 2025 +0800

        优化判断

    commit 5bdbeeef70dfe4ef821cdb3d25a0a54acc3030a8
    Merge: 96aaf03f 5b01c419
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:37:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 5b01c4197bd15740618eff1233a5e3efb020d2cb
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:37:27 2025 +0800

        修复不同步问题但保存单人游戏时的做法

    commit 96aaf03f7e2b44da5cbb100c937d96c554d6b58c
    Merge: 81048e41 3b02c099
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:11:28 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3b02c099cba9e3669bd5204bab9cf8afe720bb05
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 21:11:23 2025 +0800

        修复占据位输出

    commit 81048e41174283b8cc266ed22285dea2656f23e3
    Merge: e4acf759 b32de91d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:32:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b32de91dd49517750c60b4d4859f7de13e46e24b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:32:09 2025 +0800

        播个声音提示一下

    commit e4acf759a55a1fe891fa3aa16c4a5dedd539c86a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:59 2025 +0800

        更新改动说明

    commit 589ea561b005d0bc5167e8c014ab58c43d853d76
    Merge: b79be0b6 b2277f7a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:05 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b2277f7a74b1138922b9a8457049d76d563c7e10
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:19:00 2025 +0800

        优化并考虑图标变灰时取消

    commit b79be0b6f2e512dd6c7543c8c3c554991485b821
    Merge: 44f3938d afa171c5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:17:30 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit afa171c5d130177239c7891d773cc6f036350264
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 20:17:25 2025 +0800

        优化并考虑图标变灰时取消

    commit 44f3938d22db7b76d852a5772bd0f5081f026866
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:59:14 2025 +0800

        更新改动说明

    commit a2be6c0d429cae3e4dcfda487a9dd08e1665f725
    Merge: 9f20961b a93bd00d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:52:58 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit a93bd00d85520080fca51f372237abb275d62524
    Merge: 468b5538 0694629b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:52:44 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 0694629be5356f900a4461f70aee18010fa05ca2
    Merge: 108d160a 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:51:41 2025 +0800

        Merge branch 'develop' into develop-AirburstWeapon

    commit 108d160a38a0985e6344a0b56fd6895093e53ba3
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 19:51:29 2025 +0800

        Fix

    commit 9f20961bda6c1967fea043003ed4291abe745e4a
    Merge: 6b5b16e5 468b5538
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 468b5538b13a57e05866a8d6802c395c17c47446
    Merge: d17f606a 5f5e93e7
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:37 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 5f5e93e7ab37a2ca93e76d7ae8cd5bf6a6a23af5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:54:30 2025 +0800

        Fix

    commit 6b5b16e511098c5c052c9bb528dac00c0402b632
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:44:53 2025 +0800

        更新改动说明

    commit e8c916edd163590765bc71b32c3c2bbb5860a03a
    Merge: 719e5361 d17f606a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:42:46 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit d17f606a1d7683b64da816da7761f37f56f961bc
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:42:04 2025 +0800

        额外功能说明

    commit 7ddd551ef5b46e03204a4fda9746ee38c4844435
    Merge: f1dd19b2 2ec36e0e
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:41:56 2025 +0800

        Merge branch 'develop-NoTurretTurn' into develop-Mix4BEtest

    commit f1dd19b2c97884dd69e0a7e79df77e61d71ca0db
    Merge: 78b26694 620e03ba
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:38:28 2025 +0800

        Merge branch 'develop-AirburstWeapon' into develop-Mix4BEtest

    commit 620e03ba36f77fa5450f43274135620c5770539b
    Merge: 6482e262 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:37:52 2025 +0800

        Merge branch 'develop' into develop-AirburstWeapon

    commit 6482e2628177e4567d23caebbcb86bad9cd618e5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:37:39 2025 +0800

        Fix

    commit 2ec36e0e5e9d5323c17da8f1091ceb6ccaca32c6
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 18:08:35 2025 +0800

        Per unit define

    commit a70db4a602354d6e33da904bbb22163b453b8fad
    Merge: ee583c3f 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:58:46 2025 +0800

        Merge branch 'develop' into develop-NoTurretTurn

    commit 719e536189f535ebcbf1a7bc332ee4293eb67715
    Merge: 89f777ed 78b26694
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:36:18 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 78b26694afe72e2a1c2f41dae5588efe1d70d9b8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:33:05 2025 +0800

        小修正

    commit 89f777ed879d3cd329e6a3a4ca5cbfa7ef9527cd
    Merge: 0b346360 93b5f437
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:10:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 93b5f437f322d3f447247e483e8553b6b2760d5f
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 17:10:27 2025 +0800

        全面优化建筑疏散逻辑并支持防御和科技分离

    commit 0b3463602107f493bfc17100c95e035a2dd349cd
    Merge: 44bf8054 48372a9a
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:19 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 48372a9aade5802c8a5dd73457bce8650c536759
    Merge: e33e31a7 2eecf70d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:14 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit 2eecf70d6939bb1f74ce4488e57fede401bd922d
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:55:01 2025 +0800

        Simplify `PassengerKickOutLocation` code

    commit 44bf805475644c2ca923cad64f78598ec0cd6d42
    Merge: 1e47207b e33e31a7
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:20 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit e33e31a7e66da8b837042b7e6ed410f0f274a814
    Merge: 6d558d5a 02da3f9b
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:03 2025 +0800

        Merge branch 'develop' into develop-Mix4BEtest

    commit 6d558d5aa5fa245ba1da37b69d995bf9ecb87101
    Merge: 6b554915 93b5f068
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:23:01 2025 +0800

        Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

    commit 6b5549155b4b84326e6fdd10350b859218bf4a4e
    Merge: 861e6d39 a4cd22e1
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 14:22:57 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit a4cd22e1908088414eed9a7bd46e7d5638e91b92
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:53:08 2025 +0800

        Adjust `PassengerKickOutLocation` code

    commit eb891592721de736c5c493c77e0f550a3facd1b5
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:20:35 2025 +0800

        Also correct GetCell

    commit 93b5f0689d120d0891a59ffa0ff11c2574b78ef8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 13:10:33 2025 +0800

        Check InLimbo

    commit 1e47207b2d8cc5aadbbd2ff5e690c61d3b5886c8
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:42:59 2025 +0800

        版本号更新

    commit 12c7c3956104ff638f10be7379b3c423c970b9b2
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:34:06 2025 +0800

        更新改动说明

    commit 35df5d5a5f2f28593109c603241f85ec456cb9a5
    Merge: a92ef1d1 861e6d39
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:32:56 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 861e6d3903ba071452981a66fa43e3882208fb47
    Merge: cb5cd347 3285b762
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:31:52 2025 +0800

        Merge branch 'develop-FixTeleportOF' into develop-Mix4BEtest

    commit 3285b762af85d5ddfc9950f09d40f673d13c5020
    Author: CrimRecya <[email protected]>
    Date:   Fri Feb 14 00:27:51 2025 +0800

        Core

        Co-Authored-By: Netsu_Negi <[email protected]>

    commit a92ef1d16e741850713c7880d8090fb7907af037
    Merge: 7599529c cb5cd347
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:47:11 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit cb5cd3479267d8fbaddf4f7947ab4a5ab957697a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:47:06 2025 +0800

        修复移动中的单位可能导致的建筑问题

    commit 7599529cf299d9734598470168db573d9afae701
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:46:20 2025 +0800

        改动说明

    commit e436015da5b2e02ec052bd43876f41761836bd9c
    Merge: 27d09200 88752d8e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:26:09 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 88752d8e02fbff4c5b84f2a2ab946a8684cd4dda
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:26:02 2025 +0800

        正确输出格子占据位

    commit a2a06915711340c4934c10e158247e7fbb3b7dfd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:23:52 2025 +0800

        更换钩子位置

    commit 8bca6f3c83991b4ca80fa8ecaa4e4a13f8a20b6b
    Merge: 4e1b950a 6de8fbeb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:02:57 2025 +0800

        Merge branch 'develop-DeployDesyncFix' into develop-Mix4BEtest

    commit 4e1b950a838cc4cbbfccf3c38ecc5729f0d03579
    Merge: 59a6bff0 596bbaf7
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 23:02:13 2025 +0800

        Merge branch 'develop-CellSanityCheck' into develop-Mix4BEtest

    commit 596bbaf7d8c135eac784b6615b4d5b013dc03cde
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:11:46 2025 +0800

        Core

    commit 27d09200f893cbe6f64dd718aee1fdbe93073620
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:11:01 2025 +0800

        小修复

    commit cb4fd42c3e1301c406920fdb1cc8a52fd92c1833
    Merge: 9b244d27 59a6bff0
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:08:55 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 59a6bff05bd1d20584c39d890777435fe9ec4dd8
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:08:49 2025 +0800

        移除无用过度判断

    commit 9b244d27c4abb10f4ab10f1deae547cb6d7d3f6d
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 22:00:20 2025 +0800

        小修复

    commit e82c8e52649a21ecadb3c54a7ba76b244ce36a2c
    Merge: b5a251d3 63b33d87
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:45:36 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 63b33d87d8f3012e5defde6598bc16d6fc4c2601
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:45:31 2025 +0800

        修复一个小问题

    commit a6291514645aeeb3026d9b9f31be27243310a562
    Merge: 53530b0a c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:44:42 2025 +0800

        Merge branch 'develop' into develop-UndeployBuilding

    commit 53530b0a240c141c820f1817f9070f0621a9d168
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 21:43:58 2025 +0800

        Fix a typo

    commit b5a251d30cc646950a55c17b875d5595e4325c34
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:23:13 2025 +0800

        更新改动说明

    commit e592c36ebcb7aaa5a9123d31f193f5c81aeb74ec
    Merge: 7f3d3759 28556e66
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:21:25 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 28556e661ce2728062257a47283df72ef6545d6a
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:21:21 2025 +0800

        额外功能说明

    commit 7f3d3759603283856dc62990644f7e5544135791
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:16:28 2025 +0800

        改动说明

    commit 781138a0553c88b21d6e41db2f7cd5065906bdc5
    Merge: 226cb970 67324cee
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:14:21 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 67324cee4a40bc627eedd9b7a7ef0632eaeec3aa
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:14:17 2025 +0800

        功能说明

    commit 226cb970796bd1b9899f852281d5400c70648c91
    Merge: 2c1c82ad a818097e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:09:48 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit a818097e521fbd2ad9b55144ef9b406d7d68aca1
    Merge: c559e602 4fe6a682
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:09:33 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit 4fe6a682c50dcbfdb4d5cac90c7dac52e1cfe9fc
    Merge: 7f8c25a9 c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:07:32 2025 +0800

        Merge branch 'develop' into develop-JumpjetTilt

    commit 7f8c25a913d2efd59d7ddfd28b6cf7bda8092e91
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 19:07:22 2025 +0800

        Can be customized

    commit 2c1c82ad0b440f16568c0dfc6162445e573d0a82
    Merge: 5beab4b7 c559e602
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:43:01 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit c559e602f54427f3d3909b2e13ff7408df097453
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:42:55 2025 +0800

        Fix a typo

    commit 5beab4b79a490996cba56bb6033dc2a44516ad94
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 18:07:24 2025 +0800

        优化一下

    commit 3a6728b4706f2911be0690e003a7cce639ac8ede
    Merge: 0df4587d 1b5034ff
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:15:35 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 1b5034fff61845c1fe1070a268609536bb4c2bf4
    Merge: 54f4942e dab3385b
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:15:07 2025 +0800

        Merge branch 'develop-Distribution' into develop-Mix4BEtest

    commit dab3385b47a8437b9151fa19428bd7c626591a1c
    Merge: 55723f3e c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:13:50 2025 +0800

        Merge branch 'develop' into develop-Distribution

    commit 55723f3e5b84b5396397a20ed4b9d0a473c99fbb
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 17:13:34 2025 +0800

        Global toggle

    commit 0df4587d6c6f2c470b5b7d4aa606890af783cf06
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:56:28 2025 +0800

        小改一下

    commit 710e6c2667dbd88e3f9b2084c70ea147ab7f5d06
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:34:10 2025 +0800

        更新改动说明

    commit d66ec08d37a028fba9f1e19631e8da197c17976a
    Merge: bf5c73b1 54f4942e
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:32:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 54f4942ef1ca42cf863f42f99bcf3b7c965308cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:32:34 2025 +0800

        新的抛体功能标签

    commit bf5c73b16c394590408c436e32f061fd2448c295
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 16:17:53 2025 +0800

        改动说明

    commit 74de16cdd1dd8fc0b8c3efcceaa5569a3a8221af
    Merge: 7f38c00e bb54a2f1
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:40 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit bb54a2f14dad62a61da9aaa98e30a81f9cdfa425
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:35 2025 +0800

        修复建筑疏散有时会卡住的问题

    commit 9a34988d18a692f96e32fbc731864d5785b0bbd0
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:46:15 2025 +0800

        输出任务更新计时器

    commit 7f38c00ef785d5ab8c836555c3cbe2b963186151
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:01:47 2025 +0800

        改动说明

    commit 582da465429b520117c5dab08198f008b08ab059
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 15:01:36 2025 +0800

        合并建筑路径点修正

    commit 15c0ea5e5e0aef85cdf6e992bad5300dea3c0f5f
    Merge: 5e6e7d46 a34cdece
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:38:45 2025 +0800

        Merge branch 'develop-Mix4ECpack' of https://github.com/CrimRecya/Phobos into develop-Mix4ECpack

    commit a34cdece04d5f669f2c5602760c5598f5f42dc8a
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 13 14:38:18 2025 +0800

        Inviso fix (#7)

    commit 689e35922bc6d68439d3dfa327b3b4d07d393fcf
    Author: 航味麻酱 <[email protected]>
    Date:   Thu Feb 13 14:37:02 2025 +0800

        Update Hooks.Others.cpp (#8)

    commit 5e6e7d46e6fbb4aba21874bed483c3dfc042f3ef
    Merge: 142e45cd 0eded001
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:26:16 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 0eded00139467bebc679c3d1e3223bcc80f099f2
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 14:26:12 2025 +0800

        更换为正确的检查位置

    commit 142e45cd9f24276d4a3b1869d9c1bd95cc615778
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:52:25 2025 +0800

        更新改动说明

    commit fe6cc4accd39616d1f74ff22d2a146f75181b0b6
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:46:09 2025 +0800

        移除重复

    commit a81e006b98ba4190542bc8fc0747b623ebe0b1d0
    Merge: 05ff934b 3b84f610
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:43:37 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3b84f6103066d46614254b5ed2d360c118161d3c
    Merge: ea5e2466 c317e0cd
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 02:42:49 2025 +0800

        Merge branch 'develop' into develop-Mix4BEtest

    commit 05ff934b0a4966f3c43049e2eda8828f313bc54d
    Merge: 7bfb09f3 ea5e2466
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:56:14 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit ea5e246624795d42847cadd820a7d123579c856c
    Merge: 39d4009c 3c7f0ce2
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:56:08 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit 3c7f0ce234fa8c590be56c11f3ba594751a61139
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:55:59 2025 +0800

        Enhance readability

    commit 6de8fbebc1880886862790f5ba6a0aa6b4d647fe
    Author: CrimRecya <[email protected]>
    Date:   Thu Feb 13 00:19:57 2025 +0800

        Core

    commit 7bfb09f3b5c33f6e29dfd36f533c0ee47ebe06c1
    Merge: 673ed382 39d4009c
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 16:48:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 39d4009cd21a156edf580d6ddad12fcebfda4225
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:53:35 2025 +0800

        恢复钩子

    commit 673ed3823e56a46dcf6e8e822f491ebbbb9f8dfb
    Merge: 459fc19b 6d6d05ff
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:52:41 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6d6d05ff922203e789e8d8c34a327c5ad6caf189
    Author: CrimRecya <[email protected]>
    Date:   Wed Feb 12 14:52:35 2025 +0800

        跳过动画拓展检查

    commit 459fc19b7185d3f920b7d6e447b991d101e4667e
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:33:41 2025 +0800

        改动说明

    commit de5ddf598ada888ae3e6323f14d9a53c347c0f08
    Merge: 9297185b 466583d3
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:32:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 466583d3ba0cef3e33fff76c86d8d146c643231a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:32:26 2025 +0800

        更新说明

    commit 9297185b276fb0dc10f3968769911a26ddeca789
    Merge: bf5bf245 6ee8de6d
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:30:31 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 6ee8de6d4564c071cd939b7fa2e91217eda88af0
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:30:21 2025 +0800

        额外功能说明

    commit bf5bf24501f5433e19f0b953406c5f6070bb8e73
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:29:07 2025 +0800

        更新改动说明

    commit 471860645b7d336c6f84b6dc4dfa704f296da0c2
    Merge: 199c3298 ea67f57f
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:28:08 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit ea67f57fe4ca6066ca54a91dc8d22995d5548602
    Merge: 3ce5a8bc a966bdc4
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:27:40 2025 +0800

        Merge branch 'develop-ExtendedRateDown' into develop-Mix4BEtest

    commit 199c329882f6042e00e9a5df9d97c201afcb8b31
    Merge: 79f454b9 3ce5a8bc
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:06:32 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 3ce5a8bc47ee0f422b384ce196f3dfe637915447
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:06:16 2025 +0800

        移除合并后重复

    commit c8e560e9a7ba0ecf081d164366bb2d6703f5949c
    Merge: 9acf1324 6645df9a
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:05:26 2025 +0800

        Merge branch 'develop-ScorllSidebar' into develop-Mix4BEtest

    commit 6645df9aecde64954665fbf0bd5c7e4a0a7cf345
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 20:04:39 2025 +0800

        Core

    commit 79f454b95e26017bc9b30725846bc084971ad01b
    Merge: e959df48 9acf1324
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:37:39 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit 9acf132427a13471080cc901e663c3a6fbc4ca1d
    Merge: b01d79b8 d7cc91d6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:37:34 2025 +0800

        Merge branch 'develop-JumpjetTilt' into develop-Mix4BEtest

    commit d7cc91d6e98a1394110f27bba524dd46943783e6
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 19:33:51 2025 +0800

        Fix doc

    commit e959df486119b85aaace7d82591818eea106bf3f
    Merge: da3012e9 b01d79b8
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:58:12 2025 +0800

        Merge branch 'develop-Mix4BEtest' into develop-Mix4ECpack

    commit b01d79b87f1de46235c5a0bd74531f967d26e09c
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:57:47 2025 +0800

        修复合并后地多余项

    commit 784a1877429f7eb82e3bf280dd735287e67151a7
    Merge: a94d6d50 ec4246b5
    Author: CrimRecya <[email protected]>
    Date:   Tue Feb 11 18:57:35 2025 +0800

        Merge branch 'develop-JumpjetT…
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
Minor
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@TaranDahl @CrimRecya