Skip to content

Y
ygopro2
Commit 065f88da authored by Unicorn369's avatar Unicorn369
Browse files
Options

Upgrade to Unity5.6.7f1

parent ff10f957
Hide whitespace changes
Inline Side-by-side
Showing with 1079 additions and 724 deletions
AI_core_vs2017solution/build/gmake.linux/Makefile
View file @ 065f88da
......@@ -6,22 +6,17 @@ ifndef config
endif
export config
PROJECTS := sqlite3 ocgcore
PROJECTS := ocgcore
.PHONY: all clean help $(PROJECTS)
all: $(PROJECTS)
sqlite3:
@echo "==== Building sqlite3 ($(config)) ===="
@${MAKE} --no-print-directory -C . -f sqlite3.make
ocgcore:
@echo "==== Building ocgcore ($(config)) ===="
@${MAKE} --no-print-directory -C . -f ocgcore.make
clean:
@${MAKE} --no-print-directory -C . -f sqlite3.make clean
@${MAKE} --no-print-directory -C . -f ocgcore.make clean
help:
......@@ -34,7 +29,6 @@ help:
@echo "TARGETS:"
@echo " all (default)"
@echo " clean"
@echo " sqlite3"
@echo " ocgcore"
@echo ""
@echo "For more information, see http://industriousone.com/premake/quick-start"
AI_core_vs2017solution/build/gmake.linux/sqlite3.make deleted 100644 → 0
View file @ ff10f957
# GNU Make project makefile autogenerated by Premake
ifndef config
config=release
endif
ifndef verbose
SILENT = @
endif
ifndef CC
CC = gcc
endif
ifndef CXX
CXX = g++
endif
ifndef AR
AR = ar
endif
ifeq ($(config),release)
OBJDIR = ../../obj/Linux/x86_64/sqlite3
TARGETDIR = ../../bin/x86_64
TARGET = $(TARGETDIR)/libsqlite3.so
DEFINES += -DLUA_USE_LINUX
INCLUDES +=
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Os -fPIC -fno-strict-aliasing -Wno-multichar
CXXFLAGS += $(CFLAGS)
LDFLAGS += -s -shared
LIBS +=
RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS +=
LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
define PREBUILDCMDS
endef
define PRELINKCMDS
endef
define POSTBUILDCMDS
endef
endif
ifeq ($(config),release32)
OBJDIR = ../../obj/Linux/x86/sqlite3
TARGETDIR = ../../bin/x86
TARGET = $(TARGETDIR)/libsqlite3.so
DEFINES += -DLUA_USE_LINUX
INCLUDES +=
CPPFLAGS += -MMD -MP $(DEFINES) $(INCLUDES)
CFLAGS += $(CPPFLAGS) $(ARCH) -Os -m32 -fPIC -fno-strict-aliasing -Wno-multichar
CXXFLAGS += $(CFLAGS)
LDFLAGS += -s -shared -m32 -L/usr/lib32
LIBS +=
RESFLAGS += $(DEFINES) $(INCLUDES)
LDDEPS +=
LINKCMD = $(CXX) -o $(TARGET) $(OBJECTS) $(LDFLAGS) $(RESOURCES) $(ARCH) $(LIBS)
define PREBUILDCMDS
endef
define PRELINKCMDS
endef
define POSTBUILDCMDS
endef
endif
OBJECTS := \
$(OBJDIR)/sqlite3.o \
RESOURCES := \
SHELLTYPE := msdos
ifeq (,$(ComSpec)$(COMSPEC))
SHELLTYPE := posix
endif
ifeq (/bin,$(findstring /bin,$(SHELL)))
SHELLTYPE := posix
endif
.PHONY: clean prebuild prelink
all: $(TARGETDIR) $(OBJDIR) prebuild prelink $(TARGET)
@:
$(TARGET): $(GCH) $(OBJECTS) $(LDDEPS) $(RESOURCES)
@echo Linking sqlite3
$(SILENT) $(LINKCMD)
$(POSTBUILDCMDS)
$(TARGETDIR):
@echo Creating $(TARGETDIR)
ifeq (posix,$(SHELLTYPE))
$(SILENT) mkdir -p $(TARGETDIR)
else
$(SILENT) mkdir $(subst /,\\,$(TARGETDIR))
endif
$(OBJDIR):
@echo Creating $(OBJDIR)
ifeq (posix,$(SHELLTYPE))
$(SILENT) mkdir -p $(OBJDIR)
else
$(SILENT) mkdir $(subst /,\\,$(OBJDIR))
endif
clean:
@echo Cleaning sqlite3
ifeq (posix,$(SHELLTYPE))
$(SILENT) rm -f $(TARGET)
$(SILENT) rm -rf $(OBJDIR)
else
$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
endif
prebuild:
$(PREBUILDCMDS)
prelink:
$(PRELINKCMDS)
ifneq (,$(PCH))
$(GCH): $(PCH)
@echo $(notdir $<)
-$(SILENT) cp $< $(OBJDIR)
$(SILENT) $(CXX) $(CXXFLAGS) -o "$@" -c "$<"
endif
$(OBJDIR)/sqlite3.o: ../../ocgcore/sqlite3.c
@echo $(notdir $<)
$(SILENT) $(CC) $(CFLAGS) -o "$@" -c "$<"
-include $(OBJECTS:%.o=%.d)
Assets/SibylSystem/Program.cs
View file @ 065f88da
......@@ -287,7 +287,7 @@ public class Program : MonoBehaviour
Screen.sleepTimeout = SleepTimeout.NeverSleep;
if (!File.Exists(ANDROID_GAME_PATH + "updates/version1.0.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygocore.zip";
string filePath = Application.streamingAssetsPath + "/ygopro2.zip";
var www = new WWW(filePath);
while (!www.isDone) { }
byte[] bytes = www.bytes;
......@@ -301,7 +301,7 @@ public class Program : MonoBehaviour
string GamePaths = Application.persistentDataPath + "/ygopro2/";
if (!File.Exists(GamePaths + "updates/version1.0.txt"))
{
string filePath = Application.streamingAssetsPath + "/ygocore.zip";
string filePath = Application.streamingAssetsPath + "/ygopro2.zip";
var www = new WWW(filePath);
while (!www.isDone) { }
byte[] bytes = www.bytes;
......@@ -995,6 +995,14 @@ public class Program : MonoBehaviour
#region MonoBehaviors
private float LastUpdateShowTime = 0f;
private float UpdateShowDeltaTime = 1f; //更新帧率
private int FrameUpdate = 0;
private float m_FPS = 0;
void Start()
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
......@@ -1013,6 +1021,8 @@ public class Program : MonoBehaviour
instance = this;
initialize();
go(500, () => { gameStart(); });
LastUpdateShowTime = Time.realtimeSinceStartup;
}
int preWid = 0;
......@@ -1023,15 +1033,26 @@ public class Program : MonoBehaviour
void OnGUI()
{
if (Event.current.type == EventType.ScrollWheel)
if (Event.current.type == EventType.ScrollWheel) {
_padScroll = -Event.current.delta.y / 100;
else
} else {
_padScroll = 0;
}
//GUI.Label(new Rect(Screen.width / 2, 0, 100, 100), "FPS: " + m_FPS);
GUI.Label(new Rect(10, 5, 100, 100), "FPS: " + m_FPS);
}
void Update()
{
FrameUpdate++;
if(Time.realtimeSinceStartup - LastUpdateShowTime >= UpdateShowDeltaTime)
{
m_FPS = FrameUpdate / (Time.realtimeSinceStartup - LastUpdateShowTime);
FrameUpdate = 0;
LastUpdateShowTime = Time.realtimeSinceStartup;
}
if (preWid != Screen.width || preheight != Screen.height)
{
Resources.UnloadUnusedAssets();
......
Assets/SibylSystem/ResourceManagers/GameTextureManager.cs
View file @ 065f88da
......@@ -25,6 +25,7 @@ public class GameTextureManager
static HttpDldFile df = new HttpDldFile();
private static readonly Semaphore _sem = new Semaphore(30, 30);
public class BitmapHelper
{
public System.Drawing.Color[,] colors = null;
......@@ -144,7 +145,7 @@ public class GameTextureManager
public static Texture2D opBack = null;
public static Texture2D unknown = null;
public static Texture2D unknown = null;
public static Texture2D attack = null;
......@@ -152,7 +153,7 @@ public class GameTextureManager
public static Texture2D bar = null;
public static Texture2D exBar = null;
public static Texture2D exBar = null;
public static Texture2D lp = null;
......@@ -207,12 +208,12 @@ public class GameTextureManager
while (waitLoadStack.Count > 0)
{
thu++;
if (thu==10)
if (thu == 10)
{
Thread.Sleep(50);
thu = 0;
}
if (bLock==false)
if (bLock == false)
{
PictureResource pic;
......@@ -227,41 +228,23 @@ public class GameTextureManager
}
if (pic.type == GameTextureType.card_feature)
{
try
{
ProcessingCardFeature(pic);
}
catch (Exception e)
{
Debug.Log("e 1" + e.ToString());
}
_sem.WaitOne();
new Thread(() => ProcessingCardFeature(pic)).Start();
}
if (pic.type == GameTextureType.card_picture)
{
try
{
ProcessingCardPicture(pic);
}
catch (Exception e)
{
Debug.Log("e 2" + e.ToString());
}
_sem.WaitOne();
new Thread(() => ProcessingCardPicture(pic)).Start();
}
if (pic.type == GameTextureType.card_verticle_drawing)
{
try
{
ProcessingVerticleDrawing(pic);
}
catch (Exception e)
{
Debug.Log("e 3" + e.ToString());
}
_sem.WaitOne();
new Thread(() => ProcessingVerticleDrawing(pic)).Start();
}
}
}
}
catch (Exception e)
catch (Exception e)
{
Debug.Log("erroe 1" + e.ToString());
}
......@@ -270,96 +253,57 @@ public class GameTextureManager
private static void ProcessingCardFeature(PictureResource pic)
{
if (File.Exists("picture/closeup/" + pic.code.ToString() + ".png"))
{
string path = "picture/closeup/" + pic.code.ToString() + ".png";
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
int up;
int down;
CutTop(bitmap, out left, out right, out up, out down);
up = CutLeft(bitmap, up);
down = CutRight(bitmap, down);
right = CutButton(bitmap, right);
int width = right - left;
int height = down - up;
pic.hashed_data = new float[width, height, 4];
for (int w = 0; w < width; w++)
{
for (int h = 0; h < height; h++)
{
System.Drawing.Color color = bitmap.GetPixel(left + w, up + h);
float a = (float)color.A / 255f;
if (w < 40) if (a > (float)w / (float)40) a = (float)w / (float)40;
if (w > (width - 40)) if (a > 1f - (float)(w - (width - 40)) / (float)40) a = 1f - (float)(w - (width - 40)) / (float)40;
if (h < 40) if (a > (float)h / (float)40) a = (float)h / (float)40;
if (h > (height - 40)) if (a > 1f - (float)(h - (height - 40)) / (float)40) a = 1f - (float)(h - (height - 40)) / (float)40;
pic.hashed_data[w, height - h - 1, 0] = (float)color.R / 255f;
pic.hashed_data[w, height - h - 1, 1] = (float)color.G / 255f;
pic.hashed_data[w, height - h - 1, 2] = (float)color.B / 255f;
pic.hashed_data[w, height - h - 1, 3] = a;
}
}
caculateK(pic);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
}
else
try
{
string path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
bool Iam8 = false;
if (!File.Exists(path))
if (File.Exists("picture/closeup/" + pic.code.ToString() + ".png"))
{
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
pic.hashed_data = new float[10, 10, 4];
for (int w = 0; w < 10; w++)
string path = "picture/closeup/" + pic.code.ToString() + ".png";
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
int up;
int down;
CutTop(bitmap, out left, out right, out up, out down);
up = CutLeft(bitmap, up);
down = CutRight(bitmap, down);
right = CutButton(bitmap, right);
int width = right - left;
int height = down - up;
pic.hashed_data = new float[width, height, 4];
for (int w = 0; w < width; w++)
{
for (int h = 0; h < 10; h++)
for (int h = 0; h < height; h++)
{
pic.hashed_data[w, h, 0] = 0;
pic.hashed_data[w, h, 1] = 0;
pic.hashed_data[w, h, 2] = 0;
pic.hashed_data[w, h, 3] = 0;
System.Drawing.Color color = bitmap.GetPixel(left + w, up + h);
float a = (float)color.A / 255f;
if (w < 40) if (a > (float)w / (float)40) a = (float)w / (float)40;
if (w > (width - 40)) if (a > 1f - (float)(w - (width - 40)) / (float)40) a = 1f - (float)(w - (width - 40)) / (float)40;
if (h < 40) if (a > (float)h / (float)40) a = (float)h / (float)40;
if (h > (height - 40)) if (a > 1f - (float)(h - (height - 40)) / (float)40) a = 1f - (float)(h - (height - 40)) / (float)40;
pic.hashed_data[w, height - h - 1, 0] = (float)color.R / 255f;
pic.hashed_data[w, height - h - 1, 1] = (float)color.G / 255f;
pic.hashed_data[w, height - h - 1, 2] = (float)color.B / 255f;
pic.hashed_data[w, height - h - 1, 3] = a;
}
}
caculateK(pic);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
......@@ -367,40 +311,90 @@ public class GameTextureManager
}
else
{
pic.hashed_data = getCuttedPic(path, pic.pCard,Iam8);
int width = pic.hashed_data.GetLength(0);
int height = pic.hashed_data.GetLength(1);
int size = (int)(height * 0.8);
int empWidth = (width - size) / 2;
int empHeight = (height - size) / 2;
int right = width - empWidth;
int buttom = height - empHeight;
for (int w = 0; w < width; w++)
string path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
for (int h = 0; h < height; h++)
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
bool Iam8 = false;
if (!File.Exists(path))
{
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
pic.hashed_data = new float[10, 10, 4];
for (int w = 0; w < 10; w++)
{
float a = pic.hashed_data[w, h, 3];
if (w < empWidth)
if (a > ((float)w) / (float)empWidth)
a = ((float)w) / (float)empWidth;
if (h < empHeight)
if (a > ((float)h) / (float)empHeight)
a = ((float)h) / (float)empHeight;
if (w > right)
if (a > 1f - ((float)(w - right)) / (float)empWidth)
a = 1f - ((float)(w - right)) / (float)empWidth;
if (h > buttom)
if (a > 1f - ((float)(h - buttom)) / (float)empHeight)
a = 1f - ((float)(h - buttom)) / (float)empHeight;
pic.hashed_data[w, h, 3] = a * 0.7f;
for (int h = 0; h < 10; h++)
{
pic.hashed_data[w, h, 0] = 0;
pic.hashed_data[w, h, 1] = 0;
pic.hashed_data[w, h, 2] = 0;
pic.hashed_data[w, h, 3] = 0;
}
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
else
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
pic.hashed_data = getCuttedPic(path, pic.pCard,Iam8);
int width = pic.hashed_data.GetLength(0);
int height = pic.hashed_data.GetLength(1);
int size = (int)(height * 0.8);
int empWidth = (width - size) / 2;
int empHeight = (height - size) / 2;
int right = width - empWidth;
int buttom = height - empHeight;
for (int w = 0; w < width; w++)
{
for (int h = 0; h < height; h++)
{
float a = pic.hashed_data[w, h, 3];
if (w < empWidth)
if (a > ((float)w) / (float)empWidth)
a = ((float)w) / (float)empWidth;
if (h < empHeight)
if (a > ((float)h) / (float)empHeight)
a = ((float)h) / (float)empHeight;
if (w > right)
if (a > 1f - ((float)(w - right)) / (float)empWidth)
a = 1f - ((float)(w - right)) / (float)empWidth;
if (h > buttom)
if (a > 1f - ((float)(h - buttom)) / (float)empHeight)
a = 1f - ((float)(h - buttom)) / (float)empHeight;
pic.hashed_data[w, h, 3] = a * 0.7f;
}
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
}
}
}
catch (Exception e)
{
Debug.Log("e 1" + e.ToString());
}
finally
{
_sem.Release();
}
}
private static void caculateK(PictureResource pic)
......@@ -439,7 +433,7 @@ public class GameTextureManager
int width = pic.hashed_data.GetLength(0);
int height = pic.hashed_data.GetLength(1);
int h = 0;
for (h = height-1; h >0; h--)
for (h = height - 1; h > 0; h--)
{
int all = 0;
for (int w = 0; w < width; w++)
......@@ -454,7 +448,7 @@ public class GameTextureManager
break;
}
}
pic.k =((float)h) / ((float)height);
pic.k = ((float)h) / ((float)height);
if (pic.k > 1)
{
pic.k = 1f;
......@@ -465,12 +459,12 @@ public class GameTextureManager
}
}
private static float[,,] getCuttedPic(string path,bool pCard,bool EightEdition)
private static float[,,] getCuttedPic(string path, bool pCard, bool EightEdition)
{
BitmapHelper bitmap = new BitmapHelper(path);
int left = 0, top = 0, right = bitmap.colors.GetLength(0), buttom = bitmap.colors.GetLength(1);
//right is width and buttom is height now
if (EightEdition)
if (EightEdition)
{
if (pCard)
{
......@@ -594,148 +588,146 @@ public class GameTextureManager
private static void ProcessingVerticleDrawing(PictureResource pic)
{
string path = "picture/closeup/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
try
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
bool Iam8 = false;
if (!File.Exists(path))
{
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "texture/duel/unknown.jpg";
}
string path = "picture/closeup/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
return;
}
pic.hashed_data = getCuttedPic(path, pic.pCard,Iam8);
softVtype(pic, 0.5f);
pic.k = 1;
//pic.autoMade = true;
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
path = "picture/null.png";
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
//#elif UNITY_IPHONE //iPhone Test (Android not support)
//path = Application.streamingAssetsPath + "/closeup/" + pic.code.ToString() + ".png";
//if (File.Exists(path))
//{
// www = new WWW(path);
// byte[] data = www.bytes;
// pic.data = data;
//} else {
// path = Application.streamingAssetsPath + "/null.png"
// www = new WWW(path);
// byte[] data = www.bytes;
// pic.data = data;
//}
#endif
}
else
{
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
int up;
int down;
CutTop(bitmap, out left, out right, out up, out down);
up = CutLeft(bitmap, up);
down = CutRight(bitmap, down);
right = CutButton(bitmap, right);
int width = right - left;
int height = down - up;
pic.hashed_data = new float[width, height, 4];
for (int w = 0; w < width; w++)
{
for (int h = 0; h < height; h++)
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
System.Drawing.Color color = bitmap.GetPixel(left + w, up + h);
pic.hashed_data[w, height - h - 1, 0] = (float)color.R / 255f;
pic.hashed_data[w, height - h - 1, 1] = (float)color.G / 255f;
pic.hashed_data[w, height - h - 1, 2] = (float)color.B / 255f;
pic.hashed_data[w, height - h - 1, 3] = (float)color.A / 255f;
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
}
float wholeUNalpha = 0;
for (int w = 0; w < width; w++)
{
if (pic.hashed_data[w, 0, 3] > 0.1f)
bool Iam8 = false;
if (!File.Exists(path))
{
wholeUNalpha += ((float)Math.Abs(w - width / 2)) / ((float)(width / 2));
Iam8 = true;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (pic.hashed_data[w, height - 1, 3] > 0.1f)
if (!File.Exists(path))
{
wholeUNalpha += 1;
Iam8 = true;
path = "pics/" + pic.code.ToString() + ".jpg";
}
}
for (int h = 0; h < height; h++)
{
if (pic.hashed_data[0, h, 3] > 0.1f)
if (!File.Exists(path))
{
Iam8 = true;
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
wholeUNalpha += 1;
path = "texture/duel/unknown.jpg";
}
if (pic.hashed_data[width - 1, h, 3] > 0.1f)
if (!File.Exists(path))
{
wholeUNalpha += 1;
path = "picture/null.png";
}
pic.hashed_data = getCuttedPic(path, pic.pCard, Iam8);
softVtype(pic, 0.5f);
pic.k = 1;
//pic.autoMade = true;
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
path = "picture/null.png";
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
}
if (wholeUNalpha >= ((width + height) * 0.5f * 0.12f))
else
{
softVtype(pic,0.7f);
#if UNITY_EDITOR || UNITY_STANDALONE_WIN //编译器、Windows
BitmapHelper bitmap = new BitmapHelper(path);
int left;
int right;
int up;
int down;
CutTop(bitmap, out left, out right, out up, out down);
up = CutLeft(bitmap, up);
down = CutRight(bitmap, down);
right = CutButton(bitmap, right);
int width = right - left;
int height = down - up;
pic.hashed_data = new float[width, height, 4];
for (int w = 0; w < width; w++)
{
for (int h = 0; h < height; h++)
{
System.Drawing.Color color = bitmap.GetPixel(left + w, up + h);
pic.hashed_data[w, height - h - 1, 0] = (float)color.R / 255f;
pic.hashed_data[w, height - h - 1, 1] = (float)color.G / 255f;
pic.hashed_data[w, height - h - 1, 2] = (float)color.B / 255f;
pic.hashed_data[w, height - h - 1, 3] = (float)color.A / 255f;
}
}
float wholeUNalpha = 0;
for (int w = 0; w < width; w++)
{
if (pic.hashed_data[w, 0, 3] > 0.1f)
{
wholeUNalpha += ((float)Math.Abs(w - width / 2)) / ((float)(width / 2));
}
if (pic.hashed_data[w, height - 1, 3] > 0.1f)
{
wholeUNalpha += 1;
}
}
for (int h = 0; h < height; h++)
{
if (pic.hashed_data[0, h, 3] > 0.1f)
{
wholeUNalpha += 1;
}
if (pic.hashed_data[width - 1, h, 3] > 0.1f)
{
wholeUNalpha += 1;
}
}
if (wholeUNalpha >= ((width + height) * 0.5f * 0.12f))
{
softVtype(pic, 0.7f);
}
caculateK(pic);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
#endif
}
caculateK(pic);
/*
* 以上处理其他平台无法正常使用
* 暂时只能直接贴图，以后再处理
*/
#elif UNITY_ANDROID || UNITY_IPHONE //Android、iPhone
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
pic.data = data;
#endif
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
catch (Exception e)
{
Debug.Log("e 3" + e.ToString());
}
finally
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
_sem.Release();
}
}
......@@ -791,64 +783,75 @@ public class GameTextureManager
private static void ProcessingCardPicture(PictureResource pic)
{
string path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path) && pic.code != 0 && Program.DownloadImage)
{
//YGOMobile (177x254)
df.Download("http://download.ygopro.win/ygopro/pics/" + pic.code.ToString() + ".jpg", "expansions/pics/" + pic.code.ToString() + ".jpg");
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path) && pic.code != 0 && Program.DownloadImage)
{
//先行卡 (177x254)
df.Download("http://download.ygopro.win/ygopro2-data/expansions/pics/" + pic.code.ToString() + ".jpg", "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg");
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
try
{
if (pic.code > 0)
string path = "picture/card/" + pic.code.ToString() + ".png";
if (!File.Exists(path))
{
pic.u_data = unknown;
path = "picture/card/" + pic.code.ToString() + ".jpg";
}
else
if (!File.Exists(path))
{
pic.u_data = myBack;
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
if (!File.Exists(path))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
path = "pics/" + pic.code.ToString() + ".jpg";
}
}
else
{
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
if (!File.Exists(path))
{
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path) && pic.code != 0 && Program.DownloadImage)
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
//YGOMobile (177x254)
df.Download("http://download.ygopro.win/ygopro/pics/" + pic.code.ToString() + ".jpg", "expansions/pics/" + pic.code.ToString() + ".jpg");
path = "expansions/pics/" + pic.code.ToString() + ".jpg";
}
pic.data = data;
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
if (!File.Exists(path) && pic.code != 0 && Program.DownloadImage)
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
//先行卡 (177x254)
df.Download("http://download.ygo2019.xyz/ygopro2-data/expansions/pics/" + pic.code.ToString() + ".jpg", "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg");
path = "picture/cardIn8thEdition/" + pic.code.ToString() + ".jpg";
}
if (!File.Exists(path))
{
if (pic.code > 0)
{
pic.u_data = unknown;
}
else
{
pic.u_data = myBack;
}
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
}
else
{
byte[] data;
using (FileStream file = new FileStream(path, FileMode.Open, FileAccess.Read))
{
file.Seek(0, SeekOrigin.Begin);
data = new byte[file.Length];
file.Read(data, 0, (int)file.Length);
}
pic.data = data;
if (!loadedList.ContainsKey(hashPic(pic.code, pic.type)))
{
loadedList.Add(hashPic(pic.code, pic.type), pic);
}
}
}
catch (Exception e)
{
Debug.Log("e 2" + e.ToString());
}
finally
{
_sem.Release();
}
}
......@@ -932,7 +935,7 @@ public class GameTextureManager
return ret;
}
public static bool uiLoaded=false;
public static bool uiLoaded = false;
public static Texture2D get(string name)
{
......@@ -969,7 +972,7 @@ public class GameTextureManager
return re;
}
public static UnityEngine.Color chainColor= UnityEngine.Color.white;
public static UnityEngine.Color chainColor = UnityEngine.Color.white;
internal static void initialize()
{
......@@ -1003,10 +1006,10 @@ public class GameTextureManager
rs = UIHelper.getTexture2D("texture/duel/phase/rs.png");
ts = UIHelper.getTexture2D("texture/duel/phase/ts.png");
N = new Texture2D(10,10);
for (int i = 0; i < 10; i++)
N = new Texture2D(10, 10);
for (int i = 0; i < 10; i++)
{
for (int a = 0; a < 10; a++)
for (int a = 0; a < 10; a++)
{
N.SetPixel(i, a, new UnityEngine.Color(0, 0, 0, 0));
}
......@@ -1016,7 +1019,7 @@ public class GameTextureManager
{
ColorUtility.TryParseHtmlString(File.ReadAllText("texture/duel/chainColor.txt"), out chainColor);
}
catch (Exception)
catch (Exception)
{
}
......
Assets/SibylSystem/ResourceManagers/HttpDldFile.cs
View file @ 065f88da
......@@ -10,25 +10,34 @@ using UnityEngine;
public class HttpDldFile
{
private readonly System.Threading.Semaphore semaphore = new System.Threading.Semaphore(6, 6);
public bool Download(string url, string filename)
{
bool flag = false;
try
{
if(!Directory.Exists(Path.GetDirectoryName(filename))){
Directory.CreateDirectory(Path.GetDirectoryName(filename));
}
using (var client = new WebClient())
{
ServicePointManager.ServerCertificateValidationCallback = MyRemoteCertificateValidationCallback;
//client.Headers.Add(HttpRequestHeader.Authorization, string.Concat("token ", RepoData.GetToken()));
client.Headers.Add(HttpRequestHeader.ContentType,"application/x-www-form-urlencoded; charset=UTF-8");
client.Headers.Add(HttpRequestHeader.UserAgent, "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/52.0.2743.116 Safari/537.36 Edge/15.15063");
client.DownloadFile(new Uri(url), filename+".tmp");
}
flag = true;
if(File.Exists(filename))
if (!Directory.Exists(Path.GetDirectoryName(filename)))
{
Directory.CreateDirectory(Path.GetDirectoryName(filename));
}
using (var client = new TimeoutWebClient())
{
ServicePointManager.ServerCertificateValidationCallback = MyRemoteCertificateValidationCallback;
if (Path.GetExtension(filename).Contains("png"))
{
client.Timeout = 6500;
}
if (Path.GetExtension(filename).Contains("jpg"))
{
client.Timeout = 3500;
}
semaphore.WaitOne();
client.DownloadFile(new Uri(url), filename + ".tmp");
}
flag = true;
if (File.Exists(filename))
{
File.Delete(filename);
}
......@@ -38,6 +47,10 @@ public class HttpDldFile
{
flag = false;
}
finally
{
semaphore.Release();
}
return flag;
}
public static bool MyRemoteCertificateValidationCallback(System.Object sender,
......@@ -68,5 +81,25 @@ public class HttpDldFile
}
return isOk;
}
}
public class TimeoutWebClient : WebClient
{
public int Timeout { get; set; }
public TimeoutWebClient()
{
Timeout = 10000;
}
public TimeoutWebClient(int timeout)
{
Timeout = timeout;
}
protected override WebRequest GetWebRequest(Uri address)
{
WebRequest request = base.GetWebRequest(address);
request.Timeout = Timeout;
return request;
}
}
\ No newline at end of file
Assets/SibylSystem/Room/RoomList.cs
View file @ 065f88da
using UnityEngine;
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Threading;
using System.Linq;
public class RoomList : WindowServantSP
......@@ -11,13 +8,13 @@ public class RoomList : WindowServantSP
List<string[]> listOfRooms = new List<string[]>();
bool hideAI;
bool hideStarted;
UILabel roomNameLabel;
UILabel roomPSWLabel;
public override void initialize()
{
createWindow(Program.I().new_ui_RoomList);
UIHelper.registEvent(gameObject, "exit_", onClickExit);
UIHelper.registEvent(gameObject, "refresh_", onRefresh);
roomNameLabel = UIHelper.getByName<UILabel>(gameObject, "roomNameLabel");
roomPSWLabel = UIHelper.getByName<UILabel>(gameObject, "roomNameLabel");
hideAI =UIHelper.getByName<UIToggle>(gameObject, "hideAIrooms_").value = UIHelper.fromStringToBool(Config.Get("hideAIrooms_", "1"));
hideStarted=UIHelper.getByName<UIToggle>(gameObject, "hideStarted_").value = UIHelper.fromStringToBool(Config.Get("hideStarted_", "1"));
UIHelper.registEvent(gameObject, "hideAIrooms_", save);
......@@ -54,7 +51,7 @@ public class RoomList : WindowServantSP
}
public override void hide()
{
roomNameLabel.text = "";
roomPSWLabel.text = "";
base.hide();
}
......@@ -77,17 +74,6 @@ public class RoomList : WindowServantSP
{
superScrollView.add(room[9]);
}
//for (int i = 0; i < listOfRooms.Count; i++)
//{
// //if (listOfRooms[i].Length > 4)
// //{
// // //if (/*listOfRooms[i].Substring(fileInfos[i].Name.Length - 4, 4) == ".lua"*/)
// // //{
// // // // superScrollView.add(listOfRooms[i].Substring(0, listOf.Name.Length - 4));
// // //}
// //}
//}
}
string selectedString = string.Empty;
......@@ -106,12 +92,14 @@ public class RoomList : WindowServantSP
}
selectedString = superScrollView.selectedString;
roomPsw= listOfRooms.Find(s => s[9] == selectedString)[2];
int roomNameIndex = roomPsw.LastIndexOf("#")+1;
if (roomNameIndex > 0)
if (roomPsw != null)
{
roomNameLabel.text = roomPsw.Substring(roomNameIndex);
roomPSWLabel.text = roomPsw;
}
else
{
roomPSWLabel.text = "";
}
}
void JoinRoom(string selectedString,string roomPsw)
......
Assets/SibylSystem/Setting/Setting.cs
View file @ 065f88da
......@@ -6,6 +6,8 @@ public class Setting : WindowServant2D
public LAZYsetting setting;
public bool batterySaving;
public override void initialize()
{
gameObject = createWindow(this, Program.I().new_ui_setting);
......@@ -14,6 +16,8 @@ public class Setting : WindowServant2D
UIHelper.registEvent(gameObject, "screen_", resizeScreen);
UIHelper.registEvent(gameObject, "full_", resizeScreen);
UIHelper.registEvent(gameObject, "resize_", resizeScreen);
UIHelper.registEvent(gameObject, "batterySaving", batterySavingMode);
batterySaving = UIHelper.getByName<UIToggle>(gameObject, "batterySaving").value = UIHelper.fromStringToBool(Config.Get("batterySaving", "0"));
UIHelper.getByName<UIToggle>(gameObject, "full_").value = Screen.fullScreen;
UIHelper.getByName<UIPopupList>(gameObject, "screen_").value = Screen.width.ToString() + "*" + Screen.height.ToString();
UIHelper.getByName<UIToggle>(gameObject, "ignoreWatcher_").value = UIHelper.fromStringToBool(Config.Get("ignoreWatcher_", "0"));
......@@ -77,6 +81,20 @@ public class Setting : WindowServant2D
onchangeCloud();
}
private void batterySavingMode()
{
if (batterySaving)
{
Application.targetFrameRate = 30;
}
else
{
Application.targetFrameRate = -1;
}
batterySaving = !batterySaving;
save();
}
private void readVales()
{
try
......@@ -237,6 +255,7 @@ public class Setting : WindowServant2D
public void save()
{
Config.Set("batterySaving", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "batterySaving").value));
Config.Set("ignoreWatcher_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "ignoreWatcher_").value));
Config.Set("ignoreOP_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "ignoreOP_").value));
Config.Set("smartSelect_", UIHelper.fromBoolToString(UIHelper.getByName<UIToggle>(gameObject, "smartSelect_").value));
......
Assets/StreamingAssets/null.png.meta deleted 100644 → 0
View file @ ff10f957
fileFormatVersion: 2
guid: 7cc6adf5988b03345bc3fbbdb145cbab
timeCreated: 1548561685
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
Assets/transUI/prefab/trans_selectDeck.prefab
View file @ 065f88da
......@@ -217,26 +217,6 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &145740
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 467664}
- component: {fileID: 6550760}
- component: {fileID: 11458476}
- component: {fileID: 11126878}
- component: {fileID: 11450356}
- component: {fileID: 11441580}
m_Layer: 5
m_Name: exit_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &148926
GameObject:
m_ObjectHideFlags: 1
......@@ -426,7 +406,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 444458}
- {fileID: 467664}
- {fileID: 4655999955114628}
- {fileID: 408948}
- {fileID: 440222}
- {fileID: 4301654562176622}
......@@ -549,19 +529,6 @@ Transform:
m_Father: {fileID: 483848}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &467664
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 451, y: 222, z: 0}
m_LocalScale: {x: 1.5812898, y: 1.5812899, z: 1.5812899}
m_Children: []
m_Father: {fileID: 430046}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &472530
Transform:
m_ObjectHideFlags: 1
......@@ -688,18 +655,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 30, y: 430, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6550760
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 20, y: 20, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6562456
BoxCollider:
m_ObjectHideFlags: 1
......@@ -724,21 +679,6 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 160, y: 34, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &11126878
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_Enabled: 0
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_Animations:
- {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!114 &11400168
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1196,56 +1136,6 @@ MonoBehaviour:
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: white
mFillCenter: 1
--- !u!114 &11441580
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 430046}
relative: 1
absolute: -39
rightAnchor:
target: {fileID: 430046}
relative: 1
absolute: -19
bottomAnchor:
target: {fileID: 430046}
relative: 1
absolute: -47
topAnchor:
target: {fileID: 430046}
relative: 1
absolute: -27
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 20
mHeight: 20
mDepth: 1
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: close
mFillCenter: 1
--- !u!114 &11442162
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1444,29 +1334,6 @@ MonoBehaviour:
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &11450356
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f093ad5830afe44aba6efa8b8a5d5b9, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 11126878}
animator: {fileID: 0}
clipName:
trigger: 1
playDirection: 1
resetOnPlay: 0
clearSelection: 0
ifDisabledOnPlay: 0
disableWhenFinished: 0
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &11456170
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -1512,33 +1379,6 @@ MonoBehaviour:
mDepth: 10
mSortingOrder: 0
mClipOffset: {x: 0, y: 0}
--- !u!114 &11458476
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145740}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 145740}
hover: {r: 1, g: 1, b: 1, a: 1}
pressed: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 1, g: 1, b: 1, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
--- !u!114 &11460968
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -2375,6 +2215,26 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1996091162362038
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4655999955114628}
- component: {fileID: 65900025775816248}
- component: {fileID: 114035550960179464}
- component: {fileID: 111482691428740384}
- component: {fileID: 114737158210425152}
- component: {fileID: 114632189714543598}
m_Layer: 5
m_Name: exit_
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4035183780167598
Transform:
m_ObjectHideFlags: 1
......@@ -2595,6 +2455,19 @@ Transform:
m_Father: {fileID: 4484020028579870}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4655999955114628
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 451, y: 222, z: 0}
m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
m_Children: []
m_Father: {fileID: 430046}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4755195410450884
Transform:
m_ObjectHideFlags: 1
......@@ -2746,6 +2619,18 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 132, y: 32, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &65900025775816248
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_Material: {fileID: 0}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 30, y: 30, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!111 &111006085828665950
Animation:
m_ObjectHideFlags: 1
......@@ -2791,6 +2676,21 @@ Animation:
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!111 &111482691428740384
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_Enabled: 0
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_Animations:
- {fileID: 7400000, guid: e8c465e83c3e18040884ef096f01647b, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 1
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!111 &111699256369535224
Animation:
m_ObjectHideFlags: 1
......@@ -2965,6 +2865,33 @@ MonoBehaviour:
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 4.125
--- !u!114 &114035550960179464
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 1996091162362038}
hover: {r: 1, g: 1, b: 1, a: 1}
pressed: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 1, g: 1, b: 1, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
--- !u!114 &114037491138257406
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -3877,6 +3804,56 @@ MonoBehaviour:
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114632189714543598
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 1
absolute: -39
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: -19
bottomAnchor:
target: {fileID: 0}
relative: 1
absolute: -47
topAnchor:
target: {fileID: 0}
relative: 1
absolute: -27
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 30
mHeight: 30
mDepth: 1
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: close
mFillCenter: 1
--- !u!114 &114683538354324162
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -4032,6 +4009,29 @@ MonoBehaviour:
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114737158210425152
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1996091162362038}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f093ad5830afe44aba6efa8b8a5d5b9, type: 3}
m_Name:
m_EditorClassIdentifier:
target: {fileID: 111482691428740384}
animator: {fileID: 0}
clipName:
trigger: 1
playDirection: 1
resetOnPlay: 0
clearSelection: 0
ifDisabledOnPlay: 0
disableWhenFinished: 0
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114811913695966658
MonoBehaviour:
m_ObjectHideFlags: 1
......
Assets/transUI/prefab/trans_setting.prefab
View file @ 065f88da
......@@ -872,7 +872,7 @@ GameObject:
- component: {fileID: 11494298}
- component: {fileID: 11424234}
m_Layer: 5
m_Name: '*DownloadImage'
m_Name: batterySaving
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
......@@ -3062,7 +3062,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 145416}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: -47, z: 0}
m_LocalPosition: {x: 12, y: -52, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 445292}
......@@ -3074,18 +3074,18 @@ Transform:
- {fileID: 475610}
- {fileID: 476514}
- {fileID: 473974}
- {fileID: 498002}
- {fileID: 443912}
- {fileID: 468122}
- {fileID: 485716}
- {fileID: 490748}
- {fileID: 479900}
- {fileID: 493200}
- {fileID: 471716}
- {fileID: 490080}
- {fileID: 453648}
- {fileID: 471716}
- {fileID: 498002}
- {fileID: 493200}
m_Father: {fileID: 463726}
m_RootOrder: 23
m_RootOrder: 24
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &401690
Transform:
......@@ -3094,7 +3094,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 109232}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: 335, z: 0}
m_LocalPosition: {x: 15, y: 365, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 449270}
......@@ -3136,7 +3136,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 164798}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: 370, z: 0}
m_LocalPosition: {x: 15, y: 395, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 488244}
......@@ -3321,7 +3321,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 174428}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 180, z: 0}
m_LocalPosition: {x: -157.2, y: 185, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 404514}
......@@ -3363,7 +3363,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 196340}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: -100, z: 0}
m_LocalPosition: {x: -309.6, y: -105, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 441956}
......@@ -3405,7 +3405,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 186530}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: -130, z: 0}
m_LocalPosition: {x: -309.6, y: -135, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 413668}
......@@ -3514,7 +3514,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 157382}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: 20, z: 0}
m_LocalPosition: {x: -309.6, y: 15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 423648}
......@@ -3530,7 +3530,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 185900}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157, y: 250, z: 0}
m_LocalPosition: {x: -157, y: 265, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 401194}
......@@ -3546,7 +3546,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 172132}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: 300, z: 0}
m_LocalPosition: {x: 15, y: 335, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 477166}
......@@ -3588,7 +3588,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 176336}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: 140, z: 0}
m_LocalPosition: {x: -309.6, y: 135, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 451274}
......@@ -3760,7 +3760,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 149734}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: 50, z: 0}
m_LocalPosition: {x: -309.6, y: 45, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 463944}
......@@ -3815,7 +3815,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 116812}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: 265, z: 0}
m_LocalPosition: {x: 15, y: 305, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 469184}
......@@ -4068,7 +4068,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 113076}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 215, z: 0}
m_LocalPosition: {x: -157.2, y: 225, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 409202}
......@@ -4130,7 +4130,7 @@ Transform:
- {fileID: 488900}
- {fileID: 440652}
m_Father: {fileID: 401270}
m_RootOrder: 9
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &444350
Transform:
......@@ -4152,7 +4152,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 164062}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: 80, z: 0}
m_LocalPosition: {x: -309.6, y: 75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 466984}
......@@ -4210,7 +4210,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 163268}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 342.96, z: 0}
m_LocalPosition: {x: -157.2, y: 365, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 436330}
......@@ -4288,7 +4288,7 @@ Transform:
- {fileID: 444350}
- {fileID: 484324}
m_Father: {fileID: 401270}
m_RootOrder: 16
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &455148
Transform:
......@@ -4479,6 +4479,7 @@ Transform:
- {fileID: 418518}
- {fileID: 431416}
- {fileID: 4748048495216516}
- {fileID: 4808535323606856}
- {fileID: 487754}
- {fileID: 401270}
m_Father: {fileID: 484650}
......@@ -4491,7 +4492,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 156898}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 314.16, z: 0}
m_LocalPosition: {x: -157.2, y: 335, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 420462}
......@@ -4533,7 +4534,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 177070}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: -70, z: 0}
m_LocalPosition: {x: -309.6, y: -75, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 479946}
......@@ -4562,7 +4563,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 133812}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 361, y: 278, z: 0}
m_LocalPosition: {x: 361, y: 309, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 484650}
......@@ -4608,7 +4609,7 @@ Transform:
- {fileID: 405246}
- {fileID: 433682}
m_Father: {fileID: 401270}
m_RootOrder: 10
m_RootOrder: 11
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &468734
Transform:
......@@ -4643,7 +4644,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 108314}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -8, y: 277, z: 0}
m_LocalPosition: {x: -8, y: 308, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 484650}
......@@ -4708,14 +4709,14 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 125772}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 131.1, y: -53, z: 0}
m_LocalPosition: {x: 131.1, y: 37, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 411648}
- {fileID: 409240}
- {fileID: 493332}
m_Father: {fileID: 401270}
m_RootOrder: 17
m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &473966
Transform:
......@@ -4724,7 +4725,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 173192}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 371.76, z: 0}
m_LocalPosition: {x: -157.2, y: 395, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 462202}
......@@ -4915,7 +4916,7 @@ Transform:
- {fileID: 440572}
- {fileID: 456060}
m_Father: {fileID: 401270}
m_RootOrder: 13
m_RootOrder: 14
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &479946
Transform:
......@@ -4976,7 +4977,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 116036}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: -40, z: 0}
m_LocalPosition: {x: -309.6, y: -45, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 407374}
......@@ -5018,7 +5019,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 187840}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: -10, z: 0}
m_LocalPosition: {x: -309.6, y: -15, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 402524}
......@@ -5073,7 +5074,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 174308}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -157.2, y: 285.36, z: 0}
m_LocalPosition: {x: -157.2, y: 305, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 464358}
......@@ -5126,7 +5127,7 @@ Transform:
- {fileID: 408108}
- {fileID: 431114}
m_Father: {fileID: 401270}
m_RootOrder: 11
m_RootOrder: 12
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &487528
Transform:
......@@ -5148,14 +5149,14 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 128600}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15, y: 195, z: 0}
m_LocalPosition: {x: 15, y: 215, z: 0}
m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
m_Children:
- {fileID: 479786}
- {fileID: 411022}
- {fileID: 432392}
m_Father: {fileID: 463726}
m_RootOrder: 22
m_RootOrder: 23
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &488244
Transform:
......@@ -5232,7 +5233,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 127118}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: -309.6, y: 110, z: 0}
m_LocalPosition: {x: -309.6, y: 105, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 460024}
......@@ -5255,7 +5256,7 @@ Transform:
- {fileID: 439706}
- {fileID: 475242}
m_Father: {fileID: 401270}
m_RootOrder: 15
m_RootOrder: 16
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &490118
Transform:
......@@ -5297,7 +5298,7 @@ Transform:
- {fileID: 417302}
- {fileID: 412508}
m_Father: {fileID: 401270}
m_RootOrder: 12
m_RootOrder: 13
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &491692
Transform:
......@@ -5332,14 +5333,14 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 100964}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 131.1, y: 37, z: 0}
m_LocalPosition: {x: 131.1, y: -53, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 492888}
- {fileID: 405428}
- {fileID: 483786}
m_Father: {fileID: 401270}
m_RootOrder: 14
m_RootOrder: 18
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &493332
Transform:
......@@ -5361,7 +5362,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 139010}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 2, y: 263, z: 0}
m_LocalPosition: {x: 2, y: 294, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 484650}
......@@ -5394,7 +5395,7 @@ Transform:
- {fileID: 479564}
- {fileID: 456164}
m_Father: {fileID: 401270}
m_RootOrder: 18
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &498702
Transform:
......@@ -5648,7 +5649,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 780, y: 629, z: 0}
m_Size: {x: 780, y: 690, z: 0}
m_Center: {x: 0, y: 0, z: 0}
--- !u!65 &6551748
BoxCollider:
......@@ -9933,21 +9934,21 @@ MonoBehaviour:
bottomAnchor:
target: {fileID: 484650}
relative: 0
absolute: 25
absolute: -3
topAnchor:
target: {fileID: 484650}
relative: 1
absolute: -25
absolute: 3
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 744
mHeight: 579
mHeight: 696
mDepth: -100
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.2849741
aspectRatio: 1.0689656
mType: 0
mFillDirection: 4
mFillAmount: 1
......@@ -10227,7 +10228,7 @@ MonoBehaviour:
showoff: {fileID: 11470560}
showoffWhenActived: {fileID: 11452754}
cloud: {fileID: 114247332317060808}
DownloadImage: {fileID: 11408868}
DownloadImage: {fileID: 114654519243977964}
Vbattle: {fileID: 11435302}
Vmove: {fileID: 11428410}
Vchain: {fileID: 11427298}
......@@ -14125,7 +14126,7 @@ MonoBehaviour:
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
mText: "\u81EA\u52A8\u4E0B\u8F7D\u7F3A\u5931\u5361\u56FE"
mText: "\u964D\u4F4E\u6E38\u620F\u5E27\u6570 (30FPS)"
mFontSize: 18
mFontStyle: 0
mAlignment: 0
......@@ -15739,12 +15740,12 @@ MonoBehaviour:
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 780
mHeight: 629
mHeight: 690
mDepth: 0
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1.2400635
aspectRatio: 1.1304348
mType: 1
mFillDirection: 4
mFillAmount: 1
......@@ -18589,6 +18590,26 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1409564597213602
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4808535323606856}
- component: {fileID: 114932231810058562}
- component: {fileID: 114654519243977964}
- component: {fileID: 65968018635603156}
- component: {fileID: 114462178772296572}
- component: {fileID: 114658492503328412}
m_Layer: 5
m_Name: '*DownloadImage'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1488671369870118
GameObject:
m_ObjectHideFlags: 1
......@@ -18605,6 +18626,40 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1665393886252752
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4972888354459798}
- component: {fileID: 111463314430724194}
- component: {fileID: 114534012011523422}
- component: {fileID: 114548418715095868}
m_Layer: 5
m_Name: Checkmark
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1761586924538690
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4297149264326394}
- component: {fileID: 114806539364941284}
m_Layer: 5
m_Name: '!lable'
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1803584130090100
GameObject:
m_ObjectHideFlags: 1
......@@ -18639,6 +18694,22 @@ GameObject:
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!1 &1858696524741922
GameObject:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
serializedVersion: 5
m_Component:
- component: {fileID: 4642579248728316}
- component: {fileID: 114136671086423984}
m_Layer: 5
m_Name: Background
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &4093465128725644
Transform:
m_ObjectHideFlags: 1
......@@ -18652,6 +18723,32 @@ Transform:
m_Father: {fileID: 4748048495216516}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4297149264326394
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1761586924538690}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 27, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4808535323606856}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4642579248728316
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1858696524741922}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10, y: 1, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 4808535323606856}
m_RootOrder: 1
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4737155259452260
Transform:
m_ObjectHideFlags: 1
......@@ -18672,7 +18769,7 @@ Transform:
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1334155132578260}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 15, y: 230, z: 0}
m_LocalPosition: {x: 15, y: 275, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 4737155259452260}
......@@ -18681,6 +18778,22 @@ Transform:
m_Father: {fileID: 463726}
m_RootOrder: 21
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4808535323606856
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 15, y: 245, z: 0}
m_LocalScale: {x: 0.99846995, y: 0.99846995, z: 0.99846995}
m_Children:
- {fileID: 4972888354459798}
- {fileID: 4642579248728316}
- {fileID: 4297149264326394}
m_Father: {fileID: 463726}
m_RootOrder: 22
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4937417521647812
Transform:
m_ObjectHideFlags: 1
......@@ -18694,6 +18807,19 @@ Transform:
m_Father: {fileID: 4748048495216516}
m_RootOrder: 2
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &4972888354459798
Transform:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1665393886252752}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 10, y: 1, z: 0}
m_LocalScale: {x: 0.01, y: 0.01, z: 0.01}
m_Children: []
m_Father: {fileID: 4808535323606856}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &65762186443550356
BoxCollider:
m_ObjectHideFlags: 1
......@@ -18706,6 +18832,18 @@ BoxCollider:
serializedVersion: 2
m_Size: {x: 272, y: 24, z: 0}
m_Center: {x: 136, y: 0, z: 0}
--- !u!65 &65968018635603156
BoxCollider:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 272, y: 24, z: 0}
m_Center: {x: 136, y: 0, z: 0}
--- !u!111 &111016380425419474
Animation:
m_ObjectHideFlags: 1
......@@ -18721,6 +18859,21 @@ Animation:
m_PlayAutomatically: 0
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!111 &111463314430724194
Animation:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1665393886252752}
m_Enabled: 0
serializedVersion: 3
m_Animation: {fileID: 7400000, guid: baa794242d9902a439adb42668119f24, type: 2}
m_Animations:
- {fileID: 7400000, guid: baa794242d9902a439adb42668119f24, type: 2}
m_WrapMode: 0
m_PlayAutomatically: 0
m_AnimatePhysics: 0
m_CullingType: 0
--- !u!114 &114087385098287042
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -18762,6 +18915,56 @@ MonoBehaviour:
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114136671086423984
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1858696524741922}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 4808535323606856}
relative: 0
absolute: 1
rightAnchor:
target: {fileID: 4808535323606856}
relative: 0
absolute: 19
bottomAnchor:
target: {fileID: 4808535323606856}
relative: 0
absolute: 4
topAnchor:
target: {fileID: 4808535323606856}
relative: 1
absolute: -2
updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 18
mHeight: 18
mDepth: 10
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 1
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: kuang
mFillCenter: 1
--- !u!114 &114247332317060808
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -18887,6 +19090,33 @@ MonoBehaviour:
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: wwhite
mFillCenter: 1
--- !u!114 &114462178772296572
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1fdca5042b1d12a4890ec1bd4f04290d, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 1858696524741922}
hover: {r: 1, g: 1, b: 1, a: 1}
pressed: {r: 1, g: 1, b: 1, a: 1}
disabledColor: {r: 1, g: 1, b: 1, a: 1}
duration: 0.2
dragHighlight: 0
hoverSprite:
pressedSprite:
disabledSprite:
hoverSprite2D: {fileID: 0}
pressedSprite2D: {fileID: 0}
disabledSprite2D: {fileID: 0}
pixelSnap: 0
onClick: []
mTextureOutNormal:
mTextureOutPressed:
--- !u!114 &114529394992741522
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -18924,6 +19154,70 @@ MonoBehaviour:
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 11.333333
--- !u!114 &114534012011523422
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1665393886252752}
m_Enabled: 0
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 65ee607e1177db1479c3cbf94cac327e, type: 3}
m_Name:
m_EditorClassIdentifier:
onFinished: []
eventReceiver: {fileID: 0}
callWhenFinished:
--- !u!114 &114548418715095868
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1665393886252752}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1b3dc54f924693f41b5cbecb267e647a, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 4642579248728316}
relative: 0.5
absolute: -5
rightAnchor:
target: {fileID: 4642579248728316}
relative: 0.5
absolute: 5
bottomAnchor:
target: {fileID: 4642579248728316}
relative: 0.5
absolute: -5
topAnchor:
target: {fileID: 4642579248728316}
relative: 0.5
absolute: 5
updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 4
mWidth: 10
mHeight: 10
mDepth: 2
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 1
mType: 0
mFillDirection: 4
mFillAmount: 1
mInvert: 0
mFlip: 0
centerType: 1
leftType: 1
rightType: 1
bottomType: 1
topType: 1
mAtlas: {fileID: 11422656, guid: 1b5c469d95cc74b4e9f655da6f9dd392, type: 2}
mSpriteName: wwhite
mFillCenter: 1
--- !u!114 &114575008299407160
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -18939,6 +19233,112 @@ MonoBehaviour:
hover: {x: 0, y: 0, z: 90}
pressed: {x: 0, y: 0, z: 0}
duration: 0.2
--- !u!114 &114654519243977964
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 446d504799d99174383957fca80713c8, type: 3}
m_Name:
m_EditorClassIdentifier:
group: 0
activeSprite: {fileID: 0}
activeAnimation: {fileID: 111463314430724194}
animator: {fileID: 0}
tween: {fileID: 0}
startsActive: 0
instantTween: 0
optionCanBeNone: 0
onChange: []
checkSprite: {fileID: 0}
checkAnimation: {fileID: 0}
eventReceiver: {fileID: 0}
functionName: OnActivate
startsChecked: 0
--- !u!114 &114658492503328412
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3f23d9cb4e13584439c9f9ddeed5e512, type: 3}
m_Name:
m_EditorClassIdentifier:
tweenTarget: {fileID: 4642579248728316}
hover: {x: 0, y: 0, z: 90}
pressed: {x: 0, y: 0, z: 0}
duration: 0.2
--- !u!114 &114806539364941284
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1761586924538690}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: e9d0b5f3bbe925a408bd595c79d0bf63, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 4808535323606856}
relative: 0
absolute: 27
rightAnchor:
target: {fileID: 4808535323606856}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 4808535323606856}
relative: 0
absolute: 2
topAnchor:
target: {fileID: 4808535323606856}
relative: 1
absolute: -2
updateAnchors: 2
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 245
mHeight: 20
mDepth: 9
autoResizeBoxCollider: 0
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 12.25
keepCrispWhenShrunk: 1
mTrueTypeFont: {fileID: 10102, guid: 0000000000000000e000000000000000, type: 0}
mFont: {fileID: 0}
mText: "\u81EA\u52A8\u4E0B\u8F7D\u7F3A\u5931\u5361\u56FE"
mFontSize: 18
mFontStyle: 0
mAlignment: 0
mEncoding: 1
mMaxLineCount: 0
mEffectStyle: 1
mEffectColor: {r: 0, g: 0, b: 0, a: 1}
mSymbols: 1
mEffectDistance: {x: 1, y: 1}
mOverflow: 0
mMaterial: {fileID: 0}
mApplyGradient: 1
mGradientTop: {r: 1, g: 1, b: 1, a: 1}
mGradientBottom: {r: 0.7, g: 0.7, b: 0.7, a: 1}
mSpacingX: 0
mSpacingY: 0
mUseFloatSpacing: 0
mFloatSpacingX: 0
mFloatSpacingY: 0
mOverflowEllipsis: 0
mShrinkToFit: 0
mMaxLineWidth: 0
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &114931832146496222
MonoBehaviour:
m_ObjectHideFlags: 1
......@@ -19005,3 +19405,40 @@ MonoBehaviour:
mMaxLineHeight: 0
mLineWidth: 0
mMultiline: 1
--- !u!114 &114932231810058562
MonoBehaviour:
m_ObjectHideFlags: 1
m_PrefabParentObject: {fileID: 0}
m_PrefabInternal: {fileID: 100100000}
m_GameObject: {fileID: 1409564597213602}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 858a20c1b21a3f94bb5b2d3b901c9aaf, type: 3}
m_Name:
m_EditorClassIdentifier:
leftAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
rightAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
bottomAnchor:
target: {fileID: 0}
relative: 0
absolute: 0
topAnchor:
target: {fileID: 0}
relative: 1
absolute: 0
updateAnchors: 1
mColor: {r: 1, g: 1, b: 1, a: 1}
mPivot: 3
mWidth: 272
mHeight: 24
mDepth: 6
autoResizeBoxCollider: 1
hideIfOffScreen: 0
keepAspectRatio: 0
aspectRatio: 11.333333
ProjectSettings/ProjectVersion.txt
View file @ 065f88da
m_EditorVersion: 5.6.6f2
m_EditorVersion: 5.6.7f1
README.md
View file @ 065f88da
......@@ -54,9 +54,9 @@ The feedbacks is checked every day.
> `cp -f -r libs ../../../Assets/Plugins/Android/`
# How to compile the libocgcore.so、libsqlite3.so? (Linux)
# How to compile the libocgcore.so? (Linux)
*In most case you do not need to care about the libocgcore.so、libsqlite3.so.*
*In most case you do not need to care about the libocgcore.so.*
> `cd AI_core_vs2017solution/build/gmake.linux`
......
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