diff --git a/AssetBundles/version_banshu.txt b/AssetBundles/version_banshu.txt deleted file mode 100644 index 9248d0d93f..0000000000 --- a/AssetBundles/version_banshu.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"888", "buglyId":"b67b061643", "channel":"pc", "resUrl":"http://cdn-jl.lanjingshidai.com/banshu/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://154.8.225.157:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_en.txt b/AssetBundles/version_en.txt deleted file mode 100644 index 430ceba5e1..0000000000 --- a/AssetBundles/version_en.txt +++ /dev/null @@ -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/"} \ No newline at end of file diff --git a/AssetBundles/version_hw_kf.txt b/AssetBundles/version_hw_kf.txt deleted file mode 100644 index ccc192555b..0000000000 --- a/AssetBundles/version_hw_kf.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://42.193.191.129:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_hw_release.txt b/AssetBundles/version_hw_release.txt deleted file mode 100644 index 1bd0773d9e..0000000000 --- a/AssetBundles/version_hw_release.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"2000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_release/", "packageVersion":"0.1", "version":"0.1.1", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_hw_test.txt b/AssetBundles/version_hw_test.txt deleted file mode 100644 index f03eff4181..0000000000 --- a/AssetBundles/version_hw_test.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1000", "buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_hw_test/", "packageVersion":"0.1", "version":"0.1.0", "serverUrl":"http://119.28.117.110:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_mht_sw.txt b/AssetBundles/version_mht_sw.txt deleted file mode 100644 index 8ace456950..0000000000 --- a/AssetBundles/version_mht_sw.txt +++ /dev/null @@ -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/"} \ No newline at end of file diff --git a/AssetBundles/version_mht_test.txt b/AssetBundles/version_mht_test.txt deleted file mode 100644 index 46bcbb4bdd..0000000000 --- a/AssetBundles/version_mht_test.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.1", "subChannel":"1000", "version":"0.1.0", "serverUrl":"http://106.52.122.168:8080/"} diff --git a/AssetBundles/version_mht_tishen.txt b/AssetBundles/version_mht_tishen.txt deleted file mode 100644 index 463dcf3a63..0000000000 --- a/AssetBundles/version_mht_tishen.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_release/", "packageVersion":"0.1", "subChannel":"2000", "version":"0.1.0", "serverUrl":"http://106.52.122.168:8080/"} diff --git a/AssetBundles/version_shangwu.txt b/AssetBundles/version_shangwu.txt deleted file mode 100644 index a57926ce55..0000000000 --- a/AssetBundles/version_shangwu.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"37", "resUrl":"http://cdn-jl.lanjingshidai.com/mht_test/", "packageVersion":"0.1", "subChannel":"20201110", "version":"0.1.1", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_test.txt b/AssetBundles/version_test.txt deleted file mode 100644 index e7e73835a5..0000000000 --- a/AssetBundles/version_test.txt +++ /dev/null @@ -1 +0,0 @@ -{"subChannel":"1", "buglyId":"261348dcd3", "channel":"pc", "resUrl":"http://60.1.1.12/jieling_dl/dev/assetBundles/subChannal094-test/", "packageVersion":"0.2", "version":"0.15.0", "serverUrl":"http://60.1.1.23:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_test_inner.txt b/AssetBundles/version_test_inner.txt deleted file mode 100644 index 8fd2ec6ef6..0000000000 --- a/AssetBundles/version_test_inner.txt +++ /dev/null @@ -1 +0,0 @@ -{"buglyId":"261348dcd3", "channel":"MHT", "resUrl":"http://jl.tyu89.wang/mht_test/", "packageVersion":"0.1", "subChannel":"20000", "version":"0.1.2", "serverUrl":"http://139.9.223.139:8080/"} \ No newline at end of file diff --git a/AssetBundles/version_test_noSdk.txt b/AssetBundles/version_test_noSdk.txt deleted file mode 100644 index 9d639a812e..0000000000 --- a/AssetBundles/version_test_noSdk.txt +++ /dev/null @@ -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/"} \ No newline at end of file diff --git a/Assets/LuaFramework/Scripts/Framework/App.cs b/Assets/LuaFramework/Scripts/Framework/App.cs index 63ec7d446a..1a58b7a9bb 100644 --- a/Assets/LuaFramework/Scripts/Framework/App.cs +++ b/Assets/LuaFramework/Scripts/Framework/App.cs @@ -287,7 +287,7 @@ public class App : UnitySingleton /// 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 /// 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 /// void OnApplicationQuit() { - Debug.Log("App.cs OnApplicationQuit"); + XDebug.Log.l("App.cs OnApplicationQuit"); Util.CallMethod("Game", "OnApplicationQuit"); } diff --git a/Assets/LuaFramework/Scripts/Manager/BuglyConfig.cs b/Assets/LuaFramework/Scripts/Manager/BuglyConfig.cs index e210cc4471..1d9e17573e 100644 --- a/Assets/LuaFramework/Scripts/Manager/BuglyConfig.cs +++ b/Assets/LuaFramework/Scripts/Manager/BuglyConfig.cs @@ -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(); } diff --git a/Assets/LuaFramework/Scripts/Manager/CompressManager.cs b/Assets/LuaFramework/Scripts/Manager/CompressManager.cs index d6a260ec51..e760fb2952 100644 --- a/Assets/LuaFramework/Scripts/Manager/CompressManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/CompressManager.cs @@ -40,7 +40,7 @@ public class CompressManager : UnitySingleton 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 { 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) diff --git a/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs b/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs index 97d7740d94..8a5afba6e4 100644 --- a/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/ConfigManager.cs @@ -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 diff --git a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs index f5b4ef6411..d54c915fb6 100644 --- a/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/NetworkManager.cs @@ -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(); diff --git a/Assets/LuaFramework/Scripts/Manager/RoleRenderManager.cs b/Assets/LuaFramework/Scripts/Manager/RoleRenderManager.cs index 86a329e3a5..0a3104cf24 100644 --- a/Assets/LuaFramework/Scripts/Manager/RoleRenderManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/RoleRenderManager.cs @@ -105,9 +105,9 @@ public class RoleRenderManager : UnitySingleton } 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; } } diff --git a/Assets/LuaFramework/Scripts/Manager/SpeakManager.cs b/Assets/LuaFramework/Scripts/Manager/SpeakManager.cs index eaecfe6877..1e51a1cbbb 100644 --- a/Assets/LuaFramework/Scripts/Manager/SpeakManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/SpeakManager.cs @@ -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; diff --git a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs index 6cead430c9..c4ce1df7e3 100644 --- a/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs +++ b/Assets/LuaFramework/Scripts/Manager/ThinkingAnalyticsManager.cs @@ -23,7 +23,7 @@ namespace GameLogic private Dictionary stringToDic(string s) { - Debug.Log("stringToDic***************" + s); + XDebug.Log.l("stringToDic***************" + s); Dictionary d = new Dictionary(); 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 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); diff --git a/Assets/LuaFramework/Scripts/Network/SocketClient.cs b/Assets/LuaFramework/Scripts/Network/SocketClient.cs index 5c18128984..dba2f720ca 100644 --- a/Assets/LuaFramework/Scripts/Network/SocketClient.cs +++ b/Assets/LuaFramework/Scripts/Network/SocketClient.cs @@ -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 /// 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 /// 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 /// 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); } /// diff --git a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs index 35697a4e2a..4b74a22c4c 100644 --- a/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs +++ b/Assets/LuaFramework/Scripts/SDK/Proxy/AndroidProxy.cs @@ -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("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 + diff --git a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs index 550803ada7..c33617b400 100644 --- a/Assets/LuaFramework/Scripts/SDK/SDKManager.cs +++ b/Assets/LuaFramework/Scripts/SDK/SDKManager.cs @@ -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, diff --git a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs index 78daa3c4c3..42206a0148 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/AndroidDeviceInfo.cs @@ -87,7 +87,7 @@ public class AndroidDeviceInfo } public void DeviceInit() { - Debug.Log("设备信息初始化"); + XDebug.Log.l("设备信息初始化"); } //设备机型类型 public string GetDeviceBrand() diff --git a/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs index ce685c5d7a..56b1f483f8 100644 --- a/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs +++ b/Assets/LuaFramework/Scripts/SDK/Tools/NotchScreenUtil.cs @@ -56,7 +56,7 @@ public class NotchScreenUtil public void Init() { - Debug.Log("设备信息初始化"); + XDebug.Log.l("设备信息初始化"); } diff --git a/Assets/LuaFramework/Scripts/Tools/CheckInputLength.cs b/Assets/LuaFramework/Scripts/Tools/CheckInputLength.cs index 4cec6a7257..281d3da9cd 100644 --- a/Assets/LuaFramework/Scripts/Tools/CheckInputLength.cs +++ b/Assets/LuaFramework/Scripts/Tools/CheckInputLength.cs @@ -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) { diff --git a/Assets/LuaFramework/Scripts/Tools/Mask.cs b/Assets/LuaFramework/Scripts/Tools/Mask.cs index dc7a208852..1924aa3f69 100644 --- a/Assets/LuaFramework/Scripts/Tools/Mask.cs +++ b/Assets/LuaFramework/Scripts/Tools/Mask.cs @@ -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; } diff --git a/Assets/LuaFramework/Scripts/Tools/UGUITools/CurvedText.cs b/Assets/LuaFramework/Scripts/Tools/UGUITools/CurvedText.cs index 6109ed19d6..433a1495aa 100644 --- a/Assets/LuaFramework/Scripts/Tools/UGUITools/CurvedText.cs +++ b/Assets/LuaFramework/Scripts/Tools/UGUITools/CurvedText.cs @@ -38,14 +38,14 @@ namespace UnityEngine.UI.Extensions { base.Awake(); rectTrans = GetComponent(); - Debug.Log("rectTrans:" + rectTrans); + XDebug.Log.l("rectTrans:" + rectTrans); OnRectTransformDimensionsChange(); } protected override void OnEnable() { base.OnEnable(); rectTrans = GetComponent(); - Debug.Log("rectTrans:" + rectTrans); + XDebug.Log.l("rectTrans:" + rectTrans); OnRectTransformDimensionsChange(); } /// @@ -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; } diff --git a/Assets/LuaFramework/Scripts/Tools/UGUITools/NicerOutline.cs b/Assets/LuaFramework/Scripts/Tools/UGUITools/NicerOutline.cs index 032d82d570..81a79c0ed1 100644 --- a/Assets/LuaFramework/Scripts/Tools/UGUITools/NicerOutline.cs +++ b/Assets/LuaFramework/Scripts/Tools/UGUITools/NicerOutline.cs @@ -91,7 +91,7 @@ namespace UnityEngine.UI.Extensions // protected void ApplyShadow(List 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; diff --git a/Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta b/Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta new file mode 100644 index 0000000000..a39a39df19 --- /dev/null +++ b/Assets/ManagedResources/BG/Map/Endless4/dhlg_1.jpg.meta @@ -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: diff --git a/Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta b/Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta new file mode 100644 index 0000000000..2f38239e4d --- /dev/null +++ b/Assets/ManagedResources/BG/t_tehuishenzhuang_ditu.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC.meta b/Assets/ManagedResources/DynamicAtlas/NPC.meta new file mode 100644 index 0000000000..a03336aa6b --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 22767ab7c9cb04d48a46cae157db5fa6 +folderAsset: yes +DefaultImporter: + externalObjects: {} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png new file mode 100644 index 0000000000..fb3a20449f Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png.meta new file mode 100644 index 0000000000..129f20a9ed --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_tmk.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png new file mode 100644 index 0000000000..24eb8c2a61 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png.meta new file mode 100644 index 0000000000..067263c08c --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1f.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png new file mode 100644 index 0000000000..1f0f733d29 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png.meta new file mode 100644 index 0000000000..0f5ab7d049 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr1z.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png new file mode 100644 index 0000000000..d584a1c079 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png.meta new file mode 100644 index 0000000000..1c4f5d0916 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr2.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png new file mode 100644 index 0000000000..d79f80728a Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png.meta new file mode 100644 index 0000000000..202f56617f --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr3.png.meta @@ -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: diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png new file mode 100644 index 0000000000..b047a0eb04 Binary files /dev/null and b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png differ diff --git a/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png.meta b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png.meta new file mode 100644 index 0000000000..126f0ecc54 --- /dev/null +++ b/Assets/ManagedResources/DynamicAtlas/NPC/dhlg_xr4.png.meta @@ -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: diff --git a/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab b/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab new file mode 100644 index 0000000000..26e5b3ba2b --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab @@ -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 diff --git a/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab.meta b/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab.meta new file mode 100644 index 0000000000..7e9025b70e --- /dev/null +++ b/Assets/ManagedResources/Prefabs/Map/r_Map_NewEvent_027.prefab.meta @@ -0,0 +1,7 @@ +fileFormatVersion: 2 +guid: 90b83ad20c2caa748a8eed23e669d629 +PrefabImporter: + externalObjects: {} + userData: + assetBundleName: lz4/prefabs/map/r_map_newevent_016 + assetBundleVariant: unity3d diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab index 372e93c6e3..87904eaece 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/TimeLimitUpHero.prefab @@ -273,6 +273,129 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 +--- !u!1 &287070159207156808 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 128706687571421494} + - component: {fileID: 3803326489293840791} + - component: {fileID: 5522409710585702948} + - component: {fileID: 1880064738116154343} + m_Layer: 5 + m_Name: btn_hero + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &128706687571421494 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287070159207156808} + 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: 1048978160019082153} + - {fileID: 2273830306821007881} + - {fileID: 3889803974564930344} + - {fileID: 8937312434901707220} + - {fileID: 4188471676191158534} + - {fileID: 546194002696268747} + m_Father: {fileID: 8772735742504336993} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 0, y: 0} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: 128, y: 126} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &3803326489293840791 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287070159207156808} + m_CullTransparentMesh: 0 +--- !u!114 &5522409710585702948 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287070159207156808} + 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: e2e78596785546642987de812a6a6604, 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 +--- !u!114 &1880064738116154343 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 287070159207156808} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Navigation: + m_Mode: 3 + m_SelectOnUp: {fileID: 0} + m_SelectOnDown: {fileID: 0} + m_SelectOnLeft: {fileID: 0} + m_SelectOnRight: {fileID: 0} + m_Transition: 1 + m_Colors: + m_NormalColor: {r: 1, g: 1, b: 1, a: 1} + m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} + m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} + m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} + m_ColorMultiplier: 1 + m_FadeDuration: 0.1 + m_SpriteState: + m_HighlightedSprite: {fileID: 0} + m_PressedSprite: {fileID: 0} + m_DisabledSprite: {fileID: 0} + m_AnimationTriggers: + m_NormalTrigger: Normal + m_HighlightedTrigger: Highlighted + m_PressedTrigger: Pressed + m_DisabledTrigger: Disabled + m_Interactable: 1 + m_TargetGraphic: {fileID: 5522409710585702948} + m_OnClick: + m_PersistentCalls: + m_Calls: [] + m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, + Culture=neutral, PublicKeyToken=null --- !u!1 &390647049592672842 GameObject: m_ObjectHideFlags: 0 @@ -347,80 +470,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &405699909149428626 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3790080881252721093} - - component: {fileID: 1914144776909782611} - - component: {fileID: 582847190810486752} - m_Layer: 5 - m_Name: InfoImg2 - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3790080881252721093 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405699909149428626} - 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: 1379748134798542406} - m_RootOrder: 4 - 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: -12.8, y: 52.379986} - m_SizeDelta: {x: 70, y: 40} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1914144776909782611 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405699909149428626} - m_CullTransparentMesh: 0 ---- !u!114 &582847190810486752 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 405699909149428626} - 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: 0 - 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: bcc35b40411e4bb4f8203102dbd15126, 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 --- !u!1 &742306660034555430 GameObject: m_ObjectHideFlags: 0 @@ -609,7 +658,7 @@ RectTransform: m_Children: - {fileID: 7102695642562747275} m_Father: {fileID: 7816124763777208762} - m_RootOrder: 8 + m_RootOrder: 7 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -732,80 +781,6 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u53EC\u552428\u6B21\u5FC5\u5F97UP\u795E\u5C06" ---- !u!1 &1154613692412582567 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 4567199926921249151} - - component: {fileID: 1074814360237488751} - - component: {fileID: 9007646790154383073} - m_Layer: 5 - m_Name: Icon - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &4567199926921249151 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154613692412582567} - 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: 1379748134798542406} - m_RootOrder: 1 - 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: -2.5, y: 2.6} - m_SizeDelta: {x: 110, y: 110} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1074814360237488751 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154613692412582567} - m_CullTransparentMesh: 0 ---- !u!114 &9007646790154383073 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 1154613692412582567} - 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: 0 - 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: be7184e49c8d4f746a3381798ca17d3d, 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 --- !u!1 &1162481789171209600 GameObject: m_ObjectHideFlags: 0 @@ -6332,80 +6307,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3059715135783916075 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 6306495934727294101} - - component: {fileID: 3955937354656683245} - - component: {fileID: 8402680317376713240} - m_Layer: 5 - m_Name: Image (1) - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &6306495934727294101 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3059715135783916075} - 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: 1379748134798542406} - m_RootOrder: 5 - 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: -71.3, y: -35} - m_SizeDelta: {x: 35, y: 35} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &3955937354656683245 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3059715135783916075} - m_CullTransparentMesh: 0 ---- !u!114 &8402680317376713240 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3059715135783916075} - 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: 0 - 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: 6c1c5c71aad7a2d458935e2bbe95a907, 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 --- !u!1 &3163094083569521822 GameObject: m_ObjectHideFlags: 0 @@ -6591,154 +6492,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &3452339540969871829 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 2216688614360782419} - - component: {fileID: 4236484573430265659} - - component: {fileID: 858009818594692674} - m_Layer: 5 - m_Name: InfoImg - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &2216688614360782419 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452339540969871829} - 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: 1379748134798542406} - m_RootOrder: 2 - 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: -38.8} - m_SizeDelta: {x: 121, y: 41} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &4236484573430265659 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452339540969871829} - m_CullTransparentMesh: 0 ---- !u!114 &858009818594692674 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3452339540969871829} - 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: 0 - 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: c50319e65ad9dcf49bdea89487013be3, 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 ---- !u!1 &3578559968795292213 -GameObject: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - serializedVersion: 6 - m_Component: - - component: {fileID: 3045363996301608255} - - component: {fileID: 1606679199773926046} - - component: {fileID: 759001341816882273} - m_Layer: 5 - m_Name: Image - m_TagString: Untagged - m_Icon: {fileID: 0} - m_NavMeshLayer: 0 - m_StaticEditorFlags: 0 - m_IsActive: 1 ---- !u!224 &3045363996301608255 -RectTransform: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3578559968795292213} - 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: 1379748134798542406} - m_RootOrder: 3 - 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: 40.77, y: 52.38} - m_SizeDelta: {x: 42.33, y: 53.04} - m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &1606679199773926046 -CanvasRenderer: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3578559968795292213} - m_CullTransparentMesh: 0 ---- !u!114 &759001341816882273 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 3578559968795292213} - 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: 0 - 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: 736b010be2bfac44bb6520822053e76b, 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 --- !u!1 &3622238041857040648 GameObject: m_ObjectHideFlags: 0 @@ -6930,6 +6683,80 @@ MonoBehaviour: m_Calls: [] m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null +--- !u!1 &3982967822064868873 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 8937312434901707220} + - component: {fileID: 5043370475699188890} + - component: {fileID: 5425225965179516721} + m_Layer: 5 + m_Name: Image + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &8937312434901707220 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3982967822064868873} + 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: 128706687571421494} + m_RootOrder: 3 + 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: 40.77, y: 52.38} + m_SizeDelta: {x: 42.33, y: 53.04} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &5043370475699188890 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3982967822064868873} + m_CullTransparentMesh: 0 +--- !u!114 &5425225965179516721 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 3982967822064868873} + 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: 0 + 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: 736b010be2bfac44bb6520822053e76b, 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 --- !u!1 &4044931386107902750 GameObject: m_ObjectHideFlags: 0 @@ -7014,6 +6841,7 @@ GameObject: serializedVersion: 6 m_Component: - component: {fileID: 8772735742504336993} + - component: {fileID: 289963460829507102} m_Layer: 5 m_Name: btngroup m_TagString: Untagged @@ -7032,6 +6860,7 @@ RectTransform: m_LocalPosition: {x: 0, y: 0, z: 0} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: + - {fileID: 128706687571421494} - {fileID: 5640906329154212799} - {fileID: 8065480819767607833} - {fileID: 6424150738340887453} @@ -7044,7 +6873,30 @@ RectTransform: m_AnchoredPosition: {x: 0, y: 0} m_SizeDelta: {x: 0, y: 0} m_Pivot: {x: 0.5, y: 0.5} ---- !u!1 &4662060557435710723 +--- !u!114 &289963460829507102 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4258310626580509790} + 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: 31 + m_Top: 147 + m_Bottom: 0 + m_ChildAlignment: 2 + m_Spacing: 10 + m_ChildForceExpandWidth: 0 + m_ChildForceExpandHeight: 0 + m_ChildControlWidth: 0 + m_ChildControlHeight: 0 +--- !u!1 &4883800664921298848 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7052,9 +6904,83 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 5564270412965992152} - - component: {fileID: 6940960368604327698} - - component: {fileID: 4403791297836470967} + - component: {fileID: 546194002696268747} + - component: {fileID: 4859036159595008574} + - component: {fileID: 3964294455766340437} + m_Layer: 5 + m_Name: Image (1) + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &546194002696268747 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4883800664921298848} + 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: 128706687571421494} + m_RootOrder: 5 + 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: -71.3, y: -35} + m_SizeDelta: {x: 35, y: 35} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &4859036159595008574 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4883800664921298848} + m_CullTransparentMesh: 0 +--- !u!114 &3964294455766340437 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 4883800664921298848} + 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: 0 + 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: 6c1c5c71aad7a2d458935e2bbe95a907, 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 +--- !u!1 &5046056946132455712 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 1048978160019082153} + - component: {fileID: 5943725971075319609} + - component: {fileID: 8574854461439120441} m_Layer: 5 m_Name: Text m_TagString: Untagged @@ -7062,18 +6988,18 @@ GameObject: m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 0 ---- !u!224 &5564270412965992152 +--- !u!224 &1048978160019082153 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4662060557435710723} + m_GameObject: {fileID: 5046056946132455712} 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: 1379748134798542406} + m_Father: {fileID: 128706687571421494} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} @@ -7081,21 +7007,21 @@ RectTransform: m_AnchoredPosition: {x: 0, y: -51.8} m_SizeDelta: {x: 160, y: 30} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &6940960368604327698 +--- !u!222 &5943725971075319609 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4662060557435710723} + m_GameObject: {fileID: 5046056946132455712} m_CullTransparentMesh: 0 ---- !u!114 &4403791297836470967 +--- !u!114 &8574854461439120441 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 4662060557435710723} + m_GameObject: {fileID: 5046056946132455712} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: 708705254, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -7435,6 +7361,7 @@ GameObject: - component: {fileID: 5748723079336325078} - component: {fileID: 447480612102681171} - component: {fileID: 287249151406689506} + - component: {fileID: 7593345329237466484} m_Layer: 5 m_Name: btn2 m_TagString: Untagged @@ -7457,7 +7384,7 @@ RectTransform: - {fileID: 8467060635364585861} - {fileID: 5785594867445037020} m_Father: {fileID: 8772735742504336993} - m_RootOrder: 3 + m_RootOrder: 4 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7533,6 +7460,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &7593345329237466484 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5328489075155160766} + 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 &5406955516653188461 GameObject: m_ObjectHideFlags: 0 @@ -7686,7 +7633,7 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!1 &5533233957152409479 +--- !u!1 &5644803384910075065 GameObject: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} @@ -7694,57 +7641,50 @@ GameObject: m_PrefabAsset: {fileID: 0} serializedVersion: 6 m_Component: - - component: {fileID: 1379748134798542406} - - component: {fileID: 5589450041689530360} - - component: {fileID: 6766239910422667349} - - component: {fileID: 3870951607294735658} + - component: {fileID: 2273830306821007881} + - component: {fileID: 1858192280030963348} + - component: {fileID: 8852232257144003110} m_Layer: 5 - m_Name: btn_hero + m_Name: Icon m_TagString: Untagged m_Icon: {fileID: 0} m_NavMeshLayer: 0 m_StaticEditorFlags: 0 m_IsActive: 1 ---- !u!224 &1379748134798542406 +--- !u!224 &2273830306821007881 RectTransform: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5533233957152409479} + m_GameObject: {fileID: 5644803384910075065} 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: 5564270412965992152} - - {fileID: 4567199926921249151} - - {fileID: 2216688614360782419} - - {fileID: 3045363996301608255} - - {fileID: 3790080881252721093} - - {fileID: 6306495934727294101} - m_Father: {fileID: 7816124763777208762} - m_RootOrder: 7 + m_Children: [] + m_Father: {fileID: 128706687571421494} + 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: -88, y: -210.29999} - m_SizeDelta: {x: 128, y: 126} + m_AnchorMin: {x: 0.5, y: 0.5} + m_AnchorMax: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -2.5, y: 2.6} + m_SizeDelta: {x: 110, y: 110} m_Pivot: {x: 0.5, y: 0.5} ---- !u!222 &5589450041689530360 +--- !u!222 &1858192280030963348 CanvasRenderer: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5533233957152409479} + m_GameObject: {fileID: 5644803384910075065} m_CullTransparentMesh: 0 ---- !u!114 &6766239910422667349 +--- !u!114 &8852232257144003110 MonoBehaviour: m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: 0} m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5533233957152409479} + m_GameObject: {fileID: 5644803384910075065} m_Enabled: 1 m_EditorHideFlags: 0 m_Script: {fileID: -765806418, guid: f70555f144d8491a825f0804e09c671c, type: 3} @@ -7752,13 +7692,13 @@ MonoBehaviour: m_EditorClassIdentifier: m_Material: {fileID: 0} m_Color: {r: 1, g: 1, b: 1, a: 1} - m_RaycastTarget: 1 + m_RaycastTarget: 0 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: e2e78596785546642987de812a6a6604, type: 3} + m_Sprite: {fileID: 21300000, guid: be7184e49c8d4f746a3381798ca17d3d, type: 3} m_Type: 0 m_PreserveAspect: 0 m_FillCenter: 1 @@ -7767,48 +7707,6 @@ MonoBehaviour: m_FillClockwise: 1 m_FillOrigin: 0 m_UseSpriteMesh: 0 ---- !u!114 &3870951607294735658 -MonoBehaviour: - m_ObjectHideFlags: 0 - m_CorrespondingSourceObject: {fileID: 0} - m_PrefabInstance: {fileID: 0} - m_PrefabAsset: {fileID: 0} - m_GameObject: {fileID: 5533233957152409479} - m_Enabled: 1 - m_EditorHideFlags: 0 - m_Script: {fileID: 1392445389, guid: f70555f144d8491a825f0804e09c671c, type: 3} - m_Name: - m_EditorClassIdentifier: - m_Navigation: - m_Mode: 3 - m_SelectOnUp: {fileID: 0} - m_SelectOnDown: {fileID: 0} - m_SelectOnLeft: {fileID: 0} - m_SelectOnRight: {fileID: 0} - m_Transition: 1 - m_Colors: - m_NormalColor: {r: 1, g: 1, b: 1, a: 1} - m_HighlightedColor: {r: 0.9607843, g: 0.9607843, b: 0.9607843, a: 1} - m_PressedColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 1} - m_DisabledColor: {r: 0.78431374, g: 0.78431374, b: 0.78431374, a: 0.5019608} - m_ColorMultiplier: 1 - m_FadeDuration: 0.1 - m_SpriteState: - m_HighlightedSprite: {fileID: 0} - m_PressedSprite: {fileID: 0} - m_DisabledSprite: {fileID: 0} - m_AnimationTriggers: - m_NormalTrigger: Normal - m_HighlightedTrigger: Highlighted - m_PressedTrigger: Pressed - m_DisabledTrigger: Disabled - m_Interactable: 1 - m_TargetGraphic: {fileID: 6766239910422667349} - m_OnClick: - m_PersistentCalls: - m_Calls: [] - m_TypeName: UnityEngine.UI.Button+ButtonClickedEvent, UnityEngine.UI, Version=1.0.0.0, - Culture=neutral, PublicKeyToken=null --- !u!1 &5649620688984234810 GameObject: m_ObjectHideFlags: 0 @@ -7821,6 +7719,7 @@ GameObject: - component: {fileID: 2534790566426099267} - component: {fileID: 8883791604358700610} - component: {fileID: 2059331966236272372} + - component: {fileID: 9152115509449348881} m_Layer: 5 m_Name: btn1 m_TagString: Untagged @@ -7843,7 +7742,7 @@ RectTransform: - {fileID: 8707505760031921771} - {fileID: 6156664186709058954} m_Father: {fileID: 8772735742504336993} - m_RootOrder: 2 + m_RootOrder: 3 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_AnchorMin: {x: 0.5, y: 0.5} m_AnchorMax: {x: 0.5, y: 0.5} @@ -7919,6 +7818,26 @@ Animator: m_HasTransformHierarchy: 1 m_AllowConstantClipSamplingOptimization: 1 m_KeepAnimatorControllerStateOnDisable: 0 +--- !u!114 &9152115509449348881 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 5649620688984234810} + 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 &5673807414069377858 GameObject: m_ObjectHideFlags: 0 @@ -8383,6 +8302,80 @@ MonoBehaviour: m_VerticalOverflow: 1 m_LineSpacing: 1 m_Text: "\u4ECA\u65E5\u53EC\u5524\u4E0A\u9650\uFF1A1/9999999" +--- !u!1 &6386253689820111503 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 4188471676191158534} + - component: {fileID: 1687592198261364049} + - component: {fileID: 471035658411394361} + m_Layer: 5 + m_Name: InfoImg2 + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &4188471676191158534 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6386253689820111503} + 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: 128706687571421494} + m_RootOrder: 4 + 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: -12.8, y: 52.379986} + m_SizeDelta: {x: 70, y: 40} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &1687592198261364049 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6386253689820111503} + m_CullTransparentMesh: 0 +--- !u!114 &471035658411394361 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6386253689820111503} + 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: 0 + 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: bcc35b40411e4bb4f8203102dbd15126, 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 --- !u!1 &6387878450806583549 GameObject: m_ObjectHideFlags: 0 @@ -8707,11 +8700,11 @@ RectTransform: m_Children: - {fileID: 7595505935923086780} m_Father: {fileID: 8772735742504336993} - m_RootOrder: 1 + 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: -88.9, y: -493.7} + 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 &6256108614274236246 @@ -8907,6 +8900,80 @@ MonoBehaviour: m_EffectColor: {r: 0.990566, g: 0.98589355, b: 0.98589355, a: 0.5} m_EffectDistance: {x: 1, y: -1} m_UseGraphicAlpha: 1 +--- !u!1 &6975993651549820175 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3889803974564930344} + - component: {fileID: 621656461264786676} + - component: {fileID: 7887785554817901710} + m_Layer: 5 + m_Name: InfoImg + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3889803974564930344 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6975993651549820175} + 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: 128706687571421494} + m_RootOrder: 2 + 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: -38.8} + m_SizeDelta: {x: 121, y: 41} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &621656461264786676 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6975993651549820175} + m_CullTransparentMesh: 0 +--- !u!114 &7887785554817901710 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 6975993651549820175} + 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: 0 + 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: c50319e65ad9dcf49bdea89487013be3, 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 --- !u!1 &6985163915862480935 GameObject: m_ObjectHideFlags: 0 @@ -9219,11 +9286,11 @@ RectTransform: m_Children: - {fileID: 3283675149858067295} m_Father: {fileID: 8772735742504336993} - m_RootOrder: 0 + 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: -88.8999, y: -359.90002} + 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 &2209533806786191177 @@ -9438,7 +9505,6 @@ RectTransform: - {fileID: 565314902282462449} - {fileID: 5779984021338281634} - {fileID: 1482788062847233380} - - {fileID: 1379748134798542406} - {fileID: 5014518995866771904} m_Father: {fileID: 0} m_RootOrder: 0 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab index f521882d4d..fe63d7aeaf 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page13.prefab @@ -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 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab index 650446166b..52da03a780 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page14.prefab @@ -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 diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab index efa1942545..ed7e5defd6 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page2.prefab @@ -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: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab index 11b51066f5..564f6a0420 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page4.prefab @@ -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: diff --git a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab index 7e218b5094..fed22d4259 100644 --- a/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab +++ b/Assets/ManagedResources/Prefabs/UI/DynamicActicity/page9.prefab @@ -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 diff --git a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab index 122df0e5e5..9d47dba7c8 100644 --- a/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab +++ b/Assets/ManagedResources/Prefabs/UI/NewActivity/ExChangePage.prefab @@ -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 diff --git a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua index f77833f673..8a53f721c3 100644 --- a/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua +++ b/Assets/ManagedResources/~Lua/Modules/DynamicActivity/TimeLimitUpHero.lua @@ -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") diff --git a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua index 38e9277070..bbefc68fde 100644 --- a/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua +++ b/Assets/ManagedResources/~Lua/Modules/Map/Config/MapConfig.lua @@ -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)}, } -- 图标的说话内容 diff --git a/Assets/ManagedResources/~Lua/View/ItemView.lua b/Assets/ManagedResources/~Lua/View/ItemView.lua index e7b0e1b85b..66826529a8 100644 --- a/Assets/ManagedResources/~Lua/View/ItemView.lua +++ b/Assets/ManagedResources/~Lua/View/ItemView.lua @@ -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 --法宝 diff --git a/Assets/Plugins/Android/AndroidManifest.xml b/Assets/Plugins/Android/AndroidManifest.xml index ac2aab8b32..73a7eab169 100644 --- a/Assets/Plugins/Android/AndroidManifest.xml +++ b/Assets/Plugins/Android/AndroidManifest.xml @@ -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"> + android:name=".MainActivity"> @@ -36,16 +35,6 @@ - - - - - - - - - - diff --git a/Assets/Plugins/TapDBScripts/TapDB.cs b/Assets/Plugins/TapDBScripts/TapDB.cs index 11d946c354..61a23bfc51 100644 --- a/Assets/Plugins/TapDBScripts/TapDB.cs +++ b/Assets/Plugins/TapDBScripts/TapDB.cs @@ -89,7 +89,6 @@ public class TapDB } private static void TapDB_nativeOnResume(){ - Debug.Log ("TapDB_nativeOnResume"); AndroidJavaObject activity = getUnityClass().GetStatic("currentActivity"); getAgent().CallStatic("onResume", activity); } diff --git a/Assets/Plugins/TapDBScripts/TapDBMiniJSON.cs b/Assets/Plugins/TapDBScripts/TapDBMiniJSON.cs index 03b7d9f5b3..776c401eec 100644 --- a/Assets/Plugins/TapDBScripts/TapDBMiniJSON.cs +++ b/Assets/Plugins/TapDBScripts/TapDBMiniJSON.cs @@ -53,16 +53,16 @@ namespace TapDBMiniJSON { // // var dict = Json.Deserialize(jsonString) as Dictionary; // - // Debug.Log("deserialized: " + dict.GetType()); - // Debug.Log("dict['array'][0]: " + ((List) 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) 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); // } // } diff --git a/Assets/Scripts/Bridge/ResourcesManager.cs b/Assets/Scripts/Bridge/ResourcesManager.cs index 8b9861d3be..5061aa33b8 100644 --- a/Assets/Scripts/Bridge/ResourcesManager.cs +++ b/Assets/Scripts/Bridge/ResourcesManager.cs @@ -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) { diff --git a/Assets/Scripts/Bridge/VersionManager.cs b/Assets/Scripts/Bridge/VersionManager.cs index 15a48172c5..56cc54b0ef 100644 --- a/Assets/Scripts/Bridge/VersionManager.cs +++ b/Assets/Scripts/Bridge/VersionManager.cs @@ -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 diff --git a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs index bfc90fea50..08da6b6dda 100644 --- a/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs +++ b/Assets/Scripts/Core/ResMgr/ResourcesMgr/Manager/ResourcesManager.cs @@ -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); diff --git a/Assets/Scripts/Core/ResMgr/ResourcesMgr/ResLoader/RuntimeResLoader.cs b/Assets/Scripts/Core/ResMgr/ResourcesMgr/ResLoader/RuntimeResLoader.cs index 97f8e327ae..5916e2b96a 100644 --- a/Assets/Scripts/Core/ResMgr/ResourcesMgr/ResLoader/RuntimeResLoader.cs +++ b/Assets/Scripts/Core/ResMgr/ResourcesMgr/ResLoader/RuntimeResLoader.cs @@ -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) diff --git a/Assets/Scripts/Core/ResUpdate/Base/ThreadDownloader.cs b/Assets/Scripts/Core/ResUpdate/Base/ThreadDownloader.cs index 6b6ff5dedf..546ab1b55d 100644 --- a/Assets/Scripts/Core/ResUpdate/Base/ThreadDownloader.cs +++ b/Assets/Scripts/Core/ResUpdate/Base/ThreadDownloader.cs @@ -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)); } } } diff --git a/Assets/Scripts/Core/ResUpdate/Manager/ResourceDownloadManager.cs b/Assets/Scripts/Core/ResUpdate/Manager/ResourceDownloadManager.cs index 3b31de94ef..8764860d11 100644 --- a/Assets/Scripts/Core/ResUpdate/Manager/ResourceDownloadManager.cs +++ b/Assets/Scripts/Core/ResUpdate/Manager/ResourceDownloadManager.cs @@ -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) { diff --git a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs index be039d1617..1d18b23783 100644 --- a/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs +++ b/Assets/Scripts/Core/ResUpdate/Manager/ResourcesUpdateManager.cs @@ -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 /// 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(); diff --git a/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs b/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs index ec9b8272e3..31237ec42e 100644 --- a/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs +++ b/Assets/Scripts/GameInit/SLanguageMoreLanguageMgr.cs @@ -142,7 +142,7 @@ namespace GameLogic } private void ReadJson(string strjson) { - Debug.Log(strjson); + XDebug.Log.l(strjson); data = JsonMapper.ToObject(strjson); } @@ -192,7 +192,7 @@ namespace GameLogic case 1: languageStr = "英文"; break; case 2: languageStr = "越南语"; break; } - Debug.Log("当前语言是：" + languageStr); + XDebug.Log.l("当前语言是：" + languageStr); } /// @@ -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; diff --git a/Assets/Scripts/GameInit/UpdatePanel.cs b/Assets/Scripts/GameInit/UpdatePanel.cs index cc14024edd..7129833351 100644 --- a/Assets/Scripts/GameInit/UpdatePanel.cs +++ b/Assets/Scripts/GameInit/UpdatePanel.cs @@ -39,12 +39,12 @@ namespace GameLogic public IEnumerator LoadFromStream(Action 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) diff --git a/Assets/Scripts/JsonUtility/MiniJSON.cs b/Assets/Scripts/JsonUtility/MiniJSON.cs index b076792239..a961bdf844 100644 --- a/Assets/Scripts/JsonUtility/MiniJSON.cs +++ b/Assets/Scripts/JsonUtility/MiniJSON.cs @@ -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 ) { diff --git a/Assets/Scripts/UI/UIBgAdaptive.cs b/Assets/Scripts/UI/UIBgAdaptive.cs index 69947ef52e..5f7e5d47c5 100644 --- a/Assets/Scripts/UI/UIBgAdaptive.cs +++ b/Assets/Scripts/UI/UIBgAdaptive.cs @@ -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().sizeDelta = new Vector2(curWidth, curHeight); } else