Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev

dev_chengFeng
jiaoyangna 2021-08-05 15:10:04 +08:00
commit 5336505935
30 changed files with 39 additions and 29 deletions

3
.gitmodules vendored 100644
View File

@ -0,0 +1,3 @@
[submodule "Version"]
path = Version
url = http://gaoxin@60.1.1.230/jl/Version.git

View File

@ -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);

View File

@ -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", -- 是否禁用公告
}

View File

@ -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

View File

@ -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
-- 打开公告界面
@ -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)

View File

@ -1,6 +1,5 @@
包配置PackConfig.txt参数字段说明
PackID 用于标识母包的唯一ID
SubNoticeID 用于子包自定义公告用的ID
UpdatePanelBG 更新界面背景只支持png
LoginPanelBG 登录界面背景只支持png
LoginPanelLogo 登录界面Logo只支持png

1
Version 160000

@ -0,0 +1 @@
Subproject commit f00c2459808120719deb6ddd12b0aec370052fc1

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}

View File

@ -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/"}