Commit a18b200a authored by SherryChaos's avatar SherryChaos

bug fix

parent df03b0d8
...@@ -537,8 +537,8 @@ MonoBehaviour: ...@@ -537,8 +537,8 @@ MonoBehaviour:
text: {fileID: 1398959084} text: {fileID: 1398959084}
input: {fileID: 1775272994} input: {fileID: 1775272994}
mode_Window: 0 mode_Window: 0
mode_Android: 0 mode_Android: 1
mode_IOS: 1 mode_IOS: 0
fullCopy: 0 fullCopy: 0
--- !u!114 &916768208 --- !u!114 &916768208
MonoBehaviour: MonoBehaviour:
......
...@@ -7991,7 +7991,7 @@ RectTransform: ...@@ -7991,7 +7991,7 @@ RectTransform:
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
m_AnchorMin: {x: 1, y: 0} m_AnchorMin: {x: 1, y: 0}
m_AnchorMax: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1}
m_AnchoredPosition: {x: 600.0002, y: 0} m_AnchoredPosition: {x: 600.00024, y: 0}
m_SizeDelta: {x: 600, y: 0} m_SizeDelta: {x: 600, y: 0}
m_Pivot: {x: 1, y: 0.5} m_Pivot: {x: 1, y: 0.5}
--- !u!114 &1850716665 --- !u!114 &1850716665
......
...@@ -81,7 +81,7 @@ namespace MDPro3 ...@@ -81,7 +81,7 @@ namespace MDPro3
id = 10; id = 10;
var endString = id.ToString("D4"); var endString = id.ToString("D4");
back = ABLoader.LoadFromFolder<SpriteScaler>("MasterDuel/Background/Back" + endString, true, true); back = ABLoader.LoadFromFolder<SpriteRenderer>("MasterDuel/Background/Back" + endString, true, true);
if (back.TryGetComponent<SpriteScaler>(out var spriteScaler)) if (back.TryGetComponent<SpriteScaler>(out var spriteScaler))
{ {
spriteScaler.isApplyOnUpdate = true; spriteScaler.isApplyOnUpdate = true;
......
...@@ -225,7 +225,7 @@ namespace MDPro3.Net ...@@ -225,7 +225,7 @@ namespace MDPro3.Net
deckProtector = decks[i].Protector, deckProtector = decks[i].Protector,
isDelete = false, isDelete = false,
deckYdk = decks[i].GetYDK(), deckYdk = decks[i].GetYDK(),
timeStamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds() //timeStamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds()
}; };
decks[i].deckId = ids[i]; decks[i].deckId = ids[i];
...@@ -279,7 +279,7 @@ namespace MDPro3.Net ...@@ -279,7 +279,7 @@ namespace MDPro3.Net
{ {
userId = MyCard.account.user.id, userId = MyCard.account.user.id,
deckContributor = MyCard.account.user.username, deckContributor = MyCard.account.user.username,
deck = new PostDeck(deck, deckId, deckName, ydk, time) deck = new PostDeck(deck, deckId, deckName, ydk/*, time*/)
}; };
var json = JsonUtility.ToJson(body); var json = JsonUtility.ToJson(body);
...@@ -576,14 +576,18 @@ namespace MDPro3.Net ...@@ -576,14 +576,18 @@ namespace MDPro3.Net
public int deckProtector; public int deckProtector;
public string deckYdk; public string deckYdk;
public bool isDelete; public bool isDelete;
public long timeStamp; //public long timeStamp;
//public PostDeck()
//{
// timeStamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds();
//}
public PostDeck() public PostDeck()
{ {
timeStamp = ((DateTimeOffset)DateTime.UtcNow).ToUnixTimeMilliseconds();
} }
public PostDeck(Deck deck, string deckId, string deckName, string ydk, DateTime time) public PostDeck(Deck deck, string deckId, string deckName, string ydk/*, DateTime timeUtc*/)
{ {
this.deckId = deckId; this.deckId = deckId;
this.deckName = deckName; this.deckName = deckName;
...@@ -597,7 +601,7 @@ namespace MDPro3.Net ...@@ -597,7 +601,7 @@ namespace MDPro3.Net
deckProtector = deck.Protector; deckProtector = deck.Protector;
deckYdk = ydk; deckYdk = ydk;
isDelete = false; isDelete = false;
timeStamp = ((DateTimeOffset)time.ToUniversalTime()).ToUnixTimeMilliseconds(); //timeStamp = ((DateTimeOffset)timeUtc).ToUnixTimeMilliseconds();
} }
} }
......
...@@ -305,7 +305,7 @@ namespace MDPro3.Servant ...@@ -305,7 +305,7 @@ namespace MDPro3.Servant
var serverTime = od.GetUpdateUtcTime(); var serverTime = od.GetUpdateUtcTime();
var diff = serverTime - fileInfo.LastWriteTimeUtc; var diff = serverTime - fileInfo.LastWriteTimeUtc;
//Debug.Log($"{od.deckName}: serverTimeUtc: {od.GetUpdateUtcTime()}, serverTimeLocal: {od.GetUpdateLocalTime()} localTime: {fileInfo.LastWriteTimeUtc} diff: {diff.TotalSeconds}"); //Debug.Log($"{od.deckName}: serverTimeUtc: {od.GetUpdateUtcTime()}, localTime: {fileInfo.LastWriteTimeUtc} diff: {diff.TotalSeconds}");
if (diff.TotalSeconds > timeError || diff.TotalSeconds < -timeError) if (diff.TotalSeconds > timeError || diff.TotalSeconds < -timeError)
{ {
......
...@@ -190,8 +190,9 @@ namespace MDPro3.UI ...@@ -190,8 +190,9 @@ namespace MDPro3.UI
} }
} }
} }
else{ else
if (path.StartsWith("WallPaperIcon")) {
if (AppearanceUI.currentContent == "Wallpaper")
Config.Set("Wallpaper", itemID.ToString()); Config.Set("Wallpaper", itemID.ToString());
else else
Config.Set(Appearance.condition.ToString() + AppearanceUI.currentContent + Appearance.player, itemID.ToString()); Config.Set(Appearance.condition.ToString() + AppearanceUI.currentContent + Appearance.player, itemID.ToString());
......
...@@ -462,6 +462,7 @@ namespace MDPro3.UI.ServantUI ...@@ -462,6 +462,7 @@ namespace MDPro3.UI.ServantUI
itemMono.Refresh(); itemMono.Refresh();
currentList.Add(item); currentList.Add(item);
} }
if (Program.items.ListHaveSame(targetItems)) if (Program.items.ListHaveSame(targetItems))
{ {
GameObject item = Instantiate(Template); GameObject item = Instantiate(Template);
......
...@@ -9,7 +9,6 @@ using System.Collections; ...@@ -9,7 +9,6 @@ using System.Collections;
using System.Collections.Generic; using System.Collections.Generic;
using System.IO; using System.IO;
using System.Threading.Tasks; using System.Threading.Tasks;
using UnityEditor.Experimental.GraphView;
using UnityEngine; using UnityEngine;
using UnityEngine.EventSystems; using UnityEngine.EventSystems;
using UnityEngine.UI; using UnityEngine.UI;
......
...@@ -551,7 +551,7 @@ PlayerSettings: ...@@ -551,7 +551,7 @@ PlayerSettings:
m_APIs: 0b000000 m_APIs: 0b000000
m_Automatic: 1 m_Automatic: 1
- m_BuildTarget: WindowsStandaloneSupport - m_BuildTarget: WindowsStandaloneSupport
m_APIs: 02000000 m_APIs: 0b00000002000000
m_Automatic: 0 m_Automatic: 0
- m_BuildTarget: LinuxStandaloneSupport - m_BuildTarget: LinuxStandaloneSupport
m_APIs: 1500000011000000 m_APIs: 1500000011000000
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment