1.60 策略更新，觉醒没打死才问好，增加稀有判断
Merge branch 'dev'