root
/
miduo_client
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'china/dev' into china/xq 

# Conflicts:
#	Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
dev_chengFeng
zhangshanxue 2021-09-03 16:01:20 +08:00
parent 4b6bce3b32 7d8bb2bc36
commit 39fc099fe6
16 changed files with 6828 additions and 6643 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -32,3 +32,4 @@ BuildABs/Android/
ExportProject/
BattleRecord/
*.csproj
ClientConfig/

8
Assets/ClientConfig.meta 100644
View File

@ -0,0 +1,8 @@
fileFormatVersion: 2
guid: 6f85285cf16cbc44f96244eb7c68f8f6
folderAsset: yes
DefaultImporter:
externalObjects: {}
userData:
assetBundleName:
assetBundleVariant:

45
Assets/Editor/ClientConfigManager.cs 100644
View File

@ -0,0 +1,45 @@
using System;
using System.IO;
using UnityEngine;
using UnityEditor;
using GameEditor.Util;
public class ClientConfigManager
{
private static ClientConfigManager _instance;
public static ClientConfigManager Instance
{
get
{
if (_instance == null)
{
if (_instance == null)
{
_instance = new ClientConfigManager();
}
}
return _instance;
}
}
private string svnPath = "svn://60.1.1.230/jieling/ClientConfig";
private string localPath = Application.dataPath + "/../ClientConfig";
public void SVN_Update()
{
if (!Directory.Exists(localPath))
{
Directory.CreateDirectory(localPath);
ProcessUtil.ProcessCommand(Application.dataPath, "svn checkout " + svnPath + " "+ localPath);
}
ProcessUtil.ProcessCommand(localPath, "svn update");
}
public string[] GetVersionList()
{
string versionPath = localPath + "/Version";
string[] list = Directory.GetDirectories(versionPath);
Debug.LogError(list.Length);
return list;
}
}

11
Assets/Editor/ClientConfigManager.cs.meta 100644
View File

@ -0,0 +1,11 @@
fileFormatVersion: 2
guid: 6c926022158ec844398d3823239f8559
MonoImporter:
externalObjects: {}
serializedVersion: 2
defaultReferences: []
executionOrder: 0
icon: {instanceID: 0}
userData:
assetBundleName:
assetBundleVariant:

0
Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_yuanyinzi.png → Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_yuanying.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 15 KiB

0
Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_yuanyinzi.png.meta → Assets/ManagedResources/Atlas/PracticeAtlas/ArtFont/x_xiuxing_yuanying.png.meta
View File

13346
Assets/ManagedResources/ResConfigs/ResourcePathConfig.asset
View File

File diff suppressed because it is too large Load Diff

3
Assets/ManagedResources/~Lua/Modules/GoodFriend/GoodFriendManager.lua
View File

@ -501,8 +501,7 @@ function this.GetHeroDatas(_msgHeroData, force, specialEffects,guildSkill)
end
end
--因为后端无法区分是否为PVP，所以前端处理，把PVP伤害加成和减免从伤害加成和减免中去除
heroData.allAddProVal[51] = heroData.allAddProVal[51] - heroData.allAddProVal[69]
heroData.allAddProVal[52] = heroData.allAddProVal[52] - heroData.allAddProVal[70]
heroData.allAddProVal = HeroManager.CalculatePvpBonusForShow(heroData.allAddProVal)
heroData.skinId = _msgHeroData.skinId
if heroData.skinId == 0 then

9
Assets/ManagedResources/~Lua/Modules/Hero/HeroManager.lua
View File

