Merge pull request #4 from mackerel-12138/720_1280

720 1280
mackerel-12138 · Jun 9, 2023 · dfb650f · dfb650f
2 parents 359c6b2 + a0b98d1
commit dfb650f
Show file tree

Hide file tree

Showing 122 changed files with 82 additions and 179 deletions.
diff --git a/AutoPcr_py/AutoPcr4.0.py b/AutoPcr_py/AutoPcr4.0.py
diff --git a/AutoPcr_py/build.bat b/AutoPcr_py/build.bat
@@ -14,7 +14,7 @@ XCOPY  .\config.ini .\TMP\ /Y
 XCOPY  .\StartCmd.cmd .\TMP\ /Y
 XCOPY  .\StartLeiDian.cmd .\TMP\ /Y
 XCOPY  .\StartLeiDian1.cmd .\TMP\ /Y
-XCOPY  .\运行说明\模拟器配置\com.bilibili.priconne_960x540(pcr).kmp .\TMP\ /Y
+XCOPY  .\运行说明\模拟器配置\com.bilibili.priconne_1280x720(pcr).kmp .\TMP\ /Y
 XCOPY  .\运行说明\使用说明.txt .\TMP\ /Y
 XCOPY  .\img .\TMP\img\ /q /e /r /S /Y
 
@@ -36,7 +36,7 @@ del .\AutoPcr4.0_GUI.py
 del .\AutoPcr4.0_GUI.spec
 
 cd ..
-python -m zipfile -c AutoPcr.zip .\TMP\AutoPcr.exe .\TMP\AutoPcrCmd.exe .\TMP\CloseLeiDian.cmd .\TMP\config.ini .\TMP\StartCmd.cmd .\TMP\StartLeiDian.cmd .\TMP\StartLeiDian1.cmd .\TMP\com.bilibili.priconne_960x540(pcr).kmp .\TMP\使用说明.txt .\TMP\img\
+python -m zipfile -c AutoPcr.zip .\TMP\AutoPcr.exe .\TMP\AutoPcrCmd.exe .\TMP\CloseLeiDian.cmd .\TMP\config.ini .\TMP\StartCmd.cmd .\TMP\StartLeiDian.cmd .\TMP\StartLeiDian1.cmd .\TMP\com.bilibili.priconne_1280x720(pcr).kmp .\TMP\使用说明.txt .\TMP\img\
 
 echo. 删除临时文件夹
 rd /s /q .\TMP

