Skip to content

君主相关机制调整；应用poptip，bugfix #3026

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
Closed
wants to merge 393 commits into from
Closed

君主相关机制调整；应用poptip，bugfix #3026

wants to merge 393 commits into from

Conversation

AstralBarrage
Copy link
Contributor

PR受影响的平台

诱因和背景

PR描述

调整君主武将与国战神将等新机制间的结算
调整君主武将的珠联璧合结算为仅限同势力武将
国战模式下可猜测势力添加野心家
为海外、手杀、国战的部分概念应用poptip，如“历战”和“整肃”

调整国战野心家吕布【无常】的判定区分不同野心家
调整国战手杀陆逊【谦逊】的ai
调整威董卓【犷勇】的结算
修复国战OL钟会【邀叛】主将仍然生效的问题
修复新杀谋刘协【斩绊】被【天承】取消所有目标后报错的问题
修复徐兖荀彧【砥守】受到无来源伤害报错的bug
修复战法【眼线】不能正常生效的问题

PR测试

扩展适配

检查清单

  • 我没有把该PR提交到master分支
  • commit中没有无用信息，和没有具体内容的“bugfix”
  • 我已经进行了充足的测试，且现有的测试都已通过
  • 若我拥有PR标签权限，则已确保为该PR打上标签；若我未拥有PR标签权限且该PR仍需继续提交内容，则已确保为该PR名称打上WIP直到本PR内容全部提交
  • 如果此次PR中添加了新的武将，则我已在character/rank.js中添加对应的武将强度评级，并对双人武将/复姓武将添加name:xxx的参数
  • 如果此次PR中添加了新的语音文件，则我已在lib.translate中加入语音文件的文字台词
  • 如果此次PR涉及到新功能的添加，我已在PR描述中写入详细文档
  • 如果此次PR需要扩展跟进，我已在扩展适配中写入详细文档
  • 如果这个PR解决了一个issue，我在诱因和背景中明确链接到该issue
  • 我保证该PR中没有随意修改换行符等内容，没有制造出大量的Diff
  • 我保证该PR遵循项目中.editorconfig、eslint.config.mjs和prettier.config.mjs所规定的代码样式，并且已经通过prettier格式化过代码

@AstralBarrage
慑叛、围铸、三级血途、虚羯bugfix
4903c3e
@AstralBarrage
旧蛊惑、落宠写法调整
5c25c1d
@AstralBarrage
落宠选目标小调整
4b758c3
@AstralBarrage
回滚围铸，修复节钺和屯储的互动问题
c378403
@AstralBarrage
解决冲突
1775fe6
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
eddf74f
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
ef34dbf
@AstralBarrage
调整tamo的提示，修复3d【玄论】
347670f
@AstralBarrage
忍邓艾&忍姜维
5728f10
@AstralBarrage
补充邓艾姜维ai
02cedcf
@AstralBarrage
张琪瑛×2
03b61c6
@AstralBarrage
补个动态描述
d4e138c
@AstralBarrage
国战酣战、探锋修复；OL桥玄、手杀张燕分包调整
a16f869
@AstralBarrage
星文丑、张琪瑛素材补充
c230863
@AstralBarrage
国战卫戍、拒战调整
900df9f
@AstralBarrage
雄踞、变装调整；国战吕玲绮语音修复
0af3ac7
@AstralBarrage
国战凶虐，两个狂骨调整
1628f9c
@AstralBarrage
族杨彪素材补充
5766204
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
6cbcc4d
@AstralBarrage
调整前缀nature，修复系力ai，补充combo
1aa2630
@AstralBarrage
补充武将介绍
02ab9cc
@AstralBarrage
一号张琪瑛法箓补充提示，笮融佛宗限制手牌
f44ba03
@AstralBarrage
修复净土的aibug
6ec66e9
@AstralBarrage
玄司马昭等武将重复素材调整，修复齐眉不触发展示牌的bug
f91d40a
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
714edef
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
2469536
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
28254f5
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
be4bcbf
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
0a90f37
@AstralBarrage
调整惑乱为记录多张牌
d17eb79
@AstralBarrage
灵隐；绛脂bugfix；mod类战法修复
e100259
@AstralBarrage
张燕、黄舞蝶调整
8f98599
@AstralBarrage
骤袭调整；拥族、铸币ai优化；国战王异性别调整
845d8b7
@AstralBarrage
添加函数game.addTempTag
855cd3f 
用于创建游戏内临时生成的tag
使用例：【伸义】【纯刚】【烈计】【火上浇油】
@AstralBarrage
删除在prompt中调用的this.skill_id
b89c78f
@AstralBarrage
Merge remote-tracking branch 'upstream/PR-Branch' into PR-Branch
591e561
@AstralBarrage
斩绊、战法眼线修复
0759540
@AstralBarrage
国战邀叛、谦逊、无常bugfix；君主相关机制调整
3c12023
@AstralBarrage
国战poptip补充
d01a333
@AstralBarrage
国战可猜测势力添加野心家
4614e8a
@AstralBarrage
为海外、手杀概念进行poptip的实际应用
549a7f2
@AstralBarrage
砥守bugfix、犷勇调整
7ac6f26
@AstralBarrage
原画补充
b3c611b
@AstralBarrage
斩绊、战法眼线修复
7f08397
@AstralBarrage
国战邀叛、谦逊、无常bugfix；君主相关机制调整
427114a
@AstralBarrage
国战poptip补充
8d9fc0a
@AstralBarrage
国战可猜测势力添加野心家
70820db
@AstralBarrage
为海外、手杀概念进行poptip的实际应用
61af883
@AstralBarrage
砥守bugfix、犷勇调整
e7a4816
@AstralBarrage
原画补充
613baf9
@AstralBarrage AstralBarrage deleted the prBranch branch October 8, 2025 05:44
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
App:Character App:Mode Level:P3 Minor, Zephyr Status:Done
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@AstralBarrage