From c163d4d0042a37946539906bc6591218d4d56fef Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 11:14:13 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E5=88=A0=E9=99=A4Version=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version/商务-灵动.txt | 1 - Version/商务-蓝鲸.txt | 1 - Version/国内-专服-quick.txt | 1 - Version/国内-专服-正式.txt | 1 - Version/国内-专服-测试.txt | 1 - Version/国内-先遣-B.txt | 1 - Version/国内-先遣-推荐.txt | 1 - Version/国内-先遣-测试.txt | 1 - Version/国内-先遣.txt | 1 - Version/国内-动游.txt | 1 - Version/国内-喜扑.txt | 1 - Version/国内-正式(旧).txt | 1 - Version/国内-测试(旧).txt | 1 - Version/国内-游心.txt | 1 - Version/国内-跨服-测试.txt | 1 - Version/开发-外网测试.txt | 1 - Version/开发-本地测试.txt | 1 - Version/海外-正式服.txt | 1 - Version/海外-测试服.txt | 1 - Version/海外-英文版.txt | 1 - Version/灵动-专服-测试.txt | 1 - Version/版署.txt | 1 - Version/跨服.txt | 1 - 23 files changed, 23 deletions(-) delete mode 100644 Version/商务-灵动.txt delete mode 100644 Version/商务-蓝鲸.txt delete mode 100644 Version/国内-专服-quick.txt delete mode 100644 Version/国内-专服-正式.txt delete mode 100644 Version/国内-专服-测试.txt delete mode 100644 Version/国内-先遣-B.txt delete mode 100644 Version/国内-先遣-推荐.txt delete mode 100644 Version/国内-先遣-测试.txt delete mode 100644 Version/国内-先遣.txt delete mode 100644 Version/国内-动游.txt delete mode 100644 Version/国内-喜扑.txt delete mode 100644 Version/国内-正式(旧).txt delete mode 100644 Version/国内-测试(旧).txt delete mode 100644 Version/国内-游心.txt delete mode 100644 Version/国内-跨服-测试.txt delete mode 100644 Version/开发-外网测试.txt delete mode 100644 Version/开发-本地测试.txt delete mode 100644 Version/海外-正式服.txt delete mode 100644 Version/海外-测试服.txt delete mode 100644 Version/海外-英文版.txt delete mode 100644 Version/灵动-专服-测试.txt delete mode 100644 Version/版署.txt delete mode 100644 Version/跨服.txt diff --git a/Version/商务-灵动.txt b/Version/商务-灵动.txt deleted file mode 100644 index 9d54a1153b..0000000000 --- a/Version/商务-灵动.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_shangwu/", "packageVersion":"1.0", "subChannel":"20201222", "version":"1.1.1", "serverUrl":"http://119.29.193.45:8080/"} \ No newline at end of file diff --git a/Version/商务-蓝鲸.txt b/Version/商务-蓝鲸.txt deleted file mode 100644 index a57926ce55..0000000000 --- a/Version/商务-蓝鲸.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"37", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.1", "subChannel":"20201110", "version":"0.1.1", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/Version/国内-专服-quick.txt b/Version/国内-专服-quick.txt deleted file mode 100644 index 639fa6ec71..0000000000 --- a/Version/国内-专服-quick.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_quick/","packageVersion":"0.1","version":"1.1.12","serverUrl":"http://139.159.155.66:8080/"} \ No newline at end of file diff --git a/Version/国内-专服-正式.txt b/Version/国内-专服-正式.txt deleted file mode 100644 index d9cab05f0c..0000000000 --- a/Version/国内-专服-正式.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_release/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://124.71.8.40:8080/"} \ No newline at end of file diff --git a/Version/国内-专服-测试.txt b/Version/国内-专服-测试.txt deleted file mode 100644 index 5c6343b712..0000000000 --- a/Version/国内-专服-测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://124.71.8.40:8080/"} \ No newline at end of file diff --git a/Version/国内-先遣-B.txt b/Version/国内-先遣-B.txt deleted file mode 100644 index 0b7194f09c..0000000000 --- a/Version/国内-先遣-B.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/xq_b/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file diff --git a/Version/国内-先遣-推荐.txt b/Version/国内-先遣-推荐.txt deleted file mode 100644 index fb75303447..0000000000 --- a/Version/国内-先遣-推荐.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"3000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_china/recommend/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file diff --git a/Version/国内-先遣-测试.txt b/Version/国内-先遣-测试.txt deleted file mode 100644 index 6556846399..0000000000 --- a/Version/国内-先遣-测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file diff --git a/Version/国内-先遣.txt b/Version/国内-先遣.txt deleted file mode 100644 index 862b989ed6..0000000000 --- a/Version/国内-先遣.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/xq/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://106.52.122.168:8080/"} \ No newline at end of file diff --git a/Version/国内-动游.txt b/Version/国内-动游.txt deleted file mode 100644 index 83f445ab74..0000000000 --- a/Version/国内-动游.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"DY","resUrl":"http://jl.tyu89.wang/mht_china/dongyou/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://81.71.49.181:8080/"} \ No newline at end of file diff --git a/Version/国内-喜扑.txt b/Version/国内-喜扑.txt deleted file mode 100644 index 594f14a1e8..0000000000 --- a/Version/国内-喜扑.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"XP","resUrl":"http://jl.tyu89.wang/mht_china/xipu/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://139.9.91.197:8080/"} \ No newline at end of file diff --git a/Version/国内-正式(旧).txt b/Version/国内-正式(旧).txt deleted file mode 100644 index 463dcf3a63..0000000000 --- a/Version/国内-正式(旧).txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_release/", "packageVersion":"0.1", "subChannel":"2000", "version":"0.1.0", "serverUrl":"http://106.52.122.168:8080/"} diff --git a/Version/国内-测试(旧).txt b/Version/国内-测试(旧).txt deleted file mode 100644 index 46bcbb4bdd..0000000000 --- a/Version/国内-测试(旧).txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.1", "subChannel":"1000", "version":"0.1.0", "serverUrl":"http://106.52.122.168:8080/"} diff --git a/Version/国内-游心.txt b/Version/国内-游心.txt deleted file mode 100644 index 604cf44cdb..0000000000 --- a/Version/国内-游心.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000","buglyId":"261348dcd3","channel":"YX","resUrl":"http://jl.tyu89.wang/mht_china/youxin/","packageVersion":"0.1","version":"1.1.1","serverUrl":"http://81.71.49.181:8080/"} \ No newline at end of file diff --git a/Version/国内-跨服-测试.txt b/Version/国内-跨服-测试.txt deleted file mode 100644 index 938840e952..0000000000 --- a/Version/国内-跨服-测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/jumpserver_test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://42.193.191.129:8080/"} \ No newline at end of file diff --git a/Version/开发-外网测试.txt b/Version/开发-外网测试.txt deleted file mode 100644 index 8fd2ec6ef6..0000000000 --- a/Version/开发-外网测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_test/", "packageVersion":"0.1", "subChannel":"20000", "version":"0.1.2", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/Version/开发-本地测试.txt b/Version/开发-本地测试.txt deleted file mode 100644 index e7e73835a5..0000000000 --- a/Version/开发-本地测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/Version/海外-正式服.txt b/Version/海外-正式服.txt deleted file mode 100644 index 1bd0773d9e..0000000000 --- a/Version/海外-正式服.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_release/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file diff --git a/Version/海外-测试服.txt b/Version/海外-测试服.txt deleted file mode 100644 index f03eff4181..0000000000 --- a/Version/海外-测试服.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_test/", "packageVersion":"0.1", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file diff --git a/Version/海外-英文版.txt b/Version/海外-英文版.txt deleted file mode 100644 index e568bd84f0..0000000000 --- a/Version/海外-英文版.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://jl.tyu89.wang/mht/en/", "packageVersion":"0.1" , "version":"0.1.1", "serverUrl":"http://42.193.191.129:8080/"} \ No newline at end of file diff --git a/Version/灵动-专服-测试.txt b/Version/灵动-专服-测试.txt deleted file mode 100644 index 5c6343b712..0000000000 --- a/Version/灵动-专服-测试.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/mht_zf_test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://124.71.8.40:8080/"} \ No newline at end of file diff --git a/Version/版署.txt b/Version/版署.txt deleted file mode 100644 index 9248d0d93f..0000000000 --- a/Version/版署.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"888", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://cdn-jl.lanjingshidai.com/banshu/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://154.8.225.157:8080/"} \ No newline at end of file diff --git a/Version/跨服.txt b/Version/跨服.txt deleted file mode 100644 index ccc192555b..0000000000 --- a/Version/跨服.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://42.193.191.129:8080/"} \ No newline at end of file From 1734dc9132acd449f342f0508cf2bdd08115d6ad Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 11:15:48 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0Version=E6=96=87=E4=BB=B6?= =?UTF-8?q?=E5=A4=B9=E5=AD=90=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitmodules | 3 +++ Version | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 Version diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000000..541a7cf24c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "Version"] + path = Version + url = http://gaoxin@60.1.1.230/jl/Version.git diff --git a/Version b/Version new file mode 160000 index 0000000000..69bd44f8bc --- /dev/null +++ b/Version @@ -0,0 +1 @@ +Subproject commit 69bd44f8bc3563a36d4000c33dee9bbb4eaf5feb From 6f63bec11989c4defbc60c8beff9326e39cf12e1 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 11:46:27 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E3=80=90=E5=AD=90=E6=A8=A1=E5=9D=97?= =?UTF-8?q?=E3=80=91=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Version b/Version index 69bd44f8bc..f00c245980 160000 --- a/Version +++ b/Version @@ -1 +1 @@ -Subproject commit 69bd44f8bc3563a36d4000c33dee9bbb4eaf5feb +Subproject commit f00c2459808120719deb6ddd12b0aec370052fc1 From d86921d5a3cf5ce16f6710035ebabe56db3559f8 Mon Sep 17 00:00:00 2001 From: ZhangBiao Date: Thu, 5 Aug 2021 14:33:07 +0800 Subject: [PATCH 4/7] =?UTF-8?q?=E3=80=90=E9=99=8D=E5=A6=96=E5=A4=BA?= =?UTF-8?q?=E5=AE=9D=E3=80=91=E6=AC=A1=E6=95=B0=E4=BF=AE=E6=94=B9=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua index fdee5362b7..2e080996f7 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/XiangYaoDuoBao.lua @@ -191,7 +191,8 @@ function XiangYaoDuoBao:refreshBtnShow() --下方的数量显示 local curMoneyTimes=PrivilegeManager.GetPrivilegeRemainValue(singleRecruit.MoneyTimes) self.tip2.text = Language[12130]..curMoneyTimes..Language[10048] - self.canGet.text = Language[12131]..lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - math.floor(ActData.value/1000)..Language[12132] + ActData.value = ActData.value > 1000 and math.floor(ActData.value/1000) or ActData.value + self.canGet.text = Language[12131]..lotterySetting[singleRecruit.Id].DiamondBoxContain[1][2] - ActData.value..Language[12132] --是否是免费抽 local freeTimesId=singleRecruit.FreeTimes From 0f5e66cfea259dcd17954ad479876020d20eb045 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 14:39:39 +0800 Subject: [PATCH 5/7] =?UTF-8?q?=E3=80=90=E5=85=AC=E5=91=8A=E3=80=91?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E6=98=BE=E9=9A=90=E6=94=B9=E4=B8=BAconfig?= =?UTF-8?q?=E6=96=87=E4=BB=B6=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../~Lua/Framework/Manager/ServerConfigManager.lua | 1 + Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua index 4aa4d5b70b..a89f4bf593 100644 --- a/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua +++ b/Assets/ManagedResources/~Lua/Framework/Manager/ServerConfigManager.lua @@ -22,6 +22,7 @@ ServerConfigManager.SettingConfig = { IS_SELECT_RESLUTION = "IS_SELECT_RESLUTION", -- 是否可以选择帧率 USER_CHANNEL = "USER_CHANNEL", -- 获取登录信息渠道 USER_PROTO = "USER_PROTO", -- 用户协议功能是否开启 + IS_NO_NOTICE = "IS_NO_NOTICE", -- 是否禁用公告 } diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 9c036a702c..2927d8c1e5 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -305,7 +305,7 @@ end function this.CheckNoticeShow() -- 判断公告显示 - IsShowNotice = SERVER_VERSION == 0 -- 正式服显示公告 + IsShowNotice = not ServerConfigManager.IsSettingActive(ServerConfigManager.SettingConfig.IS_NO_NOTICE) this.btnNotice:SetActive(IsShowNotice) end -- 打开公告界面 From 597a747848fbaea0f7bd9d7bd498fa6ab015931e Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 14:41:08 +0800 Subject: [PATCH 6/7] =?UTF-8?q?=E3=80=90=E5=85=AC=E5=91=8A=E3=80=91?= =?UTF-8?q?=E5=85=AC=E5=91=8A=E5=88=86=E5=8C=85=E9=85=8D=E7=BD=AE=E5=8F=82?= =?UTF-8?q?=E6=95=B0=EF=BC=8CPackID=E5=B0=86=E4=BB=A3=E6=9B=BFSubNoticeID?= =?UTF-8?q?=EF=BC=8C=E5=AF=B9=E5=A4=96=E5=B0=86=E4=B8=8D=E5=86=8D=E6=8F=90?= =?UTF-8?q?=E4=BE=9BSubNoticeID=E7=9A=84=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua | 5 +++++ Assets/StreamingAssets/Res/_ReadMe.md | 1 - 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua index 2927d8c1e5..75932f614d 100644 --- a/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua +++ b/Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua @@ -317,6 +317,11 @@ function this.ShowNotice() local subNoticeID = PackageManager.GetSubNoticeID() if subNoticeID then noticeChannel = noticeChannel.. subNoticeID + else + local packID = PackageManager.GetPackageID() + if packID then + noticeChannel = noticeChannel.. subNoticeID + end end local url = LoginRoot_Url .. "jl_loginserver/getNotice?timestamp="..timeStamp.."&sign=".. timeSign.."&packageName="..noticeChannel Log(url) diff --git a/Assets/StreamingAssets/Res/_ReadMe.md b/Assets/StreamingAssets/Res/_ReadMe.md index a32d7cbce9..911d95b450 100644 --- a/Assets/StreamingAssets/Res/_ReadMe.md +++ b/Assets/StreamingAssets/Res/_ReadMe.md @@ -1,6 +1,5 @@ 包配置PackConfig.txt参数字段说明: PackID 用于标识母包的唯一ID -SubNoticeID 用于子包自定义公告用的ID UpdatePanelBG 更新界面背景(只支持png) LoginPanelBG 登录界面背景(只支持png) LoginPanelLogo 登录界面Logo(只支持png) From 5f9bc0caae5a770483c3edbf87e6726822628254 Mon Sep 17 00:00:00 2001 From: gaoxin Date: Thu, 5 Aug 2021 14:42:34 +0800 Subject: [PATCH 7/7] =?UTF-8?q?=E3=80=90=E6=89=93=E5=8C=85=E5=B7=A5?= =?UTF-8?q?=E5=85=B7=E3=80=91=E4=BF=AE=E6=94=B9=E5=87=BA=E5=8C=85=E7=9A=84?= =?UTF-8?q?=E5=8C=85=E5=90=8D=EF=BC=8C=E4=BB=A5=E5=8F=8A=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=E7=9A=84=E5=86=85=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Assets/Editor/AutoPack.cs | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/Assets/Editor/AutoPack.cs b/Assets/Editor/AutoPack.cs index 1eb4435c88..9e9208e8e0 100644 --- a/Assets/Editor/AutoPack.cs +++ b/Assets/Editor/AutoPack.cs @@ -415,15 +415,37 @@ public class AutoPack : EditorWindow GameEditor.Util.ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], "gradlew assembleRelease>>" + APKPath + "/_log.txt"); EditorUtility.DisplayProgressBar("正在导出APK", "", 1f); + + string versionStr = GetAPKVersionStr(PackConfig[index][2]); string apkFilePath = _MomPackPath + PackConfig[index][2] + "/build/outputs/apk/release/" + PackConfig[index][2] + "-release.apk"; if (File.Exists(apkFilePath)) { - File.Copy(apkFilePath, APKPath + "/" + PackConfig[index][2] + ".apk"); + File.Copy(apkFilePath, APKPath + "/" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk"); } Debug.Log(PackConfig[index][0] + ":打包完成"); EditorUtility.ClearProgressBar(); } + private static string GetAPKVersionStr(string folder) + { + string tpath = _MomPackPath + folder + "/build.gradle"; + string[] lines = File.ReadAllLines(tpath); + string versionCode = ""; + string versionName = ""; + foreach (string l in lines) + { + string lt = l.Trim(); + if (lt.StartsWith("versionCode")) + { + versionCode = lt.Split(' ')[1]; + }else if (lt.StartsWith("versionName")) + { + versionName = lt.Split('\'')[1]; + } + } + return string.Format("{0}({1})", versionName, versionCode); + } + private static void GitUpdate(int index) { EditorUtility.DisplayProgressBar("正在更新母包", "", 0f); @@ -434,13 +456,14 @@ public class AutoPack : EditorWindow { if (CommitToGit) { + string versionStr = GetAPKVersionStr(PackConfig[index][2]); EditorUtility.DisplayProgressBar("正在提交修改", "", 0f); string printlog = ">>" + APKPath + "/_log.txt"; string[] commands = new string[]{ "echo git add ." + printlog, "git add ." + printlog, - "echo git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, - "git commit -m 'AutoPack:" + PackConfig[index][0] + "-" + PackTime + "-" + PackConfig[index][2] + ".apk'" + printlog, + "echo git commit -m 'AutoPack:" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk'" + printlog, + "git commit -m 'AutoPack:" + PackConfig[index][0] +"_"+ PackConfig[index][2] + "_" + versionStr + "_" + PackTime + ".apk'" + printlog, "git push", }; ProcessUtil.ProcessCommand(_MomPackPath + PackConfig[index][2], commands);