Merge branch 'china/dev' of http://60.1.1.230/gaoxin/JL_Client into china/dev
ZhangBiao
commit
a00e8d0966
|
|
@ -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/"}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht/en/", "packageVersion":"0.1", "subChannel":"10000", "version":"0.1.1", "serverUrl":"http://139.9.223.139:8080/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{"subChannel":"20201222", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://119.29.193.45:8080/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -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/"}
|
||||
|
|
@ -1 +0,0 @@
|
|||
{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_test/", "packageVersion":"0.1", "subChannel":"10000", "version":"0.1.2", "serverUrl":"http://139.9.223.139:8080/"}
|
||||
|
|
@ -287,7 +287,7 @@ public class App : UnitySingleton<App>
|
|||
/// <param name="hasFocus"></param>
|
||||
void OnApplicationFocus(bool hasFocus)
|
||||
{
|
||||
Debug.Log("App.cs OnApplicationFocus");
|
||||
XDebug.Log.l("App.cs OnApplicationFocus");
|
||||
Util.CallMethod("Game", "OnApplicationFocus", hasFocus);
|
||||
}
|
||||
|
||||
|
|
@ -297,7 +297,7 @@ public class App : UnitySingleton<App>
|
|||
/// <param name="pauseStatus"></param>
|
||||
void OnApplicationPause(bool pauseStatus)
|
||||
{
|
||||
Debug.Log("App.cs OnApplicationPause");
|
||||
XDebug.Log.l("App.cs OnApplicationPause");
|
||||
Util.CallMethod("Game", "OnApplicationPause", pauseStatus);
|
||||
}
|
||||
|
||||
|
|
@ -306,7 +306,7 @@ public class App : UnitySingleton<App>
|
|||
/// </summary>
|
||||
void OnApplicationQuit()
|
||||
{
|
||||
Debug.Log("App.cs OnApplicationQuit");
|
||||
XDebug.Log.l("App.cs OnApplicationQuit");
|
||||
Util.CallMethod("Game", "OnApplicationQuit");
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ namespace GameLogic
|
|||
{
|
||||
appId = VersionManager.Instance.GetVersionInfo("buglyId");
|
||||
}
|
||||
Debug.Log("Bugly Init: " + appId);
|
||||
XDebug.Log.l("Bugly Init: " + appId);
|
||||
BuglyAgent.InitWithAppId(appId);
|
||||
BuglyAgent.EnableExceptionHandler();
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ public class CompressManager : UnitySingleton<CompressManager>
|
|||
FileInfo f = new FileInfo(sourcePath);
|
||||
if ((f.Length / 1024) >= compressSize)
|
||||
{
|
||||
Debug.Log("开始压缩，图片原始大小为：" + f.Length / 1000 + "Kb");
|
||||
XDebug.Log.l("开始压缩，图片原始大小为：" + f.Length / 1000 + "Kb");
|
||||
}
|
||||
|
||||
int qualityI = 50;
|
||||
|
|
@ -56,16 +56,16 @@ public class CompressManager : UnitySingleton<CompressManager>
|
|||
{
|
||||
Texture2D t2d = www.texture;
|
||||
byte[] b = t2d.EncodeToJPG(qualityI);
|
||||
Debug.Log("图原始读取的字节数 " + (b.Length / 1000).ToString());
|
||||
XDebug.Log.l("图原始读取的字节数 " + (b.Length / 1000).ToString());
|
||||
|
||||
while ((b.Length / 1024) >= compressSize && qualityI>0)
|
||||
{
|
||||
qualityI -= 5;
|
||||
b = t2d.EncodeToJPG(qualityI);
|
||||
Debug.Log("当前大小：" + b.Length / 1000);
|
||||
XDebug.Log.l("当前大小：" + b.Length / 1000);
|
||||
}
|
||||
|
||||
Debug.Log("压缩成功，当前大小：" + b.Length / 1000);
|
||||
XDebug.Log.l("压缩成功，当前大小：" + b.Length / 1000);
|
||||
File.WriteAllBytes(outPath, b);
|
||||
|
||||
if (action != null)
|
||||
|
|
|
|||
|
|
@ -131,12 +131,12 @@ namespace GameLogic
|
|||
else
|
||||
{
|
||||
string url = AppConst.FilePathEx + configStreamFilePath;
|
||||
Debug.Log("[ConfigLoader Start ]@" + url);
|
||||
XDebug.Log.l("[ConfigLoader Start ]@" + url);
|
||||
WWW _www = new WWW(url);
|
||||
yield return _www;
|
||||
if (string.IsNullOrEmpty(_www.error))
|
||||
{
|
||||
Debug.Log("[ConfigLoader OK ]=" + _www.text);
|
||||
XDebug.Log.l("[ConfigLoader OK ]=" + _www.text);
|
||||
NetInfo = new MConfig(_www.text);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -88,7 +88,7 @@ namespace GameLogic
|
|||
|
||||
public SocketClient AddSocket(string ipAddress, int port)
|
||||
{
|
||||
Debug.Log("SocketClient AddSocket");
|
||||
XDebug.Log.l("SocketClient AddSocket");
|
||||
SocketClient socket = new SocketClient(ipAddress, port);
|
||||
socket.netMgr = this;
|
||||
socketList.Add(socket);
|
||||
|
|
@ -205,7 +205,7 @@ namespace GameLogic
|
|||
duration += Time.deltaTime;
|
||||
if(duration>=AppConst.HttpTimeout)
|
||||
{
|
||||
Debug.Log(url + " HttpPostError: HttpTimeout:"+ AppConst.HttpTimeout+" "+ data);
|
||||
XDebug.Log.l(url + " HttpPostError: HttpTimeout:"+ AppConst.HttpTimeout+" "+ data);
|
||||
if (errorAction != null)
|
||||
errorAction();
|
||||
|
||||
|
|
@ -221,7 +221,7 @@ namespace GameLogic
|
|||
Debug.LogWarning(url+" Result: " + result);
|
||||
if (postData.error != null)
|
||||
{
|
||||
Debug.Log("HttpPostError: " + postData.error);
|
||||
XDebug.Log.l("HttpPostError: " + postData.error);
|
||||
if (errorAction != null)
|
||||
errorAction();
|
||||
|
||||
|
|
|
|||
|
|
@ -105,9 +105,9 @@ public class RoleRenderManager : UnitySingleton<RoleRenderManager>
|
|||
}
|
||||
for(int i = 0; i < 6; i++)
|
||||
{
|
||||
Debug.Log("加载材质：");
|
||||
XDebug.Log.l("加载材质：");
|
||||
Material m = App.ResMgr.LoadAsset("R" + i) as Material;
|
||||
Debug.Log("目标材质：" + m.name);
|
||||
XDebug.Log.l("目标材质：" + m.name);
|
||||
TargetMaterial[i] = m;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -40,32 +40,32 @@ namespace GameLogic {
|
|||
// string joinSuccessMessage = string.Format("joinChannel callback uid: {0}, channel: {1}, version: {2}", uid, channelName, RtcEngineForGaming.GetSdkVersion());
|
||||
// selfID = uid;
|
||||
// //Debug.LogWarning("~~~~~~~~~~~~~~~~~~~~~~~~~~~~Self ID: " + uid);
|
||||
// Debug.Log(joinSuccessMessage);
|
||||
// XDebug.Log.l(joinSuccessMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnLeaveChannel += (RtcStats stats) =>
|
||||
//{
|
||||
// string leaveChannelMessage = string.Format("onLeaveChannel callback duration {0}, tx: {1}, rx: {2}, tx kbps: {3}, rx kbps: {4}", stats.duration, stats.txBytes, stats.rxBytes, stats.txKBitRate, stats.rxKBitRate);
|
||||
// Debug.Log(leaveChannelMessage);
|
||||
// XDebug.Log.l(leaveChannelMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnUserJoined += (uint uid, int elapsed) =>
|
||||
//{
|
||||
// string userJoinedMessage = string.Format("onUserJoined callback uid {0} {1}", uid, elapsed);
|
||||
// Debug.Log(userJoinedMessage);
|
||||
// XDebug.Log.l(userJoinedMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnUserOffline += (uint uid, USER_OFFLINE_REASON reason) =>
|
||||
//{
|
||||
// string userOfflineMessage = string.Format("onUserOffline callback uid {0} {1}", uid, reason);
|
||||
// Debug.Log(userOfflineMessage);
|
||||
// XDebug.Log.l(userOfflineMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnVolumeIndication += (AudioVolumeInfo[] speakers, int speakerNumber, int totalVolume) =>
|
||||
//{
|
||||
// //if (speakerNumber == 0 || speakers == null)
|
||||
// //{
|
||||
// // //Debug.Log(string.Format("onVolumeIndication only local {0}", totalVolume));
|
||||
// // //XDebug.Log.l(string.Format("onVolumeIndication only local {0}", totalVolume));
|
||||
// //}
|
||||
|
||||
// for (int idx = 0; idx < speakerNumber; idx++)
|
||||
|
|
@ -82,7 +82,7 @@ namespace GameLogic {
|
|||
//mRtcEngine.OnUserMuted += (uint uid, bool muted) =>
|
||||
//{
|
||||
// // string userMutedMessage = string.Format("onUserMuted callback uid {0} {1}", uid, muted);
|
||||
// //Debug.Log(userMutedMessage);
|
||||
// //XDebug.Log.l(userMutedMessage);
|
||||
|
||||
// uint id = uid;
|
||||
// if (id == 0) id = selfID;
|
||||
|
|
@ -93,51 +93,51 @@ namespace GameLogic {
|
|||
//{
|
||||
// string description = RtcEngineForGaming.GetErrorDescription(warn);
|
||||
// string warningMessage = string.Format("onWarning callback {0} {1} {2}", warn, msg, description);
|
||||
// Debug.Log(warningMessage);
|
||||
// XDebug.Log.l(warningMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnError += (int error, string msg) =>
|
||||
//{
|
||||
// string description = RtcEngineForGaming.GetErrorDescription(error);
|
||||
// string errorMessage = string.Format("onError callback {0} {1} {2}", error, msg, description);
|
||||
// Debug.Log(errorMessage);
|
||||
// XDebug.Log.l(errorMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnRtcStats += (RtcStats stats) =>
|
||||
//{
|
||||
// string rtcStatsMessage = string.Format("onRtcStats callback duration {0}, tx: {1}, rx: {2}, tx kbps: {3}, rx kbps: {4}, tx(a) kbps: {5}, rx(a) kbps: {6} users {7}",
|
||||
// stats.duration, stats.txBytes, stats.rxBytes, stats.txKBitRate, stats.rxKBitRate, stats.txAudioKBitRate, stats.rxAudioKBitRate, stats.users);
|
||||
// Debug.Log(rtcStatsMessage);
|
||||
// XDebug.Log.l(rtcStatsMessage);
|
||||
|
||||
// int lengthOfMixingFile = mRtcEngine.GetAudioMixingDuration();
|
||||
// int currentTs = mRtcEngine.GetAudioMixingCurrentPosition();
|
||||
|
||||
// string mixingMessage = string.Format("Mixing File Meta {0}, {1}", lengthOfMixingFile, currentTs);
|
||||
// Debug.Log(mixingMessage);
|
||||
// XDebug.Log.l(mixingMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnAudioRouteChanged += (AUDIO_ROUTE route) =>
|
||||
//{
|
||||
// string routeMessage = string.Format("onAudioRouteChanged {0}", route);
|
||||
// Debug.Log(routeMessage);
|
||||
// XDebug.Log.l(routeMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnRequestChannelKey += () =>
|
||||
//{
|
||||
// string requestKeyMessage = string.Format("OnRequestChannelKey");
|
||||
// Debug.Log(requestKeyMessage);
|
||||
// XDebug.Log.l(requestKeyMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnConnectionInterrupted += () =>
|
||||
//{
|
||||
// string interruptedMessage = string.Format("OnConnectionInterrupted");
|
||||
// Debug.Log(interruptedMessage);
|
||||
// XDebug.Log.l(interruptedMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.OnConnectionLost += () =>
|
||||
//{
|
||||
// string lostMessage = string.Format("OnConnectionLost");
|
||||
// Debug.Log(lostMessage);
|
||||
// XDebug.Log.l(lostMessage);
|
||||
//};
|
||||
|
||||
//mRtcEngine.SetLogFilter(LOG_FILTER.INFO);
|
||||
|
|
@ -185,7 +185,7 @@ namespace GameLogic {
|
|||
// yield return new WaitForEndOfFrame();
|
||||
// if (mRtcEngine == null) yield break;
|
||||
|
||||
// Debug.Log(string.Format("tap joinChannel with channel name {0}", channelName));
|
||||
// XDebug.Log.l(string.Format("tap joinChannel with channel name {0}", channelName));
|
||||
// if (string.IsNullOrEmpty(channelName))
|
||||
// {
|
||||
// yield break;
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace GameLogic
|
|||
|
||||
private Dictionary<string, object> stringToDic(string s)
|
||||
{
|
||||
Debug.Log("stringToDic***************" + s);
|
||||
XDebug.Log.l("stringToDic***************" + s);
|
||||
Dictionary<string, object> d = new Dictionary<string, object>();
|
||||
if (s == "") return d;
|
||||
string[] kvs = s.Split('|');
|
||||
|
|
@ -100,7 +100,7 @@ namespace GameLogic
|
|||
foreach (string id in data.Keys)
|
||||
{
|
||||
object value = data[id];
|
||||
Debug.Log("value:" + value.ToString());
|
||||
XDebug.Log.l("value:" + value.ToString());
|
||||
}
|
||||
ThinkingAnalyticsAPI.SetSuperProperties(data);
|
||||
}
|
||||
|
|
@ -114,8 +114,8 @@ namespace GameLogic
|
|||
|
||||
public void Track(string trackEvent, string trackData)
|
||||
{
|
||||
Debug.Log("事件名称：" + trackEvent);
|
||||
Debug.Log("事件数据：" + trackData);
|
||||
XDebug.Log.l("事件名称：" + trackEvent);
|
||||
XDebug.Log.l("事件数据：" + trackData);
|
||||
Dictionary<string, object> data = stringToDic(trackData);
|
||||
ThinkingAnalyticsAPI.Track(trackEvent, data);
|
||||
}
|
||||
|
|
@ -127,8 +127,8 @@ namespace GameLogic
|
|||
}
|
||||
|
||||
|
||||
// Debug.Log("TA.TAExample - current disctinct ID is: " + ThinkingAnalyticsAPI.GetDistinctId());
|
||||
// Debug.Log("TA.TAExample - the device ID is: " + ThinkingAnalyticsAPI.GetDeviceId());
|
||||
// XDebug.Log.l("TA.TAExample - current disctinct ID is: " + ThinkingAnalyticsAPI.GetDistinctId());
|
||||
// XDebug.Log.l("TA.TAExample - the device ID is: " + ThinkingAnalyticsAPI.GetDeviceId());
|
||||
|
||||
// // 设置动态公共属性，传 this 是因为 this 实现了 IDynamicSuperProperties
|
||||
// ThinkingAnalyticsAPI.SetDynamicSuperProperties(this);
|
||||
|
|
|
|||
|
|
@ -111,7 +111,7 @@ public class SocketClient
|
|||
public SocketClient(string ipAddress, int port)
|
||||
{
|
||||
|
||||
//Debug.Log("****Socket*********************创建一个Socket ---" + ipAddress);
|
||||
//XDebug.Log.l("****Socket*********************创建一个Socket ---" + ipAddress);
|
||||
IpAddress = ipAddress;
|
||||
Port = port;
|
||||
_memStream = new MemoryStream();
|
||||
|
|
@ -134,7 +134,7 @@ public class SocketClient
|
|||
/// </summary>
|
||||
public void Connect()
|
||||
{
|
||||
//Debug.Log("****Socket*********************Connect ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************Connect ---" + IpAddress);
|
||||
Close();
|
||||
try
|
||||
{
|
||||
|
|
@ -155,7 +155,7 @@ public class SocketClient
|
|||
|
||||
public void OnConnectFail()
|
||||
{
|
||||
//Debug.Log("****Socket*********************OnConnectFail ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************OnConnectFail ---" + IpAddress);
|
||||
AddStateInfo(NetworkStateType.ConnectFail, null);
|
||||
}
|
||||
|
||||
|
|
@ -164,7 +164,7 @@ public class SocketClient
|
|||
/// </summary>
|
||||
void OnConnect(IAsyncResult asr)
|
||||
{
|
||||
//Debug.Log("****Socket*********************OnConnect ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************OnConnect ---" + IpAddress);
|
||||
//outStream = client.GetStream();
|
||||
//client.GetStream().BeginRead(byteBuffer, 0, MAX_READ, new AsyncCallback(OnRead), null);
|
||||
//AddStateInfo(NetworkStateType.Connected, null);
|
||||
|
|
@ -174,7 +174,7 @@ public class SocketClient
|
|||
//检测是否成功的建立了链接。..
|
||||
if (client == null || !client.Connected)
|
||||
{
|
||||
Debug.Log("****Socket*********************OnConnect FAILED ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************OnConnect FAILED ---" + IpAddress);
|
||||
return;
|
||||
}
|
||||
try
|
||||
|
|
@ -186,11 +186,11 @@ public class SocketClient
|
|||
outStream = client.GetStream();
|
||||
client.GetStream().BeginRead(byteBuffer, 0, MAX_READ, new AsyncCallback(OnRead), null);
|
||||
AddStateInfo(NetworkStateType.Connected, null);
|
||||
Debug.Log("****Socket*********************OnConnect SUCCESS ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************OnConnect SUCCESS ---" + IpAddress);
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("****Socket*********************OnConnect FAILED ---" + e.Message);
|
||||
XDebug.Log.l("****Socket*********************OnConnect FAILED ---" + e.Message);
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -226,7 +226,7 @@ public class SocketClient
|
|||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("client.connected----->>false");
|
||||
XDebug.Log.l("client.connected----->>false");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -249,7 +249,7 @@ public class SocketClient
|
|||
return;
|
||||
|
||||
//int ilen = client.GetStream().EndRead(asr);
|
||||
// Debug.Log("[SocketClient] From Socket: EndRead.Len:" + ilen);
|
||||
// XDebug.Log.l("[SocketClient] From Socket: EndRead.Len:" + ilen);
|
||||
|
||||
|
||||
lock (client.GetStream())
|
||||
|
|
@ -264,7 +264,7 @@ public class SocketClient
|
|||
AddStateInfo(NetworkStateType.Disconnect, "bytesRead < 1");
|
||||
return;
|
||||
}
|
||||
//Debug.Log("[SocketClient] NowClient:@" + ++_NNN+" _:"+bytesRead + ":" + client.Client.Handle);
|
||||
//XDebug.Log.l("[SocketClient] NowClient:@" + ++_NNN+" _:"+bytesRead + ":" + client.Client.Handle);
|
||||
|
||||
OnReceive(byteBuffer, bytesRead); //分析数据包内容，抛给逻辑层
|
||||
lock (client.GetStream())
|
||||
|
|
@ -274,7 +274,7 @@ public class SocketClient
|
|||
client.GetStream().BeginRead(byteBuffer, 0, MAX_READ, new AsyncCallback(OnRead), null);
|
||||
}
|
||||
|
||||
//Debug.Log("SocketClient.OnRead " + byteBuffer.ToString());
|
||||
//XDebug.Log.l("SocketClient.OnRead " + byteBuffer.ToString());
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
|
|
@ -335,7 +335,7 @@ public class SocketClient
|
|||
void OnReceive(byte[] bytes, int length)
|
||||
{
|
||||
|
||||
//Debug.Log("****Socket*********************OnReceive ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************OnReceive ---" + IpAddress);
|
||||
try
|
||||
{
|
||||
var stream = CurMemoryStream;
|
||||
|
|
@ -403,7 +403,7 @@ public class SocketClient
|
|||
buffer.ReadIntToByte();
|
||||
//协议号
|
||||
int msgid = buffer.ReadIntToByte();
|
||||
//Debug.Log("[SocketClient:OnReceivedMessage]msgid:" + msgid);
|
||||
//XDebug.Log.l("[SocketClient:OnReceivedMessage]msgid:" + msgid);
|
||||
//收到心跳包
|
||||
if (msgid == 1001)
|
||||
{
|
||||
|
|
@ -426,7 +426,7 @@ public class SocketClient
|
|||
private void Ygqmgx_indicationErrorAction(ByteBuffer buffer)
|
||||
{
|
||||
|
||||
//Debug.Log("****Socket*********************indicationErrorAction ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************indicationErrorAction ---" + IpAddress);
|
||||
Util.CallMethod("SocketManager", "ReceiveErrorInfo", this, buffer);
|
||||
}
|
||||
|
||||
|
|
@ -444,11 +444,11 @@ public class SocketClient
|
|||
try
|
||||
{
|
||||
client.Client.Disconnect(false);
|
||||
//Debug.Log("****Socket*********************Disconnect() ---" + client.Client.Handle+ "@"+ client.Client.LocalEndPoint.ToString());
|
||||
//XDebug.Log.l("****Socket*********************Disconnect() ---" + client.Client.Handle+ "@"+ client.Client.LocalEndPoint.ToString());
|
||||
}
|
||||
catch { }
|
||||
|
||||
Debug.Log("****Socket*********************Close ---" + client.Client.Handle);
|
||||
XDebug.Log.l("****Socket*********************Close ---" + client.Client.Handle);
|
||||
try
|
||||
{
|
||||
client.Close();
|
||||
|
|
@ -549,7 +549,7 @@ public class SocketClient
|
|||
|
||||
if (testConnect)
|
||||
{
|
||||
UnityEngine.Debug.Log("~~~~~~~~~~~~~测试掉线~~~~~~~~~~~~~~~");
|
||||
XDebug.Log.l("~~~~~~~~~~~~~测试掉线~~~~~~~~~~~~~~~");
|
||||
}
|
||||
|
||||
if (m_isConnecting && !testConnect)
|
||||
|
|
@ -566,7 +566,7 @@ public class SocketClient
|
|||
//FHF Debug time preform
|
||||
// stw.Stop();
|
||||
// if(_CCC>0)
|
||||
// UnityEngine.Debug.Log("NET EVENT HANDLE: " + _CCC.ToString()+"@"+(stw.ElapsedTicks).ToString());
|
||||
// UnityEngine.XDebug.Log.l("NET EVENT HANDLE: " + _CCC.ToString()+"@"+(stw.ElapsedTicks).ToString());
|
||||
}
|
||||
|
||||
void DispatchMessage(NetMsg _event)
|
||||
|
|
@ -637,7 +637,7 @@ public class SocketClient
|
|||
public void Disconnect(string _err)
|
||||
{
|
||||
Error = _err;
|
||||
Debug.Log("****Socket*********************Disconnect [" + Error + "] ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************Disconnect [" + Error + "] ---" + IpAddress);
|
||||
Close();
|
||||
Util.CallMethod("SocketManager", "OnDisconnect", this, _err);
|
||||
}
|
||||
|
|
@ -646,7 +646,7 @@ public class SocketClient
|
|||
IEnumerator CheckConnect_Co()
|
||||
{
|
||||
yield return new WaitForEndOfFrame();
|
||||
Debug.LogWarning("Start Connecting IP: " + IpAddress + " Port: " + Port);
|
||||
XDebug.Log.warning("Start Connecting IP: " + IpAddress + " Port: " + Port);
|
||||
Connect();
|
||||
m_isConnecting = true;
|
||||
yield return new WaitForSeconds(AppConst.ConnectTimeout);
|
||||
|
|
@ -663,7 +663,7 @@ public class SocketClient
|
|||
/// </summary>
|
||||
public void TryConnect()
|
||||
{
|
||||
//Debug.Log("****Socket*********************TryConnect ---" + IpAddress);
|
||||
//XDebug.Log.l("****Socket*********************TryConnect ---" + IpAddress);
|
||||
if (IsConnected())
|
||||
{
|
||||
NetworkStateInfo info = new NetworkStateInfo();
|
||||
|
|
@ -725,7 +725,7 @@ public class SocketClient
|
|||
|
||||
_LastReconectime = Time.time;
|
||||
|
||||
Debug.Log("****Socket*********************TryReconnect ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************TryReconnect ---" + IpAddress);
|
||||
|
||||
|
||||
|
||||
|
|
@ -739,7 +739,7 @@ public class SocketClient
|
|||
|
||||
public void Reconnect()
|
||||
{
|
||||
Debug.Log("****Socket*********************Reconnect ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************Reconnect ---" + IpAddress);
|
||||
|
||||
Close();
|
||||
|
||||
|
|
@ -748,7 +748,7 @@ public class SocketClient
|
|||
var ipType = GetIPAddressType(IpAddress);
|
||||
client = null;
|
||||
client = new TcpClient(ipType);
|
||||
Debug.Log("****Socket*********************NEW ---" + client.Client.Handle);
|
||||
XDebug.Log.l("****Socket*********************NEW ---" + client.Client.Handle);
|
||||
//client.SendTimeout = 1000;
|
||||
//client.ReceiveTimeout = 1000;
|
||||
client.NoDelay = true;
|
||||
|
|
@ -804,7 +804,7 @@ public class SocketClient
|
|||
|
||||
public void OnReconnectFail()
|
||||
{
|
||||
Debug.Log("****Socket*********************OnReconnectFail ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************OnReconnectFail ---" + IpAddress);
|
||||
AddStateInfo(NetworkStateType.ReconnectFail, null);
|
||||
}
|
||||
|
||||
|
|
@ -816,7 +816,7 @@ public class SocketClient
|
|||
//检测是否成功的建立了链接。..
|
||||
if (client == null || !client.Connected)
|
||||
{
|
||||
Debug.Log("****Socket*********************OnReconnect FAILED ---" + IpAddress);
|
||||
XDebug.Log.l("****Socket*********************OnReconnect FAILED ---" + IpAddress);
|
||||
return;
|
||||
}
|
||||
try
|
||||
|
|
@ -829,11 +829,11 @@ public class SocketClient
|
|||
client.GetStream().BeginRead(byteBuffer, 0, MAX_READ, new AsyncCallback(OnRead), null);
|
||||
AddStateInfo(NetworkStateType.Reconnected, null);
|
||||
_LastReconectime = 0;
|
||||
Debug.Log("****Socket*********************OnReconnect SUCCESS @"+ client.Client.LocalEndPoint.ToString());
|
||||
XDebug.Log.l("****Socket*********************OnReconnect SUCCESS @"+ client.Client.LocalEndPoint.ToString());
|
||||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log("****Socket*********************OnReconnect FAILED ---" + e.Message);
|
||||
XDebug.Log.l("****Socket*********************OnReconnect FAILED ---" + e.Message);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -870,7 +870,7 @@ public class SocketClient
|
|||
buffer.Close();
|
||||
|
||||
|
||||
//Debug.Log("[SocketClient.m_SendMessage]..."+ msgId);
|
||||
//XDebug.Log.l("[SocketClient.m_SendMessage]..."+ msgId);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
|
|||
|
|
@ -18,7 +18,7 @@ namespace SDK
|
|||
public AndroidProxy()
|
||||
{
|
||||
|
||||
Debug.Log("AndroidProxy INit");
|
||||
XDebug.Log.l("AndroidProxy INit");
|
||||
var player = new AndroidJavaClass(CLS_UNITY_PLAYER);
|
||||
currentActivity = player.GetStatic<AndroidJavaObject>("currentActivity");
|
||||
}
|
||||
|
|
@ -58,7 +58,7 @@ namespace SDK
|
|||
public override void Pay(SDKPayArgs args)
|
||||
{
|
||||
|
||||
Debug.Log("consumerId = " + args.roleID +
|
||||
XDebug.Log.l("consumerId = " + args.roleID +
|
||||
",consumerName= " + args.roleName +
|
||||
",mhtCurrency= " + args.coinNum +
|
||||
",vipLevel= " + args.vip +
|
||||
|
|
|
|||
|
|
@ -169,7 +169,7 @@ namespace SDK
|
|||
//sdk 埋点
|
||||
public void CustomEvent(string events, string desc, string type)
|
||||
{
|
||||
Debug.Log("sdk打点事件：" + events + "|" + desc + "|" + type);
|
||||
XDebug.Log.l("sdk打点事件：" + events + "|" + desc + "|" + type);
|
||||
if(events == null||events == "")
|
||||
{
|
||||
return;
|
||||
|
|
@ -189,7 +189,7 @@ namespace SDK
|
|||
//sdk init 回调
|
||||
public void InitCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : InitCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : InitCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_InitCallback,
|
||||
|
|
@ -199,7 +199,7 @@ namespace SDK
|
|||
//sdk 注册 回调
|
||||
public void RegisterCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : RegisterCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : RegisterCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_RegisterCallback,
|
||||
|
|
@ -209,7 +209,7 @@ namespace SDK
|
|||
//sdk login 回调
|
||||
public void LoginCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : LoginCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : LoginCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_LoginCallback,
|
||||
|
|
@ -219,7 +219,7 @@ namespace SDK
|
|||
//sdk Pay回调
|
||||
public void PayCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : PayCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : PayCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_PayCallback,
|
||||
|
|
@ -230,7 +230,7 @@ namespace SDK
|
|||
//sdk SwitchAccount回调
|
||||
public void SwitchAccountCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : SwitchAccountCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : SwitchAccountCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_SwitchAccountCallback,
|
||||
|
|
@ -241,7 +241,7 @@ namespace SDK
|
|||
//sdk Logout回调
|
||||
public void LogoutCallback(string data)
|
||||
{
|
||||
Debug.Log("Helper : LogoutCallback - data: " + data);
|
||||
XDebug.Log.l("Helper : LogoutCallback - data: " + data);
|
||||
proxy.PushMessage(new Message
|
||||
{
|
||||
msgId = MessageDef.MSG_LogoutCallback,
|
||||
|
|
|
|||
|
|
@ -87,7 +87,7 @@ public class AndroidDeviceInfo
|
|||
}
|
||||
public void DeviceInit()
|
||||
{
|
||||
Debug.Log("设备信息初始化");
|
||||
XDebug.Log.l("设备信息初始化");
|
||||
}
|
||||
//设备机型类型
|
||||
public string GetDeviceBrand()
|
||||
|
|
|
|||
|
|
@ -56,7 +56,7 @@ public class NotchScreenUtil
|
|||
|
||||
public void Init()
|
||||
{
|
||||
Debug.Log("设备信息初始化");
|
||||
XDebug.Log.l("设备信息初始化");
|
||||
}
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -73,10 +73,10 @@ public class CheckInputLength : MonoBehaviour
|
|||
{
|
||||
output += Convert.ToString((int)encodedBytes[byteIndex], 2) + " ";//二进制
|
||||
}
|
||||
Debug.Log(output);
|
||||
XDebug.Log.l(output);
|
||||
|
||||
int byteCount = System.Text.ASCIIEncoding.UTF8.GetByteCount(tempStr);
|
||||
Debug.Log("字节数=" + byteCount);
|
||||
XDebug.Log.l("字节数=" + byteCount);
|
||||
|
||||
if (byteCount > 1)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ namespace ToJ
|
|||
|
||||
if ((_maskedSpriteWorldCoordsShader == null) || (_maskedUnlitWorldCoordsShader == null))
|
||||
{
|
||||
Debug.Log("Shaders necessary for masking don't seem to be present in the project.");
|
||||
XDebug.Log.l("Shaders necessary for masking don't seem to be present in the project.");
|
||||
return;
|
||||
}
|
||||
SetMesh ();
|
||||
|
|
@ -194,17 +194,17 @@ namespace ToJ
|
|||
{
|
||||
if ((maskMappingWorldAxis == MappingAxis.X) && ((Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.x, 0)) > 0.01f) || (Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.y, invertAxis ? -90 : 90)) > 0.01f)))
|
||||
{
|
||||
Debug.Log("You cannot edit X and Y values of the Mask transform rotation!");
|
||||
XDebug.Log.l("You cannot edit X and Y values of the Mask transform rotation!");
|
||||
transform.eulerAngles = new Vector3(0, invertAxis ? 270 : 90, transform.eulerAngles.z);
|
||||
}
|
||||
else if ((maskMappingWorldAxis == MappingAxis.Y) && ((Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.x, invertAxis ? -90 : 90)) > 0.01f) || (Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.z, 0)) > 0.01f)))
|
||||
{
|
||||
Debug.Log("You cannot edit X and Z values of the Mask transform rotation!");
|
||||
XDebug.Log.l("You cannot edit X and Z values of the Mask transform rotation!");
|
||||
transform.eulerAngles = new Vector3(invertAxis ? -90 : 90, transform.eulerAngles.y, 0);
|
||||
}
|
||||
else if ((maskMappingWorldAxis == MappingAxis.Z) && ((Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.x, 0)) > 0.01f) || (Mathf.Abs(Mathf.DeltaAngle(transform.eulerAngles.y, (invertAxis ? -180 : 0))) > 0.01f)))
|
||||
{
|
||||
Debug.Log("You cannot edit X and Y values of the Mask transform rotation!");
|
||||
XDebug.Log.l("You cannot edit X and Y values of the Mask transform rotation!");
|
||||
transform.eulerAngles = new Vector3(0, invertAxis ? -180 : 0, transform.eulerAngles.z);
|
||||
}
|
||||
|
||||
|
|
@ -255,13 +255,13 @@ namespace ToJ
|
|||
if ((material.shader.ToString() == _maskedSpriteWorldCoordsShader.ToString()) &&
|
||||
(material.shader.GetInstanceID() != _maskedSpriteWorldCoordsShader.GetInstanceID()))
|
||||
{
|
||||
Debug.Log("There seems to be more than one masked shader in the project with the same display name, and it's preventing the mask from being properly applied.");
|
||||
XDebug.Log.l("There seems to be more than one masked shader in the project with the same display name, and it's preventing the mask from being properly applied.");
|
||||
_maskedSpriteWorldCoordsShader = null;
|
||||
}
|
||||
if ((material.shader.ToString() == _maskedUnlitWorldCoordsShader.ToString()) &&
|
||||
(material.shader.GetInstanceID() != _maskedUnlitWorldCoordsShader.GetInstanceID()))
|
||||
{
|
||||
Debug.Log("There seems to be more than one masked shader in the project with the same display name, and it's preventing the mask from being properly applied.");
|
||||
XDebug.Log.l("There seems to be more than one masked shader in the project with the same display name, and it's preventing the mask from being properly applied.");
|
||||
_maskedUnlitWorldCoordsShader = null;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -38,14 +38,14 @@ namespace UnityEngine.UI.Extensions
|
|||
{
|
||||
base.Awake();
|
||||
rectTrans = GetComponent<RectTransform>();
|
||||
Debug.Log("rectTrans:" + rectTrans);
|
||||
XDebug.Log.l("rectTrans:" + rectTrans);
|
||||
OnRectTransformDimensionsChange();
|
||||
}
|
||||
protected override void OnEnable()
|
||||
{
|
||||
base.OnEnable();
|
||||
rectTrans = GetComponent<RectTransform>();
|
||||
Debug.Log("rectTrans:" + rectTrans);
|
||||
XDebug.Log.l("rectTrans:" + rectTrans);
|
||||
OnRectTransformDimensionsChange();
|
||||
}
|
||||
/// <summary>
|
||||
|
|
@ -68,7 +68,7 @@ namespace UnityEngine.UI.Extensions
|
|||
for (int index = 0; index < verts.Count; index++)
|
||||
{
|
||||
var uiVertex = verts[index];
|
||||
//Debug.Log ();
|
||||
//XDebug.Log.l ();
|
||||
uiVertex.position.y += curveForText.Evaluate(rectTrans.rect.width * rectTrans.pivot.x + uiVertex.position.x) * curveMultiplier;
|
||||
verts[index] = uiVertex;
|
||||
}
|
||||
|
|
@ -105,7 +105,7 @@ namespace UnityEngine.UI.Extensions
|
|||
for (int index = 0; index < verts.Count; index++)
|
||||
{
|
||||
var uiVertex = verts[index];
|
||||
//Debug.Log ();
|
||||
//XDebug.Log.l ();
|
||||
uiVertex.position.y += curveForText.Evaluate(rectTrans.rect.width * rectTrans.pivot.x + uiVertex.position.x) * curveMultiplier;
|
||||
verts[index] = uiVertex;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -91,7 +91,7 @@ namespace UnityEngine.UI.Extensions
|
|||
//
|
||||
protected void ApplyShadow(List<UIVertex> verts, Color32 color, int start, int end, float x, float y)
|
||||
{
|
||||
//Debug.Log("verts count: "+verts.Count);
|
||||
//XDebug.Log.l("verts count: "+verts.Count);
|
||||
int num = verts.Count * 2;
|
||||
if (verts.Capacity < num)
|
||||
{
|
||||
|
|
@ -103,7 +103,7 @@ namespace UnityEngine.UI.Extensions
|
|||
verts.Add(uIVertex);
|
||||
|
||||
Vector3 position = uIVertex.position;
|
||||
//Debug.Log("vertex pos: "+position);
|
||||
//XDebug.Log.l("vertex pos: "+position);
|
||||
position.x += x;
|
||||
position.y += y;
|
||||
uIVertex.position = position;
|
||||
|
|
|
|||
|
|
@ -0,0 +1,110 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 47cb5ff929807b741a1362c911c9c71c
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 8e515d0992baf7a43a8099e50291b20b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,121 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3a0c166482a1b9446b0594546e9fb9ed
|
||||
TextureImporter:
|
||||
fileIDToRecycleName: {}
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 1
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 16a5f68f94336d84e9e4a9338fe2899a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,8 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 22767ab7c9cb04d48a46cae157db5fa6
|
||||
folderAsset: yes
|
||||
DefaultImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 373 B |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 3982ed59c0e084c4f984176d4f5be09c
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_tmk
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_tmk
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 90
|
||||
height: 90
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: aa8f21e3d6ddd804b840ef9a2834636d
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 302614cb882642e4ca1bb78c18b7aa5c
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 183 KiB |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 486e4bd797c328148bc023695089a4a7
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_xr1f
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_xr1f
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 587
|
||||
height: 487
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 8a1dc4dffe5d53147beba540000e97d5
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: b8633cb29e9492a4994ab7210ab38927
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 242 KiB |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: f4e3e8ce8ecdd124d81fe2326507d8cf
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_xr1z
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_xr1z
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 542
|
||||
height: 578
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: fdc8fb23fa1021045a95b0a0f7c50f0b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 6152a85dea826c04b9678e907f86e6ec
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 186 KiB |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 26be01b1cecd7fb45a53da23bcc7b516
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_xr2
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_xr2
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 418
|
||||
height: 470
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: 47368eca1f4302c4f91eb48bfb28ec86
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 8ca2bd43a7ce1b342878a8ba2465416b
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 231 KiB |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: ddfdec1d513d16c4d8a7dfbf8d8cc45f
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_xr3
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_xr3
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 431
|
||||
height: 517
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: b96960b4fb003f346b6ea60fed754d08
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 3738b61f0ec3b3242a1bfcc3421da4e8
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 161 KiB |
|
|
@ -0,0 +1,142 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 34a3e1a78c18e424eacb32309520dae3
|
||||
TextureImporter:
|
||||
fileIDToRecycleName:
|
||||
21300000: dhlg_xr4
|
||||
externalObjects: {}
|
||||
serializedVersion: 9
|
||||
mipmaps:
|
||||
mipMapMode: 0
|
||||
enableMipMap: 0
|
||||
sRGBTexture: 1
|
||||
linearTexture: 0
|
||||
fadeOut: 0
|
||||
borderMipMap: 0
|
||||
mipMapsPreserveCoverage: 0
|
||||
alphaTestReferenceValue: 0.5
|
||||
mipMapFadeDistanceStart: 1
|
||||
mipMapFadeDistanceEnd: 3
|
||||
bumpmap:
|
||||
convertToNormalMap: 0
|
||||
externalNormalMap: 0
|
||||
heightScale: 0.25
|
||||
normalMapFilter: 0
|
||||
isReadable: 0
|
||||
streamingMipmaps: 0
|
||||
streamingMipmapsPriority: 0
|
||||
grayScaleToAlpha: 0
|
||||
generateCubemap: 6
|
||||
cubemapConvolution: 0
|
||||
seamlessCubemap: 0
|
||||
textureFormat: 1
|
||||
maxTextureSize: 2048
|
||||
textureSettings:
|
||||
serializedVersion: 2
|
||||
filterMode: 2
|
||||
aniso: -1
|
||||
mipBias: -100
|
||||
wrapU: 1
|
||||
wrapV: 1
|
||||
wrapW: 1
|
||||
nPOTScale: 0
|
||||
lightmap: 0
|
||||
compressionQuality: 50
|
||||
spriteMode: 2
|
||||
spriteExtrude: 1
|
||||
spriteMeshType: 1
|
||||
alignment: 0
|
||||
spritePivot: {x: 0.5, y: 0.5}
|
||||
spritePixelsToUnits: 100
|
||||
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
|
||||
spriteGenerateFallbackPhysicsShape: 1
|
||||
alphaUsage: 1
|
||||
alphaIsTransparency: 1
|
||||
spriteTessellationDetail: -1
|
||||
textureType: 8
|
||||
textureShape: 1
|
||||
singleChannelComponent: 0
|
||||
maxTextureSizeSet: 0
|
||||
compressionQualitySet: 0
|
||||
textureFormatSet: 0
|
||||
platformSettings:
|
||||
- serializedVersion: 2
|
||||
buildTarget: DefaultTexturePlatform
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: -1
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 0
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Android
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 65
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: iPhone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 57
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
- serializedVersion: 2
|
||||
buildTarget: Standalone
|
||||
maxTextureSize: 2048
|
||||
resizeAlgorithm: 0
|
||||
textureFormat: 4
|
||||
textureCompression: 1
|
||||
compressionQuality: 50
|
||||
crunchedCompression: 0
|
||||
allowsAlphaSplitting: 0
|
||||
overridden: 1
|
||||
androidETC2FallbackOverride: 0
|
||||
spriteSheet:
|
||||
serializedVersion: 2
|
||||
sprites:
|
||||
- serializedVersion: 2
|
||||
name: dhlg_xr4
|
||||
rect:
|
||||
serializedVersion: 2
|
||||
x: 0
|
||||
y: 0
|
||||
width: 456
|
||||
height: 382
|
||||
alignment: 0
|
||||
pivot: {x: 0, y: 0}
|
||||
border: {x: 0, y: 0, z: 0, w: 0}
|
||||
outline: []
|
||||
physicsShape: []
|
||||
tessellationDetail: -1
|
||||
bones: []
|
||||
spriteID: fc8896d19ebc2ce4484861c3fc54689a
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
outline: []
|
||||
physicsShape: []
|
||||
bones: []
|
||||
spriteID: 49d47a2b4fd227346a40fa1c61f13a34
|
||||
vertices: []
|
||||
indices:
|
||||
edges: []
|
||||
weights: []
|
||||
spritePackingTag:
|
||||
pSDRemoveMatte: 0
|
||||
pSDShowRemoveMatteOption: 0
|
||||
userData:
|
||||
assetBundleName:
|
||||
assetBundleVariant:
|
||||
|
|
@ -0,0 +1,112 @@
|
|||
%YAML 1.1
|
||||
%TAG !u! tag:unity3d.com,2011:
|
||||
--- !u!1 &1301570400297594
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 224218639986908436}
|
||||
m_Layer: 5
|
||||
m_Name: r_Map_NewEvent_027
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &224218639986908436
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1301570400297594}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
- {fileID: 5235322377343359429}
|
||||
m_Father: {fileID: 0}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &7936479621493237122
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 5235322377343359429}
|
||||
- component: {fileID: 1481523694279806421}
|
||||
- component: {fileID: 2865140871936969021}
|
||||
m_Layer: 5
|
||||
m_Name: Image
|
||||
m_TagString: Untagged
|
||||
m_Icon: {fileID: 0}
|
||||
m_NavMeshLayer: 0
|
||||
m_StaticEditorFlags: 0
|
||||
m_IsActive: 1
|
||||
--- !u!224 &5235322377343359429
|
||||
RectTransform:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7936479621493237122}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children: []
|
||||
m_Father: {fileID: 224218639986908436}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 90, y: 90}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &1481523694279806421
|
||||
CanvasRenderer:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7936479621493237122}
|
||||
m_CullTransparentMesh: 0
|
||||
--- !u!114 &2865140871936969021
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 7936479621493237122}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Material: {fileID: 0}
|
||||
m_Color: {r: 1, g: 1, b: 1, a: 1}
|
||||
m_RaycastTarget: 1
|
||||
m_OnCullStateChanged:
|
||||
m_PersistentCalls:
|
||||
m_Calls: []
|
||||
m_TypeName: UnityEngine.UI.MaskableGraphic+CullStateChangedEvent, UnityEngine.UI,
|
||||
Version=1.0.0.0, Culture=neutral, PublicKeyToken=null
|
||||
m_Sprite: {fileID: 21300000, guid: 3982ed59c0e084c4f984176d4f5be09c, type: 3}
|
||||
m_Type: 0
|
||||
m_PreserveAspect: 0
|
||||
m_FillCenter: 1
|
||||
m_FillMethod: 4
|
||||
m_FillAmount: 1
|
||||
m_FillClockwise: 1
|
||||
m_FillOrigin: 0
|
||||
m_UseSpriteMesh: 0
|
||||
|
|
@ -0,0 +1,7 @@
|
|||
fileFormatVersion: 2
|
||||
guid: 90b83ad20c2caa748a8eed23e669d629
|
||||
PrefabImporter:
|
||||
externalObjects: {}
|
||||
userData:
|
||||
assetBundleName: lz4/prefabs/map/r_map_newevent_016
|
||||
assetBundleVariant: unity3d
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -169,7 +169,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: -0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 70, y: 70}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8186227736255178852
|
||||
|
|
@ -634,7 +634,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 119.5, y: -168.93}
|
||||
m_AnchoredPosition: {x: 119.5, y: -168.93018}
|
||||
m_SizeDelta: {x: 147.65, y: 60}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &724716022821637626
|
||||
|
|
@ -708,7 +708,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -2.6, y: 3.8}
|
||||
m_AnchoredPosition: {x: -2.5999985, y: 3.7999992}
|
||||
m_SizeDelta: {x: -24.77, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &8066938108999663997
|
||||
|
|
@ -989,7 +989,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3292009929065074264}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
|
@ -1870,7 +1870,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: 0, y: 0.000030517578}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!1 &8951164883984516019
|
||||
|
|
|
|||
|
|
@ -1270,7 +1270,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 1080696917594670099}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
|
@ -7519,7 +7519,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 1}
|
||||
m_AnchorMax: {x: 0, y: 1}
|
||||
m_AnchoredPosition: {x: 55.91, y: -39.2}
|
||||
m_AnchoredPosition: {x: 55.910004, y: -39.2}
|
||||
m_SizeDelta: {x: 100.33, y: 55}
|
||||
m_Pivot: {x: 0.5000001, y: 0.49999842}
|
||||
--- !u!222 &3262152146561394990
|
||||
|
|
@ -7974,7 +7974,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
|
@ -9027,7 +9027,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -100.05, y: -118}
|
||||
m_AnchoredPosition: {x: -100.04999, y: -118}
|
||||
m_SizeDelta: {x: 71.6, y: 69.93}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3124191691634189011
|
||||
|
|
|
|||
|
|
@ -135,7 +135,7 @@ MonoBehaviour:
|
|||
m_Top: 21
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 36.48
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
|
@ -2424,7 +2424,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0, y: 0.5}
|
||||
m_AnchorMax: {x: 0, y: 0.5}
|
||||
m_AnchoredPosition: {x: 73.2, y: 3.8}
|
||||
m_AnchoredPosition: {x: 73.20001, y: 3.8}
|
||||
m_SizeDelta: {x: 68.5, y: 50}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &3967800694420428273
|
||||
|
|
@ -2494,7 +2494,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2965682092567935477}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
|
|
|||
|
|
@ -108,9 +108,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 2
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -84.11, y: -516}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 129, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &5675656333181562820
|
||||
|
|
@ -220,6 +220,7 @@ GameObject:
|
|||
serializedVersion: 6
|
||||
m_Component:
|
||||
- component: {fileID: 7581135397323237180}
|
||||
- component: {fileID: 967181818}
|
||||
m_Layer: 5
|
||||
m_Name: rightUp
|
||||
m_TagString: Untagged
|
||||
|
|
@ -251,6 +252,29 @@ RectTransform:
|
|||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 0, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!114 &967181818
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 581457526545903035}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1297475563, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_Padding:
|
||||
m_Left: 0
|
||||
m_Right: 22
|
||||
m_Top: 157
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 2
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
m_ChildControlHeight: 0
|
||||
--- !u!1 &749973874398757662
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -519,9 +543,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 1
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -85.11011, y: -374.79492}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 129, y: 126}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &6020975154716938251
|
||||
|
|
@ -1346,6 +1370,7 @@ GameObject:
|
|||
- component: {fileID: 370551838751614035}
|
||||
- component: {fileID: 7215149483906349618}
|
||||
- component: {fileID: 4837195170920748458}
|
||||
- component: {fileID: 967181817}
|
||||
m_Layer: 5
|
||||
m_Name: btn1
|
||||
m_TagString: Untagged
|
||||
|
|
@ -1444,6 +1469,26 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &967181817
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 2010072987787748508}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &2326400323695555520
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2127,9 +2172,9 @@ RectTransform:
|
|||
m_Father: {fileID: 7581135397323237180}
|
||||
m_RootOrder: 0
|
||||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 1, y: 1}
|
||||
m_AnchorMax: {x: 1, y: 1}
|
||||
m_AnchoredPosition: {x: -85.11011, y: -231.19531}
|
||||
m_AnchorMin: {x: 0, y: 0}
|
||||
m_AnchorMax: {x: 0, y: 0}
|
||||
m_AnchoredPosition: {x: 0, y: 0}
|
||||
m_SizeDelta: {x: 127, y: 135}
|
||||
m_Pivot: {x: 0.5, y: 0.5}
|
||||
--- !u!222 &2892560023550008126
|
||||
|
|
@ -2319,6 +2364,7 @@ GameObject:
|
|||
- component: {fileID: 5642535416774203362}
|
||||
- component: {fileID: 2648886891473817919}
|
||||
- component: {fileID: 6092898537189118852}
|
||||
- component: {fileID: 967181816}
|
||||
m_Layer: 5
|
||||
m_Name: btn2
|
||||
m_TagString: Untagged
|
||||
|
|
@ -2417,6 +2463,26 @@ Animator:
|
|||
m_HasTransformHierarchy: 1
|
||||
m_AllowConstantClipSamplingOptimization: 1
|
||||
m_KeepAnimatorControllerStateOnDisable: 0
|
||||
--- !u!114 &967181816
|
||||
MonoBehaviour:
|
||||
m_ObjectHideFlags: 0
|
||||
m_CorrespondingSourceObject: {fileID: 0}
|
||||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 3764174342196893947}
|
||||
m_Enabled: 1
|
||||
m_EditorHideFlags: 0
|
||||
m_Script: {fileID: 1679637790, guid: f70555f144d8491a825f0804e09c671c, type: 3}
|
||||
m_Name:
|
||||
m_EditorClassIdentifier:
|
||||
m_IgnoreLayout: 1
|
||||
m_MinWidth: -1
|
||||
m_MinHeight: -1
|
||||
m_PreferredWidth: -1
|
||||
m_PreferredHeight: -1
|
||||
m_FlexibleWidth: -1
|
||||
m_FlexibleHeight: -1
|
||||
m_LayoutPriority: 1
|
||||
--- !u!1 &4031734823810109523
|
||||
GameObject:
|
||||
m_ObjectHideFlags: 0
|
||||
|
|
@ -2970,7 +3036,7 @@ RectTransform:
|
|||
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
|
||||
m_AnchorMin: {x: 0.5, y: 0.5}
|
||||
m_AnchorMax: {x: 0.5, y: 0.5}
|
||||
m_AnchoredPosition: {x: 0.00000008940697, y: 41.46997}
|
||||
m_AnchoredPosition: {x: 0.00000008940697, y: 41.47004}
|
||||
m_SizeDelta: {x: 191.08, y: 0}
|
||||
m_Pivot: {x: 0.5, y: 1}
|
||||
--- !u!114 &8570320678613256167
|
||||
|
|
@ -4220,7 +4286,7 @@ RectTransform:
|
|||
m_PrefabInstance: {fileID: 0}
|
||||
m_PrefabAsset: {fileID: 0}
|
||||
m_GameObject: {fileID: 9021446596343102454}
|
||||
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
|
||||
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
|
||||
m_LocalPosition: {x: 0, y: 0, z: 0}
|
||||
m_LocalScale: {x: 1, y: 1, z: 1}
|
||||
m_Children:
|
||||
|
|
|
|||
|
|
@ -6407,7 +6407,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
|
|
|||
|
|
@ -1862,7 +1862,7 @@ MonoBehaviour:
|
|||
m_Top: 0
|
||||
m_Bottom: 0
|
||||
m_ChildAlignment: 1
|
||||
m_Spacing: 0
|
||||
m_Spacing: 10
|
||||
m_ChildForceExpandWidth: 0
|
||||
m_ChildForceExpandHeight: 0
|
||||
m_ChildControlWidth: 0
|
||||
|
|
|
|||
|
|
@ -57,9 +57,9 @@ function TimeLimitUpHero:InitComponent()
|
|||
self.effect=Util.GetGameObject(self.nextReward,"juneng_chenggong")
|
||||
self.heroPar=Util.GetGameObject(self.gameObject,"Bg2/curObj")
|
||||
self.dragView=Util.GetGameObject(self.gameObject,"Bg2/dragView")
|
||||
self.btn_hero=Util.GetGameObject(self.gameObject,"btn_hero")
|
||||
self.heroIcon=Util.GetGameObject(self.gameObject,"btn_hero/Icon"):GetComponent("Image")
|
||||
self.textInfo1=Util.GetGameObject(self.gameObject,"btn_hero/Text"):GetComponent("Text")
|
||||
self.btn_hero=Util.GetGameObject(self.gameObject,"btngroup/btn_hero")
|
||||
self.heroIcon=Util.GetGameObject(self.btn_hero,"Icon"):GetComponent("Image")
|
||||
self.textInfo1=Util.GetGameObject(self.btn_hero,"Text"):GetComponent("Text")
|
||||
self.textInfo1.text="选择神将"
|
||||
self.titleImg=Util.GetGameObject(self.gameObject,"Bg2/Image (3)"):GetComponent("Image")
|
||||
self.callTimeImg=Util.GetGameObject(self.gameObject,"callTimeImg"):GetComponent("Image")
|
||||
|
|
@ -68,8 +68,8 @@ function TimeLimitUpHero:InitComponent()
|
|||
self.heroNameTxt=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Name/Text"):GetComponent("Text")
|
||||
self.heroProImg=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
|
||||
self.starPar=Util.GetGameObject(self.gameObject,"Bg2/PreviewBtn/di/Image"):GetComponent("Image")
|
||||
self.gailvImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg2"):GetComponent("Image")
|
||||
self.changeImg=Util.GetGameObject(self.gameObject,"btn_hero/InfoImg"):GetComponent("Image")
|
||||
self.gailvImg=Util.GetGameObject(self.btn_hero,"InfoImg2"):GetComponent("Image")
|
||||
self.changeImg=Util.GetGameObject(self.btn_hero,"InfoImg"):GetComponent("Image")
|
||||
self.changeImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_icondi_ghwj_zh")
|
||||
self.gailvImg.sprite=self.spLoader:LoadSprite("x_xinjiangzhaohuan_gailv")
|
||||
|
||||
|
|
|
|||
|
|
@ -93,6 +93,9 @@ MapFloatingConfig = {
|
|||
[26] = {name = "live2d_r_MapEffect_NewEvent_002",--人
|
||||
scale = Vector3.New(0.1, 0.1, 0.1),
|
||||
position = Vector3.New(0, 0, 0)},
|
||||
[27] = {name = "r_Map_NewEvent_027",
|
||||
scale = Vector3.New(1, 1, 1),
|
||||
position = Vector3.New(0, 0, 0)},
|
||||
}
|
||||
|
||||
-- 特效资源的相关数组
|
||||
|
|
@ -109,6 +112,7 @@ isEffect = {
|
|||
[22] = true,
|
||||
[23] = true,
|
||||
[24] = true,
|
||||
[27] = true,
|
||||
}
|
||||
|
||||
-- 玩家角色特效配置(type 0 空特效 1 瞬时特效 2 持续特效)
|
||||
|
|
@ -164,6 +168,9 @@ ShowTimePos = {
|
|||
[22] = {pos = Vector2.New(0, 130)},
|
||||
[23] = {pos = Vector2.New(0, 130)},
|
||||
[24] = {pos = Vector2.New(0, 130)},
|
||||
|
||||
|
||||
[27] = {pos = Vector2.New(0, 130)},
|
||||
}
|
||||
|
||||
-- 图标的说话内容
|
||||
|
|
|
|||
|
|
@ -143,10 +143,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
|
||||
if _itemData.itemType == 1 or _itemData.itemType == 0 then--物品
|
||||
--item
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
|
||||
end
|
||||
if _itemData.configData == nil then
|
||||
_itemData.configData = _itemData.itemConfig
|
||||
|
|
@ -177,10 +177,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, _itemData.backData.itemId,nil,self.isRewardItemPop)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
|
||||
end
|
||||
elseif _itemData.configData.ItemType == ItemType.TalentItem then
|
||||
--天赋材料
|
||||
|
|
@ -205,10 +205,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
_itemData.id = _itemData.configData.Id
|
||||
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData,nil,self.isRewardItemPop)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5 or _itemData.configData.Quantity == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
|
||||
end
|
||||
elseif _itemData.configData.ItemType == ItemType.Blueprint then
|
||||
local lanTuData = WorkShopManager.GetLanTuIsOpenLock(_itemData.backData.itemId)
|
||||
|
|
@ -267,10 +267,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
--Log("self.isRewardItemPop "..tostring(self.isRewardItemPop))
|
||||
UIManager.OpenPanel(UIName.RewardEquipSingleShowPopup, _itemData.backData,nil,self.isRewardItemPop)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5 or _itemData.configData.Quantity == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5 or _itemData.configData.Quantity1 == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
|
||||
end
|
||||
elseif _itemData.itemType == 3 then
|
||||
--hero
|
||||
|
|
@ -299,10 +299,10 @@ function ItemView:GetRewardShow(_itemData, effectLayer)
|
|||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardTalismanSingleShowPopup,2,_itemData.backData.id,_itemData.backData.equipId,_itemData.backData.exp,_itemData.backData.rebuildLevel)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity == 7)
|
||||
if effectLayer > 0 and _itemData.configData.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(_itemData.configData.Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(_itemData.configData.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(_itemData.configData.Quantity1 == 7)
|
||||
end
|
||||
elseif _itemData.itemType == 5 then
|
||||
self.num:SetActive(false)
|
||||
|
|
@ -407,10 +407,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
-- 卸载头像框特效
|
||||
self:UnLoadFrameEffect()
|
||||
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
|
||||
if effectLayer > 0 and itemDataConFig.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7)
|
||||
end
|
||||
if itemDataConFig.ItemType == ItemType.NoType then
|
||||
--0无特殊分类
|
||||
|
|
@ -465,10 +465,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self.icon.sprite = self.spLoader:LoadSprite(GetResourcePath(itemConfig[itemSId].ResourceID))
|
||||
self.starGrid:SetActive(true)
|
||||
EquipManager.SetEquipStarShow(self.spLoader, self.starGrid,itemSId)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity == 5 or itemDataConFig.Quantity == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
|
||||
if effectLayer > 0 and itemDataConFig.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5 or itemDataConFig.Quantity1 == 4)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7)
|
||||
end
|
||||
Util.AddOnceClick(self.frameBtn, function()
|
||||
-- UIManager.OpenPanel(UIName.HandBookEquipInfoPanel, itemSId)
|
||||
|
|
@ -489,10 +489,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
Util.AddOnceClick(self.frameBtn, function()
|
||||
UIManager.OpenPanel(UIName.RewardItemSingleShowPopup, itemSId,nil,self.isRewardItemPop,true)
|
||||
end)
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemConfig[itemSId].Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemConfig[itemSId].Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemConfig[itemSId].Quantity == 7)
|
||||
if effectLayer > 0 and itemConfig[itemSId].Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemConfig[itemSId].Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemConfig[itemSId].Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemConfig[itemSId].Quantity1 == 7)
|
||||
end
|
||||
elseif itemDataConFig.ItemType == ItemType.Blueprint then
|
||||
--蓝图
|
||||
|
|
@ -519,10 +519,10 @@ function ItemView:NoGetRewardShow(_reward, effectLayer, isShowAddImage)
|
|||
self.innateImage:SetActive(false)
|
||||
self.innateText.text = ""
|
||||
end
|
||||
if effectLayer > 0 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity == 7)
|
||||
if effectLayer > 0 and itemDataConFig.Quantity1 then
|
||||
self.UI_Effect_Kuang_JinSe:SetActive(itemDataConFig.Quantity1 == 5)
|
||||
self.UI_Effect_Kuang_HongSe:SetActive(itemDataConFig.Quantity1 == 6)
|
||||
self.UI_effect_WuCai_Kuang:SetActive(itemDataConFig.Quantity1 == 7)
|
||||
end
|
||||
elseif itemDataConFig.ItemType == ItemType.Talisman then
|
||||
--法宝
|
||||
|
|
|
|||
|
|
@ -17,15 +17,14 @@
|
|||
android:icon="@mipmap/app_icon"
|
||||
android:usesCleartextTraffic="true"
|
||||
android:label="@string/app_name"
|
||||
android:isGame="true"
|
||||
android:name="com.lingdong.packsdk.PSDKApplication" >
|
||||
android:isGame="true">
|
||||
<activity
|
||||
android:label="@string/app_name"
|
||||
android:screenOrientation="portrait"
|
||||
android:launchMode="singleTask"
|
||||
android:configChanges="mcc|mnc|locale|touchscreen|keyboard|keyboardHidden|navigation|orientation|screenLayout|uiMode|screenSize|smallestScreenSize|fontScale|layoutDirection|density"
|
||||
android:hardwareAccelerated="false"
|
||||
android:name=".MhtMainActivity">
|
||||
android:name=".MainActivity">
|
||||
<intent-filter>
|
||||
<action android:name="android.intent.action.MAIN" />
|
||||
<category android:name="android.intent.category.LAUNCHER" />
|
||||
|
|
@ -36,16 +35,6 @@
|
|||
<meta-data android:name="unity.build-id" android:value="43b9b4c5-242c-4c49-8e53-4dda6adbfa5f" />
|
||||
<meta-data android:name="unity.splash-mode" android:value="0" />
|
||||
<meta-data android:name="unity.splash-enable" android:value="True" />
|
||||
|
||||
<!--猕猴桃sdk配置-->
|
||||
<activity android:name="com.lingdong.packsdk.ui.PayWebActivity"></activity>
|
||||
<meta-data android:name="PSDK_GAME_PROXY_APPLICATION" android:value="com.mht.GameApplication" />
|
||||
<meta-data android:name="channelId" android:value="MHT" />
|
||||
<meta-data android:name="mhtrhappid" android:value="d0265404f55536a5c8b0ec33a9da27d3" />
|
||||
<meta-data android:name="mhtappid" android:value="e4ecefecc8034cffaa69e81b2c044f2c" />
|
||||
<meta-data android:name="channellevel1" android:value="MHT" />
|
||||
<meta-data android:name="channellevel2" android:value="MHT" />
|
||||
|
||||
<!--刘海屏打开刘海处的使用权限-->
|
||||
<meta-data android:name="android.notch_support" android:value="true" />
|
||||
<meta-data android:name="notch.config" android:value="portrait|landscape"/>
|
||||
|
|
|
|||
|
|
@ -89,7 +89,6 @@ public class TapDB
|
|||
}
|
||||
|
||||
private static void TapDB_nativeOnResume(){
|
||||
Debug.Log ("TapDB_nativeOnResume");
|
||||
AndroidJavaObject activity = getUnityClass().GetStatic<AndroidJavaObject>("currentActivity");
|
||||
getAgent().CallStatic("onResume", activity);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,16 +53,16 @@ namespace TapDBMiniJSON {
|
|||
//
|
||||
// var dict = Json.Deserialize(jsonString) as Dictionary<string,object>;
|
||||
//
|
||||
// Debug.Log("deserialized: " + dict.GetType());
|
||||
// Debug.Log("dict['array'][0]: " + ((List<object>) dict["array"])[0]);
|
||||
// Debug.Log("dict['string']: " + (string) dict["string"]);
|
||||
// Debug.Log("dict['float']: " + (double) dict["float"]); // floats come out as doubles
|
||||
// Debug.Log("dict['int']: " + (long) dict["int"]); // ints come out as longs
|
||||
// Debug.Log("dict['unicode']: " + (string) dict["unicode"]);
|
||||
// XDebug.Log.l("deserialized: " + dict.GetType());
|
||||
// XDebug.Log.l("dict['array'][0]: " + ((List<object>) dict["array"])[0]);
|
||||
// XDebug.Log.l("dict['string']: " + (string) dict["string"]);
|
||||
// XDebug.Log.l("dict['float']: " + (double) dict["float"]); // floats come out as doubles
|
||||
// XDebug.Log.l("dict['int']: " + (long) dict["int"]); // ints come out as longs
|
||||
// XDebug.Log.l("dict['unicode']: " + (string) dict["unicode"]);
|
||||
//
|
||||
// var str = Json.Serialize(dict);
|
||||
//
|
||||
// Debug.Log("serialized: " + str);
|
||||
// XDebug.Log.l("serialized: " + str);
|
||||
// }
|
||||
// }
|
||||
|
||||
|
|
|
|||
|
|
@ -94,21 +94,21 @@ namespace GameLogic {
|
|||
{
|
||||
if (luaFunction != null)
|
||||
{
|
||||
Debug.Log("ResourcesManager LoadAssetAsync luaFunc");
|
||||
XDebug.Log.l("ResourcesManager LoadAssetAsync luaFunc");
|
||||
luaFunction.Call(name, obj);
|
||||
}
|
||||
else {
|
||||
Debug.Log("ResourcesManager LoadAssetAsync luaFunc ==null");
|
||||
XDebug.Log.l("ResourcesManager LoadAssetAsync luaFunc ==null");
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
public void PreLoadAssetAsync(string assetName, LuaFunction luaFunc)
|
||||
{
|
||||
//Debug.Log("预加载资源：" + assetName);
|
||||
//XDebug.Log.l("预加载资源：" + assetName);
|
||||
if (File.Exists(AppConst.PersistentDataPath + assetName) && PlayerPrefs.GetInt(assetName + "_IsPreLoad", 0) == 1)
|
||||
{
|
||||
//Debug.Log("预加载资源已存在");
|
||||
//XDebug.Log.l("预加载资源已存在");
|
||||
if (luaFunc != null)
|
||||
{
|
||||
luaFunc.Call(true);
|
||||
|
|
@ -116,12 +116,12 @@ namespace GameLogic {
|
|||
}else
|
||||
{
|
||||
string downLoadURL = VersionManager.Instance.GetVersionInfo("resUrl") + AppConst.PlatformPath + "/";
|
||||
//Debug.Log("预加载资源路径："+downLoadURL);
|
||||
//XDebug.Log.l("预加载资源路径："+downLoadURL);
|
||||
ResourceDownloadManager.Instance.StartDownload(assetName, downLoadURL, "", (string name, DownLoadProgress dp) => {
|
||||
//Debug.LogFormat("预加载资源进度：{0}/{1}", dp.Size, dp.TotalSize);
|
||||
}, (string name, bool isOk) =>
|
||||
{
|
||||
//Debug.Log("预加载资源完成：" + isOk);
|
||||
//XDebug.Log.l("预加载资源完成：" + isOk);
|
||||
PlayerPrefs.SetInt(assetName + "_IsPreLoad", 1);
|
||||
if (luaFunc != null)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -89,12 +89,12 @@ namespace GameLogic
|
|||
else
|
||||
{
|
||||
string url = AppConst.FilePathEx + VersionsStreamFilePath;
|
||||
Debug.Log("[VersionLoader Start ]@" + url);
|
||||
XDebug.Log.l("[VersionLoader Start ]@" + url);
|
||||
WWW _www = new WWW(url);
|
||||
yield return _www;
|
||||
if (string.IsNullOrEmpty(_www.error))
|
||||
{
|
||||
Debug.Log("[VersionLoader OK ]=" + _www.text);
|
||||
XDebug.Log.l("[VersionLoader OK ]=" + _www.text);
|
||||
VersionInfo = new Version(_www.text);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
|
|
@ -131,12 +131,12 @@ namespace ResMgr {
|
|||
}
|
||||
public IEnumerator LoadTextureFromStream(string name, LuaFunction luaFunction)
|
||||
{
|
||||
Debug.Log(Application.streamingAssetsPath + "/Res/" + name + ".png");
|
||||
XDebug.Log.l(Application.streamingAssetsPath + "/Res/" + name + ".png");
|
||||
UnityWebRequest www = UnityWebRequestTexture.GetTexture(Application.streamingAssetsPath + "/Res/"+ name + ".png");
|
||||
yield return www.SendWebRequest();
|
||||
if (www.isNetworkError || www.isHttpError)
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
XDebug.Log.l(www.error);
|
||||
if (luaFunction != null)
|
||||
{
|
||||
luaFunction.Call(false);
|
||||
|
|
@ -158,12 +158,12 @@ namespace ResMgr {
|
|||
}
|
||||
public IEnumerator LoadTextFromStream(string name, LuaFunction luaFunction)
|
||||
{
|
||||
Debug.Log(Application.streamingAssetsPath + "/Res/" + name + ".txt");
|
||||
XDebug.Log.l(Application.streamingAssetsPath + "/Res/" + name + ".txt");
|
||||
UnityWebRequest www = UnityWebRequest.Get(Application.streamingAssetsPath + "/Res/" + name + ".txt");
|
||||
yield return www.SendWebRequest();
|
||||
if (www.isNetworkError || www.isHttpError)
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
XDebug.Log.l(www.error);
|
||||
if (luaFunction != null)
|
||||
{
|
||||
luaFunction.Call(false);
|
||||
|
|
|
|||
|
|
@ -285,7 +285,7 @@ namespace ResMgr
|
|||
{
|
||||
if (tmpLoader == null)
|
||||
{
|
||||
Debug.Log("RunttimeResLoader LoadAssetAsync tmpLoader == null abname: " + name);
|
||||
XDebug.Log.l("RunttimeResLoader LoadAssetAsync tmpLoader == null abname: " + name);
|
||||
}
|
||||
|
||||
if (tmpLoader.AbLoaderState == ABLoaderState.Failed)
|
||||
|
|
|
|||
|
|
@ -477,7 +477,7 @@ namespace ResUpdate
|
|||
if (localCrc == fileCRC)
|
||||
{
|
||||
FileUtil.MoveFile(fileLocalCache, savePath);
|
||||
if (BaseLogger.isDebug) Debug.Log(string.Format("Finish download success file {0}", fileName));
|
||||
if (BaseLogger.isDebug) XDebug.Log.l(string.Format("Finish download success file {0}", fileName));
|
||||
}
|
||||
else
|
||||
{
|
||||
|
|
@ -490,7 +490,7 @@ namespace ResUpdate
|
|||
else
|
||||
{
|
||||
FileUtil.MoveFile(fileLocalCache, savePath);
|
||||
if (BaseLogger.isDebug) Debug.Log(string.Format("Finish download success file {0}", fileName));
|
||||
if (BaseLogger.isDebug) XDebug.Log.l(string.Format("Finish download success file {0}", fileName));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -246,7 +246,7 @@ namespace ResUpdate
|
|||
|
||||
if (finishedRequest.ContainsKey(file))
|
||||
{
|
||||
if (BaseLogger.isDebug) Debug.Log(string.Format("Re download file: {0}.", file));
|
||||
if (BaseLogger.isDebug) XDebug.Log.l(string.Format("Re download file: {0}.", file));
|
||||
finishedRequest.Remove(file);
|
||||
}
|
||||
|
||||
|
|
@ -274,7 +274,7 @@ namespace ResUpdate
|
|||
|
||||
if (finishedRequest.ContainsKey(file))
|
||||
{
|
||||
if (BaseLogger.isDebug) Debug.Log(string.Format("Re download file: {0}.", file));
|
||||
if (BaseLogger.isDebug) XDebug.Log.l(string.Format("Re download file: {0}.", file));
|
||||
finishedRequest.Remove(file);
|
||||
}
|
||||
|
||||
|
|
@ -347,7 +347,7 @@ namespace ResUpdate
|
|||
if (curNetworkStatus != state)
|
||||
{
|
||||
curNetworkStatus = state;
|
||||
if (BaseLogger.isDebug) Debug.Log(string.Format("curNetworkStatus changed:{0}", curNetworkStatus));
|
||||
if (BaseLogger.isDebug) XDebug.Log.l(string.Format("curNetworkStatus changed:{0}", curNetworkStatus));
|
||||
|
||||
if (!IsNetworkReachable)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -317,7 +317,7 @@ namespace ResUpdate
|
|||
|
||||
// 获取config
|
||||
string conUrl = downLoadURL + AppConst.GameConfigFile;
|
||||
Debug.Log("Download_Resouces_Url:" + conUrl);
|
||||
XDebug.Log.l("Download_Resouces_Url:" + conUrl);
|
||||
UnityWebRequest request0 = UnityWebRequest.Get(conUrl);
|
||||
request0.certificateHandler = new AcceptAllCertificatesSignedWithASpecificPublicKey();
|
||||
yield return request0.SendWebRequest();
|
||||
|
|
@ -328,7 +328,7 @@ namespace ResUpdate
|
|||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("www.text.config:" + request0.downloadHandler.text);
|
||||
XDebug.Log.l("www.text.config:" + request0.downloadHandler.text);
|
||||
ConfigManager.Instance.SetNetInfo(request0.downloadHandler.text);
|
||||
// 初始化语言
|
||||
SLanguageMoreLanguageMgr.Instance.InitData();
|
||||
|
|
@ -336,7 +336,7 @@ namespace ResUpdate
|
|||
|
||||
// 获取version
|
||||
string resUrl = downLoadURL + AppConst.GameVersionFile;
|
||||
Debug.Log("Download_Resouces_Url:" + resUrl);
|
||||
XDebug.Log.l("Download_Resouces_Url:" + resUrl);
|
||||
|
||||
UnityWebRequest request = UnityWebRequest.Get(resUrl);
|
||||
request.certificateHandler = new AcceptAllCertificatesSignedWithASpecificPublicKey();
|
||||
|
|
@ -348,7 +348,7 @@ namespace ResUpdate
|
|||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("www.text.version:" + request.downloadHandler.text);
|
||||
XDebug.Log.l("www.text.version:" + request.downloadHandler.text);
|
||||
Hashtable table = MiniJSON.jsonDecode(request.downloadHandler.text) as Hashtable;
|
||||
|
||||
if (table == null)
|
||||
|
|
@ -371,12 +371,12 @@ namespace ResUpdate
|
|||
string version = table["version"] as string;
|
||||
int result = VersionManager.VersionCompare(version, localVersion);
|
||||
//下载链接
|
||||
Debug.Log(string.Format("ResUpdate=====>InitDownLoadURL,Version:{0},loadVersion:{1}", version, localVersion));
|
||||
Debug.Log(string.Format("Version Compare result:{0}", result));
|
||||
XDebug.Log.l(string.Format("ResUpdate=====>InitDownLoadURL,Version:{0},loadVersion:{1}", version, localVersion));
|
||||
XDebug.Log.l(string.Format("Version Compare result:{0}", result));
|
||||
//如果版本号一致，就不进行更新了
|
||||
if (result == 0)
|
||||
{
|
||||
Debug.Log(string.Format("version:{0},版本号一致，更新完成", version));
|
||||
XDebug.Log.l(string.Format("version:{0},版本号一致，更新完成", version));
|
||||
UpdateSuccess();
|
||||
}
|
||||
else
|
||||
|
|
@ -416,7 +416,7 @@ namespace ResUpdate
|
|||
/// <param name="isSuccess"></param>
|
||||
void DownLoadVersionFilesFinishCallBack(string fileName, bool isSuccess)
|
||||
{
|
||||
Debug.Log(string.Format("ResUpdate=====>DownLoadVersionFilesFinishCallBack,FileName:{0},IsSuccess:{1}", fileName, isSuccess));
|
||||
XDebug.Log.l(string.Format("ResUpdate=====>DownLoadVersionFilesFinishCallBack,FileName:{0},IsSuccess:{1}", fileName, isSuccess));
|
||||
if (isSuccess)
|
||||
{
|
||||
CalculateDownLoadFiles();
|
||||
|
|
|
|||
|
|
@ -142,7 +142,7 @@ namespace GameLogic
|
|||
}
|
||||
private void ReadJson(string strjson)
|
||||
{
|
||||
Debug.Log(strjson);
|
||||
XDebug.Log.l(strjson);
|
||||
data = JsonMapper.ToObject<Hashtable>(strjson);
|
||||
}
|
||||
|
||||
|
|
@ -192,7 +192,7 @@ namespace GameLogic
|
|||
case 1: languageStr = "英文"; break;
|
||||
case 2: languageStr = "越南语"; break;
|
||||
}
|
||||
Debug.Log("当前语言是：" + languageStr);
|
||||
XDebug.Log.l("当前语言是：" + languageStr);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
|
|
@ -227,13 +227,13 @@ namespace GameLogic
|
|||
else
|
||||
{
|
||||
//取默认值
|
||||
Debug.Log("language.txt is no exist get the default");
|
||||
XDebug.Log.l("language.txt is no exist get the default");
|
||||
}
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Debug.Log(ex.ToString());
|
||||
XDebug.Log.l(ex.ToString());
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -262,7 +262,7 @@ namespace GameLogic
|
|||
}
|
||||
catch (Exception e)
|
||||
{
|
||||
Debug.Log(e.ToString());
|
||||
XDebug.Log.l(e.ToString());
|
||||
}
|
||||
return languageThrans;
|
||||
|
||||
|
|
|
|||
|
|
@ -39,12 +39,12 @@ namespace GameLogic
|
|||
|
||||
public IEnumerator LoadFromStream(Action<Sprite> act)
|
||||
{
|
||||
Debug.Log(Application.streamingAssetsPath + "/Res/PackConfig.txt");
|
||||
XDebug.Log.l(Application.streamingAssetsPath + "/Res/PackConfig.txt");
|
||||
UnityWebRequest uwr = UnityWebRequest.Get(Application.streamingAssetsPath + "/Res/PackConfig.txt");
|
||||
yield return uwr.SendWebRequest();
|
||||
if (uwr.isNetworkError || uwr.isHttpError)
|
||||
{
|
||||
Debug.Log(uwr.error);
|
||||
XDebug.Log.l(uwr.error);
|
||||
if (act != null)
|
||||
{
|
||||
act(null);
|
||||
|
|
@ -59,7 +59,7 @@ namespace GameLogic
|
|||
yield return www.SendWebRequest();
|
||||
if (www.isNetworkError || www.isHttpError)
|
||||
{
|
||||
Debug.Log(www.error);
|
||||
XDebug.Log.l(www.error);
|
||||
if (act != null)
|
||||
{
|
||||
act(null);
|
||||
|
|
@ -67,7 +67,7 @@ namespace GameLogic
|
|||
}
|
||||
else
|
||||
{
|
||||
Debug.Log("load success");
|
||||
XDebug.Log.l("load success");
|
||||
Texture2D tex = ((DownloadHandlerTexture)www.downloadHandler).texture;
|
||||
Sprite sp = Sprite.Create(tex, new Rect(0, 0, tex.width, tex.height), new Vector2(0, 0));
|
||||
if (act != null)
|
||||
|
|
|
|||
|
|
@ -588,7 +588,7 @@ public class MiniJSON
|
|||
protected static bool serializeValue( object value, StringBuilder builder )
|
||||
{
|
||||
//Type t = value.GetType();
|
||||
//UnityEngine.Debug.Log("type: " + t.ToString() + " isArray: " + t.IsArray);
|
||||
//UnityEngine.XDebug.Log.l("type: " + t.ToString() + " isArray: " + t.IsArray);
|
||||
|
||||
if( value == null )
|
||||
{
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ public class UIBgAdaptive : MonoBehaviour
|
|||
float ft = Mathf.Pow(10, avg);
|
||||
float curHeight = Screen.height / ft;
|
||||
float curWidth = curHeight /1920f * 1080f;
|
||||
//Debug.Log("Screen.height " + Screen.height+ " curWidth "+ curWidth);
|
||||
//XDebug.Log.l("Screen.height " + Screen.height+ " curWidth "+ curWidth);
|
||||
bgList[i].GetComponent<RectTransform>().sizeDelta = new Vector2(curWidth, curHeight);
|
||||
}
|
||||
else
|
||||
|
|
|
|||
Loading…
Reference in New Issue