diff --git a/AutoPcr_py/img/button/cancel.png b/AutoPcr_py/img/button/cancel.png
diff --git a/AutoPcr_py/img/button/close.png b/AutoPcr_py/img/button/close.png
diff --git a/AutoPcr_py/img/button/next2.png b/AutoPcr_py/img/button/next2.png
diff --git a/AutoPcr_py/img/button/skip.png b/AutoPcr_py/img/button/skip.png
diff --git a/AutoPcr_py/img/button/skipdone.png b/AutoPcr_py/img/button/skipdone.png
diff --git a/AutoPcr_py/img/button/sure.png b/AutoPcr_py/img/button/sure.png
diff --git a/AutoPcr_py/img/button/takeAll.png b/AutoPcr_py/img/button/takeAll.png
diff --git a/AutoPcr_py/img/dxc/ex.png b/AutoPcr_py/img/dxc/ex.png
diff --git a/AutoPcr_py/img/dxc/quyu.png b/AutoPcr_py/img/dxc/quyu.png
diff --git a/AutoPcr_py/img/dxc/skip.png b/AutoPcr_py/img/dxc/skip.png
diff --git a/AutoPcr_py/img/dxc/win.png b/AutoPcr_py/img/dxc/win.png
diff --git a/AutoPcr_py/img/hanghui/dianzan.png b/AutoPcr_py/img/hanghui/dianzan.png
diff --git a/AutoPcr_py/img/hanghui/hhDown.png b/AutoPcr_py/img/hanghui/hhDown.png
diff --git a/AutoPcr_py/img/hanghui/members.png b/AutoPcr_py/img/hanghui/members.png
diff --git a/AutoPcr_py/img/hanghui/needSend.png b/AutoPcr_py/img/hanghui/needSend.png
diff --git a/AutoPcr_py/img/hanghui/needSend2.png b/AutoPcr_py/img/hanghui/needSend2.png
diff --git a/AutoPcr_py/img/hanghui/needSendResult.png b/AutoPcr_py/img/hanghui/needSendResult.png
diff --git a/AutoPcr_py/img/other/sendBtn.png → AutoPcr_py/img/hanghui/sendBtn.png b/AutoPcr_py/img/other/sendBtn.png → AutoPcr_py/img/hanghui/sendBtn.png
diff --git a/AutoPcr_py/img/other/sendMax.png → AutoPcr_py/img/hanghui/sendMax.png b/AutoPcr_py/img/other/sendMax.png → AutoPcr_py/img/hanghui/sendMax.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/emofazhang.png b/AutoPcr_py/img/hanghui/zhuangbei/emofazhang.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/fennufazhang.png b/AutoPcr_py/img/hanghui/zhuangbei/fennufazhang.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/huojie.png b/AutoPcr_py/img/hanghui/zhuangbei/huojie.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/shenyuanzhigong.png b/AutoPcr_py/img/hanghui/zhuangbei/shenyuanzhigong.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/shijiuyushi.png b/AutoPcr_py/img/hanghui/zhuangbei/shijiuyushi.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/wangkuzhiguan.png b/AutoPcr_py/img/hanghui/zhuangbei/wangkuzhiguan.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/xinyue.png b/AutoPcr_py/img/hanghui/zhuangbei/xinyue.png
diff --git a/AutoPcr_py/img/hanghui/zhuangbei/yingshenjian.png b/AutoPcr_py/img/hanghui/zhuangbei/yingshenjian.png
diff --git a/AutoPcr_py/img/huodong/fkhd.png b/AutoPcr_py/img/huodong/fkhd.png
diff --git a/AutoPcr_py/img/huodong/hlcheck.png b/AutoPcr_py/img/huodong/hlcheck.png
diff --git a/AutoPcr_py/img/huodong/huilang.png b/AutoPcr_py/img/huodong/huilang.png
diff --git a/AutoPcr_py/img/huodong/lunata.png b/AutoPcr_py/img/huodong/lunata.png
diff --git a/AutoPcr_py/img/huodong/saodang1.png b/AutoPcr_py/img/huodong/saodang1.png
diff --git a/AutoPcr_py/img/huodong/saodang5.png b/AutoPcr_py/img/huodong/saodang5.png
diff --git a/AutoPcr_py/img/jjc/get.png b/AutoPcr_py/img/jjc/get.png
diff --git a/AutoPcr_py/img/jjc/jjc.png b/AutoPcr_py/img/jjc/jjc.png
diff --git a/AutoPcr_py/img/jjc/jjcTop.png b/AutoPcr_py/img/jjc/jjcTop.png
diff --git a/AutoPcr_py/img/jjc/lengque.png b/AutoPcr_py/img/jjc/lengque.png
diff --git a/AutoPcr_py/img/jjc/lose.png b/AutoPcr_py/img/jjc/lose.png
diff --git a/AutoPcr_py/img/jjc/pjjc.png b/AutoPcr_py/img/jjc/pjjc.png
diff --git a/AutoPcr_py/img/jjc/pjjcEnd.png b/AutoPcr_py/img/jjc/pjjcEnd.png
diff --git a/AutoPcr_py/img/jjc/pjjcTop.png b/AutoPcr_py/img/jjc/pjjcTop.png
diff --git a/AutoPcr_py/img/jjc/skip.png b/AutoPcr_py/img/jjc/skip.png
diff --git a/AutoPcr_py/img/main/diaoCha.png b/AutoPcr_py/img/main/diaoCha.png
diff --git a/AutoPcr_py/img/main/dxc.png b/AutoPcr_py/img/main/dxc.png
diff --git a/AutoPcr_py/img/main/fight.png b/AutoPcr_py/img/main/fight.png
diff --git a/AutoPcr_py/img/main/fight2.png b/AutoPcr_py/img/main/fight2.png
diff --git a/AutoPcr_py/img/main/ghHome.png b/AutoPcr_py/img/main/ghHome.png
diff --git a/AutoPcr_py/img/main/ghHome_take.png b/AutoPcr_py/img/main/ghHome_take.png
diff --git a/AutoPcr_py/img/main/hanghui.png b/AutoPcr_py/img/main/hanghui.png
diff --git a/AutoPcr_py/img/main/home.png b/AutoPcr_py/img/main/home.png
diff --git a/AutoPcr_py/img/main/home2.png b/AutoPcr_py/img/main/home2.png
diff --git a/AutoPcr_py/img/main/huifu.png b/AutoPcr_py/img/main/huifu.png
diff --git a/AutoPcr_py/img/main/juqing.png b/AutoPcr_py/img/main/juqing.png
diff --git a/AutoPcr_py/img/main/main.png b/AutoPcr_py/img/main/main.png
diff --git a/AutoPcr_py/img/main/next2.png b/AutoPcr_py/img/main/next2.png
diff --git a/AutoPcr_py/img/main/nextg.png b/AutoPcr_py/img/main/nextg.png
diff --git a/AutoPcr_py/img/main/niuDan.png b/AutoPcr_py/img/main/niuDan.png
diff --git a/AutoPcr_py/img/main/shop.png b/AutoPcr_py/img/main/shop.png
diff --git a/AutoPcr_py/img/main/skip.png b/AutoPcr_py/img/main/skip.png
diff --git a/AutoPcr_py/img/main/sure.png b/AutoPcr_py/img/main/sure.png
diff --git a/AutoPcr_py/img/main/tansuo.png b/AutoPcr_py/img/main/tansuo.png
diff --git a/AutoPcr_py/img/main/tuichu.png b/AutoPcr_py/img/main/tuichu.png
diff --git a/AutoPcr_py/img/main/wife.png b/AutoPcr_py/img/main/wife.png
diff --git a/AutoPcr_py/img/other/dianzan.png b/AutoPcr_py/img/other/dianzan.png
diff --git a/AutoPcr_py/img/other/ghHome_take.png b/AutoPcr_py/img/other/ghHome_take.png
diff --git a/AutoPcr_py/img/other/hanghui.png b/AutoPcr_py/img/other/hanghui.png
diff --git a/AutoPcr_py/img/other/hhDown.png b/AutoPcr_py/img/other/hhDown.png
diff --git a/AutoPcr_py/img/other/members.png b/AutoPcr_py/img/other/members.png
diff --git a/AutoPcr_py/img/other/needSend.png b/AutoPcr_py/img/other/needSend.png
diff --git a/AutoPcr_py/img/other/needSend2.png b/AutoPcr_py/img/other/needSend2.png
diff --git a/AutoPcr_py/img/other/niu1.png b/AutoPcr_py/img/other/niu1.png
diff --git a/AutoPcr_py/img/other/shengqian--.txt b/AutoPcr_py/img/other/shengqian--.txt
diff --git a/AutoPcr_py/img/other/shengqian.txt b/AutoPcr_py/img/other/shengqian.txt
diff --git a/AutoPcr_py/img/other/win.png b/AutoPcr_py/img/other/win.png
diff --git a/AutoPcr_py/img/other/zhuangbei/emofazhang.png b/AutoPcr_py/img/other/zhuangbei/emofazhang.png
diff --git a/AutoPcr_py/img/other/zhuangbei/fennufazhang.png b/AutoPcr_py/img/other/zhuangbei/fennufazhang.png
diff --git a/AutoPcr_py/img/other/zhuangbei/huojie.png b/AutoPcr_py/img/other/zhuangbei/huojie.png
diff --git a/AutoPcr_py/img/other/zhuangbei/shenyuanzhigong.png b/AutoPcr_py/img/other/zhuangbei/shenyuanzhigong.png
diff --git a/AutoPcr_py/img/other/zhuangbei/shijiuyushi.png b/AutoPcr_py/img/other/zhuangbei/shijiuyushi.png
diff --git a/AutoPcr_py/img/other/zhuangbei/wangkuzhiguan.png b/AutoPcr_py/img/other/zhuangbei/wangkuzhiguan.png
diff --git a/AutoPcr_py/img/other/zhuangbei/xinyue.png b/AutoPcr_py/img/other/zhuangbei/xinyue.png
diff --git a/AutoPcr_py/img/other/zhuangbei/yingshenjian.png b/AutoPcr_py/img/other/zhuangbei/yingshenjian.png
diff --git a/AutoPcr_py/img/shop/allitem.png b/AutoPcr_py/img/shop/allitem.png
diff --git a/AutoPcr_py/img/shop/buyBtn.png b/AutoPcr_py/img/shop/buyBtn.png
diff --git a/AutoPcr_py/img/shop/buyTitle.png b/AutoPcr_py/img/shop/buyTitle.png
diff --git a/AutoPcr_py/img/shop/buyall.png b/AutoPcr_py/img/shop/buyall.png
diff --git a/AutoPcr_py/img/shop/dxc.png b/AutoPcr_py/img/shop/dxc.png
diff --git a/AutoPcr_py/img/shop/exp.png b/AutoPcr_py/img/shop/exp.png
diff --git a/AutoPcr_py/img/shop/exp2.png b/AutoPcr_py/img/shop/exp2.png
diff --git a/AutoPcr_py/img/shop/expitem.png b/AutoPcr_py/img/shop/expitem.png
diff --git a/AutoPcr_py/img/shop/selectall.png b/AutoPcr_py/img/shop/selectall.png
diff --git a/AutoPcr_py/img/shop/shop1.png b/AutoPcr_py/img/shop/shop1.png
diff --git a/AutoPcr_py/img/shop/shopTop.png b/AutoPcr_py/img/shop/shopTop.png
diff --git a/AutoPcr_py/img/shop/stone1.png b/AutoPcr_py/img/shop/stone1.png
diff --git a/AutoPcr_py/img/shop/stone2.png b/AutoPcr_py/img/shop/stone2.png
diff --git a/AutoPcr_py/img/shop/stoneitem.png b/AutoPcr_py/img/shop/stoneitem.png
diff --git a/AutoPcr_py/img/shop/update.png b/AutoPcr_py/img/shop/update.png
diff --git a/AutoPcr_py/img/tansuo/exp.png b/AutoPcr_py/img/tansuo/exp.png
diff --git a/AutoPcr_py/img/tansuo/mana.png b/AutoPcr_py/img/tansuo/mana.png
diff --git a/AutoPcr_py/img/tansuo/plus.png b/AutoPcr_py/img/tansuo/plus.png
diff --git a/AutoPcr_py/img/tansuo/start.png b/AutoPcr_py/img/tansuo/start.png
diff --git a/AutoPcr_py/img/tansuo/start2.png b/AutoPcr_py/img/tansuo/start2.png
diff --git a/AutoPcr_py/img/tansuo/tansuo.png b/AutoPcr_py/img/tansuo/tansuo.png
diff --git a/AutoPcr_py/img/tansuo/topExp.png b/AutoPcr_py/img/tansuo/topExp.png
diff --git a/AutoPcr_py/img/tansuo/topMana.png b/AutoPcr_py/img/tansuo/topMana.png
diff --git a/AutoPcr_py/img/tansuo/xinSuiEnter.png b/AutoPcr_py/img/tansuo/xinSuiEnter.png
diff --git a/AutoPcr_py/img/tansuo/xinSuiTop.png b/AutoPcr_py/img/tansuo/xinSuiTop.png
diff --git a/AutoPcr_py/img/tansuo/xinsui.png b/AutoPcr_py/img/tansuo/xinsui.png
diff --git a/AutoPcr_py/img/tansuo/xqb.png b/AutoPcr_py/img/tansuo/xqb.png
diff --git a/AutoPcr_py/img/tansuo/xqbEnter.png b/AutoPcr_py/img/tansuo/xqbEnter.png
diff --git a/AutoPcr_py/img/tansuo/xqbTop.png b/AutoPcr_py/img/tansuo/xqbTop.png
diff --git a/AutoPcr_py/img/task/gift.png b/AutoPcr_py/img/task/gift.png
diff --git a/AutoPcr_py/img/task/sure.png b/AutoPcr_py/img/task/sure.png
diff --git a/AutoPcr_py/img/task/takeAll.png b/AutoPcr_py/img/task/takeAll.png
diff --git a/AutoPcr_py/img/task/task.png b/AutoPcr_py/img/task/task.png
diff --git a/AutoPcr_py/img/window/huifu.png b/AutoPcr_py/img/window/huifu.png
diff --git a/AutoPcr_py/img/window/quit.png b/AutoPcr_py/img/window/quit.png
diff --git a/AutoPcr_py/img/window/quyu.png b/AutoPcr_py/img/window/quyu.png
diff --git a/AutoPcr_py/运行说明/模拟器配置/com.bilibili.priconne.smp b/AutoPcr_py/运行说明/模拟器配置/com.bilibili.priconne.smp
@@ -1,22 +1,18 @@
 {
-    "reduceInertia": false,
-    "keyboardShowGreet": false,
+    "reduceInertia": true,
+    "keyboardShowGreet": true,
     "joystickShowGreet": true,
     "keyboardFirstGreet": true,
     "joystickFirstGreet": true,
     "keyboardShowHints": false,
     "joystickShowHints": true,
     "keyboardIgnoreVersion": 0,
     "joystickIgnoreVersion": 0,
-    "noticeTimes": 2,
+    "noticeTimes": 15,
     "noticeHash": 960983029,
     "resolutionRelatives": {
-        "900x506": {
-            "keyboardId": "com.bilibili.priconne_900x506(公主连结).kmp",
-            "joystickId": ""
-        },
-        "960x540": {
-            "keyboardId": "com.bilibili.priconne_960x540.kmp",
+        "1280x720": {
+            "keyboardId": "com.bilibili.priconne_1280x720(pcr).kmp",
             "joystickId": ""
         }
     }

diff --git a/...配置/com.bilibili.priconne_960x540(pcr).kmp → ...置/com.bilibili.priconne_1280x720(pcr).kmp b/...配置/com.bilibili.priconne_960x540(pcr).kmp → ...置/com.bilibili.priconne_1280x720(pcr).kmp