处理冲突 #2
Merged
处理冲突 #2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
update from wangshub
update from wangshub
优化截图获取方式 (#288)
update from wangshub
支持iPhone【iOS】自动连续跳
规范实验操作，避免生产环境和实验环境干扰
update from wangshub
使用新的方法计算board_y的值
增加 iphone6 参数，调整触摸时间输出 log 格式
新增虚拟环境设置，规范实验操作
update from wanghub
更新readme的引导的文案
…ump_game into fix-screenshot
|
@F-loat 谢谢 直接在原po上面分branch修改好了 就不用给我这个fork提PR了 有点乱 |
|
@F-loat 不过已经合并了 我们先处理一些结构问题 |
|
嗯，做了rebase，后面就在原po开分支修改吧 |
|
获取截图的方法应该没什么大问题了，后面再优化就好，交给你们了就，我要开始复习了😂 |
|
好的 我也不是主要管理者 就是做了一下修改而已…… |
|
没事，有空就帮忙一起维护 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
你合并后测试下，没什么问题就先按这种方式处理吧，后面可以再增加
screenshot_way来处理兼容问题