@ -2015,6 +2015,8 @@ function this.CalculateHeroAllProValList(_type, _heroDid, isWar, _breakId, _upSt
propertyConfig[curProConfig.TargetPropertyId].Style == 1 and
math.floor(allAddProVal[curProConfig.TargetPropertyId] + allAddProVal[curProConfig.TargetPropertyId] * allAddProVal[k] / 10000)
or allAddProVal[curProConfig.TargetPropertyId] + allAddProVal[curProConfig.TargetPropertyId] * allAddProVal[k] / 10000
else
allAddProVal[curProConfig.TargetPropertyId] = allAddProVal[curProConfig.TargetPropertyId] + allAddProVal[k]/100
end
end
--战斗里面 PropertyConfig里Style字段，2类型的统一需要除以100在战斗里面
@ -3846,6 +3848,11 @@ function this.GetCostItems(curEquipData,_config)
return items,isEnough
end
function this.CalculatePvpBonusForShow(data)
--因为后端无法区分是否为PVP，所以前端处理，把PVP伤害加成和减免从伤害加成和减免中去除
data[51] = data[51] - data[69]
data[52] = data[52] - data[70]
return data
end
return this

2
Assets/ManagedResources/~Lua/Modules/Login/LoginManager.lua
View File

@ -66,7 +66,7 @@ function this.Initialize()
else
local errCode = result[2]
if not errCode then
PopupTipPanel.ShowTip("登录失败")
MsgPanel.ShowOne("登录失败")
elseif errCode == "101" then
MsgPanel.ShowOne("根据国家防沉迷相关规定，我们将不再向未成年人提供服务，敬请谅解！")
end

2
Assets/ManagedResources/~Lua/Modules/Login/LoginPanel.lua
View File

@ -830,7 +830,7 @@ function this.OnReceiveLogin(str)
local json = require 'cjson'
local data = json.decode(str)
if data.errorCode and data.errorCode == -1 then
PopupTipPanel.ShowTip(data.reason or Language[11145])
MsgPanel.ShowOne(data.reason or Language[11145])
return
end
if data.uid and data.token and not LoginManager.IsLogin then

6
Assets/ManagedResources/~Lua/Modules/LuckyTurnTable/LuckyTurnTablePanel.lua
View File

@ -662,14 +662,15 @@ function this.RefreshBtnCountDown()
end
this.freeRefreshTime.text=TimeToHMS(time)--立即刷新一次
this.refreshTimer:Reset(function()
this.freeRefreshTime.text=TimeToHMS(time)
if time<0 then
time=0
this.refreshTimer:Stop()
this.freeRefreshTime.text=" "
this.SetRefreshBtnShowState(true)
NetManager.GetRefreshCountDownRequest({62})
end
time=time-1
this.freeRefreshTime.text=TimeToHMS(time)
end,1,-1,true)
this.refreshTimer:Start()
end
@ -689,14 +690,15 @@ function this.RefreshBtnCountDown()
end
this.freeRefreshTime.text=TimeToHMS(time)--立即刷新一次
this.refreshTimer:Reset(function()
this.freeRefreshTime.text=TimeToHMS(time)
if time<0 then
this.refreshTimer:Stop()
this.freeRefreshTime.text=" "
time=0
this.SetRefreshBtnShowState(true)
NetManager.GetRefreshCountDownRequest({63})
end
time=time-1
this.freeRefreshTime.text=TimeToHMS(time)
end,1,-1,true)
this.refreshTimer:Start()
end

2
Assets/ManagedResources/~Lua/Modules/RoleInfo/RoleInfoLayout.lua
View File

@ -200,6 +200,8 @@ function this:UpdateHeroInfoData()
else
allAddProVal=HeroManager.CalculateHeroAllProValList(1,curHeroData.dynamicId,false)
end
--因为后端无法区分是否为PVP，所以前端处理，把PVP伤害加成和减免从伤害加成和减免中去除
allAddProVal = HeroManager.CalculatePvpBonusForShow(allAddProVal)
this:ProShow(this.atkPro,allAddProVal,HeroProType.Attack)
this:ProShow(this.hpPro,allAddProVal,HeroProType.Hp)
this:ProShow(this.phyDef,allAddProVal,HeroProType.PhysicalDefence)

18
Assets/Scripts/Editor/GameEditor/FrameTool/BuildWindow.cs
View File

@ -255,7 +255,7 @@ namespace GameEditor.FrameTool {
public class VersionWindow : EditorWindow
{
static string versionPath = Application.dataPath + "/../Version";
static string editorVersion = Application.dataPath + "/../AssetBundles/" + AppConst.GameVersionFile;
static string editorVersion = Application.dataPath + "/../AssetBundles";// + AppConst.GameVersionFile;
//static string persistVersion = Application.dataPath + "/Resources/version.txt";
static string streamVersion = AppConst.StreamPath + AppConst.GameVersionFile;
@ -283,9 +283,10 @@ namespace GameEditor.FrameTool {
// 加载version文件
private static void LoadVersion(string path)
{
if (!string.IsNullOrEmpty(path) && File.Exists(path))
versionPath = path + "/" + AppConst.GameVersionFile;
if (!string.IsNullOrEmpty(versionPath) && File.Exists(versionPath))
{
string json = File.ReadAllText(path);
string json = File.ReadAllText(versionPath);
m_VersionTxt = JsonUtility.FromJson<VersionTxt>(json);
}
if (!path.Equals(editorVersion))
@ -322,11 +323,12 @@ namespace GameEditor.FrameTool {
// 加载version目录
private static void LoadDic()
{
if (!string.IsNullOrEmpty(versionPath) && Directory.Exists(versionPath))
{
m_Files = Directory.GetFiles(versionPath, "*.txt", SearchOption.AllDirectories);
m_Choose = new bool[m_Files.Length];
}
//if (!string.IsNullOrEmpty(versionPath) && Directory.Exists(versionPath))
//{
ClientConfigManager.Instance.SVN_Update();
m_Files = ClientConfigManager.Instance.GetVersionList();//Directory.GetFiles(versionPath, "*.txt", SearchOption.AllDirectories);
m_Choose = new bool[m_Files.Length];
//}
}
void OnGUI()
{

16
Assets/Scripts/Editor/OptTools/TextureOptTools.cs
View File

@ -26,10 +26,10 @@ namespace LJ_OptTools
var oHeight = tex.height;
if (oWidth <= 0 || oHeight <= 0) return false;
var tarW = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
var tarH = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
//var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
//var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
//var tarW = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
//var tarH = (int)Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
return oWidth != tarW || oHeight != tarH;
}
@ -62,11 +62,11 @@ namespace LJ_OptTools
#endregion
//图片大小调整为4的整数倍
//var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
//var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
var tarW = (oWidth / 4 + ((oWidth % 4 > 0) ? 1 : 0)) * 4;
var tarH = (oHeight / 4 + ((oHeight % 4 > 0) ? 1 : 0)) * 4;
var tarW = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
var tarH = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
//var tarW = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oWidth, 2)));
//var tarH = (int) Mathf.Pow(2, Mathf.Ceil(Mathf.Log(oHeight, 2)));
ret.width = tarW;
ret.height = tarH;

2
Version/国内-先遣-测试.txt
View File

@ -1 +1 @@
{"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/"}
{"subChannel":"2000","buglyId":"261348dcd3","channel":"MHT","resUrl":"http://jl.tyu89.wang/mht_china/test/","packageVersion":"0.1","version":"0.1.1","serverUrl":"http://81.71.44.85:8080/"}